diff --git a/mozilla/mail/base/skin/communicator.css b/mozilla/mail/base/skin/communicator.css
index 9b26ac0c86c..021b2bf78db 100644
--- a/mozilla/mail/base/skin/communicator.css
+++ b/mozilla/mail/base/skin/communicator.css
@@ -41,7 +41,6 @@
 
 @import url("chrome://global/skin/");
 @import url("chrome://communicator/content/communicator.css");
-@import url("chrome://communicator/skin/button.css");
 @import url("chrome://communicator/skin/formatting.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/mozilla/mail/base/skin/primaryToolbar.css b/mozilla/mail/base/skin/primaryToolbar.css
index 71f6eea872d..7201a314b38 100644
--- a/mozilla/mail/base/skin/primaryToolbar.css
+++ b/mozilla/mail/base/skin/primaryToolbar.css
@@ -404,6 +404,38 @@ toolbar[iconsize="small"] #button-previous:hover {
 toolbar[iconsize="small"] #button-previous[disabled] {
   -moz-image-region: rect(40px 260px 60px 240px) !important;
 } 
+
+/* Smaller padding on small toolbar buttons */
+
+toolbar[iconsize="small"] .toolbarbutton-1 {
+  padding: 2px;
+}
+
+toolbar[iconsize="small"] .toolbarbutton-1:hover:active,
+toolbar[iconsize="small"] .toolbarbutton-1[open="true"] {
+  padding: 3px 1px 1px 3px;
+}
+
+toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"],
+toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"]:hover,
+toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"]:hover:active,
+toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"][open="true"] {
+  padding: 2px;
+}
+
+toolbar[iconsize="small"] .toolbarbutton-1[checked="true"] {
+  padding: 3px 1px 1px 3px !important;
+}
+
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"],
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover,
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover:active,
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][open="true"],
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"],
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"]:hover,
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"]:hover:active {
+  padding: 0;
+}
 
 /* ::::: end small primary toolbar buttons ::::: */