Index: browser/base/content/browser.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/base/content/browser.xul,v
retrieving revision 1.312
diff -u -p -r1.312 browser.xul
--- browser/base/content/browser.xul	1 Aug 2006 23:08:30 -0000	1.312
+++ browser/base/content/browser.xul	3 Aug 2006 15:26:09 -0000
@@ -285,21 +285,14 @@
         </deck>
       </toolbaritem>
 
-      <toolbaritem id="search-container" title="&searchItem.title;" 
-                   align="center" class="chromeclass-toolbar-additional"
-                   flex="100">
-        <searchbar id="searchbar" flex="1"/>
-      </toolbaritem>
-
-      <toolbaritem id="go-container" align="center" class="chromeclass-toolbar-additional">
+      <toolbaritem id="search-container" title="&searchItem.title;"
+                    align="center" class="chromeclass-toolbar-additional"
+                    flex="100">
         <toolbarbutton id="go-button"
                        chromedir="&locale.dir;"
-                       label="&goButton.label;"
                        onclick="handleURLBarCommand(event);"
-                       ondragover="nsDragAndDrop.dragOver(event, goButtonObserver);"
-                       ondragdrop="nsDragAndDrop.drop(event, goButtonObserver);"
-                       ondragexit="nsDragAndDrop.dragExit(event, goButtonObserver);"
-                       tooltiptext="&goButton.tooltip;"/> 
+                       tooltiptext="&goButton.tooltip;"/>
+        <searchbar id="searchbar" flex="1"/>
       </toolbaritem>
       
       <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
Index: browser/components/search/content/search.xml
===================================================================
RCS file: /cvsroot/mozilla/browser/components/search/content/search.xml,v
retrieving revision 1.82
diff -u -p -r1.82 search.xml
--- browser/components/search/content/search.xml	26 Jul 2006 02:50:27 -0000	1.82
+++ browser/components/search/content/search.xml	3 Aug 2006 15:26:10 -0000
@@ -89,11 +89,11 @@
                               accesskey="&cmd_engineManager.accesskey;"/>
               </xul:menupopup>
             </xul:button>
+          </xul:textbox>
             <xul:hbox class="search-go-button-container">
               <xul:toolbarbutton class="search-go-button"
                                  anonid="search-go-button" />
             </xul:hbox>
-          </xul:textbox>
         </xul:box>
       </xul:box>
     </content>
Index: browser/locales/en-US/chrome/browser/browser.dtd
===================================================================
RCS file: /cvsroot/mozilla/browser/locales/en-US/chrome/browser/browser.dtd,v
retrieving revision 1.52
diff -u -p -r1.52 browser.dtd
--- browser/locales/en-US/chrome/browser/browser.dtd	21 Jul 2006 12:30:11 -0000	1.52
+++ browser/locales/en-US/chrome/browser/browser.dtd	3 Aug 2006 15:26:11 -0000
@@ -86,7 +86,6 @@
 <!ENTITY stopCmd.accesskey            "S">
 <!ENTITY stopCmd.macCommandKey        ".">
 <!ENTITY stopButton.tooltip           "Stop loading this page">
-<!ENTITY goButton.label               "Go">
 <!ENTITY goButton.tooltip             "Type a location in the Location Bar, then click Go">
 <!ENTITY printButton.label            "Print">
 <!ENTITY printButton.tooltip          "Print this page">
Index: browser/themes/pinstripe/browser/browser.css
===================================================================
RCS file: /cvsroot/mozilla/browser/themes/pinstripe/browser/browser.css,v
retrieving revision 1.28
diff -u -p -r1.28 browser.css
--- browser/themes/pinstripe/browser/browser.css	1 Aug 2006 23:08:30 -0000	1.28
+++ browser/themes/pinstripe/browser/browser.css	3 Aug 2006 15:26:11 -0000
@@ -245,7 +245,7 @@ toolbarpaletteitem[place="toolbar"] .pla
 }
 
 .toolbarbutton-text {
-        margin: 0px;
+	margin: 0px;
 	padding: 0px;
 }
 
Index: browser/themes/winstripe/browser/browser.css
===================================================================
RCS file: /cvsroot/mozilla/browser/themes/winstripe/browser/browser.css,v
retrieving revision 1.42
diff -u -p -r1.42 browser.css
--- browser/themes/winstripe/browser/browser.css	1 Aug 2006 23:08:30 -0000	1.42
+++ browser/themes/winstripe/browser/browser.css	3 Aug 2006 15:26:14 -0000
@@ -227,21 +227,25 @@ menupopup[type="places"] > menu > .menu-
 }
 
 .bookmark-item[type="menu"][livemark="true"] { 
-  -moz-image-region: rect(0px, 48px, 16px, 32px) !important;
+  -moz-image-region: rect(0px, 54px, 18px, 36px) !important;
 }
 
 .bookmark-item[type="menu"][livemark="true"][open="true"] { 
-  -moz-image-region: rect(16px, 48px, 32px, 32px) !important;
+  -moz-image-region: rect(18px, 54px, 36px, 36px) !important;
 }
 
 /* ::::: primary toolbar buttons ::::: */
 
 .toolbarbutton-1 {
   -moz-box-orient: vertical;
-  min-width: 0px;
+  min-width: 0;
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
-
+.toolbarbutton-1[chromedir="rtl"] {
+  -moz-box-orient: vertical;
+  min-width: 0;
+  list-style-image: url("chrome://browser/skin/Toolbar-rtl.png");
+}
 .toolbarbutton-1 .toolbarbutton-icon {
   -moz-margin-end: 0px;
 }
@@ -252,28 +256,30 @@ toolbar[mode="full"] .toolbarbutton-menu
 }
 
 .toolbarbutton-1, .toolbarbutton-menubutton-button {
-  padding: 5px;
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
 }
 
 .toolbarbutton-1:hover:active:not([disabled]),
 .toolbarbutton-1[open="true"], 
 .toolbarbutton-menubutton-button:hover:active:not([disabled]),
 .toolbarbutton-menubutton-button[open="true"] {
-  padding-top: 5px;
-  padding-bottom: 5px;
-  -moz-padding-start: 6px;
-  -moz-padding-end: 4px;
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
 }
 
 .toolbarbutton-1[checked="true"] {
-  padding-top: 5px !important;
-  padding-bottom: 5px !important;
-  -moz-padding-start: 6px !important;
-  -moz-padding-end: 4px !important;
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;  
 }
 
 .toolbarbutton-1[type="menu-button"] {
-  padding: 0px !important;
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important; 
 }
 
 .toolbarbutton-menubutton-stack,
@@ -282,42 +288,142 @@ toolbar[mode="full"] .toolbarbutton-menu
 .toolbarbutton-menubutton-button:hover,
 .toolbarbutton-menubutton-stack:hover:active,
 .toolbarbutton-menubutton-button:hover:active {
+  border: 0 !important;
+  padding: 0 !important;
   margin: 0 !important;
   display: -moz-box;
 }
 
+
 /* ::::: 24px primary toolbar buttons ::::: */
 
 /* back button-- */
 
-#back-button, #forward-button[chromedir="rtl"] {
+#back-button, 
+#forward-button[chromedir="rtl"] {
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
   -moz-image-region: rect(0px 24px 24px 0px);
+  -moz-margin-start: 5px !important;
+  -moz-margin-end: 0 !important;
 }
-
-#back-button[buttonover="true"], #forward-button[buttonover="true"][chromedir="rtl"] {
+#back-button:hover,
+#back-button[buttonover="true"],
+#forward-button:hover[chromedir="rtl"],
+#forward-button[buttonover="true"][chromedir="rtl"] {
   -moz-image-region: rect(24px 24px 48px 0px);
 }
-#back-button[disabled="true"], #forward-button[disabled="true"][chromedir="rtl"] {
+#back-button[disabled="true"], 
+#forward-button[disabled="true"][chromedir="rtl"] {
   -moz-image-region: rect(48px 24px 72px 0px) !important;
 }
+#back-button:hover:active,
+#forward-button:hover:active[chromedir="rtl"] {
+  -moz-image-region: rect(96px 24px 120px 0px);
+}
+
+/* back button dropmarker */
+
+#back-button .toolbarbutton-menubutton-dropmarker {
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  list-style-image: url("chrome://browser/skin/dropmark-nav.png");
+  -moz-image-region: rect(0px 14px 24px 0px);
+}
+
+#forward-button[chromedir="rtl"] .toolbarbutton-menubutton-dropmarker {
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  list-style-image: url("chrome://browser/skin/dropmark-nav-rtl.png");
+  -moz-image-region: rect(0px 14px 24px 0px);
+}
+#back-button:hover > .toolbarbutton-menubutton-dropmarker,
+#back-button[buttonover="true"] > .toolbarbutton-menubutton-dropmarker,
+#forward-button:hover[chromedir="rtl"]  > .toolbarbutton-menubutton-dropmarker,
+#forward-button[buttonover="true"][chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker {
+  -moz-image-region: rect(24px 14px 48px 0px);
+}
+#back-button > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  list-style-image: url("chrome://browser/skin/dropmark-nav.png") !important;
+  -moz-image-region: rect(48px 14px 72px 0px);
+}
+#forward-button[chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker[disabled="true"]{
+  list-style-image: url("chrome://browser/skin/dropmark-nav-rtl.png") !important;
+  -moz-image-region: rect(48px 14px 72px 0px);
+}
+#back-button[buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
+#back-button:hover:active > .toolbarbutton-menubutton-dropmarker, 
+#forward-button[buttondown="true"][chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker,
+#forward-button:hover:active[chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker {
+  -moz-image-region: rect(72px 14px 96px 0px);
+}
 
 /* forward button */
 
-#forward-button, #back-button[chromedir="rtl"] {
+#forward-button,
+#back-button[chromedir="rtl"] {
   -moz-image-region: rect(0px 48px 24px 24px);
-  -moz-padding-end: 2px;
+  -moz-margin-start: 5px !important;
+  -moz-margin-end: 0 !important;
 }
-#forward-button[buttonover="true"], #back-button[buttonover="true"][chromedir="rtl"] {
+#forward-button:hover,
+#forward-button[buttonover="true"],
+#back-button:hover[chromedir="rtl"],
+#back-button[buttonover="true"][chromedir="rtl"] {
   -moz-image-region: rect(24px 48px 48px 24px);
 }
-#forward-button[disabled="true"], #back-button[disabled="true"][chromedir="rtl"] {
+#forward-button[disabled="true"], 
+#back-button[disabled="true"][chromedir="rtl"] {
    -moz-image-region: rect(48px 48px 72px 24px) !important;
 }
+#forward-button:hover:active,
+#back-button:hover:active[chromedir="rtl"] {
+  -moz-image-region: rect(96px 48px 120px 24px);
+}
+
+/* forward button dropmarker */
+
+#forward-button .toolbarbutton-menubutton-dropmarker {
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  list-style-image: url("chrome://browser/skin/dropmark-nav.png");
+  -moz-image-region: rect(0px 14px 24px 0px);
+}
+#back-button[chromedir="rtl"] .toolbarbutton-menubutton-dropmarker {
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  list-style-image: url("chrome://browser/skin/dropmark-nav-rtl.png");
+  -moz-image-region: rect(0px 14px 24px 0px);
+}
+#forward-button:hover > .toolbarbutton-menubutton-dropmarker,
+#forward-button[buttonover="true"] > .toolbarbutton-menubutton-dropmarker,
+#back-button:hover[chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker,
+#back-button[buttonover="true"][chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker {
+  -moz-image-region: rect(24px 14px 48px 0px);
+}
+#forward-button > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  list-style-image: url("chrome://browser/skin/dropmark-nav.png") !important;
+  -moz-image-region: rect(48px 14px 72px 0px);
+}
+#back-button[chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  list-style-image: url("chrome://browser/skin/dropmark-nav-rtl.png") !important;
+  -moz-image-region: rect(48px 14px 72px 0px);
+}
+#forward-button[buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
+#back-button[buttondown="true"][chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker {
+  -moz-image-region: rect(72px 14px 96px 0px);
+}
 
 /* stop button */
 
 #stop-button {
   -moz-image-region: rect(0px 72px 24px 48px);
+  margin: 0 5px !important;
 }
 #stop-button:hover {
   -moz-image-region: rect(24px 72px 48px 48px);
@@ -325,11 +431,15 @@ toolbar[mode="full"] .toolbarbutton-menu
 #stop-button[disabled="true"] {
   -moz-image-region: rect(48px 72px 72px 48px) !important;
 }
+#stop-button:hover:active {
+  -moz-image-region: rect(96px 72px 120px 48px);
+}
 
 /* reload button */
 
 #reload-button {
   -moz-image-region: rect(0px 96px 24px 72px);
+  margin: 0 5px !important;
 }
 #reload-button:hover {
   -moz-image-region: rect(24px 96px 48px 72px);
@@ -337,11 +447,15 @@ toolbar[mode="full"] .toolbarbutton-menu
 #reload-button[disabled="true"] {
   -moz-image-region: rect(48px 96px 72px 72px);
 }
+#reload-button:hover:active {
+  -moz-image-region: rect(96px 96px 120px 72px);
+}
 
 /* home button */
 
 #home-button {
   -moz-image-region: rect(0px 120px 24px 96px);
+  margin: 0 5px !important;
 }
 #home-button:hover {
   -moz-image-region: rect(24px 120px 48px 96px);
@@ -349,11 +463,15 @@ toolbar[mode="full"] .toolbarbutton-menu
 #home-button[disabled="true"] {
   -moz-image-region: rect(48px 120px 72px 96px);
 }
+#home-button:hover:active {
+  -moz-image-region: rect(96px 120px 120px 96px);
+}
 
 /* download manager button */
 
 #downloads-button {
   -moz-image-region: rect(0px 144px 24px 120px);
+  margin: 0 5px !important;
 }
 #downloads-button:hover {
   -moz-image-region: rect(24px 144px 48px 120px);
@@ -361,11 +479,15 @@ toolbar[mode="full"] .toolbarbutton-menu
 #downloads-button[disabled="true"] {
   -moz-image-region: rect(48px 144px 72px 120px) !important;
 }
+#downloads-button:hover:active {
+  -moz-image-region: rect(96px 144px 120px 120px);
+}
 
 /* history sidebar button */
 
 #history-button {
   -moz-image-region: rect(0px 168px 24px 144px);
+  margin: 0 5px !important;
 }
 #history-button:hover {
   -moz-image-region: rect(24px 168px 48px 144px);
@@ -373,11 +495,15 @@ toolbar[mode="full"] .toolbarbutton-menu
 #history-button[disabled="true"] {
   -moz-image-region: rect(48px 168px 72px 144px) !important;
 }
+#history-button:hover:active {
+  -moz-image-region: rect(96px 168px 120px 144px);
+}
 
 /* bookmark sidebar button */
 
 #bookmarks-button {
   -moz-image-region: rect(0px 192px 24px 168px);
+  margin: 0 5px !important;
 }
 #bookmarks-button:hover {
   -moz-image-region: rect(24px 192px 48px 168px);
@@ -388,11 +514,15 @@ toolbar[mode="full"] .toolbarbutton-menu
 #bookmarks-button[checked="true"] {
   -moz-image-region: rect(72px 192px 96px 168px) !important;
 }
+#bookmarks-button:hover:active {
+  -moz-image-region: rect(96px 192px 120px 168px);
+}
 
 /* print button */
 
 #print-button {
   -moz-image-region: rect(0px 216px 24px 192px);
+  margin: 0 5px !important;
 }
 #print-button:hover {
   -moz-image-region: rect(24px 216px 48px 192px);
@@ -400,11 +530,15 @@ toolbar[mode="full"] .toolbarbutton-menu
 #print-button[disabled="true"] {
   -moz-image-region: rect(48px 216px 72px 192px) !important;
 }
+#print-button:hover:active {
+  -moz-image-region: rect(96px 216px 120px 192px);
+}
 
 /* new tab button */
 
 #new-tab-button {
   -moz-image-region: rect(0px 240px 24px 216px);
+  margin: 0 5px !important;
 }
 #new-tab-button:hover {
   -moz-image-region: rect(24px 240px 48px 216px);
@@ -412,11 +546,15 @@ toolbar[mode="full"] .toolbarbutton-menu
 #new-tab-button[disabled="true"] {
   -moz-image-region: rect(48px 240px 72px 216px) !important;
 }
+#new-tab-button:hover:active {
+  -moz-image-region: rect(96px 240px 120px 216px);
+}
 
 /* new window button */
 
 #new-window-button {
   -moz-image-region: rect(0px 264px 24px 240px);
+  margin: 0 5px !important;
 }
 #new-window-button:hover {
   -moz-image-region: rect(24px 264px 48px 240px);
@@ -424,11 +562,15 @@ toolbar[mode="full"] .toolbarbutton-menu
 #new-window-button[disabled="true"] {
   -moz-image-region: rect(48px 264px 72px 240px) !important;
 }
+#new-window-button:hover:active {
+  -moz-image-region: rect(96px 264px 120px 240px);
+}
 
 /* cut button */
 
 #cut-button {
   -moz-image-region: rect(0px 288px 24px 264px);
+  margin: 0 5px !important;
 }
 #cut-button:hover {
   -moz-image-region: rect(24px 288px 48px 264px);
@@ -436,11 +578,15 @@ toolbar[mode="full"] .toolbarbutton-menu
 #cut-button[disabled="true"] {
   -moz-image-region: rect(48px 288px 72px 264px) !important;
 }
+#cut-button:hover:active {
+  -moz-image-region: rect(96px 288px 120px 264px);
+}
 
 /* copy button */
 
 #copy-button {
   -moz-image-region: rect(0px 312px 24px 288px);
+  margin: 0 5px !important;
 }
 #copy-button:hover {
   -moz-image-region: rect(24px 312px 48px 288px);
@@ -448,11 +594,15 @@ toolbar[mode="full"] .toolbarbutton-menu
 #copy-button[disabled="true"] {
   -moz-image-region: rect(48px 312px 72px 288px);
 }
+#copy-button:hover:active {
+  -moz-image-region: rect(96px 312px 120px 288px);
+}
 
 /* paste button */
 
 #paste-button {
   -moz-image-region: rect(0px 336px 24px 312px);
+  margin: 0 5px !important;
 }
 #paste-button:hover {
   -moz-image-region: rect(24px 336px 48px 312px);
@@ -460,42 +610,52 @@ toolbar[mode="full"] .toolbarbutton-menu
 #paste-button[disabled="true"] {
   -moz-image-region: rect(48px 336px 72px 312px);
 }
+#paste-button:hover:active {
+  -moz-image-region: rect(96px 336px 120px 312px);
+}
 
 /* ::::: 16px primary toolbar buttons ::::: */
 
 toolbar[iconsize="small"] .toolbarbutton-1 {
   -moz-box-orient: vertical;
+  min-width: 0;
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
 }
-
+toolbar[iconsize="small"] .toolbarbutton-1[chromedir="rtl"] {
+  -moz-box-orient: vertical;
+  min-width: 0;
+  list-style-image: url("chrome://browser/skin/Toolbar-rtl-small.png");
+}
 toolbar[iconsize="small"] .toolbarbutton-1 .toolbarbutton-icon {
   -moz-margin-end: 0px;
 }
 
-toolbar[iconsize="small"] .toolbarbutton-1, toolbar[iconsize="small"] .toolbarbutton-menubutton-button {
-  padding: 3px;
-  -moz-margin-end: 2px;
+toolbar[iconsize="small"] .toolbarbutton-1, 
+.toolbarbutton-menubutton-button {
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
 }
 
 toolbar[iconsize="small"] .toolbarbutton-1:hover:active:not([disabled]),
 toolbar[iconsize="small"] .toolbarbutton-1[open="true"], 
 toolbar[iconsize="small"] .toolbarbutton-menubutton-button:hover:active:not([disabled]),
 toolbar[iconsize="small"] .toolbarbutton-menubutton-button[open="true"] {
-  padding-top: 3px;
-  padding-bottom: 3px;
-  -moz-padding-start: 4px;
-  -moz-padding-end: 2px;
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
 }
 
 toolbar[iconsize="small"] .toolbarbutton-1[checked="true"] {
-  padding-top: 3px !important;
-  padding-bottom: 3px !important;
-  -moz-padding-start: 4px !important;
-  -moz-padding-end: 2px !important;
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
 }
 
 toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"] {
-  padding: 0px !important;
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important; 
 }
 
 toolbar[iconsize="small"] .toolbarbutton-menubutton-stack,
@@ -504,41 +664,142 @@ toolbar[iconsize="small"] .toolbarbutton
 toolbar[iconsize="small"] .toolbarbutton-menubutton-button:hover,
 toolbar[iconsize="small"] .toolbarbutton-menubutton-stack:hover:active,
 toolbar[iconsize="small"] .toolbarbutton-menubutton-button:hover:active {
+  border: 0 !important;
+  padding: 0 !important;
   margin: 0 !important;
   display: -moz-box;
 }
+/* ::::: small back button ::::: */
 
 /* back button-- */
 
-toolbar[iconsize="small"] #back-button, toolbar[iconsize="small"] #forward-button[chromedir="rtl"] {
+toolbar[iconsize="small"] #back-button, 
+toolbar[iconsize="small"] #forward-button[chromedir="rtl"] {
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
   -moz-image-region: rect(0px 16px 16px 0px);
+  -moz-margin-start: 5px !important;
+  -moz-margin-end: 0 !important;
 }
-
-toolbar[iconsize="small"] #back-button[buttonover="true"], toolbar[iconsize="small"] #forward-button[buttonover="true"][chromedir="rtl"] {
+toolbar[iconsize="small"] #back-button:hover,
+toolbar[iconsize="small"] #back-button[buttonover="true"],
+toolbar[iconsize="small"] #forward-button:hover[chromedir="rtl"],
+toolbar[iconsize="small"] #forward-button[buttonover="true"][chromedir="rtl"] {
   -moz-image-region: rect(16px 16px 32px 0px);
 }
-
-toolbar[iconsize="small"] #back-button[disabled="true"], toolbar[iconsize="small"] #forward-button[disabled="true"][chromedir="rtl"] {
+toolbar[iconsize="small"] #back-button[disabled="true"], 
+toolbar[iconsize="small"] #forward-button[disabled="true"][chromedir="rtl"] {
   -moz-image-region: rect(32px 16px 48px 0px) !important;
 }
+toolbar[iconsize="small"] #back-button:hover:active,
+toolbar[iconsize="small"] #forward-button:hover:active[chromedir="rtl"] {
+  -moz-image-region: rect(64px 16px 80px 0px);
+}
 
-/* forward button */
+/* small back button dropmarker */
+
+toolbar[iconsize="small"] #back-button .toolbarbutton-menubutton-dropmarker {
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  list-style-image: url("chrome://browser/skin/dropmark-nav-small.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+toolbar[iconsize="small"] #forward-button[chromedir="rtl"] .toolbarbutton-menubutton-dropmarker {
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  list-style-image: url("chrome://browser/skin/dropmark-nav-rtl-small.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+toolbar[iconsize="small"] #back-button:hover > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] #back-button[buttonover="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] #forward-button:hover[chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] #forward-button[buttonover="true"][chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker {
+  -moz-image-region: rect(16px 16px 32px 0px);
+}
+toolbar[iconsize="small"] #back-button > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  list-style-image: url("chrome://browser/skin/dropmark-nav-small.png") !important;
+  -moz-image-region: rect(32px 16px 48px 0px);
+}
+toolbar[iconsize="small"] #forward-button[chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  list-style-image: url("chrome://browser/skin/dropmark-nav-rtl-small.png") !important;
+  -moz-image-region: rect(32px 16px 48px 0px);
+}
+toolbar[iconsize="small"] #back-button[buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] #back-button:hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] #forward-button[buttondown="true"][chromedir="rtl"]  > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] #forward-button:hover:active[chromedir="rtl"]  > .toolbarbutton-menubutton-dropmarker {
+  -moz-image-region: rect(64px 16px 80px 0px);
+}
 
-toolbar[iconsize="small"] #forward-button, toolbar[iconsize="small"] #back-button[chromedir="rtl"] {
+
+/* small forward button-- */
+
+toolbar[iconsize="small"] #forward-button, 
+toolbar[iconsize="small"] #back-button[chromedir="rtl"] {
   -moz-image-region: rect(0px 32px 16px 16px);
-  -moz-padding-end: 2px;
+  -moz-margin-start: 5px !important;
+  -moz-margin-end: 0 !important;
 }
-toolbar[iconsize="small"] #forward-button[buttonover="true"], toolbar[iconsize="small"] #back-button[buttonover="true"][chromedir="rtl"] {
+toolbar[iconsize="small"] #forward-button:hover,
+toolbar[iconsize="small"] #forward-button[buttonover="true"],
+toolbar[iconsize="small"] #back-button:hover[chromedir="rtl"],
+toolbar[iconsize="small"] #back-button[buttonover="true"][chromedir="rtl"] {
   -moz-image-region: rect(16px 32px 32px 16px);
 }
-toolbar[iconsize="small"] #forward-button[disabled="true"], toolbar[iconsize="small"] #back-button[disabled="true"][chromedir="rtl"] {
-   -moz-image-region: rect(32px 32px 48px 16px) !important;
+toolbar[iconsize="small"] #forward-button[disabled="true"], 
+toolbar[iconsize="small"] #back-button[disabled="true"][chromedir="rtl"] {
+  -moz-image-region: rect(32px 32px 48px 16px) !important;
+}
+toolbar[iconsize="small"] #forward-button:hover:active,
+toolbar[iconsize="small"] #back-button:hover:active[chromedir="rtl"] {
+  -moz-image-region: rect(64px 32px 80px 16px);
+}
+
+/* small front button dropmarker */
+
+toolbar[iconsize="small"] #forward-button .toolbarbutton-menubutton-dropmarker {
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  list-style-image: url("chrome://browser/skin/dropmark-nav-small.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+toolbar[iconsize="small"] #back-button[chromedir="rtl"] .toolbarbutton-menubutton-dropmarker {
+  border: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  list-style-image: url("chrome://browser/skin/dropmark-nav-rtl-small.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+toolbar[iconsize="small"] #forward-button:hover > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] #forward-button[buttonover="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] #back-button:hover[chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] #back-button[buttonover="true"][chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker {
+  -moz-image-region: rect(16px 16px 32px 0px);
+}
+toolbar[iconsize="small"] #forward-button > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  list-style-image: url("chrome://browser/skin/dropmark-nav-small.png") !important;
+  -moz-image-region: rect(32px 16px 48px 0px);
+}
+toolbar[iconsize="small"] #back-button[chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  list-style-image: url("chrome://browser/skin/dropmark-nav-rtl-small.png") !important;
+  -moz-image-region: rect(32px 16px 48px 0px);
+}
+toolbar[iconsize="small"] #forward-button[buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] #forward-button:hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] #back-button[buttondown="true"][chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] #back-button:hover:active[chromedir="rtl"] > .toolbarbutton-menubutton-dropmarker{
+  -moz-image-region: rect(64px 16px 80px 0px);
 }
 
 /* stop button */
 
 toolbar[iconsize="small"] #stop-button {
   -moz-image-region: rect(0px 48px 16px 32px);
+  margin: 0 5px !important;
 }
 toolbar[iconsize="small"] #stop-button:hover {
   -moz-image-region: rect(16px 48px 32px 32px);
@@ -546,11 +807,14 @@ toolbar[iconsize="small"] #stop-button:h
 toolbar[iconsize="small"] #stop-button[disabled="true"] {
   -moz-image-region: rect(32px 48px 48px 32px) !important;
 }
-
+toolbar[iconsize="small"] #stop-button:hover:active {
+  -moz-image-region: rect(64px 48px 80px 32px);
+}
 /* reload button */
 
 toolbar[iconsize="small"] #reload-button {
   -moz-image-region: rect(0px 64px 16px 48px);
+  margin: 0 5px !important;
 }
 toolbar[iconsize="small"] #reload-button:hover {
   -moz-image-region: rect(16px 64px 32px 48px);
@@ -558,11 +822,14 @@ toolbar[iconsize="small"] #reload-button
 toolbar[iconsize="small"] #reload-button[disabled="true"] {
   -moz-image-region: rect(32px 64px 48px 48px);
 }
-
+toolbar[iconsize="small"] #reload-button:hover:active {
+  -moz-image-region: rect(64px 64px 80px 48px);
+}
 /* home button */
 
 toolbar[iconsize="small"] #home-button {
   -moz-image-region: rect(0px 80px 16px 64px);
+  margin: 0 5px !important;
 }
 toolbar[iconsize="small"] #home-button:hover {
   -moz-image-region: rect(16px 80px 32px 64px);
@@ -570,11 +837,15 @@ toolbar[iconsize="small"] #home-button:h
 toolbar[iconsize="small"] #home-button[disabled="true"] {
   -moz-image-region: rect(32px 80px 48px 64px);
 }
+toolbar[iconsize="small"] #home-button:hover:active {
+  -moz-image-region: rect(64px 80px 80px 64px);
+}
 
 /* download manager button */
 
 toolbar[iconsize="small"] #downloads-button {
   -moz-image-region: rect(0px 96px 16px 80px);
+  margin: 0 5px !important;
 }
 toolbar[iconsize="small"] #downloads-button:hover {
   -moz-image-region: rect(16px 96px 32px 80px);
@@ -582,11 +853,15 @@ toolbar[iconsize="small"] #downloads-but
 toolbar[iconsize="small"] #downloads-button[disabled="true"] {
   -moz-image-region: rect(32px 96px 48px 80px) !important;
 }
+toolbar[iconsize="small"] #downloads-button:hover:active {
+  -moz-image-region: rect(64px 96px 80px 80px);
+}
 
 /* history sidebar button */
 
 toolbar[iconsize="small"] #history-button {
   -moz-image-region: rect(0px 112px 16px 96px);
+  margin: 0 5px !important;
 }
 toolbar[iconsize="small"] #history-button:hover {
   -moz-image-region: rect(16px 112px 32px 96px);
@@ -594,11 +869,15 @@ toolbar[iconsize="small"] #history-butto
 toolbar[iconsize="small"] #history-button[disabled="true"] {
   -moz-image-region: rect(32px 112px 48px 96px) !important;
 }
+toolbar[iconsize="small"] #history-button:hover:active {
+  -moz-image-region: rect(64px 112px 80px 96px);
+}
 
 /* bookmark sidebar button */
 
 toolbar[iconsize="small"] #bookmarks-button {
   -moz-image-region: rect(0px 128px 16px 112px);
+  margin: 0 5px !important;
 }
 toolbar[iconsize="small"] #bookmarks-button:hover {
   -moz-image-region: rect(16px 128px 32px 112px);
@@ -609,11 +888,15 @@ toolbar[iconsize="small"] #bookmarks-but
 toolbar[iconsize="small"] #bookmarks-button[checked="true"] {
   -moz-image-region: rect(48px 128px 64px 112px) !important;
 }
+toolbar[iconsize="small"] #bookmarks-button:hover:active {
+  -moz-image-region: rect(64px 128px 80px 112px);
+}
 
 /* print button */
 
 toolbar[iconsize="small"] #print-button {
   -moz-image-region: rect(0px 144px 16px 128px);
+  margin: 0 5px !important;
 }
 toolbar[iconsize="small"] #print-button:hover {
   -moz-image-region: rect(16px 144px 32px 128px);
@@ -621,11 +904,15 @@ toolbar[iconsize="small"] #print-button:
 toolbar[iconsize="small"] #print-button[disabled="true"] {
   -moz-image-region: rect(32px 144px 48px 128px) !important;
 }
+toolbar[iconsize="small"] #print-button:hover:active {
+  -moz-image-region: rect(64px 144px 80px 128px);
+}
 
 /* new tab button */
 
 toolbar[iconsize="small"] #new-tab-button {
   -moz-image-region: rect(0px 160px 16px 144px);
+  margin: 0 5px !important;
 }
 toolbar[iconsize="small"] #new-tab-button:hover {
   -moz-image-region: rect(16px 160px 32px 144px);
@@ -633,11 +920,15 @@ toolbar[iconsize="small"] #new-tab-butto
 toolbar[iconsize="small"] #new-tab-button[disabled="true"] {
   -moz-image-region: rect(32px 160px 48px 144px) !important;
 }
+toolbar[iconsize="small"] #new-tab-button:hover:active {
+  -moz-image-region: rect(64px 160px 80px 144px);
+}
 
 /* new window button */
 
 toolbar[iconsize="small"] #new-window-button {
   -moz-image-region: rect(0px 176px 16px 160px);
+  margin: 0 5px !important;
 }
 toolbar[iconsize="small"] #new-window-button:hover {
   -moz-image-region: rect(16px 176px 32px 160px);
@@ -645,11 +936,15 @@ toolbar[iconsize="small"] #new-window-bu
 toolbar[iconsize="small"] #new-window-button[disabled="true"] {
   -moz-image-region: rect(32px 176px 48px 160px) !important;
 }
+toolbar[iconsize="small"] #new-window-button:hover:active {
+  -moz-image-region: rect(64px 176px 80px 160px);
+}
 
 /* cut button */
 
 toolbar[iconsize="small"] #cut-button {
   -moz-image-region: rect(0px 192px 16px 176px);
+  margin: 0 5px !important;
 }
 toolbar[iconsize="small"] #cut-button:hover {
   -moz-image-region: rect(16px 192px 32px 176px);
@@ -657,11 +952,15 @@ toolbar[iconsize="small"] #cut-button:ho
 toolbar[iconsize="small"] #cut-button[disabled="true"] {
   -moz-image-region: rect(32px 192px 48px 176px) !important;
 }
+toolbar[iconsize="small"] #cut-button:hover:active {
+  -moz-image-region: rect(64px 192px 80px 176px);
+}
 
 /* copy button */
 
 toolbar[iconsize="small"] #copy-button {
   -moz-image-region: rect(0px 208px 16px 192px);
+  margin: 0 5px !important;
 }
 toolbar[iconsize="small"] #copy-button:hover {
   -moz-image-region: rect(16px 208px 32px 192px);
@@ -669,11 +968,15 @@ toolbar[iconsize="small"] #copy-button:h
 toolbar[iconsize="small"] #copy-button[disabled="true"] {
   -moz-image-region: rect(32px 208px 48px 192px);
 }
+toolbar[iconsize="small"] #copy-button:hover:active {
+  -moz-image-region: rect(64px 208px 80px 192px);
+}
 
 /* paste button */
 
 toolbar[iconsize="small"] #paste-button {
   -moz-image-region: rect(0px 224px 16px 208px);
+  margin: 0 5px !important;
 }
 toolbar[iconsize="small"] #paste-button:hover {
   -moz-image-region: rect(16px 224px 32px 208px);
@@ -681,6 +984,9 @@ toolbar[iconsize="small"] #paste-button:
 toolbar[iconsize="small"] #paste-button[disabled="true"] {
   -moz-image-region: rect(32px 224px 48px 208px);
 }
+toolbar[iconsize="small"] #paste-button:hover:active {
+  -moz-image-region: rect(64px 224px 80px 208px);
+}
 
 /* ::::: fullscreen window controls ::::: */
 
@@ -707,7 +1013,7 @@ toolbar[iconsize="small"] #paste-button[
 /* ::::: nav-bar-inner ::::: */
 
 #urlbar {
-  margin: 2px 3px;
+  margin: 2px 0 2px 0;
 }
 
 /* This needs to be at least as large as the maximum possible width
@@ -775,16 +1081,19 @@ statusbarpanel#statusbar-display {
 
 #go-container {
   -moz-box-orient: vertical; /* for go button flex hack */
+  -moz-margin-end: 5px;
 }
 
 #go-button {
-  -moz-box-flex: 1; /* expand to fill toolbar height */
+  /* -moz-box-flex: 1;  expand to fill toolbar height */
   list-style-image: url("chrome://browser/skin/Go.png");
-  -moz-image-region: rect(0px 20px 20px 0px);
+  -moz-image-region: rect(0px 25px 22px 0px);
+  border-left: 0px;
+  border-right: 0px;
   padding-top: 2px;
   padding-bottom: 2px;
-  -moz-padding-start: 3px;
-  -moz-padding-end: 5px;
+  -moz-padding-start: 0;
+  -moz-padding-end: 0;
 }
 
 #go-button[chromedir="rtl"] {
@@ -792,15 +1101,16 @@ statusbarpanel#statusbar-display {
 }
 
 #go-button:hover {
-  -moz-image-region: rect(0px 40px 20px 20px);
+  -moz-image-region: rect(0px 50px 22px 25px);
 }
 
-#go-button:hover:active {
-  padding: 3px 4px 1px 4px;
+#go-button[disabled="true"] {
+  -moz-image-region: rect(0px 75px 22px 50px);
 }
 
-#go-button[disabled="true"] {
-  -moz-image-region: rect(0px 60px 20px 40px);
+#go-button:hover:active {
+  -moz-image-region: rect(0px 100px 22px 75px);
+ /* padding: 3px 4px 1px 0; */
 }
 
 #go-button > .toolbarbutton-icon {
@@ -831,16 +1141,19 @@ statusbarpanel#statusbar-display {
 
 #security-button[level="high"] {
   list-style-image: url("chrome://browser/skin/Secure.png");
+  -moz-image-region: rect(36px, 18px, 54px, 0px);
   display: -moz-box;
 }
 
 #security-button[level="low"] {
   list-style-image: url("chrome://browser/skin/Secure.png");
+  -moz-image-region: rect(36px, 18px, 54px, 0px);
   display: -moz-box;
 }
 
 #security-button[level="broken"] {
   list-style-image: url("chrome://browser/skin/Security-broken.png");
+  -moz-image-region: rect(36px, 18px, 54px, 0px);
   display: -moz-box;
 }
 
@@ -916,7 +1229,7 @@ toolbar[mode="text"] #navigator-throbber
 }
 
 #FindToolbar > .tabs-closebutton {
-	border: 1px solid transparent;
+  border: 1px solid transparent;
   padding: 3px 2px 4px 2px !important;
 }
 
Index: browser/themes/winstripe/browser/jar.mn
===================================================================
RCS file: /cvsroot/mozilla/browser/themes/winstripe/browser/jar.mn,v
retrieving revision 1.27
diff -u -p -r1.27 jar.mn
--- browser/themes/winstripe/browser/jar.mn	20 Jun 2006 02:38:39 -0000	1.27
+++ browser/themes/winstripe/browser/jar.mn	3 Aug 2006 15:26:14 -0000
@@ -2,6 +2,10 @@ classic.jar:
 % skin browser classic/1.0 %skin/classic/browser/
 *       skin/classic/browser/browser.css                        (browser.css)
         skin/classic/browser/browser.xml
+	skin/classic/browser/dropmark-nav.png
+	skin/classic/browser/dropmark-nav-rtl.png
+	skin/classic/browser/dropmark-nav-small.png
+	skin/classic/browser/dropmark-nav-rtl-small.png
 *       skin/classic/browser/engineManager.css                  (engineManager.css)
         skin/classic/browser/Go.png
         skin/classic/browser/Go-rtl.png
@@ -15,13 +19,16 @@ classic.jar:
         skin/classic/browser/Search-bar.png
         skin/classic/browser/Search.png
         skin/classic/browser/Search-add-engines.png
+	skin/classic/browser/Search-provider-bkgnd.png
         skin/classic/browser/Secure.png
         skin/classic/browser/Security-broken.png
         skin/classic/browser/Throbber.gif
         skin/classic/browser/Throbber.png
         skin/classic/browser/Throbber-small.png
         skin/classic/browser/Toolbar.png
+        skin/classic/browser/Toolbar-rtl.png
         skin/classic/browser/Toolbar-small.png
+	skin/classic/browser/Toolbar-rtl-small.png
 #ifdef MOZ_FEEDS
         skin/classic/browser/feeds/feedIcon.png                 (feeds/feedIcon.png)
         skin/classic/browser/feeds/feedIcon16.png               (feeds/feedIcon16.png)
Index: browser/themes/winstripe/browser/searchbar.css
===================================================================
RCS file: /cvsroot/mozilla/browser/themes/winstripe/browser/searchbar.css,v
retrieving revision 1.13
diff -u -p -r1.13 searchbar.css
--- browser/themes/winstripe/browser/searchbar.css	21 Jul 2006 17:05:56 -0000	1.13
+++ browser/themes/winstripe/browser/searchbar.css	3 Aug 2006 15:26:14 -0000
@@ -1,5 +1,13 @@
+#searchbar .search-go-button,
+#searchbar .searchbar-textbox {
+	border: 0px !important;
+}
+
 .searchbar-textbox {
+  height: 22px;
   width: 15em;
+  margin-right: 0;
+  margin-left: 0;
 }
 
 .searchbar-engine-image {
@@ -16,7 +24,9 @@
 
 .searchbar-engine-button {
   min-width: 22px;
-  margin: 0px 3px 0px 0px;
+  /* margin: 0px 3px 0px 0px; <-- WORKS LTR, NOT RTL */
+  margin: 0px;
+  -moz-margin-end: 3px;
 }
 
 .searchbar-engine-button[addengines="true"] {
@@ -28,51 +38,33 @@
   padding: 8px 0px 7px 20px;
 }
 
-.search-go-button-container {
-  border-left: 1px solid ThreeDShadow;
-}
-
 .search-go-button {
   list-style-image: url("chrome://browser/skin/Search.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
   padding: 0px;
   -moz-appearance: none;
-  border: 1px solid ThreeDFace;
-}
-
-.search-go-button:hover {
-  border-top: 1px solid ThreeDHighlight;
-  border-left: 1px solid ThreeDHighlight;
-  border-right: 1px solid ThreeDShadow;
-  border-bottom: 1px solid ThreeDShadow;
-}
-
-.search-go-button:hover > .toolbarbutton-menubutton-button {
-  -moz-border-right-colors: ThreeDHighlight ThreeDShadow;
-}
-
-.search-go-button:hover:active,
-.search-go-button[open="true"] {
-  border-top: 1px solid ThreeDShadow;
-  border-left: 1px solid ThreeDShadow;
-  border-right: 1px solid ThreeDShadow;
-  border-bottom: 1px solid ThreeDShadow;
+  -moz-image-region: rect(0px 25px 22px 0px);
 }
 
-.search-go-button-container {
-  background-color: ThreeDFace;
+.search-go-button[chromedir="rtl"] {
+  list-style-image: url("chrome://browser/skin/Search-rtl.png");
+  padding: 0px;
+  -moz-appearance: none;
+  -moz-image-region: rect(0px 25px 22px 0px);
 }
 
-.search-go-button:hover {
-  -moz-image-region: rect(0px 32px 16px 16px);
+.search-go-button:hover,
+.search-go-button:hover[chromedir="rtl"] {
+  -moz-image-region: rect(0px 50px 22px 25px);
 }
 
-.search-go-button:hover:active {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+.search-go-button[disabled="true"],
+.search-go-button[disabled="true"][chromedir="rtl"] {
+  -moz-image-region: rect(0px, 75px, 22px, 50px);
 }
 
-.search-go-button[disabled="true"]{
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
+.search-go-button:hover:active,
+.search-go-button[disabled="true"][chromedir="rtl"] {
+  -moz-image-region: rect(0px, 100px, 22px, 75px);
 }
 
 .searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {
Index: toolkit/content/xul.css
===================================================================
RCS file: /cvsroot/mozilla/toolkit/content/xul.css,v
retrieving revision 1.83
diff -u -p -r1.83 xul.css
--- toolkit/content/xul.css	29 Jul 2006 12:47:26 -0000	1.83
+++ toolkit/content/xul.css	3 Aug 2006 15:26:59 -0000
@@ -10,6 +10,9 @@
 @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
 @namespace xbl url("http://www.mozilla.org/xbl"); /* namespace for XBL elements */
 
+/* DELETE BEFORE LAUNCH */
+/* :root {direction: rtl;} */
+
 * {
   -moz-user-focus: ignore;
   -moz-user-select: -moz-none;
Index: toolkit/themes/winstripe/global/toolbarbutton.css
===================================================================
RCS file: /cvsroot/mozilla/toolkit/themes/winstripe/global/toolbarbutton.css,v
retrieving revision 1.7
diff -u -p -r1.7 toolbarbutton.css
--- toolkit/themes/winstripe/global/toolbarbutton.css	31 Jul 2005 15:34:56 -0000	1.7
+++ toolkit/themes/winstripe/global/toolbarbutton.css	3 Aug 2006 15:27:01 -0000
@@ -45,7 +45,6 @@
 /* ::::: toolbarbutton ::::: */
 
 toolbarbutton {
-  -moz-appearance: toolbarbutton;
   -moz-box-align: center;
   -moz-box-pack: center;
   margin: 0;
@@ -68,23 +67,17 @@ toolbarbutton.tabbable {
   -moz-user-focus: normal !important;
 }
 
-toolbarbutton:focus 
-{
-  /* -moz-appearance looks redundant here but is necessary.
-      Without it, the outline won't appear. */
-  -moz-appearance: toolbarbutton;
+toolbarbutton:focus {
   outline: 1px dotted -moz-DialogText;
   -moz-outline-offset: -2px;
 }
 
 toolbarbutton:hover,
 toolbarbutton[buttonover="true"] {
-  border-color: ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight;
 }
 
 toolbarbutton:hover:active,
 toolbarbutton[open="true"] {
-  border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow;
   padding-top: 4px;
   padding-bottom: 2px;
   -moz-padding-start: 4px;
@@ -103,7 +96,6 @@ toolbarbutton[disabled="true"][open="tru
 /* ..... checked state ..... */
 
 toolbarbutton[checked="true"] {
-  border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow !important;
   padding-top: 4px !important;
   padding-bottom: 2px !important;
   -moz-padding-start: 4px !important;
Index: toolkit/themes/winstripe/help/help.css
===================================================================
RCS file: /cvsroot/mozilla/toolkit/themes/winstripe/help/help.css,v
retrieving revision 1.16
diff -u -p -r1.16 help.css
--- toolkit/themes/winstripe/help/help.css	24 May 2006 06:57:46 -0000	1.16
+++ toolkit/themes/winstripe/help/help.css	3 Aug 2006 15:27:01 -0000
@@ -47,7 +47,7 @@ toolbar toolbarbutton {
 toolbarbutton:not([disabled="true"]):hover,
 menubutton:not([disabled="true"]):hover {
         color: -moz-buttonhovertext;
-        background-color: -moz-buttonhoverface;
+        /* background-color: -moz-buttonhoverface; */
 }
 
 toolbarbutton:not([disabled="true"]):hover:active,
@@ -58,19 +58,129 @@ menubutton:not([disabled="true"]):hover:
 /* Set the minimum sidebar width so the help contents aren't squeezed together.*/
 #help-sidebar { min-width: 15em; width: 20em; max-width: 25em; }
 
-#help-back-button, #help-forward-button[chromedir="rtl"] { -moz-image-region: rect(0px 24px 24px 0px); }
-#help-back-button:hover, #help-forward-button[chromedir="rtl"]:hover { -moz-image-region: rect(24px 24px 48px 0px); }
-#help-back-button[disabled="true"], #help-forward-button[disabled="true"][chromedir="rtl"] { -moz-image-region: rect(48px 24px 72px 0px); }
-
-#help-forward-button, #help-back-button[chromedir="rtl"] { -moz-image-region: rect(0px 48px 24px 24px); }
-#help-forward-button:hover, #help-back-button[chromedir="rtl"]:hover { -moz-image-region: rect(24px 48px 48px 24px); }
-#help-forward-button[disabled="true"], #help-back-button[disabled="true"][chromedir="rtl"] { -moz-image-region: rect(48px 48px 72px 24px); }
+/* ----- BACK BUTTON ----- */
 
-#help-home-button { -moz-image-region: rect(0px 72px 24px 48px); }
-#help-home-button:hover { -moz-image-region: rect(24px 72px 48px 48px); }
+#help-back-button, 
+#help-forward-button[chromedir="rtl"] {
+	-moz-image-region: rect(0px 24px 24px 0px); 
+}
+
+#help-back-button:hover, 
+#help-forward-button[chromedir="rtl"]:hover { 
+	-moz-image-region: rect(24px 24px 48px 0px); 
+}
+
+#help-back-button[disabled="true"], 
+#help-forward-button[disabled="true"][chromedir="rtl"] { 
+	-moz-image-region: rect(48px 24px 72px 0px); 
+}
+
+#help-back-button:hover:active, 
+#help-forward-button[chromedir="rtl"]:hover:active { 
+	-moz-image-region: rect(72px 24px 96px 0px); 
+}
+
+#help-back-button .toolbarbutton-text,
+#help-forward-button[chromedir="rtl"] .toolbarbutton-text {
+	display:none !important;
+}
+
+#help-back-button .toolbarbutton-menubutton-button,
+#help-forward-button[chromedir="rtl"] .toolbarbutton-menubutton-button {
+	-moz-box-align: end !important;
+}
+
+/* ----- BACK BUTTON DROPMARKER ----- */
+
+#help-back-button .toolbarbutton-menubutton-dropmarker {
+  list-style-image: url("chrome://browser/skin/dropmark-nav.png");
+  -moz-image-region: rect(0px 14px 24px 0px);
+  padding: 0;
+}
+#help-back-button:hover > .toolbarbutton-menubutton-dropmarker,
+#back-button[buttonover="true"] > .toolbarbutton-menubutton-dropmarker{
+  -moz-image-region: rect(24px 14px 48px 0px);
+}
+#help-back-button > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  list-style-image: url("chrome://browser/skin/dropmark-nav.png") !important;
+  -moz-image-region: rect(48px 14px 72px 0px);
+}
+#help-back-button[buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
+#back-button:hover:active > .toolbarbutton-menubutton-dropmarker{
+  -moz-image-region: rect(72px 14px 96px 0px);
+}
+/* ----- FORWARD BUTTON ----- */
+
+#help-forward-button, 
+#help-back-button[chromedir="rtl"] { 
+	-moz-image-region: rect(0px 48px 24px 24px); 
+}
+
+#help-forward-button:hover, 
+#help-back-button[chromedir="rtl"]:hover { 
+	-moz-image-region: rect(24px 48px 48px 24px); 
+}
+
+#help-forward-button[disabled="true"], 
+#help-back-button[disabled="true"][chromedir="rtl"] { 
+	-moz-image-region: rect(48px 48px 72px 24px); 
+}
+
+#help-forward-button:hover:active, 
+#help-back-button[chromedir="rtl"]:hover:active { 
+	-moz-image-region: rect(24px 48px 48px 24px); 
+}
+
+#help-forward-button .toolbarbutton-text {
+	display:none !important;
+}
+
+/* ----- HOME BUTTON ----- */
+
+#help-home-button { 
+	-moz-image-region: rect(0px 72px 24px 48px); 
+}
+
+#help-home-button:hover { 
+	-moz-image-region: rect(24px 72px 48px 48px); 
+}
+
+#help-home-button[disabled="true"] { 
+	-moz-image-region: rect(48px 72px 72px 48px); 
+}
+
+#help-home-button:hover:active { 
+	-moz-image-region: rect(72px 72px 96px 48px); 
+}
+
+#help-home-button .toolbarbutton-text {
+	display:none !important;
+}
+
+
+/* ----- PRINT BUTTON ----- */
+
+#help-print-button { 
+	-moz-image-region: rect(0px 96px 24px 72px); 
+}
+
+#help-print-button:hover { 
+	-moz-image-region: rect(24px 96px 48px 72px); 
+}
+
+#help-print-button[disabled="true"] { 
+	-moz-image-region: rect(48px 96px 72px 72px); 
+}
+
+#help-print-button:hover:active { 
+	-moz-image-region: rect(72px 96px 96px 72px); 
+}
+
+#help-print-button .toolbarbutton-text {
+	display:none !important;
+}
 
-#help-print-button { -moz-image-region: rect(0px 96px 24px 72px); }
-#help-print-button:hover { -moz-image-region: rect(24px 96px 48px 72px); }
+/* ----- OTHER ----- */
 
 #context-copy[disabled="true"] {
   visibility: collapse;
