diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index 0599dd20e..19103e167 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -38,14 +38,14 @@
 }
 
 .zotero-tb-button > .toolbarbutton-icon {
-  -moz-binding: url('chrome://zotero-platform/content/zoterotbbutton.xml#zotero-tb-button');
+  /*-moz-binding: url('chrome://zotero-platform/content/zoterotbbutton.xml#zotero-tb-button');*/
   background: url("chrome://zotero/skin/mac/menubutton-start.png") left center no-repeat;
-  -moz-padding-start: 10px;
-  padding-bottom: 2px;
+  padding: 5px 1px 5px 11px;
 }
 
 #zotero-tb-sync > .toolbarbutton-icon {
   -moz-padding-start: 8px;
+  padding-top: 1px;
 }
 
 #zotero-tb-sync-warning[error=true]
@@ -82,6 +82,7 @@
 
 #zotero-tb-sync > .toolbarbutton-icon {
 	-moz-binding: none !important;
+	padding: 2px 0px 2px 8px !important;
 }
 
 #zotero-close-button {
@@ -450,4 +451,19 @@ tree:focus treechildren::-moz-tree-twisty(selected, open) {
 treechildren::-moz-tree-image {
 	height: 16px;
 	padding-bottom: 1px;
+}
+
+#zotero-tb-advanced-search
+{
+	list-style-image: url('chrome://zotero/skin/mac/toolbar-advanced-search.png');
+}
+
+#zotero-tb-note-add
+{
+	list-style-image: url('chrome://zotero/skin/mac/toolbar-note-add.png');
+}
+
+#zotero-tb-actions-menu
+{
+	list-style-image: url('chrome://zotero/skin/mac/cog.png');
 }
\ No newline at end of file
diff --git a/chrome/content/zotero-platform/mac/zoterotbbutton.xml b/chrome/content/zotero-platform/mac/zoterotbbutton.xml
deleted file mode 100644
index f9f156bcd..000000000
--- a/chrome/content/zotero-platform/mac/zoterotbbutton.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-
-<bindings xmlns="http://www.mozilla.org/xbl"
-		  xmlns:xbl="http://www.mozilla.org/xbl" xmlns:svg="http://www.w3.org/2000/svg" 
-		  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<binding id="zotero-tb-button" display="xul:button"
-           extends="chrome://global/content/bindings/button.xml#button-base">
-		<resources>
-			<stylesheet src="chrome://global/skin/toolbarbutton.css"/>
-		</resources>
-		<implementation>
-			<constructor>
-				<![CDATA[
-					var imageURL = document.defaultView.getComputedStyle(this, null).listStyleImage;
-					if(imageURL.substr(0, 4) == "url(") {
-						imageURL = imageURL.substring(4, imageURL.length-1);
-					} else if(imageURL.substr(0, 5) == "url('" || imageURL.substr(0, 5) == "url(\"") {
-						imageURL = imageURL.substring(5, imageURL.length-2);
-					}
-					document.getAnonymousElementByAttribute(this, "anonid", "tb-image")
-						.setAttributeNS("http://www.w3.org/1999/xlink", "href", imageURL);
-				]]>
-			</constructor>
-		</implementation>
-		<content>
-			<xul:stack>
-				<svg:svg class="zotero-tb-glow" xmlns="http://www.w3.org/2000/svg" width="18" height="24" version="1.1">
-					<svg:filter id="DropShadow">
-					   <svg:feGaussianBlur in="SourceAlpha" stdDeviation="1" result="MyBlur"/>
-					</svg:filter>
-					<svg:image anonid="tb-image" filter="url(#DropShadow)" x="1" y="4" width="16" height="16"/>	
-				</svg:svg>
-				<xul:image xbl:inherits="src=image" style="padding: 4px 1px 4px 1px;"/>
-			</xul:stack>
-		</content>
-	</binding>
-</bindings>
\ No newline at end of file
diff --git a/chrome/skin/default/zotero/mac/cog.png b/chrome/skin/default/zotero/mac/cog.png
new file mode 100644
index 000000000..d9b06fa23
Binary files /dev/null and b/chrome/skin/default/zotero/mac/cog.png differ
diff --git a/chrome/skin/default/zotero/mac/toolbar-advanced-search.png b/chrome/skin/default/zotero/mac/toolbar-advanced-search.png
new file mode 100755
index 000000000..0194ff985
Binary files /dev/null and b/chrome/skin/default/zotero/mac/toolbar-advanced-search.png differ
diff --git a/chrome/skin/default/zotero/mac/toolbar-note-add.png b/chrome/skin/default/zotero/mac/toolbar-note-add.png
new file mode 100755
index 000000000..09a2376e4
Binary files /dev/null and b/chrome/skin/default/zotero/mac/toolbar-note-add.png differ