diff --git a/application/palemoon/themes/osx/Search-glass.png b/application/palemoon/themes/osx/Search-glass.png
deleted file mode 100644
index 9eb0e259f2..0000000000
Binary files a/application/palemoon/themes/osx/Search-glass.png and /dev/null differ
diff --git a/application/palemoon/themes/osx/Search.png b/application/palemoon/themes/osx/Search.png
new file mode 100644
index 0000000000..0b71db3b41
Binary files /dev/null and b/application/palemoon/themes/osx/Search.png differ
diff --git a/application/palemoon/themes/osx/browser.css b/application/palemoon/themes/osx/browser.css
index 68365162c4..0f8b83dde6 100644
--- a/application/palemoon/themes/osx/browser.css
+++ b/application/palemoon/themes/osx/browser.css
@@ -68,6 +68,21 @@
     background-image: linear-gradient(rgba(32,32,32,.8), rgba(32,32,32,0));
 }
 
+/* Blend the topmost toolbar with the titlebar */
+#main-window[tabsontop=false]:not([privatebrowsingmode=temporary]) #nav-bar:not(:-moz-lwtheme),
+#main-window[tabsontop=true]:not([privatebrowsingmode=temporary]) #TabsToolbar:not(:-moz-lwtheme) {
+    -moz-appearance: toolbar;
+}
+
+#main-window[tabsontop=false][privatebrowsingmode=temporary] #nav-bar:not(:-moz-lwtheme),
+#main-window[tabsontop=true][privatebrowsingmode=temporary] #TabsToolbar:not(:-moz-lwtheme) {
+    background-color: transparent;
+}
+
+#main-window[tabsontop=false][privatebrowsingmode=temporary] #nav-bar:not(:-moz-lwtheme) {
+    border-bottom: 1px solid rgba(26,26,26,0.2);
+}
+
 #personal-bookmarks {
     min-height: 24px;
 }
@@ -635,8 +650,8 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 @conditionalForwardWithUrlbar@ > #forward-button > .toolbarbutton-icon {
     /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
-    clip-path: url(chrome://browser/content/browser.xul#windows-keyhole-forward-clip-path);
-    -moz-margin-start: -6px !important;
+    clip-path: url(chrome://browser/content/browser.xul#osx-keyhole-forward-clip-path);
+    -moz-margin-start: -9px !important;
     border-left-style: none;
     border-radius: 0;
     padding-left: 7px;
diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn
index 67339c7cc6..9f45210a93 100644
--- a/application/palemoon/themes/osx/jar.mn
+++ b/application/palemoon/themes/osx/jar.mn
@@ -60,7 +60,7 @@ browser.jar:
   skin/classic/browser/privatebrowsing-light.png
   skin/classic/browser/privatebrowsing-dark.png
   skin/classic/browser/reload-stop-go.png
-  skin/classic/browser/Search-glass.png
+  skin/classic/browser/Search.png
   skin/classic/browser/searchbar.css
   skin/classic/browser/searchbar-dropdown-arrow.png
   skin/classic/browser/Secure24.png
diff --git a/application/palemoon/themes/osx/searchbar.css b/application/palemoon/themes/osx/searchbar.css
index 55fdfc4bd4..e770ab6a9f 100644
--- a/application/palemoon/themes/osx/searchbar.css
+++ b/application/palemoon/themes/osx/searchbar.css
@@ -57,9 +57,9 @@
 }
 
 .search-go-button {
-  padding: 1px;
-  list-style-image: url("chrome://browser/skin/Search-glass.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
+  padding: 2px 1px;
+  opacity: .4;
+  list-style-image: url("chrome://browser/skin/Search.png");
 }
 
 .search-go-button:-moz-locale-dir(rtl) {
@@ -67,11 +67,11 @@
 }
 
 .search-go-button:hover {
-  -moz-image-region: rect(0px 32px 16px 16px);
+  opacity: .6;
 }
 
 .search-go-button:hover:active {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
+  opacity: .8;
 }
 
 .searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {