fix for bug #155036

[modern skin] Text under Delete and Junk buttons one pixel too low.
thanks to abecevello@sympatico.ca for the initial patch.
also, merge junk buttons into our big button map and new icons from gail.

themes/modern/jar.mn

@@ -393,10 +393,6 @@ modern.jar:
   skin/modern/messenger/icons/thread-new-closed-offl-kill.gif      (messenger/icons/thread-new-closed-offl-kill.gif)
   skin/modern/messenger/icons/new-mail-alert.png                   (messenger/icons/new-mail-alert.png)
   skin/modern/messenger/icons/btn1.gif                             (messenger/icons/btn1.gif)
-  skin/modern/messenger/icons/junk.gif                             (messenger/icons/junk.gif)
-  skin/modern/messenger/icons/junk-act.gif                         (messenger/icons/junk-act.gif)
-  skin/modern/messenger/icons/junk-hov.gif                         (messenger/icons/junk-hov.gif)
-  skin/modern/messenger/icons/junk-dis.gif                         (messenger/icons/junk-dis.gif)
   skin/modern/messenger/icons/junkBar.gif                          (messenger/icons/junkBar.gif)
   skin/modern/messenger/icons/message-junk-other.gif               (messenger/icons/message-junk-other.gif)
   skin/modern/messenger/messengercompose/messengercompose.css      (messenger/messengercompose/messengercompose.css)

themes/modern/messenger/primaryToolbar.css

@@ -20,6 +20,8 @@
  *
  * Contributor(s):
  *  Joe Hewitt <hewitt@netscape.com>
+ *  Adam Becevello <abecevello@sympatico.ca>
+ *  Seth Spitzer <sspitzer@netscape.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or 
@@ -167,19 +169,19 @@
 } 
 
 #button-delete {
-  -moz-image-region: rect(0, 49px 34px 0);
+  -moz-image-region: rect(0, 49px 33px 0);
 }
 
 #button-delete:hover {
-  -moz-image-region: rect(0, 99px 34px 50px);
+  -moz-image-region: rect(0, 99px 33px 50px);
 } 
 
 #button-delete:hover:active {
-  -moz-image-region: rect(0 149px 34px 100px);
+  -moz-image-region: rect(0 149px 33px 100px);
 }
 
 #button-delete[disabled] {
-  -moz-image-region: rect(0 199px 34px 150px) !important;
+  -moz-image-region: rect(0 199px 33px 150px) !important;
 } 
 
 #button-mark {
@@ -198,6 +200,22 @@
   -moz-image-region: rect(136px 199px 169px 150px) !important;
 } 
 
+#button-junk {
+  -moz-image-region: rect(544px 49px 577px 0);
+}
+
+#button-junk:hover {
+  -moz-image-region: rect(544px 99px 577px 50px);
+} 
+
+#button-junk:hover:active {
+  -moz-image-region: rect(544px 149px 577px 100px);
+}
+
+#button-junk[disabled="true"] {
+  -moz-image-region: rect(544px 199px 577px 150px) !important;
+}
+
 #button-print {
   list-style-image: url("chrome://communicator/skin/icons/btn1.gif");
   -moz-image-region: rect(34px 49px 67px 0);
@@ -232,22 +250,6 @@
   -moz-image-region: rect(68px 199px 101px 150px) !important;
 }
 
-#button-junk{
-  list-style-image: url("chrome://messenger/skin/icons/junk.gif");
-}
-
-#button-junk:hover {
-  list-style-image: url("chrome://messenger/skin/icons/junk-hov.gif");
-} 
-
-#button-junk:hover:active {
-  list-style-image: url("chrome://messenger/skin/icons/junk-act.gif");
-}
-
-#button-junk[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/junk-dis.gif");
-}
-
 #junkBarImage {
   list-style-image: url("chrome://messenger/skin/icons/junkBar.gif");
 }