diff --git a/internal_packages/message-list/lib/message-controls.cjsx b/internal_packages/message-list/lib/message-controls.cjsx
index 6c5d05b52..a0d65ecd8 100644
--- a/internal_packages/message-list/lib/message-controls.cjsx
+++ b/internal_packages/message-list/lib/message-controls.cjsx
@@ -39,15 +39,15 @@ class MessageControls extends React.Component
 
   _forwardAction: ->
     <span onClick={@_onForward}>
-      <RetinaImg name="forward-message-header.png" mode={RetinaImg.Mode.ContentIsMask}/>&nbsp;&nbsp;Forward
+      <RetinaImg name="icon-dropdown-forward.png" mode={RetinaImg.Mode.ContentIsMask}/>&nbsp;&nbsp;Forward
     </span>
   _replyAction: ->
     <span onClick={@_onReply}>
-      <RetinaImg name="reply-footer.png" mode={RetinaImg.Mode.ContentIsMask}/>&nbsp;&nbsp;Reply
+      <RetinaImg name="icon-dropdown-reply.png" mode={RetinaImg.Mode.ContentIsMask}/>&nbsp;&nbsp;Reply
     </span>
   _replyAllAction: ->
     <span onClick={@_onReplyAll}>
-      <RetinaImg name="reply-all-footer.png" mode={RetinaImg.Mode.ContentIsMask}/>&nbsp;&nbsp;Reply All
+      <RetinaImg name="icon-dropdown-replyall.png" mode={RetinaImg.Mode.ContentIsMask}/>&nbsp;&nbsp;Reply All
     </span>
 
   _onReply: =>
diff --git a/static/components/button-dropdown.less b/static/components/button-dropdown.less
index 1c1c3efec..e79aca1a5 100644
--- a/static/components/button-dropdown.less
+++ b/static/components/button-dropdown.less
@@ -20,15 +20,35 @@
     &:hover {
       cursor: default;
     }
-    border: 1px solid rgba(0,0,0,0.1);
+    border: 1px solid rgba(0, 0, 0, 0.15);
     border-radius: 4px 0 4px 4px;
-    padding: 4px 15px;
-    box-shadow: 0 4px 12px rgba(0,0,0,0.55);
+    box-shadow: 0 3px 10px rgba(0, 0, 0, 0.20);
     z-index: 2;
-    background-color: @background-primary;;
+    background-color: @background-primary;
+    line-height: 14px;
     position: absolute;
     width: 110px;
     right: 0;
+
+    .secondary-item {
+      padding: 6px 15px;
+      img {
+        margin-right:4px;
+        vertical-align: text-bottom;
+      }
+    }
+    .secondary-item:first-child {
+      padding-top: 9px;
+      border-top-left-radius: 4px;
+    }
+    .secondary-item:last-child {
+      padding-bottom: 9px;
+      border-bottom-left-radius: 4px;
+      border-bottom-right-radius: 4px;
+    }
+    .secondary-item:hover {
+      background-color: darken(@background-primary, 3%);
+    }
   }
   img {
     background-color: @text-color;
diff --git a/static/images/reply-dropdown/icon-dropdown-forward@2x.png b/static/images/reply-dropdown/icon-dropdown-forward@2x.png
new file mode 100644
index 000000000..af92d0850
Binary files /dev/null and b/static/images/reply-dropdown/icon-dropdown-forward@2x.png differ
diff --git a/static/images/reply-dropdown/icon-dropdown-reply@2x.png b/static/images/reply-dropdown/icon-dropdown-reply@2x.png
new file mode 100644
index 000000000..e1df63070
Binary files /dev/null and b/static/images/reply-dropdown/icon-dropdown-reply@2x.png differ
diff --git a/static/images/reply-dropdown/icon-dropdown-replyall@2x.png b/static/images/reply-dropdown/icon-dropdown-replyall@2x.png
new file mode 100644
index 000000000..6ac038e9d
Binary files /dev/null and b/static/images/reply-dropdown/icon-dropdown-replyall@2x.png differ