diff --git a/themes/classic/communicator/mac/menubutton.css b/themes/classic/communicator/mac/menubutton.css
index 9ec7b66aafe..3cf24beb018 100644
--- a/themes/classic/communicator/mac/menubutton.css
+++ b/themes/classic/communicator/mac/menubutton.css
@@ -356,5 +356,14 @@ menubutton.button-toolbar-4[open="true"] > .menubutton-toolbar-single-internal-b
     list-style-image        : url("chrome://global/skin/dropmarker-up-on.gif");
   } 
   
+/* menubutton button-toolbar-2 */
   
+menubutton.button-toolbar-2.top {
+  -moz-binding: url("chrome://global/content/menulistBindings.xml#menubutton-single-top");
+}
+
+menubutton.button-toolbar-2.bottom {
+  -moz-binding: url("chrome://global/content/menulistBindings.xml#menubutton-single-bottom");
+}
+
 
diff --git a/themes/classic/communicator/win/menubutton.css b/themes/classic/communicator/win/menubutton.css
index 080321ed130..aeebf5ccdb2 100644
--- a/themes/classic/communicator/win/menubutton.css
+++ b/themes/classic/communicator/win/menubutton.css
@@ -301,4 +301,13 @@ menubutton.button-toolbar-4[open="true"] > .menubutton-toolbar-single-internal-b
     list-style-image        : url("chrome://global/skin/scroll-up.gif");
   } 
   
+/* menubutton button-toolbar-2 */
   
+menubutton.button-toolbar-2.top {
+  -moz-binding: url("chrome://global/content/menulistBindings.xml#menubutton-single-top");
+}
+
+menubutton.button-toolbar-2.bottom {
+  -moz-binding: url("chrome://global/content/menulistBindings.xml#menubutton-single-bottom");
+}
+
diff --git a/themes/classic/messenger/mac/messenger.css b/themes/classic/messenger/mac/messenger.css
index fce68b4b1ed..845c3f4b265 100644
--- a/themes/classic/messenger/mac/messenger.css
+++ b/themes/classic/messenger/mac/messenger.css
@@ -175,13 +175,12 @@
     list-style-image      : url("chrome://messenger/skin/file-disabled.gif");
   } 
 
-menu:hover > #button-file
+#button-file:hover
   {
     list-style-image      : url("chrome://messenger/skin/file-hover.gif");
   } 
 
-menu:hover:active > #button-file,
-menu[open="true"] > #button-file
+#button-file:hover:active
   {
     list-style-image      : url("chrome://messenger/skin/file-hover-active.gif");
   } 
diff --git a/themes/classic/messenger/win/messenger.css b/themes/classic/messenger/win/messenger.css
index 9994e9b5297..63fdb0c3748 100644
--- a/themes/classic/messenger/win/messenger.css
+++ b/themes/classic/messenger/win/messenger.css
@@ -175,13 +175,12 @@
     list-style-image      : url("chrome://messenger/skin/file-disabled.gif");
   } 
 
-menu:hover > #button-file
+#button-file:hover
   {
     list-style-image      : url("chrome://messenger/skin/file-hover.gif");
   } 
 
-menu:hover:active > #button-file,
-menu[open="true"] > #button-file
+#button-file:hover:active
   {
     list-style-image      : url("chrome://messenger/skin/file-hover-active.gif");
   } 
diff --git a/themes/modern/communicator/menubutton.css b/themes/modern/communicator/menubutton.css
index b9f194166cb..81440d7a155 100644
--- a/themes/modern/communicator/menubutton.css
+++ b/themes/modern/communicator/menubutton.css
@@ -143,12 +143,14 @@
     margin-bottom           : 1em;
   }
   
-/*  
-  
-  	  <xul:box class="button-internal-box" orient="vertical" autostretch="never" flex="1">
-        <xul:image class="button-icon" inherits="src"/>
-        <xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
-          <xul:text class="button-text" inherits="value,accesskey,crop"/>
-        </xul:box>
-      </xul:box>
-  
+menubutton.button-toolbar-2.top {
+  -moz-binding		  : url(chrome://global/skin/globalBindings.xml#button-doubletext);
+}
+
+menubutton.button-toolbar-2.bottom {
+  -moz-binding		  : url(chrome://global/skin/globalBindings.xml#button-doubletext);
+}
+
+
+
+
diff --git a/themes/modern/messenger/messenger.css b/themes/modern/messenger/messenger.css
index af77b4b0632..009919bf182 100644
--- a/themes/modern/messenger/messenger.css
+++ b/themes/modern/messenger/messenger.css
@@ -209,23 +209,23 @@ iframe {
   } 
 
 #button-file {
-	list-style-image:url("chrome://messenger/skin/file.gif");
+	list-style-image: url("chrome://messenger/skin/file.gif");
 }
 
 #button-file[disabled="true"],
-menu:hover > #button-file[disabled="true"],
-menu:hover:active > #button-file[disabled="true"]
+#button-file[disabled="true"]:hover,
+#button-file[disabled="true"]:hover:active
   {
     list-style-image      : url("chrome://messenger/skin/file-disabled.gif");
   } 
 
-menu:hover > #button-file
+#button-file:hover
   {
     list-style-image      : url("chrome://messenger/skin/file-hover.gif");
   } 
 
-menu:hover:active > #button-file,
-menu[open="true"] > #button-file
+#button-file:hover:active,
+#button-file[open="true"]
   {
     list-style-image      : url("chrome://messenger/skin/file-clicked.gif");
   }