--- a/suite/mailnews/mailWindowOverlay.xul
+++ b/suite/mailnews/mailWindowOverlay.xul
@@ -2116,35 +2116,36 @@
                   command="cmd_nextFlaggedMsg"/>
         <menuseparator/>
         <menuitem label="&nextUnreadThread.label;"
                   accesskey="&nextUnreadThread.accesskey;"
                   command="cmd_nextUnreadThread"/>
       </menupopup>
     </toolbarbutton>
 
-    <toolbaritem id="button-junk">
+    <toolbaritem id="button-junk"
+                 observes="button_junk">
       <deck id="junk-deck"
-            observes="button_junk"
             oncommand="goDoCommand('button_junk')">
         <toolbarbutton id="button-isJunk"
                        class="toolbarbutton-1"
                        label="&junkButton.label;"
                        tooltiptext="&junkButton.tooltip;"
                        observes="button_junk"/>
         <toolbarbutton id="button-notJunk"
                        class="toolbarbutton-1"
                        label="&notJunkButton.label;"
                        tooltiptext="&notJunkButton.tooltip;"
                        observes="button_junk"/>
       </deck>
     </toolbaritem>
 
-    <toolbaritem id="button-delete">
-      <deck id="delete-deck" observes="button_delete">
+    <toolbaritem id="button-delete"
+                 observes="button_delete">
+      <deck id="delete-deck">
         <toolbarbutton id="button-mark-deleted"
                        class="toolbarbutton-1"
                        label="&deleteButton.label;"
                        tooltiptext="&deleteButton.tooltip;"
                        observes="button_delete"
                        oncommand="goDoCommand(event.shiftKey ? 'button_shiftDelete' : 'button_delete')"/>
         <toolbarbutton id="button-mark-undelete"
                        class="toolbarbutton-1"

--- a/suite/themes/classic/messenger/primaryToolbar.css
+++ b/suite/themes/classic/messenger/primaryToolbar.css
@@ -39,20 +39,16 @@
 /* ===== primaryToolbar.css =============================================
   == Images for the Mail primary toolbar.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: primary toolbar buttons ::::: */
 
-.toolbarbutton-1 {
-  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
-}
-
 #button-getmsg {
   list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
   -moz-image-region: rect(90px 29px 119px 0);
 }
 
 #button-getmsg:hover {
   -moz-image-region: rect(90px 59px 119px 30px);
 } 
@@ -476,30 +472,30 @@ toolbar[iconsize="small"] > #button-mark
 toolbar[iconsize="small"] > #button-mark:hover:active {
   -moz-image-region: rect(80px 59px 99px 40px);
 }
 
 toolbar[iconsize="small"] > #button-mark[disabled] {
   -moz-image-region: rect(80px 79px 99px 60px) !important;
 }
 
-toolbar[iconsize="small"] > #button-junk > #junk-deck > .toolbarbutton-1 {
+toolbar[iconsize="small"] > #button-junk {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
   -moz-image-region: rect(240px 19px 259px 0);
 }
 
-toolbar[iconsize="small"] > #button-junk > #junk-deck:hover > .toolbarbutton-1 {
+toolbar[iconsize="small"] > #button-junk:hover {
   -moz-image-region: rect(240px 39px 259px 20px);
 }
 
-toolbar[iconsize="small"] > #button-junk > #junk-deck:hover:active > .toolbarbutton-1 {
+toolbar[iconsize="small"] > #button-junk:hover:active {
   -moz-image-region: rect(240px 59px 259px 40px);
 }
 
-toolbar[iconsize="small"] > #button-junk > #junk-deck[disabled="true"] > .toolbarbutton-1 {
+toolbar[iconsize="small"] > #button-junk[disabled="true"] {
   -moz-image-region: rect(240px 79px 259px 60px) !important;
 }
 
 toolbar[iconsize="small"] > #button-print {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(0 19px 19px 0);
 }
 

--- a/suite/themes/classic/navigator/navigator.css
+++ b/suite/themes/classic/navigator/navigator.css
@@ -39,20 +39,16 @@
 @import url("chrome://navigator/content/navigator.css");
 @import url("chrome://communicator/skin/");
 @import url("chrome://communicator/skin/bookmarks/bookmarksToolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: primary toolbar buttons ::::: */
 
-.toolbarbutton-1 {
-  list-style-image: url("chrome://navigator/skin/icons/navigatoricons.png");
-}
-
 #back-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
   -moz-image-region: rect(60px 29px 89px 0);
 }
 
 #back-button:hover {
   -moz-image-region: rect(60px 59px 89px 30px);
 }

--- a/suite/themes/modern/messenger/primaryToolbar.css
+++ b/suite/themes/modern/messenger/primaryToolbar.css
@@ -47,17 +47,16 @@
 
 #msgToolbar > .toolbar-holder > .toolbar-primary-icon {
   list-style-image: url("chrome://messenger/skin/icons/mast-mail.gif");
 }
 
 /* ::::: primary toolbar buttons ::::: */
 
 .toolbarbutton-1 {
-  list-style-image: url("chrome://messenger/skin/icons/btn1.gif");
   min-width: 0px !important;
 }
 
 #button-getmsg {
   list-style-image: url("chrome://messenger/skin/icons/btn1.gif");
   -moz-image-region: rect(102px 49px 135px 0);
 }
 

--- a/suite/themes/modern/navigator/navigator.css
+++ b/suite/themes/modern/navigator/navigator.css
@@ -39,17 +39,16 @@
 @import url("chrome://communicator/skin/");
 @import url("chrome://communicator/skin/bookmarks/bookmarksToolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: primary toolbar buttons ::::: */
 
 .toolbarbutton-1 {
-  list-style-image: url("chrome://communicator/skin/icons/common.png");
   min-width: 0px;
 }
 
 toolbox {
   border-bottom: none;
 }
 
 #appcontent {
@@ -155,21 +154,16 @@ toolbox {
 }
 
 #home-button[disabled="true"] {
   -moz-image-region: rect(156px 168px 195px 126px) !important;
 }
 
 /* ::::: small primary toolbar buttons ::::: */
 
-toolbar[iconsize="small"] > toolbarpaletteitem > .toolbarbutton-1,
-toolbar[iconsize="small"] > .toolbarbutton-1 {
-  list-style-image: url("chrome://communicator/skin/icons/common-small.png");
-}
-
 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 {