Land the new theme on trunk (bug 353673).

browser/themes/gnomestripe/browser/Makefile.in

@@ -43,3 +43,4 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
+

browser/themes/gnomestripe/browser/browser.xml

@@ -8,21 +8,6 @@
 
   <!-- :::/ widgets \ ::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
 
-  <binding id="toolbar-menu-button" display="xul:menu"
-           extends="chrome://global/content/bindings/toolbarbutton.xml#menu-button">
-    <content>
-      <children includes="observes|template|menupopup|tooltip"/>
-      <xul:stack class="box-inherit toolbarbutton-menubutton-stack" flex="1">
-        <xul:toolbarbutton class="box-inherit toolbarbutton-menubutton-button"
-             anonid="button" allowevents="true"
-             xbl:inherits="disabled,image,label,crop,accesskey,command,
-                           buttonover,buttondown,align,dir,pack,orient"/>
-        <xul:dropmarker type="menu-button" xbl:inherits="open,disabled"
-                        class="toolbarbutton-menubutton-dropmarker"/>
-      </xul:stack>
-    </content>
-  </binding>
-
   <binding id="autocomplete-security-wrapper" extends="xul:hbox">
     <content>
       <xul:hbox id="autocomplete-security-wrapper" flex="1">
@@ -30,5 +15,4 @@
       </xul:hbox>
     </content>
   </binding>
-
 </bindings>

browser/themes/gnomestripe/browser/feeds/subscribe.css

@@ -10,103 +10,74 @@ html {
 
 #feedBody, #feedError {
   border: 1px solid THreeDShadow;
-  -moz-border-radius: 10px;
   padding: 3em;
   -moz-padding-start: 30px;
   margin: 2em auto;
   background: -moz-Field;
 }
 
-#feedHeader {
+#feedHeaderContainer {
   border: 1px solid ThreeDShadow;
   -moz-border-radius: 10px;
-  padding-top: 4em;
-  padding-bottom: .3em;
-  -moz-padding-start: .3em;
-  -moz-padding-end: .3em;
   margin: -4em auto 0 auto;
-  font-size: 110%;
   background-color: InfoBackground;
 }
 
-#feedHeader[firstrun="true"] {
-  background: url("chrome://browser/skin/feeds/feedIcon.png") 1.4em 5.9em no-repeat InfoBackground;
-  padding: 5em 3em 3em 3em;
+#feedHeader {  
+  margin-top: 4.9em;
+  margin-bottom: 1em;
+  -moz-margin-start: 1.4em;
+  -moz-margin-end: 1em;
+  -moz-padding-start: 2.9em;
+  font-size: 110%;
+  background: url("chrome://browser/skin/feeds/feedIcon.png") 0% 10% no-repeat InfoBackground;
+}
+
+#feedHeader[dir="rtl"] {
+  background-position: 100% 10%;
 }
 
 #feedIntroText {
   display: none;
-  -moz-margin-start: 2em;
 }
 
 #feedHeader[firstrun="true"] #feedIntroText {
+  padding-top: 0.1em;
+  -moz-padding-start: 0.6em;
   display: block;
 }
 
+#feedHeader[firstrun="true"] > #feedSubscribeLine {
+  -moz-padding-start: 1.8em;
+}
+
 #feedSubscribeLine {
-  padding: 1em;
-  -moz-border-radius: 3px;
+  padding-top: 0.2em;
 }
 
-#feedHeader[firstrun="true"] #feedSubscribeLine {
-  -moz-margin-start: 1.7em;
-  background: -moz-Field;
+#alwaysUse {
+  padding: 5px;
 }
 
-#feedSubscribeHandler {
-  border: 1px solid ThreeDLightShadow;
-  -moz-border-radius: 3px;
-  padding: 3px;
+
+#handlersMenuList > menupopup > menuitem {
+  -moz-padding-start: 23px;
 }
 
-#feedSubscribeHandleText {
-  -moz-padding-start: 20px;
-  background: url("chrome://browser/skin/feeds/feedIcon16.png") left 0 no-repeat;
+#handlersMenuList > menupopup > menuitem.menuitem-iconic {
+  -moz-padding-start: 2px;
 }
 
-.feedSubscribeLink {
-  font-weight: bold;
-  -moz-margin-end: .4em;
-  padding: .2em .1em .2em .1em;
+#handlersMenuList > menupopup > .menuitem-iconic  > .menu-iconic-left {
+  display: -moz-box;
+  min-width: 16px;
+  -moz-padding-end: 2px;
 }
 
-.feedSubscribeLinkBox {
-  background: url("chrome://browser/skin/feeds/feedIcon16.png") left 0 no-repeat;
-  -moz-padding-start: 19px;
-  -moz-margin-end: 0px;
+#feedHeader[dir="rtl"] #handlersMenuList > menupopup {
+  direction: rtl;
 }
 
-#feedSubscribeOptionsGroup {
-  -moz-border-radius: 4px;
-  border: 2px solid ThreeDLightShadow;
-  margin-bottom: .3em;
-}
-
-#feedSubscribeOptionsGroupTitle {
-  -moz-padding-start: .3em;
-  -moz-padding-end: .3em;
-}
-
-.styleLessBorderLess {
-  -moz-appearance: none;
-  border: none;
-}
-
-#feedSubscribeOptions {
-  -moz-margin-start: 5em;
-  -moz-margin-end: 5em;
-  margin-top: 2em;
-}
-
-#feedChangeSubscribeOptions {
-  -moz-margin-start: .4em;
-}
-
-#feedSubscribeDoneChangingOptions {
-  font-weight: bold;
-}
-
-
 body {
   margin: 0;
   padding: 0 3em;
@@ -158,77 +129,13 @@ a[href] img {
 .feedEntryContent {
   font-size: 110%;
 }
-
+ 
 .link {
   color: #0000FF;
   text-decoration: underline;
   cursor: pointer;
-  margin-top: -2px;
 }
 
 .link:hover:active {
   color: #FF0000;
 }
-
-.plain {
-  -moz-appearance: none;
-  border: 0px;
-  margin: 0px;
-  padding: 0px;
-  background: none;
-}
-
-.plain > .button-box {
-  border: 1px solid transparent;
-  margin: 0px;
-  padding: 0px;
-  background: none;
-}
-
-.plain:focus > .button-box {
-  border: 1px dotted ThreeDDarkShadow;
-}
-
-#readerContainer {
-  -moz-appearance: listbox;
-}
-
-#readers {
-  -moz-appearance: none;
-  border: none;
-  margin: 0px;
-}
-
-#readers > listitem {
-  -moz-padding-start: 4px;
-}
-
-#chooseClientApp {
-  font-size: 80%;
-}
-
-#application {
-  border-bottom: 1px solid ThreeDShadow;
-}
-
-#readerGroup {
-  -moz-padding-end: 14px;
-}
-
-#handlersMenuList > menupopup > menuitem {
-  -moz-padding-start: 23px;
-}
-
-#handlersMenuList > menupopup > menuitem.menuitem-iconic {
-  -moz-padding-start: 2px;
-}
-
-#handlersMenuList > menupopup > .menuitem-iconic  > .menu-iconic-left {
-  display: -moz-box;
-  min-width: 16px;
-  -moz-padding-end: 2px;
-}
-
-#feedHeader[dir="rtl"] #handlersMenuList > menupopup {
-  direction: rtl;
-}

browser/themes/gnomestripe/browser/jar.mn

@@ -2,26 +2,47 @@ 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
         skin/classic/browser/Info.png
         skin/classic/browser/pageInfo.css
         skin/classic/browser/page-livemarks.png
-        skin/classic/browser/page-livemarks-rtl.png
         skin/classic/browser/livemark-item.png
         skin/classic/browser/livemark-item-rtl.png
-        skin/classic/browser/searchbar.css
-        skin/classic/browser/Search-bar.png
-        skin/classic/browser/Search.png
-        skin/classic/browser/Search-add-engines.png
+        skin/classic/browser/livemark-folder.png
+        skin/classic/browser/livemark-folder-rtl.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
+        skin/classic/browser/Go-arrow.png
+        skin/classic/browser/Go-arrow-rtl.png
+        skin/classic/browser/Go-bkgnd.png
+        skin/classic/browser/Go-bkgnd-rtl.png
+        skin/classic/browser/Go-mid-top.png
+        skin/classic/browser/Go-mid-top-rtl.png
+        skin/classic/browser/Go-mid-bottom.png
+        skin/classic/browser/Go-mid-bottom-rtl.png
+*       skin/classic/browser/searchbar.css                      (searchbar.css)
+        skin/classic/browser/Search-glass.png
+        skin/classic/browser/Search-glass-rtl.png
+        skin/classic/browser/Search-bkgnd.png
+        skin/classic/browser/Search-bkgnd-rtl.png
+        skin/classic/browser/Search-mid-top.png
+        skin/classic/browser/Search-mid-top-rtl.png
+        skin/classic/browser/Search-mid-bottom.png
+        skin/classic/browser/Search-mid-bottom-rtl.png
+        skin/classic/browser/Search-provider-bkgnd.png
+        skin/classic/browser/Search-provider-mid-top.png
+        skin/classic/browser/Search-provider-mid-bottom.png
 #ifdef MOZ_FEEDS
         skin/classic/browser/feeds/feedIcon.png                 (feeds/feedIcon.png)
         skin/classic/browser/feeds/feedIcon16.png               (feeds/feedIcon16.png)
@@ -47,12 +68,12 @@ classic.jar:
         skin/classic/browser/bookmarks/Bookmarks-toolbar.png    (bookmarks/Bookmarks-toolbar.png)
 #endif
 #ifdef MOZ_SAFE_BROWSING
-  skin/classic/browser/safebrowsing/browser-protection.css      (safebrowsing/browser-protection.css)
-  skin/classic/browser/safebrowsing/close16x16.png              (safebrowsing/close16x16.png)
-  skin/classic/browser/safebrowsing/dim.png                     (safebrowsing/dim.png)
-  skin/classic/browser/safebrowsing/tail.png                    (safebrowsing/tail.png)
-  skin/classic/browser/safebrowsing/warning16x16.png            (safebrowsing/warning16x16.png)
-  skin/classic/browser/safebrowsing/warning24x24.png            (safebrowsing/warning24x24.png)
+        skin/classic/browser/safebrowsing/browser-protection.css      (safebrowsing/browser-protection.css)
+        skin/classic/browser/safebrowsing/close16x16.png              (safebrowsing/close16x16.png)
+        skin/classic/browser/safebrowsing/dim.png                     (safebrowsing/dim.png)
+        skin/classic/browser/safebrowsing/tail.png                    (safebrowsing/tail.png)
+        skin/classic/browser/safebrowsing/warning16x16.png            (safebrowsing/warning16x16.png)
+        skin/classic/browser/safebrowsing/warning24x24.png            (safebrowsing/warning24x24.png)
 #endif
         skin/classic/browser/preferences/Options.png            (preferences/Options.png)
         skin/classic/browser/preferences/preferences.css        (preferences/preferences.css)

browser/themes/gnomestripe/browser/preferences/preferences.css

@@ -46,53 +46,60 @@
 radio[pane=paneMain] {
 	-moz-image-region: rect(0px, 32px,  32px, 0px)
 }
-radio[pane=paneMain]:hover, radio[pane=paneMain][selected="true"]  {
+radio[pane=paneMain]:hover, 
+radio[pane=paneMain][selected="true"]  {
 	-moz-image-region: rect(32px, 32px,  64px, 0px)
 }
 
-radio[pane=panePrivacy] {
-	-moz-image-region: rect(0px, 64px,  32px, 32px)
+radio[pane=paneTabs] {
+	-moz-image-region: rect(0px, 64px, 32px, 32px)
 }
-radio[pane=panePrivacy]:hover, radio[pane=panePrivacy][selected="true"]  {
-	-moz-image-region: rect(32px, 64px,  64px, 32px)
+radio[pane=paneTabs]:hover, 
+radio[pane=paneTabs][selected="true"] {
+	-moz-image-region: rect(32px, 64px, 64px, 32px)
 }
 
 radio[pane=paneContent] {
 	-moz-image-region: rect(0px, 96px,  32px, 64px)
 }
-radio[pane=paneContent]:hover, radio[pane=paneContent][selected="true"]  {
+radio[pane=paneContent]:hover, 
+radio[pane=paneContent][selected="true"]  {
 	-moz-image-region: rect(32px, 96px,  64px, 64px)
 }
 
 radio[pane=paneFeeds] {
-	-moz-image-region: rect(0px, 96px,  32px, 64px)
+	-moz-image-region: rect(0px, 128px,  32px, 96px)
 }
-radio[pane=paneFeeds]:hover, radio[pane=paneFeeds][selected="true"]  {
-	-moz-image-region: rect(32px, 96px,  64px, 64px)
+radio[pane=paneFeeds]:hover, 
+radio[pane=paneFeeds][selected="true"]  {
+	-moz-image-region: rect(32px, 128px,  64px, 96px)
+}
+
+radio[pane=panePrivacy] {
+	-moz-image-region: rect(0px, 160px,  32px, 128px)
+}
+radio[pane=panePrivacy]:hover, 
+radio[pane=panePrivacy][selected="true"]  {
+	-moz-image-region: rect(32px, 160px,  64px, 128px)
 }
 
 radio[pane=paneSecurity] {
-	-moz-image-region: rect(0px, 128px, 32px, 96px)
+	-moz-image-region: rect(0px, 192px,  32px, 160px)
 }
-radio[pane=paneSecurity]:hover, radio[pane=paneSecurity][selected="true"] {
-	-moz-image-region: rect(32px, 128px, 64px, 96px)
-}
-
-radio[pane=paneTabs] {
-	-moz-image-region: rect(0px, 192px, 32px, 160px)
-}
-radio[pane=paneTabs]:hover, radio[pane=paneTabs][selected="true"] {
-	-moz-image-region: rect(32px, 192px, 64px, 160px)
+radio[pane=paneSecurity]:hover, 
+radio[pane=paneSecurity][selected="true"]  {
+	-moz-image-region: rect(32px, 192px,  64px, 160px)
 }
 
 radio[pane=paneAdvanced] {
-	-moz-image-region: rect(0px, 160px, 32px, 128px)
+	-moz-image-region: rect(0px, 224px, 32px, 192px)
 }
-radio[pane=paneAdvanced]:hover, radio[pane=paneAdvanced][selected="true"] {
-	-moz-image-region: rect(32px, 160px, 64px, 128px)
+radio[pane=paneAdvanced]:hover, 
+radio[pane=paneAdvanced][selected="true"] {
+	-moz-image-region: rect(32px, 224px, 64px, 192px)
 }
 
-/* Main Pane */
+/* General Pane */
 #browserHomePage {
   padding-top: 2px;
   padding-bottom: 3px;

browser/themes/gnomestripe/browser/safebrowsing/browser-protection.css

@@ -104,7 +104,7 @@
 }
 
 #safebrowsing-urlbar-icon {
-  padding-right: 2px;
+  padding: 1px 2px 1px 0;
 }
 
 #safebrowsing-urlbar-icon[level="safe"] {

browser/themes/gnomestripe/browser/searchbar.css

@@ -1,78 +1,263 @@
+/* *** winstripe *** */
+
+%ifdef MOZ_WIDGET_GTK2
+#searchbar {
+  -moz-margin-start: 3px;
+}
+%endif
+
+#searchbar .search-go-button {
+  border: 0px !important;
+}
+
 .searchbar-textbox {
-  width: 15em;
+  min-height: 22px;
+  width: 4em;
+  min-width: 4em;
+  margin-right: 0px;
+  margin-left: 0px;
+  background-color: -moz-field;
+
+  -moz-appearance: none;
+  -moz-border-top-colors: #96969D;
+  -moz-border-bottom-colors: #96969D;
+  -moz-border-right-colors: #96969D;
+  -moz-border-left-colors: #96969D;
+  border-width: 1px;
+}
+
+.textbox-input {
+  padding: 0px !important;
+  margin: 0px !important;
+}
+
+/* ::::: searchbar-engine-button ::::: */
+
+.searchbar-engine-button-stack {
+  padding: 2px 0px 2px 0px;
+}
+
+.searchbar-engine-button-top {
+  list-style-image: url("chrome://browser/skin/Search-provider-bkgnd.png");
+  -moz-image-region: rect(0px, 32px, 10px, 0px);
+  height: 10px;
+}
+
+/* GTK does not stretch image regions properly, so use background
+   images instead.  See bugs 351764 and 254659. */
+.searchbar-engine-button-mid-top {
+  background-image: url("chrome://browser/skin/Search-provider-mid-top.png");
+}
+
+.searchbar-engine-button-mid-bottom {
+  background-image: url("chrome://browser/skin/Search-provider-mid-bottom.png");
+}
+
+.searchbar-engine-button-bottom {
+  list-style-image: url("chrome://browser/skin/Search-provider-bkgnd.png");
+  -moz-image-region: rect(12px, 32px, 22px, 0px);
+  height: 10px;
+}
+
+.searchbar-engine-button[addengines="true"] .searchbar-engine-button-top {
+  -moz-image-region: rect(0px, 128px, 10px, 96px);
+}
+
+.searchbar-engine-button[addengines="true"] .searchbar-engine-button-mid-top,
+.searchbar-engine-button[addengines="true"] .searchbar-engine-button-mid-bottom {
+  background-position: -96px 0px;
+}
+
+.searchbar-engine-button[addengines="true"] .searchbar-engine-button-bottom {
+  -moz-image-region: rect(12px, 128px, 22px, 96px);
+}
+
+.searchbar-engine-button:hover .searchbar-engine-button-top {
+  -moz-image-region: rect(0px, 64px, 10px, 32px);
+}
+
+.searchbar-engine-button:hover .searchbar-engine-button-mid-top,
+.searchbar-engine-button:hover .searchbar-engine-button-mid-bottom {
+  background-position: -32px 0px;
+}
+
+.searchbar-engine-button:hover .searchbar-engine-button-bottom {
+  -moz-image-region: rect(12px, 64px, 22px, 32px);
+}
+
+.searchbar-engine-button[open="true"] .searchbar-engine-button-top {
+  -moz-image-region: rect(0px, 96px, 10px, 64px);
+}
+
+.searchbar-engine-button[open="true"] .searchbar-engine-button-mid-top,
+.searchbar-engine-button[open="true"] .searchbar-engine-button-mid-bottom {
+  background-position: -64px 0px;
+}
+
+.searchbar-engine-button[open="true"] .searchbar-engine-button-bottom {
+  -moz-image-region: rect(12px, 96px, 22px, 64px);
 }
 
 .searchbar-engine-image {
-  margin: 0px 0px 0px 2px;
   height: 16px;
   width: 16px;
   list-style-image: url("chrome://global/skin/icons/folder-item.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-.searchbar-popup {
-  min-width: 100px;
+  -moz-margin-start: 4px;
 }
 
 .searchbar-engine-button {
-  min-width: 22px;
-  margin: 0px 3px 0px 0px;
+  width: 32px;
+  margin: 0px;
+  -moz-margin-end: -1px;
+  padding: 0px;
 }
 
-.searchbar-engine-button[addengines="true"] {
-  list-style-image: url("chrome://browser/skin/Search-add-engines.png");
+.searchbar-engine-button[open="true"] {
+  background-position: -64px 0px;
 }
 
 .searchbar-dropmarker-image {
   list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-  padding: 8px 0px 7px 20px;
+  -moz-margin-start: 3px;
 }
 
-.search-go-button-container {
-  border-left: 1px solid ThreeDShadow;
+/* ::::: search-go-button ::::: */
+
+/* In text icon mode, the Search Go button scales independently of the field,
+ * and the button can be much taller, so we have to center align the elements
+ * (instead of stretching them) to prevent the field from stretching vertically
+ * to match the button's height and growing too tall.  We still stretch
+ * the search engine dropmarker to the height of the field via a stretchy box
+ * around just those two elements.
+ */
+toolbar[mode="text"] .searchbar-box {
+  -moz-box-align: center;
 }
 
-.search-go-button {
-  list-style-image: url("chrome://browser/skin/Search.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
+toolbar:not([mode="text"]) .search-go-button {
+  list-style-image: url("chrome://browser/skin/Search-glass.png");
   padding: 0px;
   -moz-appearance: none;
-  border: 1px solid ThreeDFace;
+  -moz-image-region: rect(0px 25px 22px 0px);
 }
 
+toolbar:not([mode="text"]) .search-go-button[chromedir="rtl"] {
+  list-style-image: url("chrome://browser/skin/Search-glass-rtl.png");
+}
+
+.search-go-button-stack {
+  padding: 2px 0px 2px 0px;
+  -moz-padding-end: 5px;
+}
+
+toolbar[mode="text"] .search-go-button {
+  -moz-margin-start: 5px;
+}
+
+toolbar[mode="text"] .search-go-button-stack {
+  padding: 0px;
+}
+
+toolbar[mode="text"] .search-go-button,
+toolbar[mode="text"] .search-go-button-stack .search-go-button-bkgnd {
+  background-image: none;
+  list-style-image: none;
+  width: auto;
+}
+
+.search-go-button-top {
+  list-style-image: url("chrome://browser/skin/Search-bkgnd.png");
+  -moz-image-region: rect(0px, 25px, 10px, 0px);
+  height: 10px;
+}
+
+/* GTK does not stretch image regions properly, so use background
+   images instead.  See bugs 351764 and 254659. */
+.search-go-button-mid-top {
+  background-image: url("chrome://browser/skin/Search-mid-top.png");
+}
+
+.search-go-button-mid-bottom {
+  background-image: url("chrome://browser/skin/Search-mid-bottom.png");
+}
+
+.search-go-button-bottom {
+  list-style-image: url("chrome://browser/skin/Search-bkgnd.png");
+  -moz-image-region: rect(12px, 25px, 22px, 0px);
+  height: 10px;
+}
+
+.search-go-button-top[chromedir="rtl"],
+.search-go-button-bottom[chromedir="rtl"] {
+  list-style-image: url("chrome://browser/skin/Search-bkgnd-rtl.png");
+}
+
+.search-go-button-mid-top[chromedir="rtl"] {
+  background-image: url("chrome://browser/skin/Search-mid-top-rtl.png");
+}
+
+.search-go-button-mid-bottom[chromedir="rtl"] {
+  background-image: url("chrome://browser/skin/Search-mid-bottom-rtl.png");
+}
+
+.search-go-button-stack:hover .search-go-button-top {
+  -moz-image-region: rect(0px, 50px, 10px, 25px);
+}
+
+.search-go-button-stack:hover .search-go-button-mid-top,
+.search-go-button-stack:hover .search-go-button-mid-bottom  {
+  background-position: -25px 0px;
+}
+
+.search-go-button-stack:hover .search-go-button-bottom {
+  -moz-image-region: rect(12px, 50px, 22px, 25px);
+}
+
+
+/* Disabled images are not used. */
+.search-go-button-stack[disabled="true"] .search-go-button-top {
+  -moz-image-region: rect(0px, 75px, 10px, 50px);
+}
+
+.search-go-button-stack[disabled="true"] .search-go-button-mid-top,
+.search-go-button-stack[disabled="true"] .search-go-button-mid-bottom {
+  background-position: -50px 0px;
+}
+
+.search-go-button-stack[disabled="true"] .search-go-button-bottom {
+  -moz-image-region: rect(12px, 75px, 22px, 50px);
+}
+
+
+.search-go-button-stack:hover:active .search-go-button-top {
+  -moz-image-region: rect(0px, 100px, 10px, 75px);
+}
+
+.search-go-button-stack:hover:active .search-go-button-mid-top,
+.search-go-button-stack:hover:active .search-go-button-mid-bottom {
+  background-position: -75px 0px;
+}
+
+.search-go-button-stack:hover:active .search-go-button-bottom {
+  -moz-image-region: rect(12px, 100px, 22px, 75px);
+}
+
+
 .search-go-button:hover {
-  border-top: 1px solid ThreeDHighlight;
-  border-left: 1px solid ThreeDHighlight;
-  border-right: 1px solid ThreeDShadow;
-  border-bottom: 1px solid ThreeDShadow;
+  -moz-image-region: rect(0px 50px 22px 25px);
 }
 
-.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;
-}
-
-.search-go-button-container {
-  background-color: ThreeDFace;
-}
-
-.search-go-button:hover {
-  -moz-image-region: rect(0px 32px 16px 16px);
+.search-go-button[disabled="true"] {
+  -moz-image-region: rect(0px, 75px, 22px, 50px);
 }
 
 .search-go-button:hover:active {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+  -moz-image-region: rect(0px, 100px, 22px, 75px);
 }
 
-.search-go-button[disabled="true"]{
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
+.search-go-button > .toolbarbutton-icon {
+  margin: 0px !important;
 }
 
 .searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {