diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index a40d44c2b4f..971ed7ecca0 100755
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -1134,6 +1134,12 @@ sidebarheader > .tabs-closebutton > .toolbarbutton-text {
   
 }
 
+// XXXmano: hack until we figure out why the throbber uses a button instead
+// of a toolbarbutton
+#navigator-throbber .button-text {
+  display: none;
+  margin: 0 !important;
+}
 
 #navigator-throbber[busy="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.gif");
diff --git a/toolkit/themes/pinstripe/global/button.css b/toolkit/themes/pinstripe/global/button.css
index fd5e1a867c3..810c456fdd4 100644
--- a/toolkit/themes/pinstripe/global/button.css
+++ b/toolkit/themes/pinstripe/global/button.css
@@ -50,25 +50,21 @@ button {
   margin: 6px;
   min-width: 6.3em;
   -moz-appearance: button;
- padding: 0px 4px;
+  padding: 0;
   color: #000000;
 }
 
 .button-text {
-  margin: 0 !important;
+  margin: 0 2px 0 3px !important;
   text-align: center;
 }
 
-button[type="default"] {
-	font: menu;
+.button-icon {
+  margin-left: 1px;
 }
 
-/* .......... active/open/checked state .......... */
-
-button:hover:active,
-button[open="true"],
-button[checked="true"] {
-
+button[type="default"] {
+  font: menu;
 }
 
 /* .......... disabled state .......... */