diff --git a/calendar/base/themes/pinstripe/today-pane.css b/calendar/base/themes/pinstripe/today-pane.css
index 43a15207d5e..0be64676da3 100644
--- a/calendar/base/themes/pinstripe/today-pane.css
+++ b/calendar/base/themes/pinstripe/today-pane.css
@@ -66,9 +66,6 @@
 
 #miniday-dropdown-button {
   margin: 2px;
-  padding-left: 1px;
-  padding-right: 1px;
-  max-width: 15px;
 }
 
 .monthlabel {
@@ -84,9 +81,8 @@
 }
 
 .miniday-nav-buttons {
-  padding: 0 !important;
-  margin: 0 !important;
-  margin-top: 2px;
+  margin: 2px 0px 0px 0px;
+  padding: 1px;
   list-style-image: url("chrome://calendar/skin/mini-day-nav-buttons.png");
 }
 
@@ -128,6 +124,16 @@
   -moz-image-region: rect(26px 21px 39px 16px);
 }
 
+#miniday-dropdown-button > .toolbarbutton-icon,
+  .miniday-nav-buttons > .toolbarbutton-icon  {
+  margin: 1px;
+}
+
+#miniday-dropdown-button > .toolbarbutton-text,
+  .miniday-nav-buttons > .toolbarbutton-text  {
+  display: none;
+}
+
 .today-closebutton {
   list-style-image: url("chrome://global/skin/icons/closetab.png") !important;
 }
diff --git a/calendar/base/themes/winstripe/today-pane.css b/calendar/base/themes/winstripe/today-pane.css
index 93918878b6f..6c249455c25 100644
--- a/calendar/base/themes/winstripe/today-pane.css
+++ b/calendar/base/themes/winstripe/today-pane.css
@@ -66,8 +66,6 @@
 
 #miniday-dropdown-button {
   margin: 2px;
-  padding-left: 3px;
-  padding-right: 3px;
   max-width: 15px;
 }
 
@@ -126,6 +124,16 @@
   -moz-image-region: rect(26px 21px 39px 16px);
 }
 
+#miniday-dropdown-button > .toolbarbutton-icon,
+  .miniday-nav-buttons > .toolbarbutton-icon {
+  margin: 1px;
+}
+
+#miniday-dropdown-button > .toolbarbutton-text,
+  .miniday-nav-buttons > .toolbarbutton-text  {
+  display: none;
+}
+
 .today-closebutton {
   list-style-image: url("chrome://messenger/skin/icons/close-button.png");
   -moz-image-region: rect(0 16px 16px 0);
@@ -134,6 +142,7 @@
   padding: 2px;
 }
 
+
 .today-closebutton:hover {
   -moz-image-region: rect(0 32px 16px 16px);
 }