diff --git a/chrome/content/zotero-platform/win/overlay.css b/chrome/content/zotero-platform/win/overlay.css
index d2ba621cb1..b688743a34 100644
--- a/chrome/content/zotero-platform/win/overlay.css
+++ b/chrome/content/zotero-platform/win/overlay.css
@@ -1,22 +1,27 @@
 /*
  As of Fx36, the built-in styles don't properly handle a menu-button within combined buttons.
 */
-#zotero-toolbar-main-button-single[cui-areatype="toolbar"] .toolbarbutton-icon {
+#zotero-toolbar-main-button-single[cui-areatype="toolbar"]:not([overflowedItem=true]) .toolbarbutton-icon {
 	width: 32px;
 }
 
-#zotero-toolbar-main-button[cui-areatype="toolbar"] .toolbarbutton-icon {
+#zotero-toolbar-buttons[cui-areatype="toolbar"]:not([overflowedItem=true]) #zotero-toolbar-main-button[cui-areatype="toolbar"] .toolbarbutton-icon {
 	width: 28px;
 }
 
-#zotero-toolbar-main-button[cui-areatype="toolbar"] .toolbarbutton-icon {
+#zotero-toolbar-save-button-single[cui-areatype="toolbar"]:not([overflowedItem=true]) .toolbarbutton-icon,
+#zotero-toolbar-buttons[cui-areatype="toolbar"]:not([overflowedItem=true]) #zotero-toolbar-save-button[cui-areatype="toolbar"] .toolbarbutton-icon {
+	height: 24px;
+}
+
+#zotero-toolbar-buttons[cui-areatype="toolbar"]:not([overflowedItem=true]) #zotero-toolbar-main-button .toolbarbutton-icon {
 	margin-left: 2px;
 	margin-right: -1px;
 	padding-left: 5px !important;
 	padding-right: 5px !important;
 }
 
-#zotero-toolbar-save-button[cui-areatype="toolbar"] .toolbarbutton-icon {
+#zotero-toolbar-buttons[cui-areatype="toolbar"]:not([overflowedItem=true]) #zotero-toolbar-save-button .toolbarbutton-icon {
 	padding-left: 6px !important;
 	padding-right: 6px !important;
 }
@@ -108,8 +113,11 @@
 }
 
 /* Alterations for overflow panel */
-#zotero-toolbar-main-button-single[overflowedItem=true] .toolbarbutton-icon {
-	width: 16px;
+#zotero-toolbar-main-button-single[overflowedItem=true] .toolbarbutton-icon,
+#zotero-toolbar-buttons[overflowedItem=true] #zotero-toolbar-main-button .toolbarbutton-icon,
+#zotero-toolbar-save-button-single[overflowedItem=true] .toolbarbutton-icon,
+#zotero-toolbar-buttons[overflowedItem=true] #zotero-toolbar-save-button .toolbarbutton-icon {
+	height: 16px;
 }
 
 #zotero-toolbar-buttons[overflowedItem=true] {
@@ -120,12 +128,8 @@
 	padding-left: 0;
 }
 
-#zotero-toolbar-buttons[overflowedItem=true] #zotero-toolbar-main-button .toolbarbutton-icon {
-	width: 26px;
-}
-
 #zotero-toolbar-buttons[overflowedItem=true] #zotero-toolbar-save-button .toolbarbutton-icon {
-	margin-left: 1px;
+	margin-left: 6px;
 	padding-right: 0 !important;
 }
 /* End toolbar buttons */