diff --git a/mozilla/themes/classic/communicator/bookmarks/bookmarks.css b/mozilla/themes/classic/communicator/bookmarks/bookmarks.css
index 48c8508a42a..682d727451f 100644
--- a/mozilla/themes/classic/communicator/bookmarks/bookmarks.css
+++ b/mozilla/themes/classic/communicator/bookmarks/bookmarks.css
@@ -30,6 +30,11 @@
     list-style-image      : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
   }
 
+.bookmarkfolder > .menubutton-toolbar-single-internal-box > .menubutton-toolbar-single-dropmarker
+  {
+    display: none;
+  }
+  
 .bookmarkfolder[open="true"]
   {
     list-style-image      : url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
@@ -109,4 +114,4 @@ treeitem > treerow > .treecell-bookmark {
 .bookmarks-panel-tree
   {
     border                : none;
-  }
\ No newline at end of file
+  }
diff --git a/mozilla/themes/classic/communicator/mac/brand.css b/mozilla/themes/classic/communicator/mac/brand.css
index b71f0534af2..e2c6ef9b026 100644
--- a/mozilla/themes/classic/communicator/mac/brand.css
+++ b/mozilla/themes/classic/communicator/mac/brand.css
@@ -2,7 +2,7 @@
 #navigator-throbber
   {
     behavior              : url("chrome://global/content/xulBindings.xml#buttontop");
-    border                : 1px solid threedface;
+    border                : 1px solid #DDDDDD;
     list-style-image      : url("chrome://global/skin/animthrob_single.gif");
     margin                : 0px;
     cursor                : pointer;
@@ -10,24 +10,24 @@
   
 #navigator-throbber:hover
   {
-    border                : 1px solid threeddarkshadow;
+    border                : 1px solid black;
   }
   
 #navigator-throbber > .button-internal-box
   {
-    border-left           : 1px solid threedhighlight;
-    border-top            : 1px solid threedhighlight;
-    border-right          : 1px solid threedshadow;
-    border-bottom         : 1px solid threedshadow;
+    border-left           : 1px solid white;
+    border-top            : 1px solid white;
+    border-right          : 1px solid #9D9D9D;
+    border-bottom         : 1px solid #9D9D9D;
     padding               : 1px;
   }  
 
 #navigator-throbber:hover:active > .button-internal-box
   {
-    border-left           : 1px solid threedshadow;
-    border-top            : 1px solid threedshadow;
-    border-right          : 1px solid threedhighlight;
-    border-bottom         : 1px solid threedhighlight;
+    border-left           : 1px solid #9D9D9D;
+    border-top            : 1px solid #9D9D9D;
+    border-right          : 1px solid white;
+    border-bottom         : 1px solid white;
     padding               : 2px 0xp 0xp 2px;
   }  
   
@@ -35,4 +35,4 @@
   {
     list-style-image      : url("chrome://global/skin/animthrob.gif");
   }
-  
\ No newline at end of file
+  
diff --git a/mozilla/themes/classic/communicator/mac/button.css b/mozilla/themes/classic/communicator/mac/button.css
index 402d4d9f3b5..bf4d58a1857 100644
--- a/mozilla/themes/classic/communicator/mac/button.css
+++ b/mozilla/themes/classic/communicator/mac/button.css
@@ -1,154 +1,128 @@
-
-/** Standard toolbar buttons
- *  class="button-toolbar"
- **/
-  .button-toolbar
-    {
-      border                : 1px solid transparent;
-      margin                : 1px 0px 1px 0px;
-      padding               : 0px;
-      min-width             : 0px;
-    }
-    
-  .button-toolbar:hover
-    {
-      border                : 1px solid #000000;
-    }
-  
-  .button-toolbar:hover:active
-    {
-      border                : 1px solid #000000;
-    }
-    
-  .button-toolbar > .button-internal-box, 
-  .button-toolbar:hover > .button-internal-box
-    {
-      border-left           : 1px solid #FFFFFF;
-      border-top            : 1px solid #FFFFFF;
-      border-right          : 1px soild #9D9D9D;
-      border-bottom         : 1px soild #9D9D9D;
-      padding               : 1px 3px 1px 3px;
-    }
-    
-  .button-toolbar > .button-internal-box > .button-text-container,
-  .button-toolbar > .button-internal-box > .button-text-container > .button-text
-    {
-      padding               : none;
-      margin                : none;
-    }
-
-  .button-toolbar:hover:active > .button-internal-box
-    {
-      padding               : 2px 2px 0px 4px;
-      border                : none;
-    }
-    
-  .button-toolbar[toggled="true"] > .button-internal-box
-    {
-      border-left           : 1px solid #9D9D9D;
-      border-top            : 1px solid #9D9D9D;
-      border-right          : 1px solid #FFFFFF;
-      border-bottom         : 1px solid #FFFFFF;
-      background-color      : #DDDDDD;
-      background-image      : url("chrome://global/skin/scrollbar-bg.gif");
-    }    
-    
-  .button-toolbar[disabled="true"],
-  .button-toolbar[disabled="true"] > .button-internal-box,
-  .button-toolbar[disabled="true"]:hover,
-  .button-toolbar[disabled="true"]:hover > .button-internal-box,
-  .button-toolbar[disabled="true"]:hover:active,
-  .button-toolbar[disabled="true"]:hover:active > .button-internal-box
-    {
-      border                : 1px solid #DDDDDD;
-    }
-
-
-/** Styles for the standard 'large' toolbar button, these buttons are used for
- *  toolbar buttons that are the most commonly used elements on a toolbar, e.g.
- *  'GetMsg' in Mailnews or 'Send' in Mail/Compose.
+/** The largest type of toolbar buttons. In the Seamonkey implementation, 
+ *  these are only used in the navigation toolbar in the navigator package.
  **/
+ 
   /* outer frame */
-  .button-toolbar-1,
-	.button-toolbar-2
+  .button-toolbar-1,.button-toolbar-2
     {
-      behavior            : url("chrome://global/skin/buttonBindings.xml#buttontop");
-      min-width           : 52px;
+      behavior            : url("chrome://global/content/xulBindings.xml#buttontop");
+      min-width           : 0px;
+      margin              : 0px 1px 0px 1px;
+      border              : 1px solid #DDDDDD;
+    }
+
+  .button-toolbar,.button-toolbar-4
+    {
+      behavior            : url("chrome://global/content/xulBindings.xml#buttonleft");
+      min-width           : 0px;
       margin              : 1px;
-      border              : 1px solid #DDDDDD;	
+      border              : 1px solid #DDDDDD;
     }
     
-  .button-toolbar-1:hover,
-	.button-toolbar-2:hover 
+  .button-toolbar-1:hover, .button-toolbar:hover, .button-toolbar-2:hover, .button-toolbar-4:hover
     {
-      border              : 1px solid #000000;
-      color               : ButtonText;
+      border              : 1px solid black;
+      color               : #0000FF;
     } 
 
-  .button-toolbar-1 > .button-box-1,
-	.button-toolbar-2 > .button-box-1
+  .button-toolbar-1 > .button-internal-box,
+  .button-toolbar-2 > .button-internal-box
     {
-      padding             : 0px 2px 1px 1px;
+      padding             : 2px 8px 2px 7px;
       vertical-align      : middle;
       text-align          : center;
       border              : 1px solid #DDDDDD;
     }    
-   
-	.button-toolbar-1 > .button-box-2,
-	.button-toolbar-2 > .button-box-2
-    {
-      border-bottom       : none;
-    }    
     
-  
+  .button-toolbar > .button-internal-box > .button-text-container
+    {
+      padding-left        : 4px;
+    }    
+
+  .button-toolbar > .button-internal-box,
+  .button-toolbar-4 > .button-internal-box
+    {
+      padding             : 1px 4px 1px 3px;
+      vertical-align      : middle;
+      text-align          : center;
+      border              : 1px solid #DDDDDD;
+    }
+    
   .button-toolbar-1[disabled="true"],
   .button-toolbar-1[disabled="true"]:hover,
   .button-toolbar-1[disabled="true"]:hover:active,
-	.button-toolbar-2[disabled="true"],
+  .button-toolbar[disabled="true"],
+  .button-toolbar[disabled="true"]:hover,
+  .button-toolbar[disabled="true"]:hover:active    
+  .button-toolbar-2[disabled="true"],
   .button-toolbar-2[disabled="true"]:hover,
-  .button-toolbar-2[disabled="true"]:hover:active
+  .button-toolbar-2[disabled="true"]:hover:active,
+  .button-toolbar-4[disabled="true"],
+  .button-toolbar-4[disabled="true"]:hover,
+  .button-toolbar-4[disabled="true"]:hover:active
     {
       border              : 1px solid #DDDDDD;
-      color               : #9D9D9D;
+      color               : #999999;
     }
     
 /* internal frame */
-  .button-toolbar-1:hover > .button-box-1,
-	.button-toolbar-2:hover > .button-box-1
+  .button-toolbar-1:hover > .button-internal-box,
+  .button-toolbar:hover > .button-internal-box,
+  .button-toolbar-2:hover > .button-internal-box,
+  .button-toolbar-4:hover > .button-internal-box
     {
-      border-left         : 1px solid #FFFFFF;
-      border-top          : 1px solid #FFFFFF;
+      border-left         : 1px solid white;
+      border-top          : 1px solid white;
       border-right        : 1px solid #9D9D9D;
       border-bottom       : 1px solid #9D9D9D;
     }
 
-  .button-toolbar-1:hover:active > .button-box-1,
-	.button-toolbar-2:hover:active > .button-box-1
+  .button-toolbar-1:hover:active > .button-internal-box,
+  .button-toolbar-2:hover:active > .button-internal-box
     {
-      padding             : 1px 1px 0px 2px;
+      padding             : 3px 7px 1px 8px;
       border-left         : 1px solid #9D9D9D !important;
       border-top          : 1px solid #9D9D9D !important;
-      border-right        : 1px solid #FFFFFF !important;
-      border-bottom       : 1px solid #FFFFFF !important;
+      border-right        : 1px solid white !important;
+      border-bottom       : 1px solid white !important;
     }
     
-  .button-toolbar-1 > .button-internal-box > .button-text-container 
-	.button-toolbar-2 > .button-internal-box > .button-text-container 
+  .button-toolbar:hover:active > .button-internal-box,
+  .button-toolbar-4:hover:active > .button-internal-box
+    {
+      padding             : 1px 3px 0px 4px;
+      border-left         : 1px solid #9D9D9D !important;
+      border-top          : 1px solid #9D9D9D !important;
+      border-right        : 1px solid white !important;
+      border-bottom       : 1px solid white !important;
+    }
+
+  .button-toolbar-1 > .button-internal-box > .button-text-container,
+  .button-toolbar > .button-internal-box > .button-text-container,
+  .button-toolbar-2 > .button-internal-box > .button-text-container,
+  .button-toolbar-4 > .button-internal-box > .button-text-container
     {
       text-align          : center;
     }
     
-  .button-toolbar-1[disabled="true"] > .button-box-1,
-  .button-toolbar-1[disabled="true"]:hover > .button-box-1,
-  .button-toolbar-1[disabled="true"]:hover:active > .button-box-1,
-	.button-toolbar-2[disabled="true"] > .button-box-1,
-  .button-toolbar-2[disabled="true"]:hover > .button-box-1,
-  .button-toolbar-2[disabled="true"]:hover:active > .button-box-1
+  .button-toolbar-1[disabled="true"] > .button-internal-box,
+  .button-toolbar-1[disabled="true"]:hover > .button-internal-box,
+  .button-toolbar-1[disabled="true"]:hover:active > .button-internal-box,
+  .button-toolbar[disabled="true"] > .button-internal-box,
+  .button-toolbar[disabled="true"]:hover > .button-internal-box,
+  .button-toolbar[disabled="true"]:hover:active > .button-internal-box,
+  .button-toolbar-2[disabled="true"] > .button-internal-box,
+  .button-toolbar-2[disabled="true"]:hover > .button-internal-box,
+  .button-toolbar-2[disabled="true"]:hover:active > .button-internal-box,
+  .button-toolbar-4[disabled="true"] > .button-internal-box,
+  .button-toolbar-4[disabled="true"]:hover > .button-internal-box,
+  .button-toolbar-4[disabled="true"]:hover:active > .button-internal-box
     {
-      padding             : 0px 2px 1px 1px !important;
-      border              : 1px solid transparent !important;
+      padding             : 2px 8px 2px 7px !important;
+      border              : 1px solid #DDDDDD !important;
     }
-		
+      
+
 /** "Green" buttons, e.g. "Search"
  *  class="button-toolbar-3"
  **/  
@@ -209,51 +183,7 @@
       color               : #FF0000;
     }
 
-/** 
- * button styles for taskbar, sidebar headers, etc.
- **/
-.button-toolbar-4
-  {
-    color                 : ButtonText;
-    background            : inherit;
-    font                  : inherit;
-    border                : none;
-    padding               : 1px !important;
-    margin                : 0px;
-  }
-
-.button-toolbar-4:hover 
-  {
-    text-decoration       : none;
-    color                 : ButtonText;
-  }
-
-.button-toolbar-4:hover:active 
-  {
-    text-decoration       : none;
-    color                 : ButtonText;
-    padding               : 2px 0px 0px 2px !important;
-  }
-  
-.button-toolbar-4:hover > .button-box-1,
-.button-toolbar-4:hover:active > .button-box-1 
-  {
-	  border-left           : 1px solid ButtonHighlight;
-		border-top            : 1px solid ButtonHighlight;
-		border-right          : 1px solid ButtonShadow;
-		border-bottom         : 1px solid ButtonShadow; 
-	}
-
 menubutton.button-toolbar-4
   {
     behavior              : url("chrome://global/content/menulistBindings.xml#menubutton-single-right");
   }
-  
-.button-toolbar-4 > .button-box-1,
-.button-toolbar-4 > .menubutton-internal-box
-  {
-    border                : none !important;
-    padding               : 0px !important;
-  }  
-
-  
diff --git a/mozilla/themes/classic/communicator/mac/menubutton.css b/mozilla/themes/classic/communicator/mac/menubutton.css
index 5adc45c9925..bc851ec80f6 100644
--- a/mozilla/themes/classic/communicator/mac/menubutton.css
+++ b/mozilla/themes/classic/communicator/mac/menubutton.css
@@ -52,37 +52,48 @@
      border-bottom          : 1px solid #CCCCCC;
    }
 
-/** 
- * Navigation bar style menubuttons 
- **/
-.toolbar.menubutton-dual,
-.toolbar.menubutton-dual
+/* toolbar menubuttons */   
+ menubutton.button-toolbar, menubutton.button-toolbar-4
   {
-    border                  : none ! important;
+    behavior                : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-toolbar-single");
+    border                  : 1px solid #DDDDDD;
   }
-
-.button-toolbar-1.menubutton-dual-button
+  
+menubutton.button-toolbar:hover,menubutton.button-toolbar-4:hover
   {
-    list-style-image        : inherit;
+    border                  : 1px solid black;
   }
-
-.menubutton-dual-dropmarker
+  
+.menubutton-toolbar-single-internal-box
   {
-    background              : transparent;
-    list-style-image        : url("chrome://communicator/skin/tb-menubutton-dm.gif");
-  } 
-
-.menubutton-dual-dropmarker[disabled="true"]
+    border                  : 1px solid #DDDDDD;
+    padding                 : 1px 4px 1px 4px;
+  }  
+  
+menubutton.button-toolbar:hover > .menubutton-toolbar-single-internal-box, menubutton.button-toolbar-4:hover > .menubutton-toolbar-single-internal-box
   {
-    background              : transparent;
-    list-style-image        : url("chrome://communicator/skin/tb-menubutton-dm-disabled.gif");
+    border-left             : 1px solid white;
+    border-top              : 1px solid white;
+    border-right            : 1px solid #9D9D9D;
+    border-bottom           : 1px solid #9D9D9D;
+  }  
+  
+menubutton.button-toolbar:hover:active > .menubutton-toolbar-single-internal-box,
+menubutton.button-toolbar[open="true"] > .menubutton-toolbar-single-internal-box,
+menubutton.button-toolbar-4:hover:active > .menubutton-toolbar-single-internal-box,
+menubutton.button-toolbar-4[open="true"] > .menubutton-toolbar-single-internal-box
+  {
+    border-left             : 1px solid #9D9D9D;
+    border-top              : 1px solid #9D9D9D;
+    border-right            : 1px solid white;
+    border-bottom           : 1px solid white;
+    padding                 : 2px 3px 0px 5px;
+  }  
+  
+.menubutton-toolbar-single-dropmarker
+  {
+    padding-left            : 4px;
+    list-style-image        : url("chrome://global/skin/scroll-up.gif");
   } 
   
-.menubutton-dual-dropmarker-box
-  {
-    margin-left             : 32px;
-    margin-bottom           : 1px;
-  }
-
   
-  
\ No newline at end of file
diff --git a/mozilla/themes/classic/communicator/mac/tasksOverlay.css b/mozilla/themes/classic/communicator/mac/tasksOverlay.css
index 8983b6cfba4..c92cebc6b07 100644
--- a/mozilla/themes/classic/communicator/mac/tasksOverlay.css
+++ b/mozilla/themes/classic/communicator/mac/tasksOverlay.css
@@ -21,8 +21,6 @@
 #taskbar 
   {
 	  margin-top            : 2px;
-	  min-height            : 1em;
-  	user-focus            : ignore;
   }
 
 .taskbutton 
@@ -36,7 +34,7 @@
     width                 : 1em;
   }
 
-#taskbar > toolbargrippy
+#taskbar-toolbar > toolbargrippy
   {
     display               : none;
-  }
\ No newline at end of file
+  }
diff --git a/mozilla/themes/classic/communicator/unix/button.css b/mozilla/themes/classic/communicator/unix/button.css
index e7e61c11979..4e50bac4be3 100644
--- a/mozilla/themes/classic/communicator/unix/button.css
+++ b/mozilla/themes/classic/communicator/unix/button.css
@@ -1,119 +1,75 @@
-/** Standard toolbar buttons
- *  class="button-toolbar"
- **/
-  .button-toolbar
-    {
-      border                : 1px solid transparent;
-      margin                : 1px 0px 1px 0px;
-      padding               : 0px;
-      min-width             : 0px;
-    }
-    
-  .button-toolbar:hover
-    {
-      border                : 1px solid threeddarkshadow;
-    }
-  
-  .button-toolbar:hover:active
-    {
-      border                : 1px solid threeddarkshadow;
-    }
-    
-  .button-toolbar > .button-internal-box, 
-  .button-toolbar:hover > .button-internal-box
-    {
-      border-left           : 1px solid threedhighlight;
-      border-top            : 1px solid threedhighlight;
-      border-right          : 1px soild threedshadow;
-      border-bottom         : 1px soild threedshadow;
-      padding               : 1px 3px 1px 3px;
-    }
-    
-  .button-toolbar > .button-internal-box > .button-text-container,
-  .button-toolbar > .button-internal-box > .button-text-container > .button-text
-    {
-      padding               : none;
-      margin                : none;
-    }
-
-  .button-toolbar:hover:active > .button-internal-box
-    {
-      padding               : 2px 2px 0px 4px;
-      border                : none;
-    }
-    
-  .button-toolbar[toggled="true"] > .button-internal-box
-    {
-      border-left           : 1px solid threedshadow;
-      border-top            : 1px solid threedshadow;
-      border-right          : 1px solid threedhighlight;
-      border-bottom         : 1px solid threedhighlight;
-      background-color      : threedface;
-      background-image      : url("chrome://global/skin/scrollbar-bg.gif");
-    }    
-    
-  .button-toolbar[disabled="true"],
-  .button-toolbar[disabled="true"] > .button-internal-box,
-  .button-toolbar[disabled="true"]:hover,
-  .button-toolbar[disabled="true"]:hover > .button-internal-box,
-  .button-toolbar[disabled="true"]:hover:active,
-  .button-toolbar[disabled="true"]:hover:active > .button-internal-box
-    {
-      border                : 1px solid threedface;
-    }
-
-
-/** Styles for the standard 'large' toolbar button, these buttons are used for
- *  toolbar buttons that are the most commonly used elements on a toolbar, e.g.
- *  'GetMsg' in Mailnews or 'Send' in Mail/Compose.
+/** The largest type of toolbar buttons. In the Seamonkey implementation, 
+ *  these are only used in the navigation toolbar in the navigator package.
  **/
+ 
   /* outer frame */
-  .button-toolbar-1,
-	.button-toolbar-2
+  .button-toolbar-1, .button-toolbar-2
     {
-      behavior            : url("chrome://global/skin/buttonBindings.xml#buttontop");
-      min-width           : 52px;
+      behavior            : url("chrome://global/content/xulBindings.xml#buttontop");
+      min-width           : 0px;
+      margin              : 0px 1px 0px 1px;
+      border              : 1px solid transparent;
+    }
+
+  .button-toolbar, .button-toolbar-4
+    {
+      behavior            : url("chrome://global/content/xulBindings.xml#buttonleft");
+      min-width           : 0px;
       margin              : 1px;
-      border              : 1px solid ButtonFace;	
+      border              : 1px solid transparent;
     }
     
-  .button-toolbar-1:hover,
-	.button-toolbar-2:hover 
+  .button-toolbar-1:hover, .button-toolbar:hover, .button-toolbar-2:hover, .button-toolbar-4:hover
     {
       border              : 1px solid threeddarkshadow;
-      color               : ButtonText;
+      color               : #0000FF;
     } 
 
-  .button-toolbar-1 > .button-box-1,
-	.button-toolbar-2 > .button-box-1
+  .button-toolbar-1 > .button-internal-box,
+  .button-toolbar-2 > .button-internal-box
     {
-      padding             : 0px 2px 1px 1px;
+      padding             : 2px 8px 2px 7px;
       vertical-align      : middle;
       text-align          : center;
-      border              : 1px solid ButtonFace;
-    }    
-   
-	.button-toolbar-1 > .button-box-2,
-	.button-toolbar-2 > .button-box-2
-    {
-      border-bottom       : none;
+      border              : 1px solid transparent;
     }    
     
-  
+  .button-toolbar > .button-internal-box > .button-text-container
+    {
+      padding-left        : 4px;
+    }    
+
+  .button-toolbar > .button-internal-box,
+  .button-toolbar-4 > .button-internal-box
+    {
+      padding             : 1px 4px 1px 3px;
+      vertical-align      : middle;
+      text-align          : center;
+      border              : 1px solid transparent;
+    }
+    
   .button-toolbar-1[disabled="true"],
   .button-toolbar-1[disabled="true"]:hover,
   .button-toolbar-1[disabled="true"]:hover:active,
-	.button-toolbar-2[disabled="true"],
+  .button-toolbar[disabled="true"],
+  .button-toolbar[disabled="true"]:hover,
+  .button-toolbar[disabled="true"]:hover:active    
+  .button-toolbar-2[disabled="true"],
   .button-toolbar-2[disabled="true"]:hover,
-  .button-toolbar-2[disabled="true"]:hover:active
+  .button-toolbar-2[disabled="true"]:hover:active,
+  .button-toolbar-4[disabled="true"],
+  .button-toolbar-4[disabled="true"]:hover,
+  .button-toolbar-4[disabled="true"]:hover:active
     {
-      border              : 1px solid ButtonFace;
+      border              : 1px solid transparent;
       color               : graytext;
     }
     
 /* internal frame */
-  .button-toolbar-1:hover > .button-box-1,
-	.button-toolbar-2:hover > .button-box-1
+  .button-toolbar-1:hover > .button-internal-box,
+  .button-toolbar:hover > .button-internal-box,
+  .button-toolbar-2:hover > .button-internal-box,
+  .button-toolbar-4:hover > .button-internal-box
     {
       border-left         : 1px solid threedhighlight;
       border-top          : 1px solid threedhighlight;
@@ -121,33 +77,52 @@
       border-bottom       : 1px solid threedshadow;
     }
 
-  .button-toolbar-1:hover:active > .button-box-1,
-	.button-toolbar-2:hover:active > .button-box-1
+  .button-toolbar-1:hover:active > .button-internal-box,
+  .button-toolbar-2:hover:active > .button-internal-box
     {
-      padding             : 1px 1px 0px 2px;
+      padding             : 3px 7px 1px 8px;
       border-left         : 1px solid threedshadow !important;
       border-top          : 1px solid threedshadow !important;
       border-right        : 1px solid threedhighlight !important;
       border-bottom       : 1px solid threedhighlight !important;
     }
     
-  .button-toolbar-1 > .button-internal-box > .button-text-container 
-	.button-toolbar-2 > .button-internal-box > .button-text-container 
+  .button-toolbar:hover:active > .button-internal-box,
+  .button-toolbar-4:hover:active > .button-internal-box
+    {
+      padding             : 1px 3px 0px 4px;
+      border-left         : 1px solid threedshadow !important;
+      border-top          : 1px solid threedshadow !important;
+      border-right        : 1px solid threedhighlight !important;
+      border-bottom       : 1px solid threedhighlight !important;
+    }
+
+  .button-toolbar-1 > .button-internal-box > .button-text-container,
+  .button-toolbar > .button-internal-box > .button-text-container,
+  .button-toolbar-2 > .button-internal-box > .button-text-container,
+  .button-toolbar-4 > .button-internal-box > .button-text-container
     {
       text-align          : center;
     }
     
-  .button-toolbar-1[disabled="true"] > .button-box-1,
-  .button-toolbar-1[disabled="true"]:hover > .button-box-1,
-  .button-toolbar-1[disabled="true"]:hover:active > .button-box-1,
-	.button-toolbar-2[disabled="true"] > .button-box-1,
-  .button-toolbar-2[disabled="true"]:hover > .button-box-1,
-  .button-toolbar-2[disabled="true"]:hover:active > .button-box-1
+  .button-toolbar-1[disabled="true"] > .button-internal-box,
+  .button-toolbar-1[disabled="true"]:hover > .button-internal-box,
+  .button-toolbar-1[disabled="true"]:hover:active > .button-internal-box,
+  .button-toolbar[disabled="true"] > .button-internal-box,
+  .button-toolbar[disabled="true"]:hover > .button-internal-box,
+  .button-toolbar[disabled="true"]:hover:active > .button-internal-box,
+  .button-toolbar-2[disabled="true"] > .button-internal-box,
+  .button-toolbar-2[disabled="true"]:hover > .button-internal-box,
+  .button-toolbar-2[disabled="true"]:hover:active > .button-internal-box,
+  .button-toolbar-4[disabled="true"] > .button-internal-box,
+  .button-toolbar-4[disabled="true"]:hover > .button-internal-box,
+  .button-toolbar-4[disabled="true"]:hover:active > .button-internal-box
     {
-      padding             : 0px 2px 1px 1px !important;
+      padding             : 2px 8px 2px 7px !important;
       border              : 1px solid transparent !important;
     }
-		
+      
+
 /** "Green" buttons, e.g. "Search"
  *  class="button-toolbar-3"
  **/  
@@ -208,52 +183,7 @@
       color               : #FF0000;
     }
 
-/** 
- * button styles for taskbar, sidebar headers, etc.
- **/
-.button-toolbar-4
-  {
-    color                 : ButtonText;
-    background            : inherit;
-    font                  : inherit;
-    border                : none;
-    padding               : 1px !important;
-    margin                : 0px;
-  }
-
-.button-toolbar-4:hover 
-  {
-    text-decoration       : none;
-    /*background-color      : #336699;*/
-    color                 : ButtonText;
-  }
-
-.button-toolbar-4:hover:active 
-  {
-    text-decoration       : none;
-    color                 : ButtonText;
-    padding               : 2px 0px 0px 2px !important;
-  }
-  
-.button-toolbar-4:hover > .button-box-1,
-.button-toolbar-4:hover:active > .button-box-1 
-  {
-	  border-left           : 1px solid ButtonHighlight;
-		border-top            : 1px solid ButtonHighlight;
-		border-right          : 1px solid ButtonShadow;
-		border-bottom         : 1px solid ButtonShadow; 
-	}
-
 menubutton.button-toolbar-4
   {
     behavior              : url("chrome://global/content/menulistBindings.xml#menubutton-single-right");
   }
-  
-.button-toolbar-4 > .button-box-1,
-.button-toolbar-4 > .menubutton-internal-box
-  {
-    border                : none !important;
-    padding               : 0px !important;
-  }  
-
-  
diff --git a/mozilla/themes/classic/communicator/unix/menubutton.css b/mozilla/themes/classic/communicator/unix/menubutton.css
index 5adc45c9925..be2568d794b 100644
--- a/mozilla/themes/classic/communicator/unix/menubutton.css
+++ b/mozilla/themes/classic/communicator/unix/menubutton.css
@@ -52,37 +52,49 @@
      border-bottom          : 1px solid #CCCCCC;
    }
 
-/** 
- * Navigation bar style menubuttons 
- **/
-.toolbar.menubutton-dual,
-.toolbar.menubutton-dual
+/* toolbar menubuttons */   
+menubutton.button-toolbar, menubutton.button-toolbar-4
   {
-    border                  : none ! important;
+    behavior                : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-toolbar-single");
+    border                  : 1px solid threedface;
   }
-
-.button-toolbar-1.menubutton-dual-button
+  
+menubutton.button-toolbar:hover, menubutton.button-toolbar-4:hover
   {
-    list-style-image        : inherit;
+    border                  : 1px solid threeddarkshadow;
   }
-
-.menubutton-dual-dropmarker
+  
+.menubutton-toolbar-single-internal-box
   {
-    background              : transparent;
-    list-style-image        : url("chrome://communicator/skin/tb-menubutton-dm.gif");
-  } 
-
-.menubutton-dual-dropmarker[disabled="true"]
+    border                  : 1px solid threedface;
+    padding                 : 1px 4px 1px 4px;
+  }  
+  
+menubutton.button-toolbar:hover > .menubutton-toolbar-single-internal-box,
+menubutton.button-toolbar-4:hover > .menubutton-toolbar-single-internal-box
   {
-    background              : transparent;
-    list-style-image        : url("chrome://communicator/skin/tb-menubutton-dm-disabled.gif");
+    border-left             : 1px solid threedhighlight;
+    border-top              : 1px solid threedhighlight;
+    border-right            : 1px solid threedshadow;
+    border-bottom           : 1px solid threedshadow;
+  }  
+  
+menubutton.button-toolbar:hover:active > .menubutton-toolbar-single-internal-box,
+menubutton.button-toolbar[open="true"] > .menubutton-toolbar-single-internal-box,
+menubutton.button-toolbar-4:hover:active > .menubutton-toolbar-single-internal-box,
+menubutton.button-toolbar-4[open="true"] > .menubutton-toolbar-single-internal-box
+  {
+    border-left             : 1px solid threedshadow;
+    border-top              : 1px solid threedshadow;
+    border-right            : 1px solid threedhighlight;
+    border-bottom           : 1px solid threedhighlight;
+    padding                 : 2px 3px 0px 5px;
+  }  
+  
+.menubutton-toolbar-single-dropmarker
+  {
+    padding-left            : 4px;
+    list-style-image        : url("chrome://global/skin/scroll-up.gif");
   } 
   
-.menubutton-dual-dropmarker-box
-  {
-    margin-left             : 32px;
-    margin-bottom           : 1px;
-  }
-
   
-  
\ No newline at end of file
diff --git a/mozilla/themes/classic/communicator/unix/tasksOverlay.css b/mozilla/themes/classic/communicator/unix/tasksOverlay.css
index 8983b6cfba4..c92cebc6b07 100644
--- a/mozilla/themes/classic/communicator/unix/tasksOverlay.css
+++ b/mozilla/themes/classic/communicator/unix/tasksOverlay.css
@@ -21,8 +21,6 @@
 #taskbar 
   {
 	  margin-top            : 2px;
-	  min-height            : 1em;
-  	user-focus            : ignore;
   }
 
 .taskbutton 
@@ -36,7 +34,7 @@
     width                 : 1em;
   }
 
-#taskbar > toolbargrippy
+#taskbar-toolbar > toolbargrippy
   {
     display               : none;
-  }
\ No newline at end of file
+  }
diff --git a/mozilla/themes/classic/communicator/win/menubutton.css b/mozilla/themes/classic/communicator/win/menubutton.css
index 75b20b8cdbc..be2568d794b 100644
--- a/mozilla/themes/classic/communicator/win/menubutton.css
+++ b/mozilla/themes/classic/communicator/win/menubutton.css
@@ -53,13 +53,13 @@
    }
 
 /* toolbar menubuttons */   
-menubutton.button-toolbar-4
+menubutton.button-toolbar, menubutton.button-toolbar-4
   {
     behavior                : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-toolbar-single");
     border                  : 1px solid threedface;
   }
   
-menubutton.button-toolbar-4:hover
+menubutton.button-toolbar:hover, menubutton.button-toolbar-4:hover
   {
     border                  : 1px solid threeddarkshadow;
   }
@@ -70,6 +70,7 @@ menubutton.button-toolbar-4:hover
     padding                 : 1px 4px 1px 4px;
   }  
   
+menubutton.button-toolbar:hover > .menubutton-toolbar-single-internal-box,
 menubutton.button-toolbar-4:hover > .menubutton-toolbar-single-internal-box
   {
     border-left             : 1px solid threedhighlight;
@@ -78,6 +79,8 @@ menubutton.button-toolbar-4:hover > .menubutton-toolbar-single-internal-box
     border-bottom           : 1px solid threedshadow;
   }  
   
+menubutton.button-toolbar:hover:active > .menubutton-toolbar-single-internal-box,
+menubutton.button-toolbar[open="true"] > .menubutton-toolbar-single-internal-box,
 menubutton.button-toolbar-4:hover:active > .menubutton-toolbar-single-internal-box,
 menubutton.button-toolbar-4[open="true"] > .menubutton-toolbar-single-internal-box
   {
@@ -94,4 +97,4 @@ menubutton.button-toolbar-4[open="true"] > .menubutton-toolbar-single-internal-b
     list-style-image        : url("chrome://global/skin/scroll-up.gif");
   } 
   
-  
\ No newline at end of file
+  
diff --git a/mozilla/themes/classic/global/mac/button.css b/mozilla/themes/classic/global/mac/button.css
index bfb6fdc82b0..65cb3f4286e 100644
--- a/mozilla/themes/classic/global/mac/button.css
+++ b/mozilla/themes/classic/global/mac/button.css
@@ -8,40 +8,39 @@
   button, button.left
     {
       behavior            : url("chrome://global/skin/buttonBindings.xml#buttonleft");
-      border              : 1px solid #000000;
+      border-left         : 1px solid #DDDDDD;
+      border-top          : 1px solid #DDDDDD;
+      border-right        : 1px solid black;
+      border-bottom       : 1px solid black;
       margin              : 1px 5px 2px 5px;
       background-color    : #DDDDDD;
       min-width           : 8em;
-      font                : sans-serif;
-      color               : #000000;
-      -moz-border-radius  : 2px;
+      font                : Geneva 7pt;
+      color               : black;
+      -moz-border-radius  : 3px 2px 2px 3px;
     }
   
   .button-box-1  
     {
-      border-left         : 1px solid #FFFFFF;
-      border-top          : 1px solid #FFFFFF;
+      border-left         : 1px solid white;
+      border-top          : 1px solid white;
       border-right        : 1px solid #9D9D9D;
       border-bottom       : 1px solid #9D9D9D;
     }
 
   .button-box-2
     {
-      
 			border              : 1px solid #DDDDDD;	
     }
     
   button:hover:active 
     {
-      border              : 1px solid #000000;
+      border              : 1px solid black;
     }
 
   button:hover:active > .button-box-1
     {
-      border-left         : 1px solid #9D9D9D;
-      border-top          : 1px solid #9D9D9D;
-      border-right        : 1px solid #FFFFFF;
-      border-bottom       : 1px solid #FFFFFF;
+      border              : 1px solid #9D9D9D;
     }
 
   button:hover:active > .button-box-1 > .button-box-2
@@ -54,15 +53,10 @@
       padding             : 1px 2px 0px 3px; 
     }
   
-  .button-box-text
-    {
-      /*debug */
-    }
-  
   button[disabled="true"],
   button[disabled="true"]:hover:active 
     {
-      color               : #9D9D9D;
+      color               : #999999;
     }
         
   button[disabled="true"] > .button-box-1 > .button-box-2 > .button-box-text,
@@ -84,7 +78,7 @@
 
   button:focus > .button-box-1 > .button-box-2 > .button-box-text
     {
-      border              : 1px dotted #000000;
+      border              : 1px dotted black;
     }    
     
 /** Styles for "DEFAULT" buttons (usually 'OK' or equivalent in dialogs. 
@@ -94,16 +88,16 @@
 /* outer frame */  
   button[default], button:focus
     {
-      border              : 1px solid #000000;
+      border              : 1px solid black;
     }
 
   button[default] > .button-box-1,
   button:focus > .button-box-1
     {
-      border-left         : 1px solid #FFFFFF;
-      border-top          : 1px solid #FFFFFF;
-      border-right        : 1px solid #000000;
-      border-bottom       : 1px solid #000000;
+      border-left         : 1px solid white;
+      border-top          : 1px solid white;
+      border-right        : 1px solid black;
+      border-bottom       : 1px solid black;
     }
 
   button[default] > .button-box-1 > .button-box-2,
diff --git a/mozilla/themes/classic/global/mac/menubutton.css b/mozilla/themes/classic/global/mac/menubutton.css
index ad74a8b24db..31487fac31c 100644
--- a/mozilla/themes/classic/global/mac/menubutton.css
+++ b/mozilla/themes/classic/global/mac/menubutton.css
@@ -13,7 +13,7 @@
 .menubutton-dual[buttonover="true"],
 .menubutton-dual[buttondown="true"]
   {
-    border                : 1px solid threeddarkshadow;
+    border                : 1px solid black;
   }
 
 .classic-dropmarker-box,
@@ -26,8 +26,8 @@
   
 .menubutton-dual:hover > .classic-dropmarker-box 
   {
-    border-left           : 1px solid #FFFFFF;
-    border-top            : 1px solid #FFFFFF;
+    border-left           : 1px solid white;
+    border-top            : 1px solid white;
     border-right          : 1px solid #9D9D9D;
     border-bottom         : 1px solid #9D9D9D;
   } 
@@ -36,8 +36,8 @@
   {
     border-left           : 1px solid #9D9D9D;
     border-top            : 1px solid #9D9D9D;
-    border-right          : 1px solid #FFFFFF;
-    border-bottom         : 1px solid #FFFFFF;
+    border-right          : 1px solid white;
+    border-bottom         : 1px solid white;
   }
 
 .classic-simplebutton,
@@ -50,27 +50,26 @@
   {
     behavior              : url("chrome://global/skin/menubuttonBindings.xml#buttontop");
     margin                : 0px;
-    border                : 1px solid #DDDDDD !important;
+    border                : 1px solid #DDDDDD;
     min-width             : 0px;
     padding               : 2px 8px 2px 7px;
     text-align            : center;
-    background-color      : #DDDDDD;
   }  
   
 .classic-simplebutton:hover,
 .menubutton-dual:hover > .classic-simplebutton,
 .menubutton-dual[open="true"] > .classic-simplebutton
   {
-    border-left           : 1px solid #FFFFFF !important;
-    border-top            : 1px solid #FFFFFF !important;
-    border-right          : 1px solid #9D9D9D !important;
-    border-bottom         : 1px solid #9D9D9D !important;
+    border-left           : 1px solid white;
+    border-top            : 1px solid white;
+    border-right          : 1px solid #9D9D9D;
+    border-bottom         : 1px solid #9D9D9D;
   }  
   
 .menubutton-dual[buttonover="true"] > .classic-dropmarker-box
   {
-    border-left           : 1px solid #FFFFFF;
-    border-top            : 1px solid #FFFFFF;
+    border-left           : 1px solid white;
+    border-top            : 1px solid white;
     border-right          : 1px solid #9D9D9D;
     border-bottom         : 1px solid #9D9D9D;
   } 
@@ -79,8 +78,8 @@
   {
     border-left           : 1px solid #9D9D9D;
     border-top            : 1px solid #9D9D9D;
-    border-right          : 1px solid #FFFFFF;
-    border-bottom         : 1px solid #FFFFFF;
+    border-right          : 1px solid white;
+    border-bottom         : 1px solid white;
     padding               : 3px 7px 1px 8px;
   }  
   
@@ -88,8 +87,8 @@
   {
     border-left           : 1px solid #9D9D9D;
     border-top            : 1px solid #9D9D9D;
-    border-right          : 1px solid #FFFFFF;
-    border-bottom         : 1px solid #FFFFFF;
+    border-right          : 1px solid white;
+    border-bottom         : 1px solid white;
   }  
   
 .classic-dropmarker
@@ -102,4 +101,4 @@
     list-style-image      : url("chrome://global/skin/scroll-down-disabled.gif");
   }  
   
-  
\ No newline at end of file
+  
diff --git a/mozilla/themes/classic/global/mac/toolbar.css b/mozilla/themes/classic/global/mac/toolbar.css
index dfcfa426f98..a16f14858cf 100644
--- a/mozilla/themes/classic/global/mac/toolbar.css
+++ b/mozilla/themes/classic/global/mac/toolbar.css
@@ -1,7 +1,7 @@
 
 toolbox
   {
-    background-color      : appworkspace;
+    background-color      : #9D9D9D;
     border-bottom         : 1px solid #FFFFFF;
   }
 
@@ -61,4 +61,4 @@ toolbar[collapsed="true"] > toolbargrippy
 toolbarseparator 
   { 
     width                 : 2em; 
-  } 
\ No newline at end of file
+  } 
diff --git a/mozilla/themes/classic/global/unix/button.css b/mozilla/themes/classic/global/unix/button.css
index 6431d7197b6..b8ad1795a65 100644
--- a/mozilla/themes/classic/global/unix/button.css
+++ b/mozilla/themes/classic/global/unix/button.css
@@ -8,8 +8,8 @@
   button, button.left
     {
       behavior            : url("chrome://global/skin/buttonBindings.xml#buttonleft");
-      border-left         : 1px solid buttonhighlight;
-      border-top          : 1px solid buttonhighlight;
+      border-left         : 1px solid threedface;
+      border-top          : 1px solid threedface;
       border-right        : 1px solid threeddarkshadow;
       border-bottom       : 1px solid threeddarkshadow;
       margin              : 1px 5px 2px 5px;
@@ -21,16 +21,15 @@
   
   .button-box-1  
     {
-      border-left         : 1px solid buttonhighlight;
-      border-top          : 1px solid buttonhighlight;
-      border-right        : 1px solid buttonshadow;
-      border-bottom       : 1px solid buttonshadow;
+      border-left         : 1px solid threedhighlight;
+      border-top          : 1px solid threedhighlight;
+      border-right        : 1px solid threedshadow;
+      border-bottom       : 1px solid threedshadow;
     }
 
   .button-box-2
     {
-      
-			border              : 1px solid ButtonFace;	
+			border              : 1px solid threedface;	
     }
     
   button:hover:active 
@@ -53,11 +52,6 @@
       padding             : 1px 2px 0px 3px; 
     }
   
-  .button-box-text
-    {
-      /*debug */
-    }
-  
   button[disabled="true"],
   button[disabled="true"]:hover:active 
     {
@@ -77,7 +71,7 @@
       text-align          : center;
       vertical-align      : middle;
       padding             : 0px 3px 1px 2px;
-      border              : 1px solid buttonface;
+      border              : 1px solid threedface;
       margin              : 1px;
     }