diff --git a/mozilla/themes/classic/global/mac/menulist.css b/mozilla/themes/classic/global/mac/menulist.css
index 6d2ba712a8c..e63cdec48da 100644
--- a/mozilla/themes/classic/global/mac/menulist.css
+++ b/mozilla/themes/classic/global/mac/menulist.css
@@ -74,6 +74,10 @@ menulist {
   margin-left: 1ex !important;
 }
 
+.menulist-dropmarker {
+  display: none;
+}
+
 /* ..... disabled state ..... */
 
 menulist[disabled="true"] {
@@ -89,10 +93,6 @@ menulist[disabled="true"] > .menulist-label-box {
 
 /* ::::: editable menulists ::::: */
 
-menulist[editable="true"] {
-  -moz-user-focus: normal;
-}
-
 .menulist-editable-box {
   margin-right: 4px;
   padding: 1px 0px 1px 2px;
diff --git a/mozilla/themes/classic/messenger/mailWindow1.css b/mozilla/themes/classic/messenger/mailWindow1.css
index 75eab18f66f..1d65d38de41 100644
--- a/mozilla/themes/classic/messenger/mailWindow1.css
+++ b/mozilla/themes/classic/messenger/mailWindow1.css
@@ -101,6 +101,11 @@
   border-bottom: 1px solid ThreeDShadow;
 }
 
+/* XXX bug 313731 buttons are taller than menulists */
+#msgLocationToolbar > #searchBox[collapsed="true"] {
+  visibility: hidden;
+}
+
 #locationIcon {
   list-style-image: none;
 }
diff --git a/mozilla/themes/modern/messenger/mailWindow1.css b/mozilla/themes/modern/messenger/mailWindow1.css
index 949cca883d0..242ec34c1e1 100644
--- a/mozilla/themes/modern/messenger/mailWindow1.css
+++ b/mozilla/themes/modern/messenger/mailWindow1.css
@@ -102,6 +102,11 @@
   -moz-border-bottom-colors: #5D616E #BEC3D3;
 }
 
+/* XXX bug 313731 buttons are taller than menulists */
+#msgLocationToolbar > #searchBox[collapsed="true"] {
+  visibility: hidden;
+}
+
 #locationIcon {
   list-style-image: none;
 }