diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 1e793d5adc6..f8e1750f48a 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -2499,13 +2499,107 @@
     </handlers>
   </binding>
 
+  <binding id="tabbrowser-arrowscrollbox" extends="chrome://global/content/bindings/scrollbox.xml#arrowscrollbox-clicktoscroll">
+    <content>
+      <xul:toolbarbutton class="scrollbutton-up" collapsed="true"
+                         xbl:inherits="orient"
+                         anonid="scrollbutton-up"
+                         onmousedown="_startScroll(-1);"
+                         onmouseup="_stopScroll();"
+                         onmouseout="_stopScroll();"
+                         chromedir="&locale.dir;"/>
+      <xul:scrollbox xbl:inherits="orient,align,pack,dir" flex="1" anonid="scrollbox">
+        <children/>
+      </xul:scrollbox>
+      <xul:stack align="center" pack="end" class="scrollbutton-down-stack">
+        <!-- XXXsspitzer hack
+             this extra hbox with position: relative
+             is needed to work around two bugs.
+             see bugs #346307 and #346035 
+        -->
+        <xul:hbox style="position: relative;" class="scrollbutton-rel-box">
+          <xul:hbox flex="1" class="scrollbutton-down-box" 
+                             collapsed="true" anonid="down-box"/>
+        </xul:hbox>
+        <!-- XXXsspitzer hack
+             this extra hbox with position: relative
+             is needed to work around two bugs.
+             see bugs #346307 and #346035 
+        -->
+        <xul:hbox style="position: relative;" class="scrollbutton-rel-box">
+          <xul:hbox flex="1" class="scrollbutton-down-box-animate" 
+                             collapsed="true" anonid="down-box-animate"/>
+        </xul:hbox>
+        <!-- XXXsspitzer hack
+             this extra hbox with position: relative
+             is needed to work around two bugs.
+             see bugs #346307 and #346035 
+        -->
+        <xul:hbox style="position: relative;" class="scrollbutton-rel-box">
+          <xul:toolbarbutton class="scrollbutton-down" collapsed="true"
+                             xbl:inherits="orient"
+                             anonid="scrollbutton-down"
+                             onmousedown="_startScroll(1);"
+                             onmouseup="_stopScroll();"
+                             onmouseout="_stopScroll();"
+                             chromedir="&locale.dir;"/>
+        </xul:hbox>
+      </xul:stack>
+    </content>
+    <implementation>
+      <field name="_scrollButtonDownBox">
+        document.getAnonymousElementByAttribute(this, "anonid", "down-box");
+      </field>
+      <field name="_scrollButtonDownBoxAnimate">
+        document.getAnonymousElementByAttribute(this, "anonid", "down-box-animate");
+      </field>
+    </implementation>
+    <handlers>
+      <handler event="underflow"><![CDATA[
+        // filter underflow events which were dispatched on nested scrollboxes
+        if (event.target != this)
+          return;
+
+        this._scrollButtonDownBox.collapsed = true;
+        this._scrollButtonDownBoxAnimate.collapsed = true;
+      ]]></handler>
+
+      <handler event="overflow"><![CDATA[
+        // filter underflow events which were dispatched on nested scrollboxes
+        if (event.target != this)
+          return;
+
+        this._scrollButtonDownBox.collapsed = false;
+        this._scrollButtonDownBoxAnimate.collapsed = false;
+      ]]></handler>
+
+      <handler event="UpdatedScrollButtonsDisabledState"><![CDATA[
+        // filter underflow events which were dispatched on nested scrollboxes
+        if (event.target != this)
+          return;
+
+        // fix for bug #352353
+        // unlike the scrollup button on the tab strip (which is a 
+        // simple toolbarbutton) the scrolldown button is 
+        // a more complicated stack of boxes and a toolbarbutton
+        // so that we can animate when a tab is opened offscreen.
+        // in order to style the box with the actual background image
+        // we need to manually set the disable state to match the
+        // disable state of the toolbarbutton.
+        this._scrollButtonDownBox
+            .setAttribute("disabled", this._scrollButtonDown.disabled);
+      ]]></handler>
+
+    </handlers>
+  </binding>
+
   <binding id="tabbrowser-tabs"
            extends="chrome://global/content/bindings/tabbox.xml#tabs">
     <content>
-      <xul:arrowscrollbox anonid="arrowscrollbox" orient="horizontal" flex="1" style="min-width: 1px;" clicktoscroll="true">
+      <xul:arrowscrollbox anonid="arrowscrollbox" orient="horizontal" flex="1" style="min-width: 1px;" class="tabbrowser-arrowscrollbox">
         <children includes="tab"/>
       </xul:arrowscrollbox>
-      <xul:stack align="center" pack="end" class="scrollbutton-down-stack">
+      <xul:stack align="center" pack="end" class="tabs-alltabs-stack">
         <!-- XXXsspitzer hack
              this extra hbox with position: relative
              is needed to work around two bugs.
@@ -2519,9 +2613,19 @@
              is needed to work around two bugs.
              see bugs #346307 and #346035 
         -->
+        <xul:hbox style="position: relative;">
+          <xul:hbox flex="1" class="tabs-alltabs-box-animate" 
+                    anonid="alltabs-box-animate"/>
+        </xul:hbox>
+        <!-- XXXsspitzer hack
+             this extra hbox with position: relative
+             is needed to work around two bugs.
+             see bugs #346307 and #346035 
+        -->
         <xul:hbox style="position: relative;">
           <xul:toolbarbutton class="tabs-alltabs-button" type="menu"
-                             anonid="alltabs-button" tooltipstring="&listAllTabs.label;">
+                             anonid="alltabs-button"
+                             tooltipstring="&listAllTabs.label;">
             <xul:menupopup class="tabs-alltabs-popup"
                            anonid="alltabs-popup" 
                            position="after_end"/>
@@ -2645,7 +2749,7 @@
           case 1:
             try {
               var width = this.firstChild.boxObject.width;
-              // 0 width is an invalid value and indicates 
+              // 0 width is an invalid value and indicates
               // an item without display, so ignore.
               if (width > this.mTabClipWidth || width == 0)
                 this.setAttribute("closebuttons", "alltabs");
@@ -2697,6 +2801,7 @@
               break;
             case "underflow":
               this.removeAttribute("overflow");
+              break;
           }
         ]]></body>
       </method>
@@ -2706,9 +2811,14 @@
                                                 "anonid", "alltabs-popup");
       </field>
 
-      <field name="mAllTabsBox">
+      <field name="mAllTabsBoxAnimate">
         document.getAnonymousElementByAttribute(this, 
-                                                "anonid", "alltabs-box");
+                                                "anonid",
+                                                "alltabs-box-animate");
+      </field>
+
+      <field name="mDownBoxAnimate">
+        this.mTabstrip._scrollButtonDownBoxAnimate;
       </field>
 
       <field name="mAllTabsButton">
@@ -2735,7 +2845,8 @@
               this._animateTimer.cancel();
 
             this._animateStep = -1;
-            this.mAllTabsBox.style.opacity = 0.0;
+            this.mAllTabsBoxAnimate.style.opacity = 0.0;
+            this.mDownBoxAnimate.style.opacity = 0.0;
           }
         ]]></body>
       </method>
@@ -2777,7 +2888,8 @@
             aTimer.cancel();
 
           var percent = this._animatePercents[this._animateStep];
-          this.mAllTabsBox.style.opacity = percent;
+          this.mAllTabsBoxAnimate.style.opacity = percent;
+          this.mDownBoxAnimate.style.opacity = percent;
 
           if (this._animateStep < (this._animatePercents.length - 1))
             this._animateStep++;
diff --git a/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-bkgnd.png b/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-bkgnd.png
new file mode 100644
index 00000000000..22292d8b34b
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-bkgnd.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-overflow-bkgnd-animate.png b/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-overflow-bkgnd-animate.png
new file mode 100755
index 00000000000..f9092b6b8da
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-overflow-bkgnd-animate.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-overflow-bkgnd.png b/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-overflow-bkgnd.png
new file mode 100644
index 00000000000..bb941ebb5c0
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-overflow-bkgnd.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-end-bkgnd-animate.png b/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-end-bkgnd-animate.png
new file mode 100755
index 00000000000..9218b0f01b6
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-end-bkgnd-animate.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-end-bkgnd.png b/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-end-bkgnd.png
new file mode 100644
index 00000000000..93bd39c1162
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-end-bkgnd.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-end.png b/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-end.png
new file mode 100644
index 00000000000..4447bba1bc8
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-end.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-start-bkgnd-animate.png b/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-start-bkgnd-animate.png
new file mode 100755
index 00000000000..6ea757696d7
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-start-bkgnd-animate.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-start.png b/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-start.png
new file mode 100644
index 00000000000..7d12a977b62
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-arrow-start.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-left-bkgnd.png b/browser/themes/pinstripe/browser/tabbrowser/tab-left-bkgnd.png
new file mode 100755
index 00000000000..367f9a7c9fd
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-left-bkgnd.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-left-hover.png b/browser/themes/pinstripe/browser/tabbrowser/tab-left-hover.png
new file mode 100755
index 00000000000..2ed07645bf1
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-left-hover.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-left.png b/browser/themes/pinstripe/browser/tabbrowser/tab-left.png
new file mode 100644
index 00000000000..7a93dc05644
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-left.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-middle-bkgnd.png b/browser/themes/pinstripe/browser/tabbrowser/tab-middle-bkgnd.png
new file mode 100755
index 00000000000..b83a381a7ad
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-middle-bkgnd.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-middle-hover.png b/browser/themes/pinstripe/browser/tabbrowser/tab-middle-hover.png
new file mode 100755
index 00000000000..b18dbddc8b4
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-middle-hover.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-middle.png b/browser/themes/pinstripe/browser/tabbrowser/tab-middle.png
new file mode 100644
index 00000000000..c161fa47133
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-middle.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-right-bkgnd.png b/browser/themes/pinstripe/browser/tabbrowser/tab-right-bkgnd.png
new file mode 100755
index 00000000000..96d49cea9a8
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-right-bkgnd.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-right-hover.png b/browser/themes/pinstripe/browser/tabbrowser/tab-right-hover.png
new file mode 100755
index 00000000000..db9d4af3e6a
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-right-hover.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-right.png b/browser/themes/pinstripe/browser/tabbrowser/tab-right.png
new file mode 100644
index 00000000000..9ff1d66c0bc
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tab-right.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tabDragIndicator.png b/browser/themes/pinstripe/browser/tabbrowser/tabDragIndicator.png
index 6a18e78e5e3..c50c4080dcf 100755
Binary files a/browser/themes/pinstripe/browser/tabbrowser/tabDragIndicator.png and b/browser/themes/pinstripe/browser/tabbrowser/tabDragIndicator.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tabbrowser-tabs-bkgnd.png b/browser/themes/pinstripe/browser/tabbrowser/tabbrowser-tabs-bkgnd.png
new file mode 100644
index 00000000000..60734b803c2
Binary files /dev/null and b/browser/themes/pinstripe/browser/tabbrowser/tabbrowser-tabs-bkgnd.png differ
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tabbrowserBindings.xml b/browser/themes/pinstripe/browser/tabbrowser/tabbrowserBindings.xml
index 9caaf944700..1a664dcffb4 100644
--- a/browser/themes/pinstripe/browser/tabbrowser/tabbrowserBindings.xml
+++ b/browser/themes/pinstripe/browser/tabbrowser/tabbrowserBindings.xml
@@ -16,7 +16,6 @@
     <content chromedir="&locale.dir;"
              closetabtext="&closeTab.label;">
       <xul:hbox class="tab-image-left" xbl:inherits="selected"/>
-      <xul:toolbarbutton anonid="close-button" class="tab-close-button" tabindex="-1"/>
       <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"/>
@@ -24,7 +23,8 @@
         </xul:stack>
         <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
       </xul:hbox>
-      <xul:hbox class="tab-image-right" xbl:inherits="selected"/>
+      <xul:toolbarbutton anonid="close-button" class="tab-close-button" tabindex="-1"/>
+        <xul:hbox class="tab-image-right" xbl:inherits="selected"/>
     </content>
   </binding>
   
@@ -56,7 +56,7 @@
             <xul:stack>
               <xul:spacer class="tabs-left"/>
             </xul:stack>
-            <xul:arrowscrollbox anonid="arrowscrollbox" orient="horizontal" flex="1" style="min-width: 1px;" clicktoscroll="true">
+            <xul:arrowscrollbox anonid="arrowscrollbox" orient="horizontal" flex="1" style="min-width: 1px;" class="tabbrowser-arrowscrollbox">
               <children/>
             </xul:arrowscrollbox>
             <xul:stack align="center" pack="end">
@@ -75,7 +75,17 @@
                    see bugs #346307 and #346035 
               -->
               <xul:hbox style="position: relative;">
-                <xul:toolbarbutton class="tabs-alltabs-button" type="menu"
+                <xul:hbox flex="1" class="tabs-alltabs-box-animate" 
+                          anonid="alltabs-box-animate"/>
+              </xul:hbox>
+              <!-- XXXsspitzer hack
+                   this extra hbox with position: relative
+                   is needed to work around two bugs.
+                   see bugs #346307 and #346035 
+              -->
+              <xul:hbox style="position: relative;">
+                <xul:toolbarbutton class="tabs-alltabs-button"
+                                   type="menu"
                                    anonid="alltabs-button"
                                    tooltipstring="&listAllTabs.label;">
                   <xul:menupopup class="tabs-alltabs-popup"
diff --git a/browser/themes/pinstripe/browser/tabbrowser/tabs-bottom-bg.png b/browser/themes/pinstripe/browser/tabbrowser/tabs-bottom-bg.png
index e382b7b6669..f3d739d5555 100644
Binary files a/browser/themes/pinstripe/browser/tabbrowser/tabs-bottom-bg.png and b/browser/themes/pinstripe/browser/tabbrowser/tabs-bottom-bg.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-end-bkgnd-animate.png b/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-end-bkgnd-animate.png
new file mode 100755
index 00000000000..3db331b6cf7
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-end-bkgnd-animate.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-end-bkgnd-hover.png b/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-end-bkgnd-hover.png
new file mode 100755
index 00000000000..754fd3385d9
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-end-bkgnd-hover.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-end-bkgnd.png b/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-end-bkgnd.png
new file mode 100755
index 00000000000..79e592bbeb3
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-end-bkgnd.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-start-bkgnd-animate.png b/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-start-bkgnd-animate.png
new file mode 100755
index 00000000000..2752c48fb34
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-start-bkgnd-animate.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-start-bkgnd-hover.png b/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-start-bkgnd-hover.png
new file mode 100755
index 00000000000..3431d0635e1
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-start-bkgnd-hover.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-start-bkgnd.png b/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-start-bkgnd.png
new file mode 100755
index 00000000000..785f79c3629
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/alltabs-box-overflow-start-bkgnd.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end-bkgnd-animate.png b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end-bkgnd-animate.png
new file mode 100755
index 00000000000..7be05802249
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end-bkgnd-animate.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end-bkgnd-disabled.png b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end-bkgnd-disabled.png
new file mode 100755
index 00000000000..9c96befeb11
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end-bkgnd-disabled.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end-bkgnd-enabled.png b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end-bkgnd-enabled.png
new file mode 100755
index 00000000000..91e6813923d
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end-bkgnd-enabled.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end-bkgnd-hover.png b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end-bkgnd-hover.png
new file mode 100755
index 00000000000..ce4a54ffbd3
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end-bkgnd-hover.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end.png b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end.png
new file mode 100755
index 00000000000..81c34615c74
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-end.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start-bkgnd-animate.png b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start-bkgnd-animate.png
new file mode 100755
index 00000000000..f61accf07aa
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start-bkgnd-animate.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start-bkgnd-disabled.png b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start-bkgnd-disabled.png
new file mode 100755
index 00000000000..aa26d3ec994
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start-bkgnd-disabled.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start-bkgnd-enabled.png b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start-bkgnd-enabled.png
new file mode 100755
index 00000000000..7550d9c2f58
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start-bkgnd-enabled.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start-bkgnd-hover.png b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start-bkgnd-hover.png
new file mode 100755
index 00000000000..89746a47d3f
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start-bkgnd-hover.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start.png b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start.png
new file mode 100755
index 00000000000..27f2d94f7d9
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-arrow-start.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-left-bkgnd.png b/browser/themes/winstripe/browser/tabbrowser/tab-left-bkgnd.png
new file mode 100755
index 00000000000..60cf0c097a1
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-left-bkgnd.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-left.png b/browser/themes/winstripe/browser/tabbrowser/tab-left.png
new file mode 100755
index 00000000000..bc357cc2e25
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-left.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-middle-bkgnd.png b/browser/themes/winstripe/browser/tabbrowser/tab-middle-bkgnd.png
new file mode 100755
index 00000000000..bc955065c33
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-middle-bkgnd.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-middle.png b/browser/themes/winstripe/browser/tabbrowser/tab-middle.png
new file mode 100755
index 00000000000..c63a0fdd4a8
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-middle.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-right-bkgnd.png b/browser/themes/winstripe/browser/tabbrowser/tab-right-bkgnd.png
new file mode 100755
index 00000000000..967b59fa391
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-right-bkgnd.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tab-right.png b/browser/themes/winstripe/browser/tabbrowser/tab-right.png
new file mode 100755
index 00000000000..7a25b14669c
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tab-right.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tabbrowser-tabs-bkgnd.png b/browser/themes/winstripe/browser/tabbrowser/tabbrowser-tabs-bkgnd.png
new file mode 100755
index 00000000000..eb8e901d032
Binary files /dev/null and b/browser/themes/winstripe/browser/tabbrowser/tabbrowser-tabs-bkgnd.png differ
diff --git a/browser/themes/winstripe/browser/tabbrowser/tabbrowserBindings.xml b/browser/themes/winstripe/browser/tabbrowser/tabbrowserBindings.xml
index 63b22a5db25..036332058c7 100644
--- a/browser/themes/winstripe/browser/tabbrowser/tabbrowserBindings.xml
+++ b/browser/themes/winstripe/browser/tabbrowser/tabbrowserBindings.xml
@@ -1,5 +1,12 @@
 <?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"
@@ -48,4 +55,99 @@
     </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="tabs" extends="chrome://global/content/bindings/tabbox.xml#tabs">
+    <content>
+      <xul:spacer class="tab-border-top-left-cap"/>
+      <xul:spacer class="tab-border-top-left"/>
+      <children/>
+      <xul:stack flex="1">
+        <xul:spacer class="tab-border-top-right"/>
+        <xul:hbox class="tabs-misc-dec" align="center">
+          <xul:spacer flex="1"/>
+        </xul:hbox>
+      </xul:stack>
+      <xul:spacer class="tab-border-top-right-cap"/>
+    </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;">
+              <!-- XXXsspitzer hack
+                   this extra hbox with position: relative
+                   is needed to work around two bugs.
+                   see bugs #346307 and #346035 
+              -->
+              <xul:hbox style="position: relative;">
+                <xul:hbox flex="1"
+                          class="tabs-alltabs-box"
+                          anonid="alltabs-box"/>
+              </xul:hbox>
+              <!-- XXXsspitzer hack
+                   this extra hbox with position: relative
+                   is needed to work around two bugs.
+                   see bugs #346307 and #346035 
+              -->
+              <xul:hbox style="position: relative;">
+                <xul:hbox flex="1" class="tabs-alltabs-box-animate"
+                          anonid="alltabs-box-animate"/>
+              </xul:hbox>
+              <!-- XXXsspitzer hack
+                   this extra hbox with position: relative
+                   is needed to work around two bugs.
+                   see bugs #346307 and #346035
+              -->
+              <xul:hbox style="position: relative;">
+                <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:hbox>
+            </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>
 </bindings>
diff --git a/browser/themes/winstripe/browser/tabbrowser/tabstrip-bottom.png b/browser/themes/winstripe/browser/tabbrowser/tabstrip-bottom.png
index 89ced7fdcf2..945f42da7c5 100644
Binary files a/browser/themes/winstripe/browser/tabbrowser/tabstrip-bottom.png and b/browser/themes/winstripe/browser/tabbrowser/tabstrip-bottom.png differ