diff --git a/extensions/help/resources/skin/classic/help.css b/extensions/help/resources/skin/classic/help.css
index 0b18ab37e7ce..08d7175e94f3 100644
--- a/extensions/help/resources/skin/classic/help.css
+++ b/extensions/help/resources/skin/classic/help.css
@@ -47,11 +47,11 @@
   -moz-image-region: rect(0px 19px 20px 0px);
 }
 
-#helpBackButton[buttonover="true"] {
+#helpBackButton:hover {
   -moz-image-region: rect(0px 38px 20px 19px);
 }
 
-#helpBackButton[buttondown="true"] {
+#helpBackButton:hover:active {
   -moz-image-region: rect(0px 57px 20px 38px);
 }
 
@@ -63,11 +63,11 @@
   -moz-image-region: rect(20px 19px 40px 0px);
 }
 
-#helpForwardButton[buttonover="true"] {
+#helpForwardButton:hover {
   -moz-image-region: rect(20px 38px 40px 19px);
 }
 
-#helpForwardButton[buttondown="true"] {
+#helpForwardButton:hover:active {
   -moz-image-region: rect(20px 57px 40px 38px);
 }
 
@@ -80,11 +80,11 @@
   -moz-image-region: rect(0px 23px 21px 0px);
 }
 
-#print[buttonover="true"] {
+#print:hover {
   -moz-image-region: rect(0px 46px 21px 23px);
 }
 
-#print[buttondown="true"] {
+#print:hover:active {
   -moz-image-region: rect(0px 69px 21px 46px);
 }
 
diff --git a/extensions/help/resources/skin/modern/help.css b/extensions/help/resources/skin/modern/help.css
index f2d4f5e500bb..fae4ecb3626c 100644
--- a/extensions/help/resources/skin/modern/help.css
+++ b/extensions/help/resources/skin/modern/help.css
@@ -1,4 +1,3 @@
-/*  */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -71,11 +70,11 @@
   -moz-image-region: rect(0, 41px, 38px, 0);
 }
 
-#helpBackButton[buttonover="true"] {
+#helpBackButton:hover {
   -moz-image-region: rect(0, 83px, 38px, 42px);
 }
 
-#helpBackButton[buttondown="true"] {
+#helpBackButton:hover:active {
   -moz-image-region: rect(0, 125px, 38px, 84px);
 }
 
@@ -87,11 +86,11 @@
   -moz-image-region: rect(39px, 41px, 77px, 0);
 }
 
-#helpForwardButton[buttonover="true"] {
+#helpForwardButton:hover {
   -moz-image-region: rect(39px, 83px, 77px, 42px);
 }
 
-#helpForwardButton[buttondown="true"] {
+#helpForwardButton:hover:active {
   -moz-image-region: rect(39px, 125px, 77px, 84px);
 }
 
diff --git a/themes/classic/navigator/navigator.css b/themes/classic/navigator/navigator.css
index 2a8851919c77..d14f11a5f214 100644
--- a/themes/classic/navigator/navigator.css
+++ b/themes/classic/navigator/navigator.css
@@ -52,11 +52,11 @@
   -moz-image-region: rect(0px 19px 20px 0px);
 }
 
-#back-button[buttonover="true"] {
+#back-button:hover {
   -moz-image-region: rect(0px 38px 20px 19px);
 }
 
-#back-button[buttondown="true"] {
+#back-button:hover:active {
   -moz-image-region: rect(0px 57px 20px 38px);
 }
 
@@ -68,11 +68,11 @@
   -moz-image-region: rect(20px 19px 40px 0px);
 }
 
-#forward-button[buttonover="true"] {
+#forward-button:hover {
   -moz-image-region: rect(20px 38px 40px 19px);
 }
 
-#forward-button[buttondown="true"] {
+#forward-button:hover:active {
   -moz-image-region: rect(20px 57px 40px 38px);
 }
 
@@ -118,11 +118,11 @@
   -moz-image-region: rect(0px 23px 21px 0px);
 }
 
-#print-button[buttonover="true"] {
+#print-button:hover {
   -moz-image-region: rect(0px 46px 21px 23px);
 }
 
-#print-button[buttondown="true"] {
+#print-button:hover:active {
   -moz-image-region: rect(0px 69px 21px 46px);
 }
 
diff --git a/themes/modern/navigator/navigator.css b/themes/modern/navigator/navigator.css
index 31c64ec7c039..365b06197abd 100644
--- a/themes/modern/navigator/navigator.css
+++ b/themes/modern/navigator/navigator.css
@@ -61,11 +61,11 @@ toolbox {
   -moz-image-region: rect(0 41px 38px 0);
 }
 
-#back-button[buttonover="true"] {
+#back-button:hover {
   -moz-image-region: rect(0 83px 38px 42px);
 }
 
-#back-button[buttondown="true"] {
+#back-button:hover:active {
   -moz-image-region: rect(0 125px 38px 84px);
 }
 
@@ -77,11 +77,11 @@ toolbox {
   -moz-image-region: rect(39px 41px 77px 0);
 }
 
-#forward-button[buttonover="true"] {
+#forward-button:hover {
   -moz-image-region: rect(39px 83px 77px 42px);
 }
 
-#forward-button[buttondown="true"] {
+#forward-button:hover:active {
   -moz-image-region: rect(39px 125px 77px 84px);
 }
 
@@ -126,11 +126,11 @@ toolbox {
   -moz-image-region: rect(0 49px 33px 0);
 }
 
-#print-button[buttonover="true"] {
+#print-button:hover {
   -moz-image-region: rect(0 99px 33px 50px);
 }
 
-#print-button[buttondown="true"] {
+#print-button:hover:active {
   -moz-image-region: rect(0 149px 33px 100px);
 }
 
@@ -186,11 +186,11 @@ toolbox {
   -moz-image-region: rect(0 19px 19px 0);
 }
 
-#back-button[buttonover="true"][toolbarmode="small"] {
+#back-button[toolbarmode="small"]:hover {
   -moz-image-region: rect(0 38px 19px 19px);
 }
 
-#back-button[buttondown="true"][toolbarmode="small"] {
+#back-button[toolbarmode="small"]:hover:active {
   -moz-image-region: rect(0 57px 19px 38px);
 }
 
@@ -202,11 +202,11 @@ toolbox {
   -moz-image-region: rect(19px 19px 38px 0);
 }
 
-#forward-button[buttonover="true"][toolbarmode="small"] {
+#forward-button[toolbarmode="small"]:hover {
   -moz-image-region: rect(19px 38px 38px 19px);
 }
 
-#forward-button[buttondown="true"][toolbarmode="small"] {
+#forward-button[toolbarmode="small"]:hover:active {
   -moz-image-region: rect(19px 57px 38px 38px);
 }
 
@@ -218,11 +218,11 @@ toolbox {
   -moz-image-region: rect(38px 19px 57px 0);
 }
   
-#reload-button:hover[toolbarmode="small"] {
+#reload-button[toolbarmode="small"]:hover {
   -moz-image-region: rect(38px 38px 57px 19px);
 }
 
-#reload-button:hover:active[toolbarmode="small"] {
+#reload-button[toolbarmode="small"]:hover:active {
   -moz-image-region: rect(38px 57px 57px 38px);
 }
 
@@ -234,11 +234,11 @@ toolbox {
   -moz-image-region: rect(57px 19px 76px 0);
 } 
 
-#stop-button:hover[toolbarmode="small"] {
+#stop-button[toolbarmode="small"]:hover {
   -moz-image-region: rect(57px 38px 76px 19px);
 } 
 
-#stop-button:hover:active[toolbarmode="small"] {
+#stop-button[toolbarmode="small"]:hover:active {
   -moz-image-region: rect(57px 57px 76px 38px);
 }