--- a/suite/themes/classic/navigator/navigator.css
+++ b/suite/themes/classic/navigator/navigator.css
@@ -149,132 +149,114 @@
 /* ::::: small primary toolbar buttons ::::: */
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #back-button,
 toolbar[iconsize="small"] > #back-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(40px 19px 59px 0);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #back-button:hover,
 toolbar[iconsize="small"] > #back-button:hover {
   -moz-image-region: rect(40px 39px 59px 20px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #back-button:hover:active,
 toolbar[iconsize="small"] > #back-button:hover:active {
   -moz-image-region: rect(40px 59px 59px 40px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #back-button[disabled="true"],
 toolbar[iconsize="small"] > #back-button[disabled="true"] {
   -moz-image-region: rect(40px 79px 59px 60px) !important;
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #forward-button,
 toolbar[iconsize="small"] > #forward-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(60px 19px 79px 0);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #forward-button:hover,
 toolbar[iconsize="small"] > #forward-button:hover {
   -moz-image-region: rect(60px 39px 79px 20px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #forward-button:hover:active,
 toolbar[iconsize="small"] > #forward-button:hover:active {
   -moz-image-region: rect(60px 59px 79px 40px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #forward-button[disabled="true"],
 toolbar[iconsize="small"] > #forward-button[disabled="true"] {
   -moz-image-region: rect(60px 79px 79px 60px) !important;
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #reload-button,
 toolbar[iconsize="small"] > #reload-button {
   list-style-image: url("chrome://navigator/skin/icons/navigatoricons-small.png");
   -moz-image-region: rect(0 19px 19px 0);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #reload-button:hover,
 toolbar[iconsize="small"] > #reload-button:hover {
   -moz-image-region: rect(0 39px 19px 20px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #reload-button:hover:active,
 toolbar[iconsize="small"] > #reload-button:hover:active {
   -moz-image-region: rect(0 59px 19px 40px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #reload-button[disabled="true"],
 toolbar[iconsize="small"] > #reload-button[disabled="true"] {
   -moz-image-region: rect(0 79px 19px 60px) !important;
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #stop-button,
 toolbar[iconsize="small"] > #stop-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(20px 19px 39px 0);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #stop-button:hover,
 toolbar[iconsize="small"] > #stop-button:hover {
   -moz-image-region: rect(20px 39px 39px 20px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #stop-button:hover:active,
 toolbar[iconsize="small"] > #stop-button:hover:active {
   -moz-image-region: rect(20px 59px 39px 40px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #stop-button[disabled="true"],
 toolbar[iconsize="small"] > #stop-button[disabled="true"] {
   -moz-image-region: rect(20px 79px 39px 60px) !important;
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
 toolbar[iconsize="small"] > #print-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(0 19px 19px 0);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #print-button:hover,
 toolbar[iconsize="small"] > #print-button:hover {
   -moz-image-region: rect(0 39px 19px 20px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #print-button:hover:active,
 toolbar[iconsize="small"] > #print-button:hover:active {
   -moz-image-region: rect(0 59px 19px 40px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #print-button[disabled="true"],
 toolbar[iconsize="small"] > #print-button[disabled="true"] {
   -moz-image-region: rect(0 79px 19px 60px) !important;
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #home-button,
 toolbar[iconsize="small"] > #home-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(80px 19px 99px 0);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #home-button:hover,
 toolbar[iconsize="small"] > #home-button:hover {
   -moz-image-region: rect(80px 39px 99px 20px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #home-button:hover:active,
 toolbar[iconsize="small"] > #home-button:hover:active {
   -moz-image-region: rect(80px 59px 99px 40px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #home-button[disabled="true"],
 toolbar[iconsize="small"] > #home-button[disabled="true"] {
   -moz-image-region: rect(80px 79px 99px 60px) !important;
 }
 
 /* ::::: fullscreen window controls ::::: */
 
 #window-controls {
   -moz-box-align: center;

--- a/suite/themes/modern/navigator/navigator.css
+++ b/suite/themes/modern/navigator/navigator.css
@@ -160,132 +160,114 @@ toolbox {
 /* ::::: small primary toolbar buttons ::::: */
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #back-button,
 toolbar[iconsize="small"] > #back-button {
   list-style-image: url("chrome://communicator/skin/icons/common-small.png");
   -moz-image-region: rect(38px 19px 57px 0);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #back-button:hover,
 toolbar[iconsize="small"] > #back-button:hover {
   -moz-image-region: rect(38px 38px 57px 19px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #back-button:hover:active,
 toolbar[iconsize="small"] > #back-button:hover:active {
   -moz-image-region: rect(38px 57px 57px 38px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #back-button[disabled="true"],
 toolbar[iconsize="small"] > #back-button[disabled="true"] {
   -moz-image-region: rect(38px 76px 57px 57px) !important;
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #forward-button,
 toolbar[iconsize="small"] > #forward-button {
   list-style-image: url("chrome://communicator/skin/icons/common-small.png");
   -moz-image-region: rect(57px 19px 76px 0);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #forward-button:hover,
 toolbar[iconsize="small"] > #forward-button:hover {
   -moz-image-region: rect(57px 38px 76px 19px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #forward-button:hover:active,
 toolbar[iconsize="small"] > #forward-button:hover:active {
   -moz-image-region: rect(57px 57px 76px 38px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #forward-button[disabled="true"],
 toolbar[iconsize="small"] > #forward-button[disabled="true"] {
   -moz-image-region: rect(57px 76px 76px 57px) !important;
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #reload-button,
 toolbar[iconsize="small"] > #reload-button {
   list-style-image: url("chrome://navigator/skin/icons/browser-small.png");
   -moz-image-region: rect(0 19px 19px 0);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #reload-button:hover,
 toolbar[iconsize="small"] > #reload-button:hover {
   -moz-image-region: rect(0 38px 19px 19px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #reload-button:hover:active,
 toolbar[iconsize="small"] > #reload-button:hover:active {
   -moz-image-region: rect(0 57px 19px 38px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #reload-button[disabled="true"],
 toolbar[iconsize="small"] > #reload-button[disabled="true"] {
   -moz-image-region: rect(0 76px 19px 57px) !important;
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #stop-button,
 toolbar[iconsize="small"] > #stop-button {
   list-style-image: url("chrome://communicator/skin/icons/common-small.png");
   -moz-image-region: rect(19px 19px 38px 0);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #stop-button:hover,
 toolbar[iconsize="small"] > #stop-button:hover {
   -moz-image-region: rect(19px 38px 38px 19px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #stop-button:hover:active,
 toolbar[iconsize="small"] > #stop-button:hover:active {
   -moz-image-region: rect(19px 57px 38px 38px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #stop-button[disabled="true"],
 toolbar[iconsize="small"] > #stop-button[disabled="true"] {
   -moz-image-region: rect(19px 76px 38px 57px) !important;
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
 toolbar[iconsize="small"] > #print-button {
   list-style-image: url("chrome://communicator/skin/icons/common-small.png");
   -moz-image-region: rect(0 19px 19px 0);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #print-button:hover,
 toolbar[iconsize="small"] > #print-button:hover {
   -moz-image-region: rect(0 38px 19px 19px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #print-button:hover:active,
 toolbar[iconsize="small"] > #print-button:hover:active {
   -moz-image-region: rect(0 57px 19px 38px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #print-button[disabled="true"],
 toolbar[iconsize="small"] > #print-button[disabled="true"] {
   -moz-image-region: rect(0 76px 19px 57px) !important;
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #home-button,
 toolbar[iconsize="small"] > #home-button {
   list-style-image: url("chrome://communicator/skin/icons/common-small.png");
   -moz-image-region: rect(76px 19px 95px 0);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #home-button:hover,
 toolbar[iconsize="small"] > #home-button:hover {
   -moz-image-region: rect(76px 38px 95px 19px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #home-button:hover:active,
 toolbar[iconsize="small"] > #home-button:hover:active {
   -moz-image-region: rect(76px 57px 95px 38px);
 }
 
-toolbar[iconsize="small"] > toolbarpaletteitem > #home-button[disabled="true"],
 toolbar[iconsize="small"] > #home-button[disabled="true"] {
   -moz-image-region: rect(76px 76px 95px 57px) !important;
 }
 
 #nav-bar[iconsize="small"] {
   min-height: 0;
 }