diff --git a/mozilla/themes/classic/communicator/button.css b/mozilla/themes/classic/communicator/button.css
index e7a821cecf9..4819c2a0c39 100644
--- a/mozilla/themes/classic/communicator/button.css
+++ b/mozilla/themes/classic/communicator/button.css
@@ -61,7 +61,7 @@
 
 .toolbarbutton-1:hover:active,
 .toolbarbutton-1[open="true"],
-.toolbarbutton-1[buttondown="true"] > .toolbarbutton-menubutton-button {
+.toolbarbutton-1:hover:active > .toolbarbutton-menubutton-button {
   padding: 3px 6px 1px 7px;
 }
 
@@ -132,4 +132,3 @@
   -moz-border-bottom-colors: ThreeDDarkShadow ThreeDHighlight;
   -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow;
 }
-
diff --git a/mozilla/themes/classic/global/mac/toolbarbutton.css b/mozilla/themes/classic/global/mac/toolbarbutton.css
index 959c0a2a521..6e1fb4ca538 100644
--- a/mozilla/themes/classic/global/mac/toolbarbutton.css
+++ b/mozilla/themes/classic/global/mac/toolbarbutton.css
@@ -67,8 +67,7 @@ toolbarbutton {
   text-align: center;
 }
 
-toolbarbutton:hover,
-toolbarbutton[buttonover="true"] {
+toolbarbutton:hover {
   -moz-appearance: toolbarbutton;
   -moz-border-top-colors: #000000 #FFFFFF;
   -moz-border-right-colors: #000000 #9D9D9D;
@@ -165,9 +164,7 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
 }
 
 toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-button,
-toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-button,
 toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-button {
   -moz-border-top-colors: ThreeDHighlight;
   -moz-border-right-colors: ThreeDShadow;
@@ -175,8 +172,8 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-butto
   -moz-border-left-colors: ThreeDHighlight;
 }
 
-toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-button,
-toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
   -moz-border-top-colors: #444444;
   -moz-border-right-colors: #AAAAAA;
@@ -201,6 +198,6 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm
 }
 
 toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker {
+toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker {
   padding: 1px 0 0 0;
 }
diff --git a/mozilla/themes/classic/global/unix/toolbarbutton.css b/mozilla/themes/classic/global/unix/toolbarbutton.css
index cf974f480f0..ea72d99c48d 100644
--- a/mozilla/themes/classic/global/unix/toolbarbutton.css
+++ b/mozilla/themes/classic/global/unix/toolbarbutton.css
@@ -69,8 +69,7 @@ toolbarbutton {
   text-align: center;
 }
 
-toolbarbutton:hover,
-toolbarbutton[buttonover="true"] {
+toolbarbutton:hover {
   -moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight;
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
   -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
@@ -165,9 +164,7 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
 }
 
 toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-button,
-toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-button,
 toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-button {
   -moz-border-top-colors: ThreeDHighlight;
   -moz-border-right-colors: ThreeDShadow;
@@ -175,9 +172,8 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-butto
   -moz-border-left-colors: ThreeDHighlight;
 }
 
-toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-button,
 toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
   -moz-border-top-colors: ThreeDShadow;
   -moz-border-right-colors: ThreeDHighlight;
@@ -202,6 +198,6 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm
 }
 
 toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker {
+toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker {
   padding: 1px 0 0 0;
 }
diff --git a/mozilla/themes/classic/global/win/toolbarbutton.css b/mozilla/themes/classic/global/win/toolbarbutton.css
index 6bcfca54c17..5927c29a48d 100644
--- a/mozilla/themes/classic/global/win/toolbarbutton.css
+++ b/mozilla/themes/classic/global/win/toolbarbutton.css
@@ -69,8 +69,7 @@ toolbarbutton {
   padding: 2px 0px 0px 0px;
 }
 
-toolbarbutton:hover,
-toolbarbutton[buttonover="true"] {
+toolbarbutton:hover {
   -moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight;
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
   -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
@@ -163,9 +162,7 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
 }
 
 toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-button,
-toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-button,
 toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-button {
   -moz-border-top-colors: ThreeDHighlight;
   -moz-border-right-colors: ThreeDShadow;
@@ -173,9 +170,8 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-butto
   -moz-border-left-colors: ThreeDHighlight;
 }
 
-toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-button,
 toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
   -moz-border-top-colors: ThreeDShadow;
   -moz-border-right-colors: ThreeDHighlight;
@@ -199,6 +195,6 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm
 }
 
 toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker {
+toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker {
   padding: 1px 0 0 0;
 }