backing out remainder of bug 22056 patch to hopefully fix remaining

regression. a=perf regression.

suite/themes/modern/communicator/toolbar/toolbarBindings.xml

@@ -6,7 +6,7 @@
           xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="toolbar-primary"
-           extends="chrome://global/content/bindings/toolbar.xml#toolbar-primary">
+           extends="chrome://global/content/bindings/toolbar.xml#toolbar">
     <content>
       <xul:toolbargrippy xbl:inherits="last-toolbar"
           tbattr="toolbar-grippy" class="toolbar-primary-grippy"/>
@@ -22,8 +22,8 @@
   <binding id="toolbargrippy-primary"
            extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
     <content>
-      <xul:image class="toolbargrippy-arrow"/>
-      <xul:image class="toolbargrippy-texture" flex="1"/>
+      <xul:spacer class="toolbargrippy-primary-top" flex="1"/>
+      <xul:spacer class="toolbargrippy-primary-btm"/>
     </content>
   </binding>