diff --git a/build/resources/mac/nylas.icns b/build/resources/mac/nylas.icns
index 86398f897..1f14a42f2 100644
Binary files a/build/resources/mac/nylas.icns and b/build/resources/mac/nylas.icns differ
diff --git a/internal_packages/composer-templates/lib/template-picker.jsx b/internal_packages/composer-templates/lib/template-picker.jsx
index deff81100..e92ebe744 100644
--- a/internal_packages/composer-templates/lib/template-picker.jsx
+++ b/internal_packages/composer-templates/lib/template-picker.jsx
@@ -64,7 +64,7 @@ class TemplatePicker extends React.Component {
 
   render() {
     const button = (
-      <button className="btn btn-toolbar narrow" title="Insert email template">
+      <button className="btn btn-toolbar narrow" title="Insert email template...">
         <RetinaImg url="nylas://composer-templates/assets/icon-composer-templates@2x.png" mode={RetinaImg.Mode.ContentIsMask}/>
         &nbsp;
         <RetinaImg name="icon-composer-dropdown.png" mode={RetinaImg.Mode.ContentIsMask}/>
diff --git a/internal_packages/composer-translate/lib/main.cjsx b/internal_packages/composer-translate/lib/main.cjsx
index de44f413f..09f721706 100644
--- a/internal_packages/composer-translate/lib/main.cjsx
+++ b/internal_packages/composer-translate/lib/main.cjsx
@@ -70,7 +70,7 @@ class TranslateButton extends React.Component
   # `RetinaImg` will automatically chose the best image format for our display.
   #
   _renderButton: =>
-    <button className="btn btn-toolbar" title="Translate">
+    <button className="btn btn-toolbar" title="Translate email body...">
       <RetinaImg mode={RetinaImg.Mode.ContentIsMask} url="nylas://composer-translate/assets/icon-composer-translate@2x.png" />
       &nbsp;
       <RetinaImg name="icon-composer-dropdown.png" mode={RetinaImg.Mode.ContentIsMask}/>
diff --git a/internal_packages/link-tracking/icon.png b/internal_packages/link-tracking/icon.png
index 94e058a45..67cbc47ce 100644
Binary files a/internal_packages/link-tracking/icon.png and b/internal_packages/link-tracking/icon.png differ
diff --git a/internal_packages/link-tracking/lib/link-tracking-button.jsx b/internal_packages/link-tracking/lib/link-tracking-button.jsx
index 6d77dca3b..1dabf3126 100644
--- a/internal_packages/link-tracking/lib/link-tracking-button.jsx
+++ b/internal_packages/link-tracking/lib/link-tracking-button.jsx
@@ -17,30 +17,35 @@ export default class LinkTrackingButton extends React.Component {
 
   componentDidMount() {
     const query = DatabaseStore.findBy(Message, {clientId: this.props.draftClientId});
-    this._subscription = Rx.Observable.fromQuery(query).subscribe(this.setStateFromDraft)
+    this._subscription = Rx.Observable.fromQuery(query).subscribe(this.setStateFromDraft);
   }
 
   componentWillUnmount() {
     this._subscription.dispose();
   }
 
-  setStateFromDraft =(draft)=> {
+  setStateFromDraft = (draft)=> {
     if (!draft) return;
     const metadata = draft.metadataForPluginId(PLUGIN_ID);
     this.setState({enabled: metadata ? metadata.tracked : false});
   };
 
-  _onClick=()=> {
+  _onClick = ()=> {
     const currentlyEnabled = this.state.enabled;
 
     // write metadata into the draft to indicate tracked state
-    DraftStore.sessionForClientId(this.props.draftClientId)
-      .then(session => session.draft())
-      .then(draft => {
-        return NylasAPI.authPlugin(PLUGIN_ID, plugin.title, draft.accountId).then(() => {
-          Actions.setMetadata(draft, PLUGIN_ID, currentlyEnabled ? null : {tracked: true});
-        });
+    DraftStore.sessionForClientId(this.props.draftClientId).then((session) => {
+      const draft = session.draft();
+
+      NylasAPI.authPlugin(PLUGIN_ID, plugin.title, draft.accountId)
+      .then(() => {
+        Actions.setMetadata(draft, PLUGIN_ID, currentlyEnabled ? null : {tracked: true});
+      })
+      .catch((error)=> {
+        NylasEnv.reportError(error);
+        NylasEnv.showErrorDialog(`Sorry, we were unable to save your link tracking settings. ${error.message}`);
       });
+    });
   };
 
   render() {
@@ -51,10 +56,9 @@ export default class LinkTrackingButton extends React.Component {
         className={`btn btn-toolbar ${this.state.enabled ? "btn-enabled" : ""}`}
         onClick={this._onClick}>
         <RetinaImg
-          url="nylas://link-tracking/assets/linktracking-icon@2x.png"
+          name="icon-composer-linktracking.png"
           mode={RetinaImg.Mode.ContentIsMask} />
       </button>
     )
   }
 }
-
diff --git a/internal_packages/open-tracking/lib/open-tracking-button.jsx b/internal_packages/open-tracking/lib/open-tracking-button.jsx
index 584f30e5c..c64a165e0 100644
--- a/internal_packages/open-tracking/lib/open-tracking-button.jsx
+++ b/internal_packages/open-tracking/lib/open-tracking-button.jsx
@@ -35,13 +35,18 @@ export default class OpenTrackingButton extends React.Component {
     const currentlyEnabled = this.state.enabled;
 
     // write metadata into the draft to indicate tracked state
-    DraftStore.sessionForClientId(this.props.draftClientId)
-      .then(session => session.draft())
-      .then(draft => {
-        return NylasAPI.authPlugin(PLUGIN_ID, plugin.title, draft.accountId).then(() => {
-          Actions.setMetadata(draft, PLUGIN_ID, currentlyEnabled ? null : {tracked: true});
-        });
+    DraftStore.sessionForClientId(this.props.draftClientId).then((session)=> {
+      const draft = session.draft();
+
+      NylasAPI.authPlugin(PLUGIN_ID, plugin.title, draft.accountId)
+      .then(() => {
+        Actions.setMetadata(draft, PLUGIN_ID, currentlyEnabled ? null : {tracked: true});
+      })
+      .catch((error)=> {
+        NylasEnv.reportError(error);
+        NylasEnv.showErrorDialog(`Sorry, we were unable to save your read receipt settings. ${error.message}`);
       });
+    });
   };
 
   render() {
diff --git a/internal_packages/quick-schedule/lib/calendar-button.cjsx b/internal_packages/quick-schedule/lib/calendar-button.cjsx
index e5da5b3fc..706ef61ed 100644
--- a/internal_packages/quick-schedule/lib/calendar-button.cjsx
+++ b/internal_packages/quick-schedule/lib/calendar-button.cjsx
@@ -5,7 +5,7 @@ class CalendarButton extends React.Component
   @displayName: 'CalendarButton'
 
   render: =>
-    <button className="btn btn-toolbar" onClick={@_onClick} title="Quick schedule">
+    <button className="btn btn-toolbar" onClick={@_onClick} title="Insert calendar availability...">
       <RetinaImg url="nylas://quick-schedule/assets/icon-composer-quickschedule@2x.png" mode={RetinaImg.Mode.ContentIsMask} />
     </button>
 
diff --git a/internal_packages/send-later/lib/send-later-popover.jsx b/internal_packages/send-later/lib/send-later-popover.jsx
index f36c01b26..c47a8b46e 100644
--- a/internal_packages/send-later/lib/send-later-popover.jsx
+++ b/internal_packages/send-later/lib/send-later-popover.jsx
@@ -102,7 +102,7 @@ class SendLaterPopover extends Component {
 
     if (scheduledDate === 'saving') {
       return (
-        <button className={className}>
+        <button className={className} title="Send later...">
           <RetinaImg
             name="inline-loading-spinner.gif"
             mode={RetinaImg.Mode.ContentDark}
diff --git a/internal_packages/thread-snooze/lib/snooze-store.js b/internal_packages/thread-snooze/lib/snooze-store.js
index 87b87aa1d..d043a0ebc 100644
--- a/internal_packages/thread-snooze/lib/snooze-store.js
+++ b/internal_packages/thread-snooze/lib/snooze-store.js
@@ -26,9 +26,9 @@ class SnoozeStore {
       Actions.setMetadata(updatedThreads, this.pluginId, {snoozeDate})
     })
     .catch((error)=> {
-      console.error(error)
-      NylasEnv.showErrorDialog(error.message)
-    })
+      NylasEnv.reportError(error);
+      NylasEnv.showErrorDialog(`Sorry, we were unable to save your snooze settings. ${error.message}`);
+    });
   };
 
   deactivate() {
diff --git a/static/images/composer/icon-composer-emoji@1x.png b/static/images/composer/icon-composer-emoji@1x.png
new file mode 100644
index 000000000..0fda40b22
Binary files /dev/null and b/static/images/composer/icon-composer-emoji@1x.png differ
diff --git a/static/images/composer/icon-composer-emoji@2x.png b/static/images/composer/icon-composer-emoji@2x.png
new file mode 100644
index 000000000..1d9678035
Binary files /dev/null and b/static/images/composer/icon-composer-emoji@2x.png differ
diff --git a/static/images/composer/icon-composer-linktracking@1x.png b/static/images/composer/icon-composer-linktracking@1x.png
new file mode 100644
index 000000000..71c45b232
Binary files /dev/null and b/static/images/composer/icon-composer-linktracking@1x.png differ
diff --git a/static/images/composer/icon-composer-linktracking@2x.png b/static/images/composer/icon-composer-linktracking@2x.png
new file mode 100644
index 000000000..90edf8728
Binary files /dev/null and b/static/images/composer/icon-composer-linktracking@2x.png differ