diff --git a/mozilla/themes/classic/global/win/tabbox.css b/mozilla/themes/classic/global/win/tabbox.css
index 5166da3d49f..3f6caa1f82d 100644
--- a/mozilla/themes/classic/global/win/tabbox.css
+++ b/mozilla/themes/classic/global/win/tabbox.css
@@ -97,7 +97,7 @@ tab[selected="true"] {
   padding: 1px 6px 4px 6px;
 }
 
-tab:focus {
+tab:focus > .tab-middle {
   -moz-outline: 1px dotted invert;
 }
 
diff --git a/mozilla/toolkit/content/widgets/tabbox.xml b/mozilla/toolkit/content/widgets/tabbox.xml
index a1c2ba2ead6..9c46ba8c86c 100644
--- a/mozilla/toolkit/content/widgets/tabbox.xml
+++ b/mozilla/toolkit/content/widgets/tabbox.xml
@@ -450,7 +450,7 @@
   <binding id="tab" display="xul:button"
            extends="chrome://global/content/bindings/tabbox.xml#tab-base">
     <content>
-      <xul:hbox flex="1" style="min-width: 1px;">
+      <xul:hbox class="tab-middle box-inherit" xbl:inherits="align,dir,pack,orient,selected" flex="1">
         <xul:image class="tab-icon" xbl:inherits="validate,src=image"/>
         <xul:label class="tab-text" xbl:inherits="value=label,accesskey,crop,disabled" flex="1"/>
       </xul:hbox>
diff --git a/mozilla/toolkit/themes/qute/global/browser.css b/mozilla/toolkit/themes/qute/global/browser.css
index e8d10920c46..6c5226b5198 100644
--- a/mozilla/toolkit/themes/qute/global/browser.css
+++ b/mozilla/toolkit/themes/qute/global/browser.css
@@ -28,7 +28,7 @@ tabpanels {
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
-tab[busy] > .tab-icon {
+tab[busy] > .tab-middle > .tab-icon {
   list-style-image: url("chrome://global/skin/icons/Loading.gif");
 }
 
diff --git a/mozilla/toolkit/themes/qute/global/tabbox.css b/mozilla/toolkit/themes/qute/global/tabbox.css
index 01e7af86a3f..fde746a16d5 100644
--- a/mozilla/toolkit/themes/qute/global/tabbox.css
+++ b/mozilla/toolkit/themes/qute/global/tabbox.css
@@ -82,7 +82,7 @@ tab[selected="true"] {
   padding: 1px 6px 4px 6px;
 }
 
-tab:focus > hbox {
+tab:focus > .tab-middle {
   -moz-outline: 1px dotted invert;
 }
 
diff --git a/mozilla/toolkit/themes/winstripe/global/browser.css b/mozilla/toolkit/themes/winstripe/global/browser.css
index 99066bae413..ec628a07565 100644
--- a/mozilla/toolkit/themes/winstripe/global/browser.css
+++ b/mozilla/toolkit/themes/winstripe/global/browser.css
@@ -30,7 +30,7 @@ tabpanels {
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
-tab[busy] > .tab-icon {
+tab[busy] > .tab-middle > .tab-icon {
   list-style-image: url("chrome://browser/skin/Throbber-small.gif");
   -moz-opacity: 0.5;
 }
diff --git a/mozilla/toolkit/themes/winstripe/global/tabbox.css b/mozilla/toolkit/themes/winstripe/global/tabbox.css
index cc7cc4ed96a..abbb57d59ec 100644
--- a/mozilla/toolkit/themes/winstripe/global/tabbox.css
+++ b/mozilla/toolkit/themes/winstripe/global/tabbox.css
@@ -83,7 +83,7 @@ tab[selected="true"]
   padding: 1px 6px 4px 6px;
 }
 
-tab:focus > hbox {
+tab:focus > .tab-middle {
   -moz-outline: 1px dotted invert;
 }
 
diff --git a/mozilla/xpfe/global/resources/content/bindings/tabbox.xml b/mozilla/xpfe/global/resources/content/bindings/tabbox.xml
index 63c70222aa4..7e825946eaa 100644
--- a/mozilla/xpfe/global/resources/content/bindings/tabbox.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/tabbox.xml
@@ -454,8 +454,10 @@
   <binding id="tab" display="xul:button"
            extends="chrome://global/content/bindings/tabbox.xml#tab-base">
     <content>
-      <xul:image class="tab-icon" xbl:inherits="validate,src=image"/>
-      <xul:label class="tab-text" xbl:inherits="value=label,accesskey,crop,disabled" flex="1"/>
+      <xul:hbox class="tab-middle box-inherit" xbl:inherits="align,dir,pack,orient,selected" flex="1">
+        <xul:image class="tab-icon" xbl:inherits="validate,src=image"/>
+        <xul:label class="tab-text" xbl:inherits="value=label,accesskey,crop,disabled" flex="1"/>
+      </xul:hbox>
     </content>
     
     <implementation implements="nsIDOMXULSelectControlItemElement, nsIAccessibleProvider">