--- a/toolkit/themes/linux/global/button.css
+++ b/toolkit/themes/linux/global/button.css
@@ -7,17 +7,17 @@
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* :::::::::: button :::::::::: */
 
 button {
   -moz-appearance: button;
-  margin: 1px 5px 2px 5px;
+  margin: 1px 5px 2px;
   min-width: 6.3em;
   color: ButtonText;
   text-shadow: none;
 }
 
 .button-box {
   -moz-appearance: button-focus;
 }
@@ -28,32 +28,23 @@ button {
 
 .button-text {
   margin: 0 !important;
   text-align: center;
 }
 
 /* .......... hover state .......... */
 
-button:hover {
+button:hover:not(:-moz-any(:active,[disabled="true"],[open="true"],[checked="true"])) {
   color: -moz-buttonhovertext;
 }
 
-/* .......... active/open/checked state .......... */
-
-button:hover:active,
-button[open="true"],
-button[checked="true"] {
-  color: ButtonText;
-}
-
 /* .......... disabled state .......... */
 
-button[disabled="true"],
-button[disabled="true"]:hover:active {
+button[disabled="true"] {
   color: GrayText;
 }
 
 /* ::::: menu/menu-button buttons ::::: */
 
 button[type="menu-button"] {
   -moz-appearance: dualbutton;
 }