diff --git a/internal_packages/composer-templates/assets/icon-composer-templates@1x.png b/internal_packages/composer-templates/assets/icon-composer-templates@1x.png
new file mode 100644
index 000000000..128f3bc7c
Binary files /dev/null and b/internal_packages/composer-templates/assets/icon-composer-templates@1x.png differ
diff --git a/internal_packages/composer-templates/assets/icon-composer-templates@2x.png b/internal_packages/composer-templates/assets/icon-composer-templates@2x.png
index ec53deedb..a3c93d534 100644
Binary files a/internal_packages/composer-templates/assets/icon-composer-templates@2x.png and b/internal_packages/composer-templates/assets/icon-composer-templates@2x.png differ
diff --git a/internal_packages/composer-templates/lib/template-picker.jsx b/internal_packages/composer-templates/lib/template-picker.jsx
index b6bbae5a9..deff81100 100644
--- a/internal_packages/composer-templates/lib/template-picker.jsx
+++ b/internal_packages/composer-templates/lib/template-picker.jsx
@@ -25,8 +25,6 @@ class TemplatePicker extends React.Component {
     if (this.unsubscribe) this.unsubscribe();
   }
 
-  static containerStyles = {order: 2};
-
   _filteredTemplates(search = this.state.searchValue) {
     const items = TemplateStore.items();
 
@@ -66,7 +64,7 @@ class TemplatePicker extends React.Component {
 
   render() {
     const button = (
-      <button className="btn btn-toolbar narrow">
+      <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/open-tracking/assets/eye@2x.png b/internal_packages/composer-translate/assets/icon-composer-translate@1x.png
similarity index 83%
rename from internal_packages/open-tracking/assets/eye@2x.png
rename to internal_packages/composer-translate/assets/icon-composer-translate@1x.png
index 0766e833f..064353827 100644
Binary files a/internal_packages/open-tracking/assets/eye@2x.png and b/internal_packages/composer-translate/assets/icon-composer-translate@1x.png differ
diff --git a/internal_packages/composer-translate/assets/icon-composer-translate@2x.png b/internal_packages/composer-translate/assets/icon-composer-translate@2x.png
new file mode 100644
index 000000000..3e8031037
Binary files /dev/null and b/internal_packages/composer-translate/assets/icon-composer-translate@2x.png differ
diff --git a/internal_packages/composer-translate/assets/translate-icon@2x.png b/internal_packages/composer-translate/assets/translate-icon@2x.png
deleted file mode 100644
index 58c837f71..000000000
Binary files a/internal_packages/composer-translate/assets/translate-icon@2x.png and /dev/null differ
diff --git a/internal_packages/composer-translate/lib/main.cjsx b/internal_packages/composer-translate/lib/main.cjsx
index f81e1af03..de44f413f 100644
--- a/internal_packages/composer-translate/lib/main.cjsx
+++ b/internal_packages/composer-translate/lib/main.cjsx
@@ -71,8 +71,9 @@ class TranslateButton extends React.Component
   #
   _renderButton: =>
     <button className="btn btn-toolbar" title="Translate">
-      <RetinaImg mode={RetinaImg.Mode.ContentIsMask} url="nylas://composer-translate/assets/translate-icon@2x.png" />
-      <span style={fontSize: "9px", verticalAlign: "top"}>▼</span>
+      <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}/>
     </button>
 
   _onTranslate: (lang) =>
diff --git a/internal_packages/composer/lib/send-action-button.cjsx b/internal_packages/composer/lib/send-action-button.cjsx
index 1ab5e3be1..d88734a4c 100644
--- a/internal_packages/composer/lib/send-action-button.cjsx
+++ b/internal_packages/composer/lib/send-action-button.cjsx
@@ -8,8 +8,12 @@ class SendActionButton extends React.Component
 
   @propTypes:
     draft: React.PropTypes.object
+    style: React.PropTypes.object
     isValidDraft: React.PropTypes.func
 
+  @defaultProps:
+    style: {}
+
   @CONFIG_KEY: "core.sending.defaultSendType"
 
   constructor: (@props) ->
diff --git a/internal_packages/composer/stylesheets/composer.less b/internal_packages/composer/stylesheets/composer.less
index 33db49d10..f70c22885 100644
--- a/internal_packages/composer/stylesheets/composer.less
+++ b/internal_packages/composer/stylesheets/composer.less
@@ -13,6 +13,9 @@ body.platform-win32 {
     .composer-drop-cover {
       border-radius: 0;
     }
+    .composer-action-bar-wrap {
+      border-radius: 0;
+    }
     input, input:focus {
       box-shadow: none;
     }
@@ -50,20 +53,40 @@ body.platform-win32 {
   .composer-action-bar-wrap {
     position: relative;
     width: 100%;
-    background: transparent;
+    background: @background-off-primary;
+    border-top: 1px solid darken(@background-off-primary, 7%);
+    box-shadow: inset 0px 2px 1px rgba(0,0,0,0.03);
     border-bottom: 0;
+    border-radius: @border-radius-base;
+
+    // Buttons in the composer footer
+    .btn.btn-toolbar {
+      background: transparent;
+      box-shadow: 0 0 0;
+      margin: 0;
+      padding: 0 9px;
+    }
+
+    .btn-send {
+      margin-right: 10px;
+    }
+
+    .btn img.content-mask {
+      background-color: #6b777d;
+    }
+
+    .btn.btn-enabled {
+      img.content-mask {
+        background-color: @text-color-link;
+      }
+    }
 
     .composer-action-bar-content {
       display:flex;
       margin: 0 auto;
       flex-direction:row;
       max-width: @compose-width;
-      padding: @spacing-standard;
-
-      > * {
-        margin-left: @spacing-standard / 2;
-        margin-right: @spacing-standard / 2;
-      }
+      padding: 9px 22.5px;
     }
   }
 
diff --git a/internal_packages/link-tracking/lib/link-tracking-button.jsx b/internal_packages/link-tracking/lib/link-tracking-button.jsx
index 282328338..6d77dca3b 100644
--- a/internal_packages/link-tracking/lib/link-tracking-button.jsx
+++ b/internal_packages/link-tracking/lib/link-tracking-button.jsx
@@ -44,10 +44,11 @@ export default class LinkTrackingButton extends React.Component {
   };
 
   render() {
+    const title = this.state.enabled ? "Disable" : "Enable"
     return (
       <button
-        title="Link Tracking"
-        className={`btn btn-toolbar ${this.state.enabled ? "btn-action" : ""}`}
+        title={`${title} link tracking`}
+        className={`btn btn-toolbar ${this.state.enabled ? "btn-enabled" : ""}`}
         onClick={this._onClick}>
         <RetinaImg
           url="nylas://link-tracking/assets/linktracking-icon@2x.png"
diff --git a/internal_packages/open-tracking/assets/envelope-closed-icon@2x.png b/internal_packages/open-tracking/assets/envelope-closed-icon@2x.png
deleted file mode 100644
index 7014411d9..000000000
Binary files a/internal_packages/open-tracking/assets/envelope-closed-icon@2x.png and /dev/null differ
diff --git a/internal_packages/open-tracking/assets/envelope-open-icon@2x.png b/internal_packages/open-tracking/assets/envelope-open-icon@2x.png
deleted file mode 100644
index 957897e37..000000000
Binary files a/internal_packages/open-tracking/assets/envelope-open-icon@2x.png and /dev/null differ
diff --git a/internal_packages/open-tracking/assets/icon-composer-eye@1x.png b/internal_packages/open-tracking/assets/icon-composer-eye@1x.png
new file mode 100644
index 000000000..2d7a1a840
Binary files /dev/null and b/internal_packages/open-tracking/assets/icon-composer-eye@1x.png differ
diff --git a/internal_packages/open-tracking/assets/icon-composer-eye@2x.png b/internal_packages/open-tracking/assets/icon-composer-eye@2x.png
new file mode 100644
index 000000000..5a87f3f6e
Binary files /dev/null and b/internal_packages/open-tracking/assets/icon-composer-eye@2x.png differ
diff --git a/internal_packages/open-tracking/lib/open-tracking-button.jsx b/internal_packages/open-tracking/lib/open-tracking-button.jsx
index 5e01c3285..584f30e5c 100644
--- a/internal_packages/open-tracking/lib/open-tracking-button.jsx
+++ b/internal_packages/open-tracking/lib/open-tracking-button.jsx
@@ -45,9 +45,10 @@ export default class OpenTrackingButton extends React.Component {
   };
 
   render() {
-    return (<button className={`btn btn-toolbar ${this.state.enabled ? "btn-action" : ""}`}
-                   onClick={this._onClick} title="Open Tracking">
-      <RetinaImg url="nylas://open-tracking/assets/envelope-open-icon@2x.png"
+    const title = this.state.enabled ? "Disable" : "Enable";
+    return (<button className={`btn btn-toolbar ${this.state.enabled ? "btn-enabled" : ""}`}
+                   onClick={this._onClick} title={`${title} read receipts`}>
+      <RetinaImg url="nylas://open-tracking/assets/icon-composer-eye@2x.png"
                  mode={RetinaImg.Mode.ContentIsMask} />
     </button>)
   }
diff --git a/internal_packages/open-tracking/lib/open-tracking-icon.jsx b/internal_packages/open-tracking/lib/open-tracking-icon.jsx
index 972bdde4f..7f6c67e29 100644
--- a/internal_packages/open-tracking/lib/open-tracking-icon.jsx
+++ b/internal_packages/open-tracking/lib/open-tracking-icon.jsx
@@ -27,17 +27,11 @@ export default class OpenTrackingIcon extends React.Component {
   _renderIcon = () => {
     if (this.state.opened == null) {
       return <span />;
-    } else if (this.state.opened) {
-      return (
-        <RetinaImg
-          url="nylas://open-tracking/assets/envelope-open-icon@2x.png"
-          mode={RetinaImg.Mode.ContentIsMask} />
-      );
     }
     return (
       <RetinaImg
-        className="unopened"
-        url="nylas://open-tracking/assets/envelope-closed-icon@2x.png"
+        className={this.state.opened ? "opened" : "unopened"}
+        url="nylas://open-tracking/assets/icon-composer-eye@2x.png"
         mode={RetinaImg.Mode.ContentIsMask} />
     );
   };
diff --git a/internal_packages/quick-schedule/assets/icon-composer-quickschedule@1x.png b/internal_packages/quick-schedule/assets/icon-composer-quickschedule@1x.png
new file mode 100644
index 000000000..b716570ad
Binary files /dev/null and b/internal_packages/quick-schedule/assets/icon-composer-quickschedule@1x.png differ
diff --git a/internal_packages/quick-schedule/assets/icon-composer-quickschedule@2x.png b/internal_packages/quick-schedule/assets/icon-composer-quickschedule@2x.png
new file mode 100644
index 000000000..510b9c7be
Binary files /dev/null and b/internal_packages/quick-schedule/assets/icon-composer-quickschedule@2x.png differ
diff --git a/internal_packages/quick-schedule/assets/quickschedule-icon@2x.png b/internal_packages/quick-schedule/assets/quickschedule-icon@2x.png
deleted file mode 100644
index 2333a6313..000000000
Binary files a/internal_packages/quick-schedule/assets/quickschedule-icon@2x.png and /dev/null differ
diff --git a/internal_packages/quick-schedule/lib/calendar-button.cjsx b/internal_packages/quick-schedule/lib/calendar-button.cjsx
index 8046b4ec3..e5da5b3fc 100644
--- a/internal_packages/quick-schedule/lib/calendar-button.cjsx
+++ b/internal_packages/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} title="QuickSchedule">
-      <RetinaImg url="nylas://quick-schedule/assets/quickschedule-icon@2x.png" mode={RetinaImg.Mode.ContentIsMask} />
+    <button className="btn btn-toolbar" onClick={@_onClick} title="Quick schedule">
+      <RetinaImg url="nylas://quick-schedule/assets/icon-composer-quickschedule@2x.png" mode={RetinaImg.Mode.ContentIsMask} />
     </button>
 
   _onClick: =>
diff --git a/internal_packages/send-later/assets/icon-composer-sendlater@1x.png b/internal_packages/send-later/assets/icon-composer-sendlater@1x.png
new file mode 100644
index 000000000..f005cf33f
Binary files /dev/null and b/internal_packages/send-later/assets/icon-composer-sendlater@1x.png differ
diff --git a/internal_packages/send-later/assets/icon-composer-sendlater@2x.png b/internal_packages/send-later/assets/icon-composer-sendlater@2x.png
new file mode 100644
index 000000000..01eb64a6e
Binary files /dev/null and b/internal_packages/send-later/assets/icon-composer-sendlater@2x.png differ
diff --git a/static/buttons.less b/static/buttons.less
index 5412ed4e0..76dd473de 100644
--- a/static/buttons.less
+++ b/static/buttons.less
@@ -140,6 +140,7 @@ body.platform-win32 {
   &.narrow {
     padding: 0 9px;
   }
+
 }
 
 .btn-gradient {
diff --git a/static/images/composer/icon-composer-attachment@1x.png b/static/images/composer/icon-composer-attachment@1x.png
new file mode 100644
index 000000000..0e6b47f37
Binary files /dev/null and b/static/images/composer/icon-composer-attachment@1x.png differ
diff --git a/static/images/composer/icon-composer-attachment@2x.png b/static/images/composer/icon-composer-attachment@2x.png
index a3e6462c2..fbce0d87a 100644
Binary files a/static/images/composer/icon-composer-attachment@2x.png and b/static/images/composer/icon-composer-attachment@2x.png differ
diff --git a/static/images/composer/icon-composer-dropdown@1x.png b/static/images/composer/icon-composer-dropdown@1x.png
new file mode 100644
index 000000000..affde6c17
Binary files /dev/null and b/static/images/composer/icon-composer-dropdown@1x.png differ
diff --git a/static/images/composer/icon-composer-dropdown@2x.png b/static/images/composer/icon-composer-dropdown@2x.png
index c0aae9445..5bb02da91 100644
Binary files a/static/images/composer/icon-composer-dropdown@2x.png and b/static/images/composer/icon-composer-dropdown@2x.png differ
diff --git a/static/images/composer/icon-composer-overflow@1x.png b/static/images/composer/icon-composer-overflow@1x.png
new file mode 100644
index 000000000..f10c06e4b
Binary files /dev/null and b/static/images/composer/icon-composer-overflow@1x.png differ
diff --git a/static/images/composer/icon-composer-overflow@2x.png b/static/images/composer/icon-composer-overflow@2x.png
new file mode 100644
index 000000000..d5ee97de3
Binary files /dev/null and b/static/images/composer/icon-composer-overflow@2x.png differ
diff --git a/static/images/composer/icon-composer-trash@1x.png b/static/images/composer/icon-composer-trash@1x.png
new file mode 100644
index 000000000..75780f600
Binary files /dev/null and b/static/images/composer/icon-composer-trash@1x.png differ
diff --git a/static/images/composer/icon-composer-trash@2x.png b/static/images/composer/icon-composer-trash@2x.png
index ae523d284..7d1825386 100644
Binary files a/static/images/composer/icon-composer-trash@2x.png and b/static/images/composer/icon-composer-trash@2x.png differ