diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 0217df2d5..433f90886 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -115,7 +115,7 @@
 				<!-- This extra vbox prevents the toolbar from getting compressed when resizing
 						the tag selector to max height -->
 				<vbox flex="1">
-					<toolbar>
+					<hbox class="toolbar">
 						<toolbarbutton id="zotero-tb-collection-add" tooltiptext="&zotero.toolbar.newCollection.label;" oncommand="ZoteroPane.newCollection()"/>
 						<spacer flex="1"/>
 						<toolbarbutton id="zotero-tb-tag-selector" tooltiptext="&zotero.toolbar.tagSelector.label;" oncommand="ZoteroPane.toggleTagSelector()"/>
@@ -144,7 +144,7 @@
 								<menuitem id="zotero-tb-actions-about" label="&zotero.toolbar.about.label;" oncommand="window.openDialog('chrome://zotero/content/about.xul', 'about', 'chrome')"/>
 							</menupopup>
 						</toolbarbutton>
-					</toolbar>
+					</hbox>
 					<tree id="zotero-collections-tree" hidecolumnpicker="true" context="zotero-collectionmenu"
 						onmouseover="ZoteroPane.collectionsView.setHighlightedRows();"
 						ondblclick="ZoteroPane.onDoubleClick(event, this);"
@@ -173,7 +173,7 @@
 			<splitter id="zotero-tree-splitter" resizebefore="closest" resizeafter="closest"/>
 			
 			<vbox id="zotero-items-pane" persist="width" flex="1">
-				<toolbar align="center">
+				<hbox class="toolbar" align="center">
 					<toolbarbutton id="zotero-tb-add" tooltiptext="&zotero.toolbar.newItem.label;" type="menu">
 						<!-- New Item drop-down built in overlay.js::onLoad() -->
 						<menupopup>
@@ -203,7 +203,7 @@
 						ontestfail="ZoteroPane.setItemsPaneMessage(Zotero.getString('advancedSearchMode'))">
 						<toolbarbutton id="zotero-tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
 					</textbox>
-				</toolbar>
+				</hbox>
 				
 				<deck id="zotero-items-pane-content" selectedIndex="0" flex="1">
 					<tree 
@@ -311,7 +311,7 @@
 			<splitter id="zotero-view-splitter" resizebefore="closest" resizeafter="closest"/>
 			
 			<vbox id="zotero-item-pane" persist="width">
-				<toolbar align="center" pack="end">
+				<hbox class="toolbar" align="center" pack="end">
 					<hbox id="zotero-tb-sync-progress-box" hidden="true" align="center">
 						<toolbarbutton id="zotero-tb-sync-storage-cancel"
 							tooltiptext="Cancel Storage Sync"
@@ -357,7 +357,7 @@
 					<toolbarseparator/>
 					<toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.fullscreen.tooltip;" oncommand="ZoteroPane.fullScreen();"/>
 					<toolbarbutton class="tabs-closebutton" oncommand="ZoteroPane.toggleDisplay()"/>
-				</toolbar>
+				</hbox>
 				<groupbox flex="1">
 					<caption>
 						<tabs id="zotero-view-tabs" onselect="document.getElementById('zotero-view-item').selectedIndex = this.selectedIndex;" hidden="true">
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 1d78c5799..e8a866a9d 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -86,24 +86,17 @@
 	min-width: 335px;
 }
 
-#zotero-pane toolbar
+#zotero-pane .toolbar
 {
-	border: none;
 	height: 32px !important; /* Hard-code this to fix toolbar icon compression on Linux */
 	margin: 0;
 	padding: 0;
-	background: transparent !important;
 }
 
 #zotero-pane toolbarseparator {
 	height:24px;
 }
 
-#zotero-pane toolbar .toggler
-{
-	margin: 4px;
-}
-
 #zotero-tb-collection-add
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-collection-add.png');