diff --git a/mozilla/suite/browser/navigator.css b/mozilla/suite/browser/navigator.css
index 75e616cf366..8656e6383b3 100644
--- a/mozilla/suite/browser/navigator.css
+++ b/mozilla/suite/browser/navigator.css
@@ -15,7 +15,7 @@ tabbrowser {
 }
 
 .tabbrowser-tabs > .tabbrowser-tab {
-  -moz-binding: url("chrome://global/content/bindings/tabbox.xml#tab");
+  -moz-binding: url("chrome://navigator/content/tabbrowser.xml#tabbrowser-tab");
 }
 
 .tabs-closebutton-box > .tabs-closebutton {
diff --git a/mozilla/suite/browser/tabbrowser.xml b/mozilla/suite/browser/tabbrowser.xml
index 96438fb1d17..d98cfab2601 100644
--- a/mozilla/suite/browser/tabbrowser.xml
+++ b/mozilla/suite/browser/tabbrowser.xml
@@ -2171,27 +2171,54 @@
     </handlers>
   </binding>
 
-  <binding id="tabbrowser-tabs" 
+  <binding id="tabbrowser-tabs"
            extends="chrome://global/content/bindings/tabbox.xml#tabs">
     <resources>
       <stylesheet src="chrome://navigator/skin/tabbrowser.css"/>
     </resources>
 
     <content>
-      <xul:stack>
-        <xul:spacer class="tabs-left"/>
-        <xul:toolbarbutton ondblclick="event.stopPropagation();" class="tabs-newbutton" xbl:inherits="oncommand=onnewtab,tooltiptext=tooltiptextnew"/>
-      </xul:stack>
-      <xul:hbox flex="1" style="min-width: 1px; overflow: -moz-hidden-unscrollable;">
-        <children/>
-        <xul:spacer class="tabs-right" flex="1"/>
-      </xul:hbox>
-      <xul:stack>
-        <xul:spacer class="tabs-right"/>
-        <xul:hbox class="tabs-closebutton-box" align="center" pack="end">
-          <xul:toolbarbutton ondblclick="event.stopPropagation();" class="tabs-closebutton close-button" xbl:inherits="disabled=disableclose,oncommand=onclosetab"/>
-        </xul:hbox>
+      <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:toolbarbutton class="tabs-newbutton" xbl:inherits="oncommand=onnewtab,tooltiptext=tooltiptextnew"/>
+            </xul:stack>
+            <xul:hbox flex="1" style="min-width: 1px; overflow: -moz-hidden-unscrollable;">
+              <children/>
+              <xul:spacer class="tabs-right" flex="1"/>
+            </xul:hbox>
+            <xul:stack>
+              <xul:spacer class="tabs-right"/>
+              <xul:hbox class="tabs-closebutton-box" align="center" pack="end">
+                <xul:toolbarbutton class="tabs-closebutton close-button" xbl:inherits="disabled=disableclose,oncommand=onclosetab"/>
+              </xul:hbox>
+            </xul:stack>
+          </xul:hbox>
+          <xul:spacer class="tabs-bottom-spacer"/>
+        </xul:vbox>
       </xul:stack>
     </content>
   </binding>
+
+  <binding id="tabbrowser-tab"
+           extends="chrome://global/content/bindings/tabbox.xml#tab">
+    <resources>
+      <stylesheet src="chrome://navigator/skin/tabbrowser.css"/>
+    </resources>
+
+    <content>
+      <xul:spacer class="tab-image-left" xbl:inherits="selected"/>
+      <xul:hbox flex="1" class="tab-image-middle" align="center" xbl:inherits="selected">
+        <xul:image class="tab-icon" xbl:inherits="src=image,validate"/>
+        <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
+      </xul:hbox>
+      <xul:spacer class="tab-image-right" xbl:inherits="selected"/>
+    </content>
+  </binding>
 </bindings>
diff --git a/mozilla/themes/classic/jar.mn b/mozilla/themes/classic/jar.mn
index b797d1b03eb..4c77f5a6795 100644
--- a/mozilla/themes/classic/jar.mn
+++ b/mozilla/themes/classic/jar.mn
@@ -543,7 +543,11 @@ classic.jar:
   skin/classic/navigator/navigator.css                                  (navigator/navigator.css)
   skin/classic/navigator/linkToolbar.css                                (navigator/linkToolbar.css)
   skin/classic/navigator/pageInfo.css                                   (navigator/pageInfo.css)
-  skin/classic/navigator/tabbrowser.css                                 (navigator/tabbrowser.css)
+#ifdef XP_MACOSX
+  skin/classic/navigator/tabbrowser.css                                 (navigator/mac/tabbrowser.css)
+#else
+  skin/classic/navigator/tabbrowser.css                                 (navigator/win/tabbrowser.css)
+#endif
   skin/classic/navigator/btn1/first.gif                                 (navigator/btn1/first.gif)
   skin/classic/navigator/btn1/first-disabled.gif                        (navigator/btn1/first-disabled.gif)
   skin/classic/navigator/btn1/first-hover.gif                           (navigator/btn1/first-hover.gif)
diff --git a/mozilla/themes/classic/navigator/mac/tabbrowser.css b/mozilla/themes/classic/navigator/mac/tabbrowser.css
index 522cf129bb3..3ff2d8d2c80 100644
--- a/mozilla/themes/classic/navigator/mac/tabbrowser.css
+++ b/mozilla/themes/classic/navigator/mac/tabbrowser.css
@@ -1,18 +1,9 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.tabbrowser-strip {
-  padding-bottom: 3px;
-  border-bottom: 2px solid;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-}
-
-tabpanels {
-  -moz-appearance: none;
-}
-
 .tabbrowser-tabs {
   padding-top: 1px;
+  margin-bottom: 0;
 }
 
 .tabs-left,
@@ -34,6 +25,20 @@ tabpanels {
   height: 2px;
 }
 
+.tab-image-left {
+  width: 11px;
+  height: 25px;
+}
+
+.tab-image-right {
+  width: 12px;
+  height: 25px;
+}
+
+.tab-image-left, .tab-image-right, .tab-image-middle {
+  -moz-appearance: tab-left-edge;
+}
+
 .tab-icon {
   margin-top: 1px;
   margin-right: 3px;
@@ -41,43 +46,62 @@ tabpanels {
   height: 16px;
 }
 
-tab {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.png"); 
+.tabbrowser-tab {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.png");
+  padding: 0;
+  margin: 0;
 }
 
-tab[busy] {
+.tabbrowser-tab[busy] {
   list-style-image: url("chrome://communicator/skin/icons/loading.gif");
 }
 
+.tabbrowser-tab[selected="true"] {
+  -moz-user-focus: normal;
+}
+
+.tabbrowser-tab:focus {
+  outline: 3px solid -moz-mac-focusring;
+  outline-offset: -3px;
+  -moz-outline-radius-topleft:  5px;
+  -moz-outline-radius-topright: 5px;
+}
+
 /* ::::: close button ::::: */
 
 .tabs-closebutton {
   margin: 3px;
+  padding: 2px;
   list-style-image: url("chrome://communicator/skin/icons/close-button.gif");
 }
 
 .tabs-closebutton > .toolbarbutton-icon {
-  margin: 0;
+  margin: 0px;
 }
 
 .tabs-newbutton {
   margin: 0px;
+  padding: 2px;
   list-style-image: url("chrome://navigator/skin/icons/tab-new.gif");
 }
 
-.tab-drop-indicator-bar {
-    height: 11px;
-    margin-top: -11px;
-    margin-left: -8px;
-    position: relative;
+.tabs-newbutton > .toolbarbutton-icon {
+  margin-right: 2px;
 }
 
+.tab-drop-indicator-bar {
+  height: 11px;
+  margin-top: -11px;
+  margin-left: -8px;
+  position: relative;
+}
+ 
 .tab-drop-indicator {
-    height: 11px;
-    width: 11px;
-    margin-bottom: -5px;
-    position: relative;
-    list-style-image: url('chrome://navigator/skin/icons/tab-drag-indicator.gif');
+  height: 11px;
+  width: 11px;
+  margin-bottom: -5px;
+  position: relative;
+  list-style-image: url('chrome://navigator/skin/icons/tab-drag-indicator.gif');
 }
 
 tooltip[tabpreview="true"] {
diff --git a/mozilla/themes/classic/navigator/win/tabbrowser.css b/mozilla/themes/classic/navigator/win/tabbrowser.css
index 522cf129bb3..35a86aff1dc 100644
--- a/mozilla/themes/classic/navigator/win/tabbrowser.css
+++ b/mozilla/themes/classic/navigator/win/tabbrowser.css
@@ -20,20 +20,6 @@ tabpanels {
   width: 3px;
 }
 
-.tabs-bottom {
-  -moz-appearance: tabpanels;
-  height: 4px;
-}
-
-.tabs-stack {
-  border-bottom: 1px solid;
-  -moz-border-bottom-colors: ThreeDShadow;
-}
-
-.tabs-bottom-spacer {
-  height: 2px;
-}
-
 .tab-icon {
   margin-top: 1px;
   margin-right: 3px;
@@ -41,11 +27,11 @@ tabpanels {
   height: 16px;
 }
 
-tab {
+.tabbrowser-tab {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.png"); 
 }
 
-tab[busy] {
+.tabbrowser-tab[busy] {
   list-style-image: url("chrome://communicator/skin/icons/loading.gif");
 }