diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 516712771..550c9ce46 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -399,10 +399,12 @@ var ZoteroPane = new function()
 	
 	function toggleTagSelector(){
 		var zoteroPane = document.getElementById('zotero-pane');
+		var splitter = document.getElementById('zotero-tags-splitter');
 		var tagSelector = document.getElementById('zotero-tag-selector');
 		
 		var showing = tagSelector.getAttribute('collapsed') == 'true';
 		tagSelector.setAttribute('collapsed', !showing);
+		splitter.setAttribute('collapsed', !showing);
 		this.updateTagSelectorSize();
 		
 		// If showing, set scope to items in current view
@@ -448,7 +450,7 @@ var ZoteroPane = new function()
 			}
 			// 121px seems to be enough room for the toolbar and collections
 			// tree at minimum height
-			height = height + 121;
+			height = height + 125;
 		}
 		
 		//Zotero.debug('Setting Zotero pane minheight to ' + height);
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 8aebff965..82a29669a 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -138,7 +138,7 @@
 						<treechildren/>
 					</tree>
 				</vbox>
-				<splitter id="zotero-tags-splitter" onmouseup="ZoteroPane.updateTagSelectorSize()"/>
+				<splitter id="zotero-tags-splitter" persist="collapsed" onmouseup="ZoteroPane.updateTagSelectorSize()"/>
 				<zoterotagselector id="zotero-tag-selector" persist="height,collapsed,showAutomatic"
 					oncommand="ZoteroPane.updateTagFilter()"/>
 			</vbox>
diff --git a/chrome/skin/default/zotero/bindings/tagselector.css b/chrome/skin/default/zotero/bindings/tagselector.css
index 6cc316365..afa688f3a 100644
--- a/chrome/skin/default/zotero/bindings/tagselector.css
+++ b/chrome/skin/default/zotero/bindings/tagselector.css
@@ -2,7 +2,8 @@ groupbox
 {
 	overflow: hidden;
 	min-height: 132px;
-	padding-bottom: 2px;
+	margin: 0;
+	padding: 1px 1px 0;
 }
 
 #tags-toggle
@@ -56,7 +57,7 @@ groupbox > hbox
 
 textbox
 {
-	margin: 3px 0 2px;
+	margin: 3px 0 1px;
 	font-size: 11px !important; /* Keep font size in Linux within reason */
 }
 
@@ -80,7 +81,7 @@ groupbox > hbox > hbox
 /* Bottom buttons */
 toolbarbutton.zotero-clicky
 {
-	margin:3px 5px;
+	margin:2px 5px 3px;
 	padding:1px;
 	height:1em;
 }
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 063787364..ca0a61711 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -19,10 +19,9 @@
 
 #zotero-pane
 {
-	background: #f5f5f5;
 	min-height: 32px; /* must match value in ZoteroPane.updateTagSelectorSize() */
 	height: 300px;
-	padding: 4px;
+	padding: 0 7px 4px;
 	overflow: hidden;
 }
 
@@ -50,8 +49,10 @@
 
 #zotero-pane splitter
 {
-	background: #f5f5f5;
-	border:0;
+	border: 0;
+	width: 10px;
+	background-color: transparent !important;
+	background-image: none;
 }
 
 #zotero-items-tree treechildren::-moz-tree-image
@@ -72,9 +73,11 @@
 
 #zotero-pane toolbar
 {
-	border-bottom: none;
-	background: #f5f5f5;
-	height: 24px;
+	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 {
@@ -86,11 +89,6 @@
 	margin: 4px;
 }
 
-#zotero-toolbar-name
-{
-	font-size: larger;
-}
-
 #zotero-tb-collection-add
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-collection-add.png');
@@ -102,16 +100,10 @@
 	list-style-image: url(chrome://zotero/skin/tag-selector.png);
 }
 
-/* Hard-code this to fix toolbar icon compression on Linux */
-#zotero-pane toolbar
+#zotero-collections-tree, #zotero-items-tree, #zotero-item-pane > groupbox
 {
-	height: 32px !important;
-}
-
-/* Remove extra padding on Linux */
-#zotero-pane {
-	padding-top: 0;
-	padding-bottom: 0;
+	margin: 0;
+	padding: 0;
 }
 
 /* These fix a rendering bug in Fx2.0b2 */
@@ -258,9 +250,10 @@
 	border-bottom: 1px solid #A3A3A3;
 	min-height: 4px;
 	max-height: 4px;
-	background: #f5f5f5 !important;
+	background-image: none;
 }
 
+
 #zotero-annotate-tb-add
 {
 	list-style-image: url('chrome://zotero/skin/annotate-add.png');