Land the new theme on trunk (bug 353673).

browser/base/content/browser.xul

@@ -44,7 +44,10 @@
 # ***** END LICENSE BLOCK *****
 
 <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
+
+#ifdef MOZ_PLACES
 <?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
+#endif
 
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
 
@@ -208,78 +211,97 @@
                      ondragexit="nsDragAndDrop.dragExit(event, homeButtonObserver);"
                      onclick="BrowserHomeClick(event);"/>
 
-      <toolbaritem id="urlbar-container" align="center" flex="1000"
+      <toolbaritem id="urlbar-container" align="center" flex="400"
                    title="&locationItem.title;" class="chromeclass-location">
-        <!-- This stack is a hack to make sure that the border between the
-             urlbar and the searchbar doesn't shift when the SSL and RSS
-             icons appear and disappear.  Now that the searchbar is flexible,
-             the appearance of the urlbar status icons tweaks the flex
-             calculation enough to move the border between the two.  The "fix"
-             is to hide a decoy textbox with a spacer behind the urlbar, so
-             that the deck that contains it is always as least as large as
-             it would be if both icons were visible. -->
-        <stack id="urlbar-sizing-deck" flex="1">
-          <textbox id="urlbar" flex="1"
-                   type="autocomplete"
-                   autocompletesearch="history" 
-                   autocompletepopup="PopupAutoComplete"
-                   completeselectedindex="true"
-                   tabscrolling="true"
-                   showcommentcolumn="true"
-                   enablehistory="true"
+        <hbox id="urlbar-button-box" flex="1">
+            <textbox id="urlbar" flex="1"
+                     chromedir="&locale.dir;"
+                     type="autocomplete"
+                     autocompletesearch="history" 
+                     autocompletepopup="PopupAutoComplete"
+                     completeselectedindex="true"
+                     tabscrolling="true"
+                     showcommentcolumn="true"
+                     enablehistory="true"
 #ifndef MOZILLA_1_8_BRANCH
 # bug 23485
-                   newlines="stripsurroundingwhitespace"
+                     newlines="stripsurroundingwhitespace"
 #endif
-                   oninput="gBrowser.userTypedValue = this.value"
-                   ontextentered="return handleURLBarCommand(param);"
-                   ontextreverted="return handleURLBarRevert();">
-            <deck id="page-proxy-deck" onclick="PageProxyClickHandler(event);">
-              <image id="page-proxy-button"
-                      ondraggesture="PageProxyDragGesture(event);"
-                      tooltiptext="&proxyIcon.tooltip;"/>
-              <image id="page-proxy-favicon" validate="never"
-                      ondraggesture="PageProxyDragGesture(event);"
-                      onload="this.parentNode.selectedIndex = 1;
-                              event.stopPropagation();"
-                      onerror="gBrowser.addToMissedIconCache(this.src);
-                               this.removeAttribute('src');
-                               this.parentNode.selectedIndex = 0;"
-                      tooltiptext="&proxyIcon.tooltip;"/>
-            </deck>
-            <hbox id="urlbar-icons">
-              <button type="menu"
-                      style="-moz-user-focus: none"
-                      class="plain"
-                      id="feed-button"
-                      chromedir="&locale.dir;"
-                      onclick="return FeedHandler.onFeedButtonClick(event);">
-                <menupopup position="after_end"
-                           onpopupshowing="return FeedHandler.buildFeedList(this);"
+                     oninput="gBrowser.userTypedValue = this.value"
+                     ontextentered="return handleURLBarCommand(param);"
+                     ontextreverted="return handleURLBarRevert();">
+              <deck id="page-proxy-deck" onclick="PageProxyClickHandler(event);">
+                <image id="page-proxy-button"
+                        ondraggesture="PageProxyDragGesture(event);"
+                        tooltiptext="&proxyIcon.tooltip;"/>
+                <image id="page-proxy-favicon" validate="never"
+                        ondraggesture="PageProxyDragGesture(event);"
+                        onload="this.parentNode.selectedIndex = 1;
+                                event.stopPropagation();"
+                        onerror="gBrowser.addToMissedIconCache(this.src);
+                                 this.removeAttribute('src');
+                                 this.parentNode.selectedIndex = 0;"
+                        tooltiptext="&proxyIcon.tooltip;"/>
+              </deck>
+              <hbox id="urlbar-icons">
+                <button type="menu"
+                        style="-moz-user-focus: none"
+                        class="plain"
+                        id="feed-button"
+                        chromedir="&locale.dir;"
+                        onclick="return FeedHandler.onFeedButtonClick(event);">
+                  <menupopup position="after_end"
+                             onpopupshowing="return FeedHandler.buildFeedList(this);"
 #ifdef MOZ_FEEDS
-                           oncommand="return FeedHandler.subscribeToFeed(null, event);"
-                           onclick="checkForMiddleClick(this, event);"/>
+                             oncommand="return FeedHandler.subscribeToFeed(null, event);"
+                             onclick="checkForMiddleClick(this, event);"/>
 #else
 #ifdef MOZ_PLACES
-                           oncommand="PlacesCommandHook.addLiveBookmark(event.target.getAttribute('feed'));" />
+                             oncommand="PlacesCommandHook.addLiveBookmark(event.target.getAttribute('feed'));" />
 #else
-                           oncommand="FeedHandler.addLiveBookmark(event.target.getAttribute('feed'));" />
+                             oncommand="FeedHandler.addLiveBookmark(event.target.getAttribute('feed'));" />
 #endif
 #endif
-              </button>
-              <image id="lock-icon" onclick="if (event.button == 0) displaySecurityInfo(); event.stopPropagation();"/>
+                </button>
+                <image id="lock-icon" onclick="if (event.button == 0) displaySecurityInfo(); event.stopPropagation();"/>
 #ifdef MOZ_SAFE_BROWSING
-              <image id="safebrowsing-urlbar-icon" tooltiptext="&safeb.urlbaricon.tooltip;"
-                     level="safe"
-                     onclick="goDoCommand('safebrowsing-show-warning')" />
+                <image id="safebrowsing-urlbar-icon" tooltiptext="&safeb.urlbaricon.tooltip;"
+                       level="safe"
+                       onclick="goDoCommand('safebrowsing-show-warning')" />
 #endif
-            </hbox>
-          </textbox>
-          <!-- Hack to make sure urlbar size doesn't shift, see above. -->
-          <textbox id="urlbar-spacer" flex="1">
-            <hbox id="urlbar-icons-spacer"/>
-          </textbox>
-        </stack>
+              </hbox>
+            </textbox>
+            <stack id="go-button-stack">
+              <vbox>
+                <!-- These image segments allow the button to stretch nicely
+                     in larger urlbars. -->
+                <image id="go-button-top"
+                       class="go-button-background"
+                       chromedir="&locale.dir;" />
+                <image flex="1"
+                       id="go-button-mid-top"
+                       class="go-button-background"
+                       chromedir="&locale.dir;" />
+                <image flex="1"
+                       id="go-button-mid-bottom"
+                      class="go-button-background"
+                      chromedir="&locale.dir;" />
+                <image id="go-button-bottom"
+                       class="go-button-background"
+                       chromedir="&locale.dir;" />
+              </vbox>
+							
+            <toolbarbutton id="go-button"
+                           flex="1"
+                           chromedir="&locale.dir;"
+                           label="&goEndCap.label;"
+                           onclick="handleURLBarCommand(event);"
+                           ondragover="nsDragAndDrop.dragOver(event, goButtonObserver);"
+                           ondragdrop="nsDragAndDrop.drop(event, goButtonObserver);"
+                           ondragexit="nsDragAndDrop.dragExit(event, goButtonObserver);"
+                           tooltiptext="&goEndCap.tooltip;"/>
+          </stack>
+        </hbox>
       </toolbaritem>
 
       <toolbaritem id="search-container" title="&searchItem.title;" 
@@ -288,17 +310,6 @@
         <searchbar id="searchbar" flex="1" chromedir="&locale.dir;"/>
       </toolbaritem>
 
-      <toolbaritem id="go-container" align="center" class="chromeclass-toolbar-additional">
-        <toolbarbutton id="go-button"
-                       chromedir="&locale.dir;"
-                       label="&goEndCap.label;"
-                       onclick="handleURLBarCommand(event);"
-                       ondragover="nsDragAndDrop.dragOver(event, goButtonObserver);"
-                       ondragdrop="nsDragAndDrop.drop(event, goButtonObserver);"
-                       ondragexit="nsDragAndDrop.dragExit(event, goButtonObserver);"
-                       tooltiptext="&goEndCap.tooltip;"/> 
-      </toolbaritem>
-      
       <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      label="&printButton.label;" command="cmd_print"
                      tooltiptext="&printButton.tooltip;"/>

browser/components/search/content/search.xml

@@ -64,8 +64,25 @@
     <content>
       <xul:stringbundle src="chrome://browser/locale/search.properties"
                         anonid="searchbar-stringbundle"/>
-      <xul:box class="searchbar-left" flex="1">
-        <xul:box class="searchbar-right" flex="1">
+
+      <xul:hbox class="searchbar-box" flex="1">
+        <xul:hbox flex="1">
+          <xul:button class="searchbar-engine-button"
+                      type="menu"
+                      anonid="searchbar-engine-button"
+                      popup="_child"
+                      xbl:inherits="src">
+            <xul:menupopup class="searchbar-popup"
+                           anonid="searchbar-popup"
+                           position="after_start">
+              <xul:menuseparator/>
+              <xul:menuitem class="open-engine-manager"
+                            anonid="open-engine-manager"
+                            label="&cmd_engineManager.label;"
+                            accesskey="&cmd_engineManager.accesskey;"/>
+            </xul:menupopup>
+          </xul:button>
+  
           <xul:textbox class="searchbar-textbox"
                        anonid="searchbar-textbox"
                        type="autocomplete"
@@ -78,31 +95,33 @@
                        completeselectedindex="true"
                        showcommentcolumn="true"
                        tabscrolling="true"
-                       xbl:inherits="disableautocomplete,searchengine,src">
-            <xul:button class="searchbar-engine-button"
-                        type="menu"
-                        anonid="searchbar-engine-button"
-                        popup="_child"
-                        xbl:inherits="src">
-              <xul:menupopup class="searchbar-popup"
-                             anonid="searchbar-popup"
-                             position="after_start">
-                <xul:menuseparator/>
-                <xul:menuitem class="open-engine-manager"
-                              anonid="open-engine-manager"
-                              label="&cmd_engineManager.label;"
-                              accesskey="&cmd_engineManager.accesskey;"/>
-              </xul:menupopup>
-            </xul:button>
-            <xul:hbox class="search-go-button-container">
-              <xul:toolbarbutton class="search-go-button"
-                                 anonid="search-go-button"
-                                 chromedir="&locale.dir;" />
-            </xul:hbox>
+                       xbl:inherits="disabled,disableautocomplete,searchengine,src">
           </xul:textbox>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+
+        <xul:stack class="search-go-button-stack">
+          <xul:vbox>
+            <!-- These image segments allow the button's gradient to stretch
+                 nicely in larger urlbars. -->
+            <xul:image class="search-go-button-top search-go-button-bkgnd"
+                       chromedir="&locale.dir;"/>
+            <xul:image flex="1"
+                       class="search-go-button-mid-top search-go-button-bkgnd"
+                       chromedir="&locale.dir;"/>
+            <xul:image flex="1"
+                       class="search-go-button-mid-bottom search-go-button-bkgnd"
+                       chromedir="&locale.dir;"/>
+            <xul:image class="search-go-button-bottom search-go-button-bkgnd"
+                       chromedir="&locale.dir;"/>
+          </xul:vbox>
+          <xul:toolbarbutton class="search-go-button"
+                             anonid="search-go-button"
+                             chromedir="&locale.dir;"
+                             label="&searchEndCap.label;" />
+        </xul:stack>
+      </xul:hbox>
     </content>
+
     <implementation implements="nsIObserver">
 
       <constructor><![CDATA[
@@ -838,11 +857,20 @@
   <binding id="searchbar-engine-button"
            extends="chrome://browser/content/search/search.xml#searchbar-base">
     <content>
-      <xul:stack flex="1">
-        <xul:hbox align="center" class="searchbar-engine-image-container">
+      <xul:stack flex="1" class="searchbar-engine-button-stack">
+        <xul:vbox>
+          <xul:image class="searchbar-engine-button-top searchbar-engine-button-bkgnd"/>
+          <xul:image flex="1"
+                     class="searchbar-engine-button-mid-top searchbar-engine-button-bkgnd"/>
+          <xul:image flex="1"
+                     class="searchbar-engine-button-mid-bottom searchbar-engine-button-bkgnd"/>
+          <xul:image class="searchbar-engine-button-bottom searchbar-engine-button-bkgnd"/>
+        </xul:vbox>
+        <xul:hbox align="center"
+                  class="searchbar-engine-image-container">
           <xul:image class="searchbar-engine-image" xbl:inherits="src"/>
+          <xul:image class="searchbar-dropmarker-image"/>
         </xul:hbox>
-        <xul:image class="searchbar-dropmarker-image"/>
       </xul:stack>
       <children/>
     </content>

browser/locales/en-US/chrome/browser/searchbar.dtd

@@ -1,2 +1,3 @@
 <!ENTITY cmd_engineManager.label        "Manage Search Engines...">
 <!ENTITY cmd_engineManager.accesskey    "M">
+<!ENTITY searchEndCap.label             "Search">

browser/themes/pinstripe/browser/bookmarks/bookmarksManager.css

@@ -4,85 +4,94 @@
 }
 
 toolbarbutton#newbookmark {
-  -moz-image-region: rect(0px, 224px, 32px, 192px);
+  -moz-image-region: rect(0px, 168px, 24px, 144px);
 }
-toolbarbutton#newbookmark:active {
-  -moz-image-region: rect(32px, 224px, 64px, 192px);
+toolbarbutton#newbookmark:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 168px, 48px, 144px);
 }
 toolbarbutton#newbookmark[disabled="true"] {
-  -moz-image-region: rect(64px, 224px, 96px, 192px);
+  -moz-image-region: rect(48px, 168px, 72px, 144px);
 }
-
-toolbarbutton#newlivemark {
-  -moz-image-region: rect(0px, 224px, 32px, 192px);
-}
-
-toolbarbutton#newlivemark:hover {
-  -moz-image-region: rect(32px, 224px, 64px, 192px);
-}
-
-toolbarbutton#newlivemark[disabled="true"] {
-  -moz-image-region: rect(64px, 224px, 96px, 192px);
+toolbarbutton#newbookmark:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 168px, 96px, 144px);
 }
 
 toolbarbutton#newfolder {
-  -moz-image-region: rect(0px, 32px, 32px, 0px);
+  -moz-image-region: rect(0px, 24px, 24px, 0px);
 }
-toolbarbutton#newfolder:active {
-  -moz-image-region: rect(32px, 32px, 64px, 0px);
+toolbarbutton#newfolder:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 24px, 48px, 0px);
 }
 toolbarbutton#newfolder[disabled="true"] {
-  -moz-image-region: rect(64px, 32px, 96px, 0px);
+  -moz-image-region: rect(48px, 24px, 72px, 0px);
+}
+toolbarbutton#newfolder:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 24px, 96px, 0px);
 }
 
 toolbarbutton#newseparator {
-  -moz-image-region: rect(0px, 64px, 32px, 32px);
+  -moz-image-region: rect(0px, 48px, 24px, 24px);
 }
-toolbarbutton#newseparator:active {
-  -moz-image-region: rect(32px, 64px, 64px, 32px);
+toolbarbutton#newseparator:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 48px, 48px, 24px);
 }
 toolbarbutton#newseparator[disabled="true"] {
-  -moz-image-region: rect(64px, 64px, 96px, 32px);
+  -moz-image-region: rect(48px, 48px, 72px, 24px);
+}
+toolbarbutton#newseparator:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 48px, 96px, 24px);
 }
 
 toolbarbutton#moveBookmark {
-  -moz-image-region: rect(0px, 96px, 32px, 64px);
+  -moz-image-region: rect(0px, 72px, 24px, 48px);
 }
-toolbarbutton#moveBookmark:active {
-  -moz-image-region: rect(32px, 96px, 64px, 64px);
+toolbarbutton#moveBookmark:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 72px, 48px, 48px);
 }
 toolbarbutton#moveBookmark[disabled="true"] {
-  -moz-image-region: rect(64px, 96px, 96px, 64px);
+  -moz-image-region: rect(48px, 72px, 72px, 48px);
+}
+toolbarbutton#moveBookmark:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 72px, 96px, 48px);
 }
 
 toolbarbutton#properties {
-  -moz-image-region: rect(0px, 128px, 32px, 96px);
+  -moz-image-region: rect(0px, 96px, 24px, 72px);
 }
-toolbarbutton#properties:active {
-  -moz-image-region: rect(32px, 128px, 64px, 96px);
+toolbarbutton#properties:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 96px, 48px, 72px);
 }
 toolbarbutton#properties[disabled="true"] {
-  -moz-image-region: rect(64px, 128px, 96px, 96px);
+  -moz-image-region: rect(48px, 96px, 72px, 72px);
+}
+toolbarbutton#properties:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 96px, 96px, 72px);
 }
 
 toolbarbutton#rename {
-  -moz-image-region: rect(0px, 160px, 32px, 128px);
+  -moz-image-region: rect(0px, 120px, 24px, 96px);
 }
-toolbarbutton#rename:active {
-  -moz-image-region: rect(32px, 160px, 64px, 128px);
+toolbarbutton#rename:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 120px, 48px, 96px);
 }
 toolbarbutton#rename[disabled="true"] {
-  -moz-image-region: rect(64px, 160px, 96px, 128px);
+  -moz-image-region: rect(48px, 120px, 72px, 96px);
+}
+toolbarbutton#rename:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 120px, 96px, 96px);
 }
 
 toolbarbutton#delete {
-  -moz-image-region: rect(0px, 192px, 32px, 160px);
+  -moz-image-region: rect(0px, 144px, 24px, 120px);
 }
-toolbarbutton#delete:active {
-  -moz-image-region: rect(32px, 192px, 64px, 160px);
+toolbarbutton#delete:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 144px, 48px, 120px);
 }
 toolbarbutton#delete[disabled="true"] {
-  -moz-image-region: rect(64px, 192px, 96px, 160px);
+  -moz-image-region: rect(48px, 144px, 72px, 120px);
+}
+toolbarbutton#delete:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 144px, 96px, 120px);
 }
 
 #bookmarks-search {

browser/themes/pinstripe/browser/browser.xml

@@ -8,20 +8,42 @@
 
   <!-- :::/ 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>
+  <binding id="bf-menu-button-allowevents-box"
+           display="xul:button"
+           extends="chrome://global/content/bindings/button.xml#button-base">
+    <content allowevents="true">
+      <children/>
     </content>
   </binding>
+
+  <binding id="bf-menu-button" extends="chrome://global/content/bindings/toolbarbutton.xml#menu-button">
+    <content>
+      <children includes="observes|template|menupopup|tooltip"/>
+      <xul:hbox flex="1" class="allowevents-box"/>
+      <xul:vbox>
+        <xul:hbox align="center" flex="1">
+          <xul:toolbarbutton class="box-inherit toolbarbutton-menubutton-button"
+                             anonid="button"
+                             allowevents="true"
+                             flex="1"
+                             align="end"
+                             xbl:inherits="disabled,crop,image,label,accesskey,command,
+                                           dir,pack,orient,toolbarmode,buttonstyle"/>
+          <xul:dropmarker type="menu-button"
+                          class="toolbarbutton-menubutton-dropmarker"
+                          xbl:inherits="align,dir,pack,orient,disabled,toolbarmode,buttonstyle,label"/>
+        </xul:hbox>
+        <xul:hbox flex="1" class="toolbarbutton-text-box allowevents-box">
+           <xul:label class="toolbarbutton-text"
+                      crop="right"
+                      xbl:inherits="value=label,accesskey,crop,toolbarmode,buttonstyle"
+                      flex="1"/>
+        </xul:hbox>
+      </xul:vbox>
+      <xul:hbox flex="1" class="allowevents-box"/>
+    </content>
+  </binding>
+
   <binding id="bookmark-left">
     <content>
       	<xul:spacer class="bookmark-image-left" xbl:inherits="selected"/>

browser/themes/pinstripe/browser/feeds/subscribe.css

@@ -26,12 +26,13 @@ html {
   -moz-padding-end: .3em;
   margin: -4em auto 0 auto;
   font-size: 110%;
-  background-color: rgb(255,255,225);
+  background: url("chrome://browser/skin/feeds/feedIcon.png") 1.4em 5.9em no-repeat rgb(255,255,225);
+  padding: 5em 3em 0 3em;
 }
 
-#feedHeader[firstrun="true"] {
-  background: url("chrome://browser/skin/feeds/feedIcon.png") 1.4em 5.9em no-repeat rgb(255,255,225);
-  padding: 5em 3em 3em 3em;
+
+#feedHeader[firstrun="true"] #feedIntroText {
+  display: block;
 }
 
 #feedIntroText {
@@ -39,74 +40,18 @@ html {
   -moz-margin-start: 2em;
 }
 
-#feedHeader[firstrun="true"] #feedIntroText {
-  display: block;
-}
-
 #feedSubscribeLine {
-  padding: 1em;
-  -moz-border-radius: 3px;
+  padding: 0 1em 1em 2em;
 }
 
-#feedHeader[firstrun="true"] #feedSubscribeLine {
-  -moz-margin-start: 1.7em;
-  background: -moz-Field;
-}
-
-#feedSubscribeHandler {
-  border: 1px solid ThreeDLightShadow;
-  -moz-border-radius: 3px;
+#alwaysUse {
   padding: 3px;
 }
 
-#feedSubscribeHandleText {
-  -moz-padding-start: 20px;
-  background: url("chrome://browser/skin/feeds/feedIcon16.png") left 0 no-repeat;
+#feedHeader[firstrun="true"] #feedSubscribeLine {
+  padding-left: 3.7em;
 }
 
-.feedSubscribeLink {
-  font-weight: bold;
-  -moz-margin-end: .4em;
-  padding: .2em .1em .2em .1em;
-}
-
-.feedSubscribeLinkBox {
-  background: url("chrome://browser/skin/feeds/feedIcon16.png") left 0 no-repeat;
-  -moz-padding-start: 19px;
-  -moz-margin-end: 0px;
-}
-
-#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;
@@ -169,52 +114,3 @@ a[href] img {
 .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;
-}
-
-#application {
-  border-bottom: 1px solid ThreeDShadow;
-}
-
-#readerGroup {
-  -moz-padding-end: 14px;
-}
-
-.feedSubscribeButton {
-  font-weight: bold;
-  list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
-}
-.feedSubscribeButton .button-icon {
-  -moz-margin-end: 3px;
-}

browser/themes/pinstripe/browser/jar.mn

@@ -9,6 +9,8 @@ classic.jar:
   skin/classic/browser/bookmark-open-right.png
 * skin/classic/browser/browser.css                          (browser.css)
   skin/classic/browser/browser.xml
+  skin/classic/browser/dropmark-nav-small.png
+  skin/classic/browser/dropmark-nav.png
 * skin/classic/browser/engineManager.css                    (engineManager.css)
   skin/classic/browser/find.png
   skin/classic/browser/find-bar-background.png
@@ -20,13 +22,10 @@ classic.jar:
   skin/classic/browser/livemark-item.png
   skin/classic/browser/pageInfo.css
   skin/classic/browser/Popup-blocked.png
-* skin/classic/browser/searchbar.css                       (searchbar.css)
-  skin/classic/browser/search-bar-background-left.png
+  skin/classic/browser/searchbar.css
   skin/classic/browser/search-bar-background-mid.png
-  skin/classic/browser/search-bar-background-right.png
-  skin/classic/browser/Search-bar.png
-  skin/classic/browser/Search.png
-  skin/classic/browser/Search-add-engines.png
+  skin/classic/browser/Search-go.png
+  skin/classic/browser/Search-provider-bkgnd.png
   skin/classic/browser/Secure.png
   skin/classic/browser/Security-broken.png
   skin/classic/browser/Secure-urlbar.png

browser/themes/pinstripe/browser/places/places.css

@@ -118,29 +118,6 @@ treechildren::-moz-tree-cell-text(title, separator, selected, focus) {
   margin: 6px -4px 0px 2px;
 }
 
-.textbox-input-closebutton {
-  -moz-appearance: none;
-  margin: 1px 2px 1px 1px;
-  min-width: 0;
-  background-color: transparent;
-  border: none;
-  padding: 0 !important;
-  list-style-image: url("chrome://global/skin/icons/closetab.png");
-  width: 16px;
-  height: 16px;
-  cursor: default;
-}
-
-.textbox-input-closebutton > .button-box {
-  margin: 0;
-  padding: 0;
-  border: 0;
-}
-
-.textbox-input-closebutton:hover:active {
-  list-style-image: url("chrome://global/skin/icons/closetab-active.png");
-}
-
 .small {
   font-size: x-small;
   min-width: 0px;

browser/themes/pinstripe/browser/preferences/preferences.css

@@ -83,61 +83,90 @@ radio[pane][selected="true"] {
     color: ButtonText !important;
 }
 
+
+/* ----- GENERAL BUTTON ----- */
+
+radio[pane=paneGeneral],
 radio[pane=paneMain] {
 	-moz-image-region: rect(0px, 32px, 32px, 0px)
 }
-
-radio[pane=paneMain]:active {
+radio[pane=paneGeneral]:hover, 
+radio[pane=paneGeneral]:active,
+radio[pane=paneGeneral][selected="true"],
+radio[pane=paneMain]:hover, 
+radio[pane=paneMain]:active,
+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=panePrivacy]:active {
-	-moz-image-region: rect(32px, 64px, 64px, 32px)
-}
-
-radio[pane=paneContent] {
-	-moz-image-region: rect(0px, 96px, 32px, 64px)
-}
-
-radio[pane=paneContent]:active {
-	-moz-image-region: rect(32px, 96px, 64px, 64px)
-}
-
-radio[pane=paneFeeds] {
-	-moz-image-region: rect(0px, 96px, 32px, 64px)
-}
-
-radio[pane=paneFeeds]:active {
-	-moz-image-region: rect(32px, 96px, 64px, 64px)
-}
+/* ----- TABS BUTTON ----- */
 
 radio[pane=paneTabs] {
-	-moz-image-region: rect(0px, 128px, 32px, 96px)
+	-moz-image-region: rect(0px, 64px, 32px, 32px);
+}
+radio[pane=paneTabs]:hover,
+radio[pane=paneTabs]:active,
+radio[pane=paneTabs][selected="true"] {
+	-moz-image-region: rect(32px, 64px, 64px, 32px);
 }
 
-radio[pane=paneTabs]:active {
-	-moz-image-region: rect(32px, 128px, 64px, 96px)
+/* ----- CONTENT BUTTON ----- */
+
+radio[pane=paneContent] {
+	-moz-image-region: rect(0px, 96px, 32px, 64px);
 }
 
+radio[pane=paneContent]:hover,
+radio[pane=paneContent]:active,
+radio[pane=paneContent][selected="true"] {
+	-moz-image-region: rect(32px, 96px, 64px, 64px);
+}
+
+/* ----- FEEDS BUTTON ----- */
+
+radio[pane=paneFeeds] {
+	-moz-image-region: rect(0px, 128px, 32px, 96px);
+}
+radio[pane=paneFeeds]:hover,
+radio[pane=paneFeeds]:active,
+radio[pane=paneFeeds][selected="true"] {
+	-moz-image-region: rect(32px, 128px, 64px, 96px);
+}
+
+/* ----- PRIVACY BUTTON ----- */
+
+radio[pane=panePrivacy] {
+	-moz-image-region: rect(0px, 160px, 32px, 128px);
+}
+radio[pane=panePrivacy]:hover,
+radio[pane=panePrivacy]:active,
+radio[pane=panePrivacy][selected="true"] {
+	-moz-image-region: rect(32px, 160px, 64px, 128px);
+}
+
+/* ----- SECURITY BUTTON ----- */
+
 radio[pane=paneSecurity] {
-	-moz-image-region: rect(0px, 224px, 32px, 192px)
+	-moz-image-region: rect(0px, 192px, 32px, 160px);
+}
+radio[pane=paneSecurity]:hover,
+radio[pane=paneSecurity]:active,
+radio[pane=paneSecurity][selected="true"] {
+	-moz-image-region: rect(32px, 192px, 64px, 160px);
 }
 
-radio[pane=paneSecurity]:active {
-	-moz-image-region: rect(32px, 224px, 64px, 192px)
-}
+/* ----- ADVANCED BUTTON ----- */
 
 radio[pane=paneAdvanced] {
-	-moz-image-region: rect(0px, 192px, 32px, 160px)
+	-moz-image-region: rect(0px, 224px, 32px, 192px);
+}
+radio[pane=paneAdvanced]:hover,
+radio[pane=paneAdvanced]:active,
+radio[pane=paneAdvanced][selected="true"] {
+	-moz-image-region: rect(32px, 224px, 64px, 192px);
 }
 
-radio[pane=paneAdvanced]:active {
-	-moz-image-region: rect(32px, 192px, 64px, 160px)
-}
+
 
 .content-box > separator {
   border: 1px solid red;

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

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

browser/themes/pinstripe/browser/searchbar.css

@@ -1,77 +1,92 @@
+/* *** pinstripe *** */
+
+.search-go-button-bkgnd,
+.searchbar-engine-button-bkgnd {
+  list-style-image: none;
+}
+
 .searchbar-textbox {
   background: url("chrome://browser/skin/search-bar-background-mid.png") repeat-x;
-  
-  margin: 4px 11px 4px 11px;
+  margin: 4px 0px 4px 0px;
   -moz-appearance: none;
   font: icon;
   height: 22px !important;
-  width: 182px !important;
+  width: 4em;
+  min-width: 4em;
   border: none !important;
 }
 
-.searchbar-left {
-  background: url("chrome://browser/skin/search-bar-background-left.png") no-repeat left center;
-  margin-left: 3px;
+.searchbar-box {
+  -moz-margin-start: 3px;
 }
 
-.searchbar-right {
-  background: url("chrome://browser/skin/search-bar-background-right.png") no-repeat right center;
-  margin-right: 3px;
+.searchbar-engine-button-stack {
+  padding: 2px 0px 2px 0px;
 }
 
 .searchbar-engine-image {
   width: 16px;
   height: 16px;
-  margin: 3px 3px 3px 0px;
+  -moz-margin-start: 9px;
   list-style-image: url("chrome://browser/skin/bookmarks/bookmark-item.png");
 }
 
-.searchbar-engine-button {
-  min-width: 22px;
-  margin: 0px 3px 0px 0px;
+.searchbar-engine-button-top {
+  list-style-image: url("chrome://browser/skin/Search-provider-bkgnd.png");
+  -moz-image-region: rect(0px, 37px, 22px, 0px);
+  margin-top: 2px;
+  height: 22px;
+  width: 37px;
 }
 
-.searchbar-engine-button[addengines="true"] {
-  list-style-image: url("chrome://browser/skin/Search-add-engines.png");
+.searchbar-engine-button:hover .searchbar-engine-button-top {
+  -moz-image-region: rect(0px, 74px, 22px, 37px);
+}
+
+.searchbar-engine-button[open="true"] .searchbar-engine-button-top {
+  -moz-image-region: rect(0px, 111px, 22px, 74px);
+}
+
+.searchbar-engine-button[addengines="true"] .searchbar-engine-button-top {
+  -moz-image-region: rect(0px, 148px, 22px, 111px);
+}
+
+.searchbar-engine-button {
+  margin: 0px;
+  padding: 0px;
 }
 
 .searchbar-dropmarker-image {
-%ifdef MOZ_PLACES
-  list-style-image: url("chrome://browser/skin/places/folderDropArrow.png") !important;
-%else
-  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png") !important;
-%endif
-  padding: 8px 0px 7px 19px;
-}
-
-.searchbar-popup {
-  min-width: 100px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+  -moz-margin-start: 4px;
 }
 
 .autocomplete-textbox-container {
   border: none;
-  padding-right: 0px;
+  padding: 0px;
+  margin: 0px;
   height: 21px !important;
-	margin: 0px -5px 0px -3px;
 }
 
 .search-go-button {
   -moz-box-flex: 1; /* expand to fill toolbar height */
-  list-style-image: url("chrome://browser/skin/Search.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
+  list-style-image: url("chrome://browser/skin/Search-go.png");
+  -moz-image-region: rect(0px 25px 22px 0px);
   padding: 0px;
+  margin: 0px;
+  -moz-margin-start: -1px;
 }
 
 .search-go-button:hover {
-  -moz-image-region: rect(0px 32px 16px 16px);
+  -moz-image-region: rect(0px 50px 22px 25px);
 }
 
 .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);
+  -moz-image-region: rect(0px, 75px, 22px, 50px);
 }
 
 .searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {

browser/themes/winstripe/browser/Makefile.in

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

browser/themes/winstripe/browser/bookmarks/bookmarksManager.css

@@ -14,27 +14,14 @@
 toolbarbutton#newbookmark {
   -moz-image-region: rect(0px 24px 24px 0px);
 }
-
-toolbarbutton#newbookmark:hover {
+toolbarbutton#newbookmark:not([disabled="true"]):hover {
   -moz-image-region: rect(24px 24px 48px 0px);
 }
-
 toolbarbutton#newbookmark[disabled="true"] {
-  -moz-image-region: rect(48px 24px 72px 0px) !important;
+  -moz-image-region: rect(72px 24px 96px 0px);
 }
-
-/* new livemark */
-
-toolbarbutton#newlivemark {
-  -moz-image-region: rect(0px 24px 24px 0px);
-}
-
-toolbarbutton#newlivemark:hover {
-  -moz-image-region: rect(24px 24px 48px 0px);
-}
-
-toolbarbutton#newlivemark[disabled="true"] {
-  -moz-image-region: rect(48px 24px 72px 0px) !important;
+toolbarbutton#newbookmark:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 24px 72px 0px);
 }
 
 /* new folder */
@@ -42,11 +29,14 @@ toolbarbutton#newlivemark[disabled="true"] {
 toolbarbutton#newfolder {
   -moz-image-region: rect(0px 48px 24px 24px);
 }
-toolbarbutton#newfolder:hover {
+toolbarbutton#newfolder:not([disabled="true"]):hover {
   -moz-image-region: rect(24px 48px 48px 24px);
 }
 toolbarbutton#newfolder[disabled="true"] {
-   -moz-image-region: rect(48px 48px 72px 24px) !important;
+   -moz-image-region: rect(72px 48px 96px 24px);
+}
+toolbarbutton#newfolder:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 48px 72px 24px);
 }
 
 /* new separator */
@@ -54,11 +44,14 @@ toolbarbutton#newfolder[disabled="true"] {
 toolbarbutton#newseparator {
   -moz-image-region: rect(0px 72px 24px 48px);
 }
-toolbarbutton#newseparator:hover {
+toolbarbutton#newseparator:not([disabled="true"]):hover {
   -moz-image-region: rect(24px 72px 48px 48px);
 }
 toolbarbutton#newseparator[disabled="true"] {
-  -moz-image-region: rect(48px 72px 72px 48px) !important;
+  -moz-image-region: rect(72px 72px 96px 48px);
+}
+toolbarbutton#newseparator:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 72px 72px 48px);
 }
 
 /* move bookmark */
@@ -66,10 +59,13 @@ toolbarbutton#newseparator[disabled="true"] {
 toolbarbutton#moveBookmark {
   -moz-image-region: rect(0px 96px 24px 72px);
 }
-toolbarbutton#moveBookmark:hover {
+toolbarbutton#moveBookmark:not([disabled="true"]):hover {
   -moz-image-region: rect(24px 96px 48px 72px);
 }
 toolbarbutton#moveBookmark[disabled="true"] {
+  -moz-image-region: rect(72px 96px 96px 72px);
+}
+toolbarbutton#moveBookmark:not([disabled="true"]):hover:active {
   -moz-image-region: rect(48px 96px 72px 72px);
 }
 
@@ -78,12 +74,14 @@ toolbarbutton#moveBookmark[disabled="true"] {
 toolbarbutton#properties {
   -moz-image-region: rect(0px 120px 24px 96px);
 }
-toolbarbutton#properties:hover {
+toolbarbutton#properties:not([disabled="true"]):hover {
   -moz-image-region: rect(24px 120px 48px 96px);
 }
-
 toolbarbutton#properties[disabled="true"] {
-  -moz-image-region: rect(48px 120px 72px 96px) !important;
+  -moz-image-region: rect(72px 120px 96px 96px);
+}
+toolbarbutton#properties:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 120px 72px 96px);
 }
 
 /* rename */
@@ -91,11 +89,14 @@ toolbarbutton#properties[disabled="true"] {
 toolbarbutton#rename {
   -moz-image-region: rect(0px 144px 24px 120px);
 }
-toolbarbutton#rename:hover {
+toolbarbutton#rename:not([disabled="true"]):hover {
   -moz-image-region: rect(24px 144px 48px 120px);
 }
 toolbarbutton#rename[disabled="true"] {
-  -moz-image-region: rect(48px 144px 72px 120px) !important;
+  -moz-image-region: rect(72px 144px 96px 120px);
+}
+toolbarbutton#rename:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 144px 72px 120px);
 }
 
 /* delete */
@@ -103,11 +104,14 @@ toolbarbutton#rename[disabled="true"] {
 toolbarbutton#delete {
   -moz-image-region: rect(0px 168px 24px 144px);
 }
-toolbarbutton#delete:hover {
+toolbarbutton#delete:not([disabled="true"]):hover {
   -moz-image-region: rect(24px 168px 48px 144px);
 }
 toolbarbutton#delete[disabled="true"] {
-  -moz-image-region: rect(48px 168px 72px 144px) !important;
+  -moz-image-region: rect(72px 168px 96px 144px);
+}
+toolbarbutton#delete:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 168px 72px 144px);
 }
 
 #bookmark-folders-view > .bookmarksTree {
@@ -117,4 +121,3 @@ toolbarbutton#delete[disabled="true"] {
 #bookmark-views-splitter {
   border: none; 
 }
-

browser/themes/winstripe/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/winstripe/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/winstripe/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/winstripe/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/winstripe/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"] {