diff --git a/chrome/content/scaffold/scaffold.js b/chrome/content/scaffold/scaffold.js
index 236878bcd6..ab99528ff1 100644
--- a/chrome/content/scaffold/scaffold.js
+++ b/chrome/content/scaffold/scaffold.js
@@ -78,10 +78,10 @@ var Scaffold = new function () {
 		if (e.target !== document) return;
 		_document = document;
 
-		if (Zotero.isWin) {
-			// Hack to fix Windows toolbar
+		if (!Zotero.isMac) {
+			// Hack to fix Windows/Linux toolbar
 			let toolbar = document.getElementById('zotero-toolbar');
-			toolbar.className = '';
+			toolbar.className = 'toolbar-scaffold-small';
 		}
 		
 		_browser = document.getElementById('browser');
diff --git a/chrome/skin/default/scaffold/scaffold.css b/chrome/skin/default/scaffold/scaffold.css
index ff47e96acd..3ce1c75c16 100644
--- a/chrome/skin/default/scaffold/scaffold.css
+++ b/chrome/skin/default/scaffold/scaffold.css
@@ -74,6 +74,15 @@ listbox {
 	margin-bottom: 3px;
 }
 
+#zotero-toolbar.toolbar-scaffold-small {
+	-moz-appearance: none !important;
+	padding: 3px;
+}
+
+#zotero-toolbar.toolbar-scaffold-small .toolbarbutton-icon {
+	max-width: 16px;
+}
+
 #zotero-toolbar toolbarseparator {
 	height: 18px;
 }