diff --git a/examples/N1-Composer-Translate/lib/main.cjsx b/examples/N1-Composer-Translate/lib/main.cjsx
index 50247324c..b85cdc01a 100644
--- a/examples/N1-Composer-Translate/lib/main.cjsx
+++ b/examples/N1-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">
+    <button className="btn btn-toolbar" title="Translate">
       <RetinaImg mode={RetinaImg.Mode.ContentIsMask} url="nylas://N1-Composer-Translate/assets/translate-icon@2x.png" style={}/>
       <span style={fontSize: "9px", verticalAlign: "top"}>▼</span>
     </button>
diff --git a/examples/N1-Quick-Schedule/assets/quickschedule-icon@2x.png b/examples/N1-Quick-Schedule/assets/quickschedule-icon@2x.png
new file mode 100644
index 000000000..2333a6313
Binary files /dev/null and b/examples/N1-Quick-Schedule/assets/quickschedule-icon@2x.png differ
diff --git a/examples/N1-Quick-Schedule/lib/calendar-button.cjsx b/examples/N1-Quick-Schedule/lib/calendar-button.cjsx
index e246d96dd..4c2eafb20 100644
--- a/examples/N1-Quick-Schedule/lib/calendar-button.cjsx
+++ b/examples/N1-Quick-Schedule/lib/calendar-button.cjsx
@@ -5,8 +5,8 @@ class CalendarButton extends React.Component
   @displayName: 'CalendarButton'
 
   render: =>
-    <button className="btn btn-toolbar" onClick={@_onClick}>
-      QuickSchedule
+    <button className="btn btn-toolbar" onClick={@_onClick} title="QuickSchedule">
+      <RetinaImg url="nylas://N1-Quick-Schedule/assets/quickschedule-icon@2x.png" mode={RetinaImg.Mode.ContentIsMask} />
     </button>
 
   _onClick: =>
diff --git a/internal_packages/message-list/stylesheets/message-list.less b/internal_packages/message-list/stylesheets/message-list.less
index ef9f400b0..5fc07d0f4 100644
--- a/internal_packages/message-list/stylesheets/message-list.less
+++ b/internal_packages/message-list/stylesheets/message-list.less
@@ -135,6 +135,7 @@ body.platform-win32 {
   .mail-important-icon {
     margin-right:@spacing-half;
     margin-bottom:2px;
+    flex-shrink: 0;
   }
   .message-subject {
     font-size: @font-size-large;