diff --git a/common/content/bindings.xml b/common/content/bindings.xml
index cef6f710..edde99e8 100644
--- a/common/content/bindings.xml
+++ b/common/content/bindings.xml
@@ -18,7 +18,30 @@
         <content><html:span class="td-strut"/><html:span class="td-span"><children/></html:span></content>
     </binding>
 
-    <binding id="tab" display="xul:hbox"
+    <binding id="tab-3" display="xul:hbox"
+             extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tab">
+        <content context="tabContextMenu" closetabtext="Close Tab">
+            <xul:stack class="tab-icon dactyl-tab-stack">
+                <xul:image xbl:inherits="validate,src=image" role="presentation"
+                           class="tab-icon-image" dactyl:highlight="TabIcon"/>
+                <xul:vbox>
+                    <xul:spring flex="1"/>
+                    <xul:label xbl:inherits="value=ordinal" dactyl:highlight="TabIconNumber"/>
+                    <xul:spring flex="1"/>
+                </xul:vbox>
+            </xul:stack>
+            <xul:label xbl:inherits="value=ordinal" dactyl:highlight="TabNumber"/>
+            <xul:label flex="1"
+                       xbl:inherits="value=label,crop,accesskey"
+                       class="tab-text" dactyl:highlight="TabText"
+                       role="presentation"/>
+            <xul:toolbarbutton anonid="close-button"
+                               tabindex="-1"
+                               class="tab-close-button" dactyl:highlight="TabClose"/>
+        </content>
+    </binding>
+
+    <binding id="tab-4" display="xul:hbox"
              extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tab">
         <content context="tabContextMenu" closetabtext="Close Tab">
             <xul:stack class="tab-stack" flex="1">
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 1df666fa..17f2cc8d 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -21,12 +21,13 @@ const Tabs = Module("tabs", {
         this._lastBufferSwitchArgs = "";
         this._lastBufferSwitchSpecial = true;
 
-        let fragment = dactyl.has("Darwin") ? "tab-mac" : "tab";
-        this.tabBinding = styles.addSheet(true, "tab-binding", "chrome://browser/content/browser.xul",
-                ".tabbrowser-tab { -moz-binding: url(chrome://dactyl/content/bindings.xml#" + fragment + ") !important; }" +
+        this.tabBinding = styles.addSheet(true, "tab-binding", "chrome://browser/content/browser.xul", String.replace(<![CDATA[
+                xul|tab { -moz-binding: url(chrome://dactyl/content/bindings.xml#tab-3) !important; }
+                #TabsToolbar > xul|tabs > xul|tab { -moz-binding: url(chrome://dactyl/content/bindings.xml#tab-4) !important; }
                 // FIXME: better solution for themes?
-                ".tabbrowser-tab[busy] > .tab-icon > .tab-icon-image { list-style-image: url('chrome://global/skin/icons/loading_16.png') !important; }",
-                false, true);
+                .tabbrowser-tab[busy] > .tab-icon > .tab-icon-image { list-style-image: url('chrome://global/skin/icons/loading_16.png') !important; }
+        ]]>, /tab-./g, function (m) dactyl.has("Darwin") ? "tab-mac" : m),
+        false, true);
 
         // hide tabs initially to prevent flickering when 'stal' would hide them
         // on startup