Bug 339964 - move tabbrowser.xml out of mozilla/toolkit and into mozilla/browser. Patch by Stefan <stefanh@bluebottle.com> and myself, r=mconnor
authorrflint@ryanflint.com
Wed, 22 Aug 2007 14:02:02 -0700
changeset 5173 4ba55affa5784da0a7c498276677c4ea05c055f7
parent 5172 af3c0749b914a25304734d586f1c927e32ce1da1
child 5174 d884a811c03aac294923dd0213dcc06c59711ce9
push idunknown
push userunknown
push dateunknown
reviewersmconnor
bugs339964
milestone1.9a8pre
Bug 339964 - move tabbrowser.xml out of mozilla/toolkit and into mozilla/browser. Patch by Stefan <stefanh@bluebottle.com> and myself, r=mconnor
browser/base/content/browser.css
browser/base/content/tabbrowser.xml
browser/base/jar.mn
browser/locales/jar.mn
browser/themes/pinstripe/browser/browser.css
browser/themes/pinstripe/browser/jar.mn
browser/themes/pinstripe/browser/tabbrowser/tabbrowserBindings.xml
browser/themes/winstripe/browser/browser.css
browser/themes/winstripe/browser/jar.mn
browser/themes/winstripe/browser/tabbrowser/tabbrowserBindings.xml
netwerk/test/jarlist.dat
toolkit/content/jar.mn
toolkit/content/xul.css
toolkit/locales/jar.mn
toolkit/themes/pinstripe/global/jar.mn
toolkit/themes/winstripe/global/globalBindings.xml
toolkit/themes/winstripe/global/jar.mn
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -23,8 +23,47 @@ menuitem.spell-suggestion {
 #sidebar-box toolbarbutton.tabs-closebutton {
   -moz-user-focus: normal;
 }
 
 /* apply Fitts' law to the notification bar's close button */
 window[sizemode="maximized"] #content .notification-inner {
   border-right: 0px !important;
 }
+
+tabbrowser {
+  -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser");
+}
+
+.tabbrowser-tabs {
+  -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser-tabs");
+}
+
+.tabbrowser-arrowscrollbox {
+  -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser-arrowscrollbox");
+}
+
+.tabs-alltabs-popup {
+  -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser-alltabs-popup");
+}
+
+.tabbrowser-tabs > .tabbrowser-tab {
+  -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser-tab");
+}
+
+.tabbrowser-tabs > .tabbrowser-tab > .tab-close-button,
+.tabbrowser-tabs .tabs-closebutton-box > .tabs-closebutton {
+  -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser-close-tab-button");
+}
+
+.tab-close-button {
+  display: none;
+}
+
+.tabbrowser-tabs:not([closebuttons="noclose"]):not([closebuttons="closeatend"]) > .tabbrowser-tab[selected="true"] > .tab-close-button {
+  display: -moz-box;
+}
+
+.tabbrowser-tabs[closebuttons="alltabs"] > .tabbrowser-tab > .tab-close-button {
+  display: -moz-box;
+}
+
+
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -41,34 +41,34 @@
    - decision by deleting the provisions above and replace them with the notice
    - and other provisions required by the GPL or the LGPL. If you do not delete
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE bindings [
-<!ENTITY % tabBrowserDTD SYSTEM "chrome://global/locale/tabbrowser.dtd" >
+<!ENTITY % tabBrowserDTD SYSTEM "chrome://browser/locale/tabbrowser.dtd" >
 %tabBrowserDTD;
 <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
 %globalDTD;
 ]>
 
 <bindings id="tabBrowserBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="tabbrowser">
     <resources>
-      <stylesheet src="chrome://global/skin/browser.css"/>
+      <stylesheet src="chrome://browser/skin/browser.css"/>
     </resources>
 
     <content>
-      <xul:stringbundle anonid="tbstringbundle" src="chrome://global/locale/tabbrowser.properties"/>
+      <xul:stringbundle anonid="tbstringbundle" src="chrome://browser/locale/tabbrowser.properties"/>
       <xul:tabbox anonid="tabbox" flex="1" eventnode="document" xbl:inherits="handleCtrlPageUpDown"
                   onselect="if (!('updateCurrentBrowser' in this.parentNode) || event.target.localName != 'tabpanels') return; this.parentNode.updateCurrentBrowser();">
         <xul:hbox class="tab-drop-indicator-bar">
           <xul:hbox class="tab-drop-indicator" mousethrough="always"/>
         </xul:hbox>
         <xul:hbox class="tabbrowser-strip" collapsed="true" tooltip="_child" context="_child"
                   anonid="strip"
                   ondraggesture="nsDragAndDrop.startDrag(event, this.parentNode.parentNode); event.stopPropagation();"
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -32,16 +32,17 @@ browser.jar:
 *       content/browser/openLocation.js               (content/openLocation.js)
 *       content/browser/openLocation.xul              (content/openLocation.xul)
 *       content/browser/pageReport.js                 (content/pageReport.js)
 *       content/browser/pageReport.xul                (content/pageReport.xul)
 *       content/browser/pageReportFirstTime.xul       (content/pageReportFirstTime.xul)
 *       content/browser/safeMode.js                   (content/safeMode.js)
 *       content/browser/safeMode.xul                  (content/safeMode.xul)
 *       content/browser/sanitize.js                   (content/sanitize.js)
+*       content/browser/tabbrowser.xml                (content/tabbrowser.xml)
 *       content/browser/sanitize.xul                  (content/sanitize.xul)
 *       content/browser/urlbarBindings.xml            (content/urlbarBindings.xml)
 *       content/browser/utilityOverlay.js             (content/utilityOverlay.js)
 *       content/browser/web-panels.js                 (content/web-panels.js)
 *       content/browser/web-panels.xul                (content/web-panels.xul)
 *       content/browser/baseMenuOverlay.xul           (content/baseMenuOverlay.xul)
 *       content/browser/nsContextMenu.js              (content/nsContextMenu.js)
 # XXX: We should exclude this one as well (bug 71895)
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -20,16 +20,18 @@
     locale/browser/sanitize.dtd                    (%chrome/browser/sanitize.dtd)
     locale/browser/search.properties               (%chrome/browser/search.properties)
     locale/browser/searchbar.dtd                   (%chrome/browser/searchbar.dtd)
     locale/browser/engineManager.dtd               (%chrome/browser/engineManager.dtd)
     locale/browser/engineManager.properties        (%chrome/browser/engineManager.properties)
     locale/browser/setDesktopBackground.dtd        (%chrome/browser/setDesktopBackground.dtd)
     locale/browser/shellservice.properties         (%chrome/browser/shellservice.properties)
     locale/browser/sessionstore.properties         (%chrome/browser/sessionstore.properties)
+    locale/browser/tabbrowser.dtd                  (%chrome/browser/tabbrowser.dtd)
+    locale/browser/tabbrowser.properties           (%chrome/browser/tabbrowser.properties)
     locale/browser/places/places.dtd               (%chrome/browser/places/places.dtd)
     locale/browser/places/places.properties        (%chrome/browser/places/places.properties)
     locale/browser/places/editBookmarkOverlay.dtd  (%chrome/browser/places/editBookmarkOverlay.dtd)
     locale/browser/places/bookmarkProperties.dtd   (%chrome/browser/places/bookmarkProperties.dtd)
     locale/browser/places/bookmarkProperties.properties (%chrome/browser/places/bookmarkProperties.properties)
     locale/browser/preferences/selectBookmark.dtd  (%chrome/browser/preferences/selectBookmark.dtd)
     locale/browser/places/moveBookmarks.dtd        (%chrome/browser/places/moveBookmarks.dtd)
 #ifdef MOZ_SAFE_BROWSING
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -1189,21 +1189,408 @@ toolbarbutton.chevron > .toolbarbutton-m
 .bookmark-item {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
 .openintabs-menuitem {
   list-style-image: none;
 }
 
+/* ::::: tabbrowser ::::: */
+
 .tabs-left {
 	display: none !important;
 }
 
-/* ::::: close button ::::: */
+.tabbrowser-tab:not([selected="true"]):hover {
+  background: url("chrome://browser/skin/tabbrowser/tabbrowser-tabs-bkgnd.png") repeat-x;
+}
+
+.tabbrowser-tab:hover > .tab-image-middle > .tab-icon > .tab-extra-status {
+  background: none;
+}
+
+.tab-icon-image {
+  width: 16px;
+  height: 16px;
+  list-style-image: url("chrome://global/skin/icons/small-globe-sunken.png");
+}
+
+.tab-icon {
+  padding-top: 1px;
+  margin: 2px 0px 1px 0px;
+}
+
+.tab-text {
+  font: icon;
+  padding-top: 1px;
+  margin-top: 2px !important;
+}
+
+.tabbrowser-tab[busy] > .tab-icon-image,
+.tabbrowser-tab[busy] > .tab-image-middle > .tab-icon > .tab-icon-image {
+ list-style-image: url("chrome://global/skin/icons/loading_16_grey.gif") !important; 
+}
+
+.tabbrowser-tab {
+  -moz-binding: url("chrome://browser/skin/tabbrowser/tabbrowserBindings.xml#tabbrowser-tab") !important;
+  -moz-appearance: none;
+  color: #383838;
+  -moz-box-pack: center;
+  margin: 2px 0px 3px 0px;
+  padding: 0px;
+  border: none !important;
+  height: 22px !important;
+  min-width: 1px !important;
+  text-align: center;
+}
+
+.tabbrowser-tab[selected="true"] {
+  -moz-user-focus: normal;
+}
+
+.tabbrowser-tab > .tab-image-middle > .tab-text {
+  border: 1.4pt solid transparent;
+}
+
+.tabbrowser-tab:focus > .tab-image-middle > .tab-text {
+  border: 1.4pt solid -moz-mac-focusring;
+}
+
+.tabbrowser-tab[selected="true"], .tabbrowser-tab:hover {
+  color: #000000;
+}
+
+.tabbrowser-tab[first-tab="true"] > .tab-image-left {
+  margin-left: 3px !important;
+}
+
+.tab-image-left, .tab-image-right {
+  width: 8px;
+  margin: 0px;
+  padding: 0px;
+}
+
+.tabbrowser-tab > .tab-image-right {
+  background: url("chrome://browser/skin/tabbrowser/tab-right.png") no-repeat;
+}
+
+.tabbrowser-tab:not([selected="true"]) > .tab-image-right {
+  background: url("chrome://browser/skin/tabbrowser/tab-right-bkgnd.png") no-repeat;
+  margin-bottom: 1px;
+}
+
+.tabbrowser-tab:hover:not([selected="true"]) > .tab-image-right {
+  background: url("chrome://browser/skin/tabbrowser/tab-right-hover.png") no-repeat;
+}
+
+.tabbrowser-tab > .tab-image-left {
+  background: url("chrome://browser/skin/tabbrowser/tab-left.png") no-repeat;
+}
+
+.tabbrowser-tab:not([selected="true"]) > .tab-image-left {
+  background: url("chrome://browser/skin/tabbrowser/tab-left-bkgnd.png") no-repeat;
+  margin-bottom: 1px;
+}
+
+.tabbrowser-tab:hover:not([selected="true"]) > .tab-image-left {
+  background: url("chrome://browser/skin/tabbrowser/tab-left-hover.png") no-repeat;
+}
+
+.tabbrowser-tab > .tab-image-middle {
+  background: url("chrome://browser/skin/tabbrowser/tab-middle.png") repeat-x;
+  -moz-box-flex: 0 !important;
+}
+
+.tabbrowser-tab:not([selected="true"]) > .tab-image-middle {
+  background: url("chrome://browser/skin/tabbrowser/tab-middle-bkgnd.png");
+  margin-bottom: 1px;
+}
+
+.tabbrowser-tab:hover:not([selected="true"]) > .tab-image-middle {
+  background: url("chrome://browser/skin/tabbrowser/tab-middle-hover.png");
+}
+
+.tabbrowser-tab:not([selected="true"]) > .tab-image-middle > .tab-icon > .tab-icon-image  {
+  list-style-image: url("chrome://global/skin/icons/small-globe-sunken-grey.png");
+}
+
+.tabs-closebutton {
+  padding: 0px 4px 2px 0px;
+  margin: 0px;
+  list-style-image: url("chrome://global/skin/icons/closetab.png") !important;
+  border: none !important;
+}
+
+.tabs-closebutton:hover {
+  list-style-image: url("chrome://global/skin/icons/closetab-hover.png") !important;
+  border: none !important;
+}
+
+.tabs-closebutton:hover:active {
+  list-style-image: url("chrome://global/skin/icons/closetab-active.png") !important;
+  border: none !important;
+}
+
+.tabbrowser-strip {
+  -moz-box-orient: vertical !important;
+  -moz-appearance: dialog;
+}
+
+.tabbrowser-tabs {
+  -moz-binding: url("chrome://browser/skin/tabbrowser/tabbrowserBindings.xml#tabbrowser-tabs");
+  border: none;
+  padding: 0;
+  margin: 0;
+  -moz-box-pack: center;
+  -moz-box-align: center;
+  background: url("chrome://browser/skin/tabbrowser/tabbrowser-tabs-bkgnd.png") repeat-x;
+}
+
+.tab-image-right, .tab-image-left {
+  height: 18px !important;
+}
+
+.tabs-bottom {
+  border: none;
+  height: 4px !important;
+  background: url("chrome://browser/skin/tabbrowser/tabs-bottom-bg.png") repeat !important;
+  margin: 0px !important;
+}
+
+tabbrowser > tabbox > tabpanels {
+  -moz-appearance: none !important;
+}
+
+.tab-drop-indicator-bar {
+   visibility: hidden;
+   height: 9px;
+   margin-top: -9px;
+   position: relative;
+}
+
+.tab-drop-indicator {
+   height: 9px;
+   width: 9px;
+   margin-bottom: -5px;
+   position: relative;
+   background: url('chrome://browser/skin/tabbrowser/tabDragIndicator.png') 50% 50% no-repeat;
+}
+
+.tab-drop-indicator-bar[dragging="true"] {
+   visibility: visible;
+}
+
+/**
+ * In-tab close button
+ */
+.tab-close-button > .toolbarbutton-icon {
+  -moz-margin-end: 0px !important;
+  margin-top: 2px;
+}
+
+.tab-close-button {
+  list-style-image: url("chrome://global/skin/icons/closetab.png");
+  -moz-appearance: none;
+  border: none !important;
+  padding: 0px;
+  background: inherit;
+  cursor: default;
+}
+
+.tab-close-button:hover,
+.tabbrowser-tab[selected="true"] > .tab-close-button:hover {
+  list-style-image: url("chrome://global/skin/icons/closetab-hover.png");
+}
+
+.tab-close-button:hover:active,
+.tabbrowser-tab[selected="true"] > .tab-close-button:hover:active {
+  list-style-image: url("chrome://global/skin/icons/closetab-active.png");
+}
+
+.tabbrowser-tab > .tab-close-button {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-middle.png");
+  background-repeat: repeat-x;
+  -moz-margin-start: -5px;
+  -moz-margin-end: -1px;
+  -moz-padding-end: 0px;
+}
+
+.tabbrowser-tab[selected="true"] > .tab-close-button {
+  /* Make this button focusable so clicking on it will not focus the tab while
+     it's getting closed */
+  -moz-user-focus: normal;
+}
+
+.tabbrowser-tab:not([selected="true"]) > .tab-close-button {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-middle-bkgnd.png");
+  margin-bottom: 1px;
+}
+
+.tabbrowser-tab:not([selected="true"]):hover > .tab-close-button {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-middle-hover.png");
+}
+
+/**
+ * Tab Scrollbox Arrow Buttons
+ */
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up {
+  width: 18px;
+  height: 18px;
+  margin: 2px 0px 3px 0px;
+  padding-left: 0;
+  padding-right: 0;
+  border: none;
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start.png");
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start-bkgnd.png");
+  background-repeat: no-repeat;
+  -moz-image-region: rect(0, 11px, 14px, 0);
+  opacity: 0.65;
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled="true"] {
+  -moz-image-region: rect(0, 33px, 14px, 22px);
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled="true"]):hover {
+  -moz-image-region: rect(0, 22px, 14px, 11px);
+  opacity: 1.0;
+}
+ 
+.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0, 44px, 14px, 33px);
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon {
+  margin-top: 4px;
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down-box {
+  margin: 2px 0px 3px 0px;
+  width: 18px;
+  height: 18px;
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd.png") !important;
+  background-repeat: no-repeat;
+  opacity: 0.65;
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down-box-animate {
+  margin: 2px 0px 3px 0px;
+  width: 18px;
+  height: 18px;
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd-animate.png") !important;
+  background-repeat: no-repeat;
+  opacity: 0.0;
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down {
+  margin: 2px 0px 3px 0px;
+  width: 18px;
+  height: 18px;
+  padding-left: 0;
+  padding-right: 0;
+  border: none;
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end.png") !important;
+  -moz-image-region: rect(0, 11px, 14px, 0);
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down[disabled="true"] {
+  -moz-image-region: rect(0, 33px, 14px, 22px);
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down:not([disabled="true"]):hover {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd.png") !important;
+  background-repeat: no-repeat;
+  -moz-image-region: rect(0, 22px, 14px, 11px);
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0, 44px, 14px, 33px);
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down > .toolbarbutton-icon {
+  margin-top: 4px;
+  -moz-margin-start: 1px;
+}
+
+/**
+ * All Tabs Button
+ */
+
+.tabs-alltabs-box {
+  margin: 2px 0px 3px 0px;
+  width: 16px;
+  height: 18px;
+  background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-bkgnd.png");
+  background-repeat: no-repeat;
+  opacity: 0.65;
+}
+
+.tabbrowser-tabs[overflow="true"] .tabs-alltabs-box {
+  background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-bkgnd.png");
+}
+
+.tabs-alltabs-button {
+  margin: 2px 0px 3px 0px;
+  width: 16px;
+  height: 18px;
+  padding-left: 0;
+  padding-right: 0;
+  border: none;
+}
+
+.tabs-alltabs-button  > .toolbarbutton-menu-dropmarker {
+  margin-right: 2px;
+  margin-top: 4px;
+}
+
+.tabs-alltabs-button  > .toolbarbutton-text {
+  display: none;
+}
+
+.tabs-alltabs-button > .toolbarbutton-icon {
+  -moz-margin-end: 2px;
+}
+
+.tabs-alltabs-button:hover {
+  margin: 2px 0px 3px 0px;
+  background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-bkgnd.png");
+  background-repeat: no-repeat;
+  opacity: 1.0;
+}
+
+.tabbrowser-tabs[overflow="true"] .tabs-alltabs-button:hover {
+  background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-bkgnd.png");
+}
+
+.tabs-alltabs-box-animate {
+  margin: 2px 0px 3px 0px;
+  width: 16px;
+  height: 18px;
+  background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-bkgnd-animate.png");
+  background-repeat: no-repeat;
+  opacity: 0.0;
+}
+
+/**
+ * All Tabs Menupopup 
+ */
+
+.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://global/skin/icons/small-globe-sunken.png");
+}
+
+.alltabs-item[selected="true"] {
+  font-weight: bold;
+}
+
+.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://global/skin/icons/loading_16_grey.gif") !important;
+}
 
 .tabs-closebutton {
   padding-right: 4px;
   list-style-image: url("chrome://global/skin/icons/closetab.png") !important;
   list-style-image: none;
   border: none;
 }
 
--- a/browser/themes/pinstripe/browser/jar.mn
+++ b/browser/themes/pinstripe/browser/jar.mn
@@ -57,10 +57,32 @@ classic.jar:
   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)
+  skin/classic/browser/tabbrowser/alltabs-box-bkgnd.png                  (tabbrowser/alltabs-box-bkgnd.png)
+  skin/classic/browser/tabbrowser/alltabs-box-overflow-bkgnd.png         (tabbrowser/alltabs-box-overflow-bkgnd.png)
+  skin/classic/browser/tabbrowser/alltabs-box-overflow-bkgnd-animate.png (tabbrowser/alltabs-box-overflow-bkgnd-animate.png)
+  skin/classic/browser/tabbrowser/tab-arrow-start.png                    (tabbrowser/tab-arrow-start.png)
+  skin/classic/browser/tabbrowser/tab-arrow-start-bkgnd.png              (tabbrowser/tab-arrow-start-bkgnd.png)
+  skin/classic/browser/tabbrowser/tab-arrow-start-bkgnd-animate.png      (tabbrowser/tab-arrow-start-bkgnd-animate.png)
+  skin/classic/browser/tabbrowser/tab-arrow-end.png                      (tabbrowser/tab-arrow-end.png)
+  skin/classic/browser/tabbrowser/tab-arrow-end-bkgnd.png                (tabbrowser/tab-arrow-end-bkgnd.png)
+  skin/classic/browser/tabbrowser/tab-arrow-end-bkgnd-animate.png        (tabbrowser/tab-arrow-end-bkgnd-animate.png)
+  skin/classic/browser/tabbrowser/tabbrowserBindings.xml                 (tabbrowser/tabbrowserBindings.xml)
+  skin/classic/browser/tabbrowser/tabbrowser-tabs-bkgnd.png              (tabbrowser/tabbrowser-tabs-bkgnd.png)
+  skin/classic/browser/tabbrowser/tabDragIndicator.png                   (tabbrowser/tabDragIndicator.png)
+  skin/classic/browser/tabbrowser/tab-left.png                           (tabbrowser/tab-left.png)
+  skin/classic/browser/tabbrowser/tab-left-bkgnd.png                     (tabbrowser/tab-left-bkgnd.png)
+  skin/classic/browser/tabbrowser/tab-left-hover.png                     (tabbrowser/tab-left-hover.png)
+  skin/classic/browser/tabbrowser/tab-middle.png                         (tabbrowser/tab-middle.png)
+  skin/classic/browser/tabbrowser/tab-middle-bkgnd.png                   (tabbrowser/tab-middle-bkgnd.png)
+  skin/classic/browser/tabbrowser/tab-middle-hover.png                   (tabbrowser/tab-middle-hover.png)
+  skin/classic/browser/tabbrowser/tab-right.png                          (tabbrowser/tab-right.png)
+  skin/classic/browser/tabbrowser/tab-right-bkgnd.png                    (tabbrowser/tab-right-bkgnd.png)
+  skin/classic/browser/tabbrowser/tab-right-hover.png                    (tabbrowser/tab-right-hover.png)
+  skin/classic/browser/tabbrowser/tabs-bottom-bg.png                     (tabbrowser/tabs-bottom-bg.png)
   icon.png
   preview.png
--- a/browser/themes/pinstripe/browser/tabbrowser/tabbrowserBindings.xml
+++ b/browser/themes/pinstripe/browser/tabbrowser/tabbrowserBindings.xml
@@ -1,40 +1,40 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE bindings [
-<!ENTITY % tabBrowserDTD SYSTEM "chrome://global/locale/tabbrowser.dtd" >
+<!ENTITY % tabBrowserDTD SYSTEM "chrome://browser/locale/tabbrowser.dtd" >
 %tabBrowserDTD;
 <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
 %globalDTD;
 ]>
 
 <bindings id="globalBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:xbl="http://www.mozilla.org/xbl">
 
-  <binding id="tabbrowser-tab" extends="chrome://global/content/bindings/tabbrowser.xml#tabbrowser-tab">
+  <binding id="tabbrowser-tab" extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tab">
     <content chromedir="&locale.dir;"
              closetabtext="&closeTab.label;">
       <xul:hbox class="tab-image-left" xbl:inherits="selected"/>
       <xul:hbox flex="1" class="tab-image-middle" align="center" xbl:inherits="selected">
         <xul:stack class="tab-icon">
           <xul:image xbl:inherits="validate,src=image" class="tab-icon-image"/>
           <xul:image class="tab-extra-status"/>
         </xul:stack>
         <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
       </xul:hbox>
       <xul:toolbarbutton anonid="close-button" class="tab-close-button" tabindex="-1"/>
         <xul:hbox class="tab-image-right" xbl:inherits="selected"/>
     </content>
   </binding>
-  
+
    <binding id="tabbrowser-tabs"  
-            extends="chrome://global/content/bindings/tabbrowser.xml#tabbrowser-tabs">
+            extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tabs">
     <content>
       <xul:stack flex="1" class="tabs-stack">
         <xul:vbox>
           <xul:spacer flex="1"/>
           <xul:hbox class="tabs-bottom" align="center"/>
         </xul:vbox>
         <xul:vbox>
           <xul:hbox>
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -1223,16 +1223,491 @@ toolbar[mode="text"] #navigator-throbber
   list-style-image: url("chrome://browser/skin/Throbber-small.png");
 }
 toolbar[iconsize="small"] #navigator-throbber[busy="true"],
 toolbar[mode="text"] #navigator-throbber[busy="true"] {
   list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
   opacity: 0.5;
 }
 
+/**
+ * Tabbrowser Tabs
+ */
+
+.tabbrowser-tabs {
+  -moz-binding: url("chrome://browser/skin/tabbrowser/tabbrowserBindings.xml#tabbrowser-tabs") !important;
+  padding-top: 0px;
+  background: -moz-dialog url("chrome://browser/skin/tabbrowser/tabbrowser-tabs-bkgnd.png") !important;
+  -moz-padding-start: 0px;
+}
+
+.tabbrowser-tabs[overflow="true"] {
+  -moz-padding-start: 0px;
+}
+
+/**
+ * Tab
+ */
+
+.tabbrowser-tab {
+  -moz-appearance: none !important;
+  -moz-binding: url("chrome://browser/skin/tabbrowser/tabbrowserBindings.xml#tabbrowser-tab") !important;
+  background: transparent !important;
+  margin: 0px 0px 1px !important;
+  padding: 0px !important;
+  border: none !important;
+  height: 22px !important;
+}
+
+.tabbrowser-tab > .tab-image-middle {
+  padding-top: 1px;
+  -moz-padding-start: 1px;
+}
+
+.tabbrowser-tab[busy] > .tab-image-middle > .tab-icon > .tab-icon-image {
+  list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif") !important;
+  opacity: 0.6;
+}
+
+.tabbrowser-tab[selected="true"] {
+  font-weight: bold;
+}
+
+.tabbrowser-tab[selected="true"] > .tab-image-middle > .tab-text {
+  opacity: 1.0 !important;
+}
+
+.tabbrowser-tab > .tab-image-left {
+  width: 8px;
+  height: 24px;
+  background: url("chrome://browser/skin/tabbrowser/tab-left.png") no-repeat;
+  background-color: -moz-dialog;
+  -moz-border-radius-topleft: 4px;
+}
+
+.tabbrowser-tab[chromedir="rtl"] > .tab-image-left {
+  background: url("chrome://browser/skin/tabbrowser/tab-right.png") no-repeat;
+  background-color: -moz-dialog;
+  -moz-border-radius-topleft: 0px;
+  -moz-border-radius-topright: 4px;
+}
+
+.tabbrowser-tab:not([selected="true"]):not(:hover) > .tab-image-left {
+  background: url("chrome://browser/skin/tabbrowser/tab-left-bkgnd.png") no-repeat;
+  background-color: -moz-dialog;
+}
+
+.tabbrowser-tab[chromedir="rtl"]:not([selected="true"]):not(:hover) > .tab-image-left {
+  background: url("chrome://browser/skin/tabbrowser/tab-right-bkgnd.png") no-repeat;
+  background-color: -moz-dialog;
+}
+
+.tabbrowser-tab > .tab-image-middle {
+  height: 24px;
+  background: url("chrome://browser/skin/tabbrowser/tab-middle.png") repeat-x;
+  background-color: -moz-dialog;
+}
+
+.tabbrowser-tab:not([selected="true"]):not(:hover) > .tab-image-middle {
+  background: url("chrome://browser/skin/tabbrowser/tab-middle-bkgnd.png") repeat-x;
+  background-color: -moz-dialog;
+}
+
+.tabbrowser-tab > .tab-image-right {
+  width: 8px;
+  height: 24px;
+  background: url("chrome://browser/skin/tabbrowser/tab-right.png") no-repeat;
+  background-color: -moz-dialog;
+  -moz-border-radius-topright: 4px;
+}
+
+.tabbrowser-tab[chromedir="rtl"] > .tab-image-right {
+  background: url("chrome://browser/skin/tabbrowser/tab-left.png") no-repeat;
+  background-color: -moz-dialog;
+  -moz-border-radius-topleft: 4px;
+  -moz-border-radius-topright: 0px;
+}
+
+.tabbrowser-tab:not([selected="true"]):not(:hover) > .tab-image-right {
+  background: url("chrome://browser/skin/tabbrowser/tab-right-bkgnd.png") no-repeat;
+  background-color: -moz-dialog;
+}
+
+.tabbrowser-tab[chromedir="rtl"]:not([selected="true"]):not(:hover) > .tab-image-right {
+  background: url("chrome://browser/skin/tabbrowser/tab-left-bkgnd.png") no-repeat;
+  background-color: -moz-dialog;
+}
+
+.tabbrowser-tab:not([selected="true"]) > .tab-image-left,
+.tabbrowser-tab:not([selected="true"]) > .tab-image-middle,
+.tabbrowser-tab:not([selected="true"]) > .tab-image-right {
+  height: 23px;
+  margin-bottom: 1px;
+}
+
+.tab-icon-image {
+  margin-top: 1px;
+  -moz-margin-end: 3px;
+  width: 16px;
+  height: 16px;
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.tabs-bottom {
+  height: 4px !important;
+  margin: 0px !important;
+  background: -moz-dialog url("chrome://browser/skin/tabbrowser/tabstrip-bottom.png") repeat !important;
+  border-top: 1px solid threedshadow; 
+  border-bottom: 1px solid threedshadow;
+}
+
+tabpanels {
+  -moz-appearance: none;
+}
+
+.tabs-left,
+.tabs-right {
+  width: 3px;
+  border-bottom-width: 0px;
+}
+
+/* tabbrowser-tab focus ring */
+.tabbrowser-tab >  .tab-image-middle > .tab-text {
+  border: 1px dotted transparent;
+}
+
+.tabbrowser-tab:focus > .tab-image-middle > .tab-text {
+  border: 1px dotted -moz-DialogText;
+}
+
+/**
+ * Tab Drag and Drop
+ */
+
+.tab-drop-indicator-bar {
+    visibility: hidden;
+    height: 9px;
+    margin-top: -9px;
+    position: relative;
+}
+
+.tab-drop-indicator {
+    height: 9px;
+    width: 9px;
+    margin-bottom: -5px;
+    position: relative;
+    background: url('chrome://browser/skin/tabbrowser/tabDragIndicator.png') 50% 50% no-repeat;
+}
+
+.tab-drop-indicator-bar[dragging="true"] {
+    visibility: visible;
+}
+
+/**
+ * In-tab close button
+ */
+.tab-close-button > .toolbarbutton-icon {
+  -moz-margin-end: 0px !important;
+  margin-top: 1px;
+}
+
+.tab-close-button {
+  -moz-appearance: none;
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+  height: 24px;
+  border: none !important;
+  padding: 0px;
+  cursor: default;
+  list-style-image: url("chrome://global/skin/icons/close.png");
+}
+
+.tabbrowser-tab:not([selected="true"]) > .tab-close-button {
+  height: 23px;
+  margin-bottom: 1px;
+}
+
+.tabbrowser-tab:not([selected="true"]) > .tab-close-button > .toolbarbutton-icon {
+  margin-top: 2px;
+}
+
+.tab-close-button:hover,
+.tabbrowser-tab[selected="true"] > .tab-close-button:hover {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+  opacity: 1.0;
+}
+
+.tab-close-button:hover:active,
+.tabbrowser-tab[selected="true"] > .tab-close-button:hover:active {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+  opacity: 1.0;
+}
+
+.tabbrowser-tab > .tab-close-button {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-middle-bkgnd.png");
+  background-color: -moz-dialog;
+}
+
+.tabbrowser-tab:hover > .tab-close-button {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-middle.png");
+}
+
+.tabbrowser-tab[selected="true"] > .tab-close-button {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-middle.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+  /* Make this button focusable so clicking on it will not focus the tab while
+     it's getting closed */
+  -moz-user-focus: normal;
+}
+
+.tab-close-button:focus {
+  outline: none !important;
+}
+
+/**
+ * Tab Scrollbox Arrow Buttons
+ */
+
+.tabbrowser-tabs[overflow="true"] .tabs-left {
+  display: none;
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up {
+  -moz-appearance: none !important;
+  border: none !important;
+  margin-top: 2px;
+  margin-bottom: 4px !important;
+  padding: 0px;
+  width: 18px;
+  height: 23px;
+  -moz-margin-start: 0px;
+  -moz-margin-end: 0px;
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start.png");
+  -moz-image-region: rect(0, 11px, 14px, 0);
+  background-repeat: no-repeat;
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start-bkgnd-enabled.png");
+  background-color: -moz-dialog;
+  -moz-border-radius-topright: 4px;
+}
+
+.tabbrowser-arrowscrollbox[chromedir="rtl"] > .scrollbutton-up {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end.png");
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd-enabled.png");
+  -moz-border-radius-topleft: 4px;
+  -moz-border-radius-topright: 0px;
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled="true"] {
+  -moz-image-region: rect(0, 33px, 14px, 22px);
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start-bkgnd-disabled.png");
+}
+
+.tabbrowser-arrowscrollbox[chromedir="rtl"] > .scrollbutton-up[disabled="true"] {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd-disabled.png");
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled="true"]):hover {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start-bkgnd-hover.png");
+  -moz-image-region: rect(0, 22px, 14px, 11px);
+}
+
+.tabbrowser-arrowscrollbox[chromedir="rtl"] > .scrollbutton-up:not([disabled="true"]):hover {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd-hover.png");
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0, 44px, 14px, 33px);
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon {    
+  margin: 6px 0px 0px 0px;
+}                                                                            
+
+.tabbrowser-arrowscrollbox > .scrollbutton-down-stack {
+  margin-top: 2px;
+  margin-bottom: 4px;
+  height: 23px;
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down-box {
+  -moz-appearance: none !important;
+  border: none !important;
+  width: 18px;
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd-enabled.png");
+  background-repeat: no-repeat;	
+  background-color: -moz-dialog;
+  -moz-border-radius-topleft: 4px;
+}
+
+.tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-down-box {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start-bkgnd-enabled.png");
+  -moz-border-radius-topleft: 0px;
+  -moz-border-radius-topright: 4px;
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down-box[disabled="true"] {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd-disabled.png");
+}
+
+.tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-down-box[disabled="true"] {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start-bkgnd-disabled.png");
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down-box-animate {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd-animate.png");
+  background-repeat: no-repeat;
+  opacity: 0.0;
+}
+
+.tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-down-box-animate {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start-bkgnd-animate.png");
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down {
+  -moz-appearance: none !important;
+  border: none !important;
+  width: 18px;
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end.png");
+  -moz-image-region: rect(0, 11px, 14px, 0);
+  margin: 0px;
+  padding: 0px;
+}
+
+.tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-down {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start.png");
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down[disabled="true"] {
+  -moz-image-region: rect(0, 33px, 14px, 22px);
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down:not([disabled="true"]):hover {
+  -moz-image-region: rect(0, 22px, 14px, 11px);
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd-hover.png");
+  background-repeat: no-repeat;
+  background-position: top left;
+}
+
+.tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-down:not([disabled="true"]):hover {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start-bkgnd-hover.png");
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0, 44px, 14px, 33px);
+}
+
+.tabbrowser-arrowscrollbox > stack > .scrollbutton-down > .toolbarbutton-icon {
+  margin: 6px 0px 0px 1px;
+}
+
+/**
+ * All Tabs Button
+ */
+
+.tabs-alltabs-box {
+  margin-top: 2px;
+  margin-bottom: 4px;
+  width: 18px !important;
+  height: 23px !important;
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd-enabled.png");
+  background-repeat: no-repeat;
+  background-color: -moz-dialog; 
+  -moz-border-radius-topleft: 4px;
+}
+
+stack[chromedir="rtl"] > hbox > .tabs-alltabs-box {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start-bkgnd-enabled.png");
+  -moz-border-radius-topleft: 0px;
+  -moz-border-radius-topright: 4px;
+}
+
+.tabbrowser-tabs[overflow="true"] .tabs-alltabs-box {
+  background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-end-bkgnd.png");
+  -moz-border-radius-topleft: 0px;
+  -moz-border-radius-topright: 0px;
+}
+
+.tabbrowser-tabs[overflow="true"] stack[chromedir="rtl"] > hbox > .tabs-alltabs-box {
+  background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-start-bkgnd.png");
+}
+
+.tabs-alltabs-button {
+  -moz-appearance: none !important;
+  border: 0px !important;
+  margin-top: 2px;
+  margin-bottom: 4px;
+  width: 18px !important;
+  height: 23px !important;
+  border: 0px !important;
+  -moz-padding-start: 4px !important;
+  -moz-padding-end: 4px !important;
+  padding: 0px;
+}
+
+.tabs-alltabs-button > .toolbarbutton-text {
+  display: none;
+}
+
+.tabs-alltabs-button > .toolbarbutton-icon {
+  -moz-margin-end: 2px;
+}
+
+.tabs-alltabs-button > .toolbarbutton-menu-dropmarker {
+  margin-top: 3px !important;
+}
+
+.tabs-alltabs-button:hover {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd-hover.png");
+  background-repeat: no-repeat;
+}
+
+stack[chromedir="rtl"] > hbox > .tabs-alltabs-button:hover {
+  background-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start-bkgnd-hover.png");
+}
+
+.tabbrowser-tabs[overflow="true"] .tabs-alltabs-button:hover {
+  background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-end-bkgnd-hover.png");
+}
+
+.tabbrowser-tabs[overflow="true"] stack[chromedir="rtl"] > hbox > .tabs-alltabs-button:hover {
+  background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-start-bkgnd-hover.png");
+}
+
+.tabs-alltabs-box-animate {
+  margin-top: 2px;
+  margin-bottom: 4px;
+  width: 18px !important;
+  height: 23px !important;
+  background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-end-bkgnd-animate.png");
+  background-repeat: no-repeat;
+  opacity: 0.0;
+}
+
+stack[chromedir="rtl"] > hbox > .tabs-alltabs-box-animate {
+  background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-start-bkgnd-animate.png");
+}
+
+/**
+ * All Tabs Menupopup 
+ */
+
+.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.alltabs-item[selected="true"] {
+  font-weight: bold;
+}
+
+.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
+  opacity: 0.6;
+}
+
 .tabs-closebutton > .toolbarbutton-icon {
   -moz-margin-end: 0px !important;
   -moz-padding-end: 2px !important;
   -moz-padding-start: 2px !important;
 }
 
 .tabs-closebutton {
   list-style-image: url("chrome://global/skin/icons/close.png");
--- a/browser/themes/winstripe/browser/jar.mn
+++ b/browser/themes/winstripe/browser/jar.mn
@@ -60,10 +60,36 @@ classic.jar:
         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)
+        skin/classic/browser/tabbrowser/alltabs-box-overflow-end-bkgnd.png           (tabbrowser/alltabs-box-overflow-end-bkgnd.png)
+        skin/classic/browser/tabbrowser/alltabs-box-overflow-end-bkgnd-animate.png   (tabbrowser/alltabs-box-overflow-end-bkgnd-animate.png)
+        skin/classic/browser/tabbrowser/alltabs-box-overflow-end-bkgnd-hover.png     (tabbrowser/alltabs-box-overflow-end-bkgnd-hover.png)
+        skin/classic/browser/tabbrowser/alltabs-box-overflow-start-bkgnd.png         (tabbrowser/alltabs-box-overflow-start-bkgnd.png)
+        skin/classic/browser/tabbrowser/alltabs-box-overflow-start-bkgnd-animate.png (tabbrowser/alltabs-box-overflow-start-bkgnd-animate.png)        
+        skin/classic/browser/tabbrowser/alltabs-box-overflow-start-bkgnd-hover.png   (tabbrowser/alltabs-box-overflow-start-bkgnd-hover.png)
+        skin/classic/browser/tabbrowser/tab-arrow-end.png                  (tabbrowser/tab-arrow-end.png)
+        skin/classic/browser/tabbrowser/tab-arrow-end-bkgnd-animate.png    (tabbrowser/tab-arrow-end-bkgnd-animate.png)
+        skin/classic/browser/tabbrowser/tab-arrow-end-bkgnd-disabled.png   (tabbrowser/tab-arrow-end-bkgnd-disabled.png)
+        skin/classic/browser/tabbrowser/tab-arrow-end-bkgnd-enabled.png    (tabbrowser/tab-arrow-end-bkgnd-enabled.png)
+        skin/classic/browser/tabbrowser/tab-arrow-end-bkgnd-hover.png      (tabbrowser/tab-arrow-end-bkgnd-hover.png)
+        skin/classic/browser/tabbrowser/tab-arrow-start.png                (tabbrowser/tab-arrow-start.png)
+        skin/classic/browser/tabbrowser/tab-arrow-start-bkgnd-animate.png  (tabbrowser/tab-arrow-start-bkgnd-animate.png)
+        skin/classic/browser/tabbrowser/tab-arrow-start-bkgnd-disabled.png (tabbrowser/tab-arrow-start-bkgnd-disabled.png)
+        skin/classic/browser/tabbrowser/tab-arrow-start-bkgnd-enabled.png  (tabbrowser/tab-arrow-start-bkgnd-enabled.png)
+        skin/classic/browser/tabbrowser/tab-arrow-start-bkgnd-hover.png    (tabbrowser/tab-arrow-start-bkgnd-hover.png)
+        skin/classic/browser/tabbrowser/tabbrowserBindings.xml             (tabbrowser/tabbrowserBindings.xml)
+        skin/classic/browser/tabbrowser/tabbrowser-tabs-bkgnd.png          (tabbrowser/tabbrowser-tabs-bkgnd.png)
+        skin/classic/browser/tabbrowser/tabDragIndicator.png               (tabbrowser/tabDragIndicator.png)
+        skin/classic/browser/tabbrowser/tab-left.png                       (tabbrowser/tab-left.png)
+        skin/classic/browser/tabbrowser/tab-left-bkgnd.png                 (tabbrowser/tab-left-bkgnd.png)
+        skin/classic/browser/tabbrowser/tab-middle.png                     (tabbrowser/tab-middle.png)
+        skin/classic/browser/tabbrowser/tab-middle-bkgnd.png               (tabbrowser/tab-middle-bkgnd.png)
+        skin/classic/browser/tabbrowser/tab-right.png                      (tabbrowser/tab-right.png)
+        skin/classic/browser/tabbrowser/tab-right-bkgnd.png                (tabbrowser/tab-right-bkgnd.png)
+        skin/classic/browser/tabbrowser/tabstrip-bottom.png                (tabbrowser/tabstrip-bottom.png)
         icon.png
         preview.png
--- a/browser/themes/winstripe/browser/tabbrowser/tabbrowserBindings.xml
+++ b/browser/themes/winstripe/browser/tabbrowser/tabbrowserBindings.xml
@@ -1,83 +1,40 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE bindings [
-<!ENTITY % tabBrowserDTD SYSTEM "chrome://global/locale/tabbrowser.dtd" >
+<!ENTITY % tabBrowserDTD SYSTEM "chrome://browser/locale/tabbrowser.dtd" >
 %tabBrowserDTD;
 <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
 %globalDTD;
 ]>
 
 <bindings id="globalBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:xbl="http://www.mozilla.org/xbl">
 
-  <binding id="radio"
-           extends="chrome://global/content/bindings/radio.xml#radio">
-    <content>
-      <xul:hbox class="radio-check-box1" xbl:inherits="selected,checked,disabled">
-        <xul:hbox class="radio-check-box2" flex="1">
-          <xul:image class="radio-check" xbl:inherits="selected,checked,disabled"/>
-        </xul:hbox>
-      </xul:hbox>
-      <xul:hbox class="radio-label-box" flex="1">
-        <xul:image class="radio-icon" xbl:inherits="src"/>
-        <xul:label class="radio-label" xbl:inherits="xbl:text=label,accesskey,crop" flex="1"/>
-      </xul:hbox>
-    </content>
-  </binding>
-
-  <binding id="radio-with-spacing"
-           extends="chrome://global/skin/globalBindings.xml#radio">
-
-    <content>
-      <xul:hbox class="radio-spacer-box">
-        <xul:hbox class="radio-check-box1" xbl:inherits="selected,checked,disabled">
-          <xul:hbox class="radio-check-box2" flex="1">
-            <xul:image class="radio-check" xbl:inherits="selected,checked,disabled"/>
-          </xul:hbox>
-        </xul:hbox>
-      </xul:hbox>
-      <xul:hbox class="radio-label-center-box" flex="1">
-        <xul:hbox class="radio-label-box" flex="1">
-          <xul:image class="radio-icon" xbl:inherits="src"/>
-          <xul:label class="radio-label" xbl:inherits="xbl:text=label,accesskey,crop" flex="1"/>
-        </xul:hbox>
-      </xul:hbox>
-    </content>
-  </binding>
-
-  <binding id="toolbarpaletteitem-spacer" extends="chrome://global/content/bindings/toolbar.xml#toolbarpaletteitem">
-    <content>
-      <xul:spacer class="spacer-left"/>
-      <children/>
-      <xul:spacer class="spacer-right"/>
-    </content>
-  </binding>
-
-  <binding id="tabbrowser-tab" extends="chrome://global/content/bindings/tabbrowser.xml#tabbrowser-tab">
+  <binding id="tabbrowser-tab" extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tab">
     <content chromedir="&locale.dir;"
              closetabtext="&closeTab.label;">
       <xul:hbox class="tab-image-left" xbl:inherits="selected"/>
       <xul:hbox flex="1" class="tab-image-middle" align="center" xbl:inherits="selected">
         <xul:stack class="tab-icon">
           <xul:image xbl:inherits="validate,src=image" class="tab-icon-image"/>
           <xul:image class="tab-extra-status"/>
         </xul:stack>
         <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
       </xul:hbox>
       <xul:toolbarbutton anonid="close-button" class="tab-close-button" tabindex="-1"/>
         <xul:hbox class="tab-image-right" xbl:inherits="selected"/>
     </content>
   </binding>
-  
+
    <binding id="tabbrowser-tabs"  
-            extends="chrome://global/content/bindings/tabbrowser.xml#tabbrowser-tabs">
+            extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tabs">
     <content>
       <xul:stack flex="1" class="tabs-stack">
         <xul:vbox>
           <xul:spacer flex="1"/>
           <xul:hbox class="tabs-bottom" align="center"/>
         </xul:vbox>
         <xul:vbox>
           <xul:hbox>
@@ -109,29 +66,9 @@
               <xul:toolbarbutton class="close-button tabs-closebutton"/>
             </xul:hbox>
           </xul:hbox>
           <xul:spacer class="tabs-bottom-spacer"/>
         </xul:vbox>
       </xul:stack>
     </content>
   </binding>
-
-  <binding id="history-dropmarker"
-           extends="chrome://global/content/bindings/autocomplete.xml#history-dropmarker">
-    <content>
-      <xul:stack class="history-dropmarker-stack">
-        <xul:vbox class="autocomplete-dropmarker-bkgnd-box">
-          <xul:image class="autocomplete-dropmarker-bkgnd-top autocomplete-dropmarker-bkgnd"/>
-          <xul:vbox flex="1" class="autocomplete-dropmarker-inner-box">
-            <xul:image flex="1" class="autocomplete-dropmarker-bkgnd-mid-top autocomplete-dropmarker-bkgnd"/>
-            <xul:image flex="1" class="autocomplete-dropmarker-bkgnd-mid-bottom autocomplete-dropmarker-bkgnd"/>
-          </xul:vbox>
-          <xul:image class="autocomplete-dropmarker-bkgnd-bottom autocomplete-dropmarker-bkgnd"/>
-        </xul:vbox>
-
-        <xul:hbox align="center" class="dropmarker-image-container">
-          <xul:image class="dropmarker-image"/>
-        </xul:hbox>
-      </xul:stack>
-    </content>
-  </binding>
 </bindings>
--- a/netwerk/test/jarlist.dat
+++ b/netwerk/test/jarlist.dat
@@ -144,17 +144,16 @@ jar:resource:///chrome/venkman.jar!/loca
 jar:resource:///chrome/en-US.jar!/locale/en-US/wallet/walletTasksOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/global/charsetOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/navigator/linkToolbar.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/sidebar/sidebarOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/permissions/imageContextOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/wallet/walletContextOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/securityOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/bookmarks/bookmarksOverlay.dtd
-jar:resource:///chrome/en-US.jar!/locale/en-US/global/tabbrowser.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/global/textcontext.dtd
 jar:resource:///chrome/comm.jar!/content/navigator/navigator.xul
 jar:resource:///chrome/comm.jar!/content/wallet/walletNavigatorOverlay.xul
 jar:resource:///chrome/comm.jar!/content/navigator/navigatorOverlay.xul
 jar:resource:///chrome/messenger.jar!/content/messenger/mailNavigatorOverlay.xul
 jar:resource:///chrome/messenger.jar!/content/messenger/mailOverlay.xul
 jar:resource:///chrome/comm.jar!/content/editor/editorNavigatorOverlay.xul
 jar:resource:///chrome/toolkit.jar!/content/global/globalOverlay.xul
@@ -180,17 +179,16 @@ jar:resource:///chrome/toolkit.jar!/cont
 jar:resource:///chrome/toolkit.jar!/content/global/bindings/general.xml
 jar:resource:///chrome/modern.jar!/skin/modern/global/globalBindings.xml
 jar:resource:///chrome/toolkit.jar!/content/global/bindings/stringbundle.xml
 jar:resource:///chrome/modern.jar!/skin/modern/navigator/resources.xml
 jar:resource:///chrome/toolkit.jar!/content/global/bindings/popup.xml
 jar:resource:///chrome/toolkit.jar!/content/global/bindings/toolbar.xml
 jar:resource:///chrome/toolkit.jar!/content/global/bindings/splitter.xml
 jar:resource:///chrome/modern.jar!/skin/modern/communicator/sidebar/sidebarBindings.xml
-jar:resource:///chrome/toolkit.jar!/content/global/bindings/tabbrowser.xml
 jar:resource:///chrome/toolkit.jar!/content/global/bindings/toolbarbutton.xml
 jar:resource:///chrome/toolkit.jar!/content/global/bindings/text.xml
 jar:resource:///chrome/toolkit.jar!/content/global/bindings/progressmeter.xml
 jar:resource:///chrome/toolkit.jar!/content/global/bindings/menu.xml
 jar:resource:///chrome/modern.jar!/skin/modern/communicator/toolbar/toolbarBindings.xml
 jar:resource:///chrome/toolkit.jar!/content/global/bindings/tabbox.xml
 jar:resource:///chrome/toolkit.jar!/content/global/bindings/browser.xml
 jar:resource:///chrome/toolkit.jar!/content/global/bindings/button.xml
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -59,17 +59,16 @@ toolkit.jar:
 *+ content/global/bindings/richlistbox.xml     (widgets/richlistbox.xml)
 *+ content/global/bindings/scale.xml           (widgets/scale.xml)
 *+ content/global/bindings/scrollbar.xml       (widgets/scrollbar.xml)
 *+ content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)
 *+ content/global/bindings/splitter.xml        (widgets/splitter.xml)
 *+ content/global/bindings/spinbuttons.xml     (widgets/spinbuttons.xml)
 *+ content/global/bindings/stringbundle.xml    (widgets/stringbundle.xml)
 *+ content/global/bindings/tabbox.xml          (widgets/tabbox.xml)
-*+ content/global/bindings/tabbrowser.xml      (widgets/tabbrowser.xml)
 *+ content/global/bindings/text.xml            (widgets/text.xml)
 *+ content/global/bindings/textbox.xml         (widgets/textbox.xml)
 *+ content/global/bindings/toolbar.xml         (widgets/toolbar.xml)
 *+ content/global/bindings/toolbarbutton.xml   (widgets/toolbarbutton.xml)
 *+ content/global/bindings/tree.xml            (widgets/tree.xml)
 *+ content/global/bindings/wizard.xml          (widgets/wizard.xml)
 *+ content/global/bindings/findbar.xml         (widgets/findbar.xml)
 #ifdef XP_MACOSX
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -144,20 +144,16 @@ editor,
 iframe {
   display: inline;
 }
 
 browser {
   -moz-binding: url("chrome://global/content/bindings/browser.xml#browser");
 }
 
-tabbrowser {
-  -moz-binding: url("chrome://global/content/bindings/tabbrowser.xml#tabbrowser");
-}
-
 editor {
   -moz-binding: url("chrome://global/content/bindings/editor.xml#editor");
 }
 
 iframe {
   -moz-binding: url("chrome://global/content/bindings/general.xml#iframe");
 }
 
@@ -612,55 +608,21 @@ tabs[closebutton="true"] {
 }
 
 tab {
   -moz-binding: url("chrome://global/content/bindings/tabbox.xml#tab");
   -moz-box-align: center;
   -moz-box-pack: center;
 }
 
-.tabbrowser-tabs {
-  -moz-binding: url("chrome://global/content/bindings/tabbrowser.xml#tabbrowser-tabs");
-}
-
-.tabbrowser-arrowscrollbox {
-  -moz-binding: url("chrome://global/content/bindings/tabbrowser.xml#tabbrowser-arrowscrollbox");
-}
-
-.tabbrowser-tabs > .tabbrowser-tab {
-  -moz-binding: url("chrome://global/content/bindings/tabbrowser.xml#tabbrowser-tab");
-}
-
-.tabbrowser-tabs > .tabbrowser-tab > .tab-close-button,
-.tabbrowser-tabs .tabs-closebutton-box > .tabs-closebutton {
-  -moz-binding: url("chrome://global/content/bindings/tabbrowser.xml#tabbrowser-close-tab-button");
-}
-
-.tab-close-button {
-  display: none;
-}
-
-.tabbrowser-tabs:not([closebuttons="noclose"]):not([closebuttons="closeatend"]) > .tabbrowser-tab[selected="true"] > .tab-close-button {
-  display: -moz-box;
-}
-
-.tabbrowser-tabs[closebuttons="alltabs"] > .tabbrowser-tab > .tab-close-button {
-  display: -moz-box;
-}
-
 tabpanels {
   -moz-binding: url("chrome://global/content/bindings/tabbox.xml#tabpanels");
   display: -moz-deck;
 }
 
-.tabs-alltabs-popup {
-  -moz-binding: url("chrome://global/content/bindings/tabbrowser.xml#tabbrowser-alltabs-popup");
-}
-
-
 /********** progressmeter **********/
 
 progressmeter {
   -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter");
 }
 
 /********** basic rule for anonymous content that needs to pass box properties through
  ********** to an insertion point parent that holds the real kids **************/
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -36,18 +36,16 @@
 + locale/@AB_CD@/global/printdialog.dtd                 (%chrome/global/printdialog.dtd)
 + locale/@AB_CD@/global/printjoboptions.dtd             (%chrome/global/printjoboptions.dtd)
 + locale/@AB_CD@/global/printPageSetup.dtd              (%chrome/global/printPageSetup.dtd)
 + locale/@AB_CD@/global/printPreview.dtd                (%chrome/global/printPreview.dtd)
 + locale/@AB_CD@/global/printPreviewProgress.dtd        (%chrome/global/printPreviewProgress.dtd)
 + locale/@AB_CD@/global/printProgress.dtd               (%chrome/global/printProgress.dtd)
 + locale/@AB_CD@/global/regionNames.properties          (%chrome/global/regionNames.properties)
 + locale/@AB_CD@/global/dialog.properties               (%chrome/global/dialog.properties)
-+ locale/@AB_CD@/global/tabbrowser.dtd                  (%chrome/global/tabbrowser.dtd)
-+ locale/@AB_CD@/global/tabbrowser.properties           (%chrome/global/tabbrowser.properties)
 + locale/@AB_CD@/global/tree.dtd                        (%chrome/global/tree.dtd)
 + locale/@AB_CD@/global/textcontext.dtd                 (%chrome/global/textcontext.dtd)
 + locale/@AB_CD@/global/viewSource.dtd                  (%chrome/global/viewSource.dtd)
 + locale/@AB_CD@/global/viewSource.properties           (%chrome/global/viewSource.properties)
 + locale/@AB_CD@/global/wizard.dtd                      (%chrome/global/wizard.dtd)
 + locale/@AB_CD@/global/wizard.properties               (%chrome/global/wizard.properties)
   locale/@AB_CD@/global/nsHelperAppDlg.dtd              (%chrome/global/nsHelperAppDlg.dtd)
   locale/@AB_CD@/global/nsHelperAppDlg.properties       (%chrome/global/nsHelperAppDlg.properties)
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -1,42 +1,31 @@
 classic.jar:
 % skin global classic/1.0 %skin/classic/global/
 +  skin/classic/global/10pct_transparent_grey.png
 +  skin/classic/global/10pct_transparent_pixel.png
 +  skin/classic/global/20pct_transparent_pixel.png
 +  skin/classic/global/50pct_transparent_grey.png
 +  skin/classic/global/50pct_transparent_white.png
 +  skin/classic/global/about.css                                      (../../winstripe/global/about.css)
-+  skin/classic/global/activetab-left.png
-+  skin/classic/global/activetab-middle.png
-+  skin/classic/global/activetab-right.png
 +  skin/classic/global/arrow.css
-+  skin/classic/global/alltabs-box-bkgnd.png
-+  skin/classic/global/alltabs-box-overflow-bkgnd.png
-+  skin/classic/global/alltabs-box-overflow-bkgnd-animate.png
 +  skin/classic/global/autocomplete.css
-*+  skin/classic/global/browser.css
 +  skin/classic/global/button.css
 +  skin/classic/global/checkbox.css
 +  skin/classic/global/closetab.png
 +  skin/classic/global/colorpicker.css
 +  skin/classic/global/config.css
 +  skin/classic/global/customizeToolbar.css
 +  skin/classic/global/dialog.css
 +  skin/classic/global/dropmarker.css
 +  skin/classic/global/filepicker.css
 +  skin/classic/global/formatting.css
 +  skin/classic/global/findBar.css
 +  skin/classic/global/global.css
-+  skin/classic/global/globalBindings.xml
 +  skin/classic/global/groupbox.css
-+  skin/classic/global/inactive-icon-black.png
-+  skin/classic/global/inactivetab-icon-black.png
-+  skin/classic/global/inactivetab-icon-grey.png
 +  skin/classic/global/linkTree.css
 +  skin/classic/global/listbox_highlight.png
 +  skin/classic/global/listbox.css
 +  skin/classic/global/menu.css
 +  skin/classic/global/menulist.css
 +  skin/classic/global/notification.css
 +  skin/classic/global/netError.css
 +  skin/classic/global/numberbox.css
@@ -49,34 +38,17 @@ classic.jar:
 # chrome://global/skin/nativescrollbars.css is used on Mac
 +  skin/classic/global/nativescrollbars.css
 # chrome://global/skin/xulscrollbars.css is used on non-Mac platforms
 +  skin/classic/global/xulscrollbars.css                              (../../winstripe/global/xulscrollbars.css)
 *+ skin/classic/global/scale.css
 +  skin/classic/global/scrollbox.css
 +  skin/classic/global/spinbuttons.css
 +  skin/classic/global/splitter.css
-+  skin/classic/global/tab-arrow-start.png
-+  skin/classic/global/tab-arrow-start-bkgnd.png
-+  skin/classic/global/tab-arrow-start-bkgnd-animate.png
-+  skin/classic/global/tab-arrow-end.png
-+  skin/classic/global/tab-arrow-end-bkgnd.png
-+  skin/classic/global/tab-arrow-end-bkgnd-animate.png
-+  skin/classic/global/tab-left.png
-+  skin/classic/global/tab-middle.png
-+  skin/classic/global/tab-right.png
-+  skin/classic/global/tab-left-bkgnd.png
-+  skin/classic/global/tab-middle-bkgnd.png
-+  skin/classic/global/tab-right-bkgnd.png
-+  skin/classic/global/tab-left-hover.png
-+  skin/classic/global/tab-middle-hover.png
-+  skin/classic/global/tab-right-hover.png
 +  skin/classic/global/tabbox.css
-+  skin/classic/global/tabbrowser-tabs-bkgnd.png
-+  skin/classic/global/tabs-bottom-bg.png
 +  skin/classic/global/textbox.css
 +  skin/classic/global/datetimepicker.css
 +  skin/classic/global/toolbar.css
 +  skin/classic/global/toolbarbutton.css
 +  skin/classic/global/tree.css
 +  skin/classic/global/wizard.css
 +  skin/classic/global/wizardOverlay.css
 +  skin/classic/global/arrow/arrow-dn-dis.gif                         (arrow/arrow-dn-dis.gif)
@@ -170,17 +142,16 @@ classic.jar:
 +  skin/classic/global/scrollbox/autorepeat-arrow-dn-dis.gif          (scrollbox/autorepeat-arrow-dn-dis.gif)
 +  skin/classic/global/scrollbox/autorepeat-arrow-up.gif              (scrollbox/autorepeat-arrow-up.gif)
 +  skin/classic/global/scrollbox/autorepeat-arrow-up-dis.gif          (scrollbox/autorepeat-arrow-up-dis.gif)
 +  skin/classic/global/splitter/dimple.png                            (splitter/dimple.png)
 +  skin/classic/global/splitter/grip-hrz-after.gif                    (splitter/grip-hrz-after.gif)
 +  skin/classic/global/splitter/grip-hrz-before.gif                   (splitter/grip-hrz-before.gif)
 +  skin/classic/global/splitter/grip-vrt-after.gif                    (splitter/grip-vrt-after.gif)
 +  skin/classic/global/splitter/grip-vrt-before.gif                   (splitter/grip-vrt-before.gif)
-+  skin/classic/global/tabDragDrop/tabDragIndicator.png               (tabDragDrop/tabDragIndicator.png)
 +  skin/classic/global/toolbar/Lighten.png                            (toolbar/Lighten.png)
 +  skin/classic/global/toolbar/dropmark-nav.png                       (toolbar/dropmark-nav.png)
 +  skin/classic/global/toolbar/dropmark-nav-small.png                 (toolbar/dropmark-nav-small.png)
 +  skin/classic/global/toolbar/spring.gif                             (toolbar/spring.gif)
 +  skin/classic/global/toolbar/toolbar-background.gif                 (toolbar/toolbar-background.gif)
 +  skin/classic/global/toolbar/toolbar-pinstripe-overlay.png          (toolbar/toolbar-pinstripe-overlay.png)
 +  skin/classic/global/toolbar/toolbar-separator.png                  (toolbar/toolbar-separator.png)
 +  skin/classic/global/toolbar/toolbarbutton-customhover-left.png     (toolbar/toolbarbutton-customhover-left.png)
--- a/toolkit/themes/winstripe/global/globalBindings.xml
+++ b/toolkit/themes/winstripe/global/globalBindings.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE bindings [
-<!ENTITY % tabBrowserDTD SYSTEM "chrome://global/locale/tabbrowser.dtd" >
-%tabBrowserDTD;
 <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
 %globalDTD;
 ]>
 
 <bindings id="globalBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:xbl="http://www.mozilla.org/xbl">
@@ -50,76 +48,16 @@
   <binding id="toolbarpaletteitem-spacer" extends="chrome://global/content/bindings/toolbar.xml#toolbarpaletteitem">
     <content>
       <xul:spacer class="spacer-left"/>
       <children/>
       <xul:spacer class="spacer-right"/>
     </content>
   </binding>
 
-  <binding id="tabbrowser-tab" extends="chrome://global/content/bindings/tabbrowser.xml#tabbrowser-tab">
-    <content chromedir="&locale.dir;"
-             closetabtext="&closeTab.label;">
-      <xul:hbox class="tab-image-left" xbl:inherits="selected"/>
-      <xul:hbox flex="1" class="tab-image-middle" align="center" xbl:inherits="selected">
-        <xul:stack class="tab-icon">
-          <xul:image xbl:inherits="validate,src=image" class="tab-icon-image"/>
-          <xul:image class="tab-extra-status"/>
-        </xul:stack>
-        <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
-      </xul:hbox>
-      <xul:toolbarbutton anonid="close-button" class="tab-close-button" tabindex="-1"/>
-        <xul:hbox class="tab-image-right" xbl:inherits="selected"/>
-    </content>
-  </binding>
-  
-   <binding id="tabbrowser-tabs"  
-            extends="chrome://global/content/bindings/tabbrowser.xml#tabbrowser-tabs">
-    <content>
-      <xul:stack flex="1" class="tabs-stack">
-        <xul:vbox>
-          <xul:spacer flex="1"/>
-          <xul:hbox class="tabs-bottom" align="center"/>
-        </xul:vbox>
-        <xul:vbox>
-          <xul:hbox>
-            <xul:stack>
-              <xul:spacer class="tabs-left"/>
-            </xul:stack>
-            <xul:arrowscrollbox anonid="arrowscrollbox"
-                                orient="horizontal"
-                                flex="1"
-                                style="min-width: 1px;"
-                                chromedir="&locale.dir;"
-                                class="tabbrowser-arrowscrollbox">
-              <children/>
-            </xul:arrowscrollbox>
-            <xul:stack align="center" pack="end" chromedir="&locale.dir;">
-              <xul:hbox flex="1"
-                        class="tabs-alltabs-box"
-                        anonid="alltabs-box"/>
-              <xul:hbox flex="1" class="tabs-alltabs-box-animate"
-                        anonid="alltabs-box-animate"/>
-              <xul:toolbarbutton class="tabs-alltabs-button" type="menu"
-                                 anonid="alltabs-button" 
-                                 tooltipstring="&listAllTabs.label;">
-                <xul:menupopup class="tabs-alltabs-popup"
-                               anonid="alltabs-popup" position="after_end"/>
-              </xul:toolbarbutton>
-            </xul:stack>
-            <xul:hbox class="tabs-closebutton-box" align="center" pack="end" anonid="tabstrip-closebutton">
-              <xul:toolbarbutton class="close-button tabs-closebutton"/>
-            </xul:hbox>
-          </xul:hbox>
-          <xul:spacer class="tabs-bottom-spacer"/>
-        </xul:vbox>
-      </xul:stack>
-    </content>
-  </binding>
-
   <binding id="history-dropmarker"
            extends="chrome://global/content/bindings/autocomplete.xml#history-dropmarker">
     <content>
       <xul:stack class="history-dropmarker-stack">
         <xul:vbox class="autocomplete-dropmarker-bkgnd-box">
           <xul:image class="autocomplete-dropmarker-bkgnd-top autocomplete-dropmarker-bkgnd"/>
           <xul:vbox flex="1" class="autocomplete-dropmarker-inner-box">
             <xul:image flex="1" class="autocomplete-dropmarker-bkgnd-mid-top autocomplete-dropmarker-bkgnd"/>
--- a/toolkit/themes/winstripe/global/jar.mn
+++ b/toolkit/themes/winstripe/global/jar.mn
@@ -1,14 +1,13 @@
 classic.jar:
 % skin global classic/1.0 %skin/classic/global/
         skin/classic/global/about.css
         skin/classic/global/arrow.css
         skin/classic/global/autocomplete.css
-        skin/classic/global/browser.css
         skin/classic/global/button.css
         skin/classic/global/checkbox.css
         skin/classic/global/colorpicker.css
         skin/classic/global/config.css
         skin/classic/global/dialog.css
         skin/classic/global/expander.css
         skin/classic/global/filepicker.css
         skin/classic/global/findBar.css
@@ -63,60 +62,35 @@ classic.jar:
         skin/classic/global/arrow/arrow-up-sharp.gif                (arrow/arrow-up-sharp.gif)
         skin/classic/global/checkbox/cbox-check.gif                 (checkbox/cbox-check.gif)
         skin/classic/global/checkbox/cbox-check-dis.gif             (checkbox/cbox-check-dis.gif)
         skin/classic/global/dirListing/dirListing.css               (dirListing/dirListing.css)
         skin/classic/global/dirListing/local.png                    (dirListing/local.png)
         skin/classic/global/dirListing/remote.png                   (dirListing/remote.png)
         skin/classic/global/dirListing/up.png                       (dirListing/up.png)
         skin/classic/global/Filepicker.png                          (filepicker/Filepicker.png)
-	skin/classic/global/icons/alltabs-box-overflow-end-bkgnd-hover.png (icons/alltabs-box-overflow-end-bkgnd-hover.png)
-	skin/classic/global/icons/alltabs-box-overflow-start-bkgnd-hover.png (icons/alltabs-box-overflow-start-bkgnd-hover.png)
-	skin/classic/global/icons/alltabs-box-overflow-end-bkgnd.png   (icons/alltabs-box-overflow-end-bkgnd.png)
-    skin/classic/global/icons/alltabs-box-overflow-start-bkgnd-animate.png   (icons/alltabs-box-overflow-start-bkgnd-animate.png)
-	skin/classic/global/icons/alltabs-box-overflow-end-bkgnd-animate.png   (icons/alltabs-box-overflow-end-bkgnd-animate.png)
-	skin/classic/global/icons/alltabs-box-overflow-start-bkgnd.png (icons/alltabs-box-overflow-start-bkgnd.png)
         skin/classic/global/icons/autocomplete-dropmark-arrow.png   (icons/autocomplete-dropmark-arrow.png)
         skin/classic/global/icons/autocomplete-dropmark-bkgnd.png   (icons/autocomplete-dropmark-bkgnd.png)
         skin/classic/global/icons/autocomplete-dropmark-bkgnd-mid-top.png    (icons/autocomplete-dropmark-bkgnd-mid-top.png)
         skin/classic/global/icons/autocomplete-dropmark-bkgnd-mid-bottom.png (icons/autocomplete-dropmark-bkgnd-mid-bottom.png)
         skin/classic/global/icons/autoscroll.png                    (icons/autoscroll.png)
         skin/classic/global/icons/blacklist_favicon.png             (icons/blacklist_favicon.png)
         skin/classic/global/icons/blacklist_large.png               (icons/blacklist_large.png)
         skin/classic/global/icons/Close.gif                         (icons/Close.gif)
         skin/classic/global/icons/close.png                         (icons/close.png)
-        skin/classic/global/icons/alltabs.png                       (icons/alltabs.png)
         skin/classic/global/icons/Error.png                         (icons/Error.png)
         skin/classic/global/icons/find.png                          (icons/find.png)
         skin/classic/global/icons/folder-item.png                   (icons/folder-item.png)
         skin/classic/global/icons/Minimize.gif                      (icons/Minimize.gif)
         skin/classic/global/icons/notfound.png                      (icons/notfound.png)
         skin/classic/global/icons/Print-preview.png                 (icons/Print-preview.png)
         skin/classic/global/icons/Portrait.png                      (icons/Portrait.png)
         skin/classic/global/icons/Landscape.png                     (icons/Landscape.png)
         skin/classic/global/icons/Question.png                      (icons/Question.png)        
         skin/classic/global/icons/Restore.gif                       (icons/Restore.gif)
-	skin/classic/global/icons/tab-arrow-end.png                 (icons/tab-arrow-end.png)
-	skin/classic/global/icons/tab-arrow-start.png               (icons/tab-arrow-start.png)
-	skin/classic/global/icons/tab-arrow-end-bkgnd-hover.png     (icons/tab-arrow-end-bkgnd-hover.png)
-	skin/classic/global/icons/tab-arrow-end-bkgnd-disabled.png  (icons/tab-arrow-end-bkgnd-disabled.png)
-	skin/classic/global/icons/tab-arrow-end-bkgnd-enabled.png   (icons/tab-arrow-end-bkgnd-enabled.png)
-	skin/classic/global/icons/tab-arrow-end-bkgnd-animate.png   (icons/tab-arrow-end-bkgnd-animate.png)
-	skin/classic/global/icons/tab-arrow-start-bkgnd-hover.png   (icons/tab-arrow-start-bkgnd-hover.png)
-	skin/classic/global/icons/tab-arrow-start-bkgnd-disabled.png (icons/tab-arrow-start-bkgnd-disabled.png)
-	skin/classic/global/icons/tab-arrow-start-bkgnd-enabled.png (icons/tab-arrow-start-bkgnd-enabled.png)
-	skin/classic/global/icons/tab-arrow-start-bkgnd-animate.png (icons/tab-arrow-start-bkgnd-animate.png)
-	skin/classic/global/icons/tab-left.png                      (icons/tab-left.png)
-	skin/classic/global/icons/tab-middle.png                    (icons/tab-middle.png)
-	skin/classic/global/icons/tab-right.png                     (icons/tab-right.png)
-	skin/classic/global/icons/tab-left-bkgnd.png                (icons/tab-left-bkgnd.png)
-	skin/classic/global/icons/tab-middle-bkgnd.png              (icons/tab-middle-bkgnd.png)
-	skin/classic/global/icons/tab-right-bkgnd.png               (icons/tab-right-bkgnd.png)
-        skin/classic/global/icons/tabstrip-bottom.png               (icons/tabstrip-bottom.png)
-	skin/classic/global/icons/tabbrowser-tabs-bkgnd.png         (icons/tabbrowser-tabs-bkgnd.png)
         skin/classic/global/icons/Warning.png                       (icons/Warning.png)
         skin/classic/global/icons/warning-large.png                 (icons/warning-large.png)
         skin/classic/global/icons/wrap.png                          (icons/wrap.png)
         skin/classic/global/menu/Menu-arrow.png                     (menu/Menu-arrow.png)
         skin/classic/global/menu/Menu-arrow-rtl.png                 (menu/Menu-arrow-rtl.png)
         skin/classic/global/menu/Menu-arrow-disabled.png            (menu/Menu-arrow-disabled.png)
         skin/classic/global/menu/Menu-arrow-disabled-rtl.png        (menu/Menu-arrow-disabled-rtl.png)
         skin/classic/global/menu/Menu-arrow-hover.png               (menu/Menu-arrow-hover.png)
@@ -129,17 +103,16 @@ classic.jar:
         skin/classic/global/menu/menu-radio-hover.gif               (menu/menu-radio-hover.gif)
         skin/classic/global/radio/radio-check.gif                   (radio/radio-check.gif)
         skin/classic/global/radio/radio-check-dis.gif               (radio/radio-check-dis.gif)
         skin/classic/global/scrollbar/slider.gif                    (scrollbar/slider.gif)
         skin/classic/global/splitter/grip-hrz-after.gif             (splitter/grip-hrz-after.gif)
         skin/classic/global/splitter/grip-hrz-before.gif            (splitter/grip-hrz-before.gif)
         skin/classic/global/splitter/grip-vrt-after.gif             (splitter/grip-vrt-after.gif)
         skin/classic/global/splitter/grip-vrt-before.gif            (splitter/grip-vrt-before.gif)
-        skin/classic/global/tabDragDrop/tabDragIndicator.png        (tabDragDrop/tabDragIndicator.png)
         skin/classic/global/toolbar/chevron.gif                     (toolbar/chevron.gif)
         skin/classic/global/toolbar/chevron-rtl.gif                 (toolbar/chevron-rtl.gif)
         skin/classic/global/toolbar/Lighten.png                     (toolbar/Lighten.png)
         skin/classic/global/toolbar/spring.gif                      (toolbar/spring.gif)
         skin/classic/global/tree/columnpicker.gif                   (tree/columnpicker.gif)
         skin/classic/global/tree/sort-asc.gif                       (tree/sort-asc.gif)
         skin/classic/global/tree/sort-dsc.gif                       (tree/sort-dsc.gif)
         skin/classic/global/tree/twisty-clsd.png                    (tree/twisty-clsd.png)