diff --git a/internal_packages/send-later/lib/send-later-popover.jsx b/internal_packages/send-later/lib/send-later-popover.jsx
index 71bf0a68e..222ad5784 100644
--- a/internal_packages/send-later/lib/send-later-popover.jsx
+++ b/internal_packages/send-later/lib/send-later-popover.jsx
@@ -21,6 +21,9 @@ const SendLaterOptions = {
 
 class SendLaterPopover extends Component {
   static displayName = 'SendLaterPopover';
+  static containerStyles = {
+    order: -99,
+  };
 
   static propTypes = {
     draftClientId: PropTypes.string,
@@ -102,10 +105,12 @@ class SendLaterPopover extends Component {
 
     if (scheduledDate === 'saving') {
       return (
-        <RetinaImg
-          name="inline-loading-spinner.gif"
-          mode={RetinaImg.Mode.ContentDark}
-          style={{width: 14, height: 14}}/>
+        <button className={className}>
+          <RetinaImg
+            name="inline-loading-spinner.gif"
+            mode={RetinaImg.Mode.ContentDark}
+            style={{width: 14, height: 14}}/>
+        </button>
       );
     }
 
@@ -122,7 +127,8 @@ class SendLaterPopover extends Component {
       <button className={className}>
         <RetinaImg name="icon-composer-sendlater.png" mode={RetinaImg.Mode.ContentIsMask}/>
         {dateInterpretation}
-        <RetinaImg name="composer-caret.png" style={{marginLeft: 6}} mode={RetinaImg.Mode.ContentIsMask}/>
+        <span data-reactid=".s.0.0.1">&nbsp;</span>
+        <RetinaImg name="icon-composer-dropdown.png" mode={RetinaImg.Mode.ContentIsMask}/>
       </button>
     );
   }
diff --git a/static/components/menu.less b/static/components/menu.less
index ce6910ceb..bc5551a02 100644
--- a/static/components/menu.less
+++ b/static/components/menu.less
@@ -17,25 +17,6 @@
     position: relative;
   }
 
-  .header-container,
-  .footer-container {
-    input[type=text] {
-      border: 1px solid darken(@background-secondary, 10%);
-      border-radius: 3px;
-      background-color: white;
-      box-shadow: inset 0 1px 0 rgba(0,0,0,0.05), 0 1px 0 rgba(0,0,0,0.05);
-
-      &.search {
-        padding-left: 0;
-        background-repeat: no-repeat;
-        background-image: url("../static/images/search/searchloupe@2x.png");
-        background-size: 15px 15px;
-        background-position: 7px 4px;
-        text-indent: 31px;
-      }
-    }
-  }
-
   .content-container {
     background: @background-secondary;
     width: 100%;
diff --git a/static/components/popover.less b/static/components/popover.less
index e0801e088..2ed592dd2 100644
--- a/static/components/popover.less
+++ b/static/components/popover.less
@@ -30,6 +30,22 @@
           border-bottom-right-radius: @border-radius-base;
       }
     }
+
+    input[type=text] {
+      border: 1px solid darken(@background-secondary, 10%);
+      border-radius: 3px;
+      background-color: white;
+      box-shadow: inset 0 1px 0 rgba(0,0,0,0.05), 0 1px 0 rgba(0,0,0,0.05);
+
+      &.search {
+        padding-left: 0;
+        background-repeat: no-repeat;
+        background-image: url("../static/images/search/searchloupe@2x.png");
+        background-size: 15px 15px;
+        background-position: 7px 4px;
+        text-indent: 31px;
+      }
+    }
   }
 
   .popover-pointer {