--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -82,22 +82,20 @@
 
 /* NB: these would be margin-inline-start/end if it wasn't for the fact that OS X
  * doesn't reverse the order of the items in the titlebar in RTL mode. */
 .titlebar-placeholder[type="caption-buttons"],
 #titlebar-buttonbox {
   margin-left: 7px;
 }
 
-@media (-moz-mac-lion-theme) {
-  .titlebar-placeholder[type="fullscreen-button"],
-  #titlebar-secondary-buttonbox {
-    margin-right: 7px;
-    margin-left: 7px;
-  }
+.titlebar-placeholder[type="fullscreen-button"],
+#titlebar-secondary-buttonbox {
+  margin-right: 7px;
+  margin-left: 7px;
 }
 
 #main-window:not(:-moz-lwtheme) > #titlebar {
   -moz-appearance: -moz-window-titlebar;
 }
 
 #main-window:not([tabsintitlebar]) > #titlebar {
   height: 22px; /* The native titlebar on OS X is 22px tall. */
@@ -1057,41 +1055,33 @@ toolbar .toolbarbutton-1 > .toolbarbutto
 
 toolbar .toolbarbutton-1:not([type="menu-button"]),
 toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   min-width: 28px;
 }
 
 #main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-icon,
 #main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
-#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled="true"] > .toolbarbutton-icon {
-  opacity: .4;
-}
-
-@media (-moz-mac-lion-theme) {
-  #main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-icon,
-  #main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
-  #main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled="true"] > .toolbarbutton-icon,
-  #main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-menu-dropmarker,
-  #main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-menubutton-dropmarker,
-  .toolbarbutton-1:not(:hover):-moz-window-inactive > #downloads-indicator-anchor,
-  .toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-icon,
-  .toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-text,
-  .toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-badge-stack > .toolbarbutton-icon,
-  .toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-menu-dropmarker,
-  .toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-  .toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-    opacity: .5;
-  }
-
-  #main-window:not([customizing]) .toolbarbutton-1:-moz-window-inactive[disabled="true"] > .toolbarbutton-icon,
-  #main-window:not([customizing]) .toolbarbutton-1:-moz-window-inactive[disabled="true"] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
-  #main-window:not([customizing]) .toolbarbutton-1:-moz-window-inactive > .toolbarbutton-menubutton-button[disabled="true"] > .toolbarbutton-icon {
-    opacity: .25;
-  }
+#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled="true"] > .toolbarbutton-icon,
+#main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-menu-dropmarker,
+#main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1:not(:hover):-moz-window-inactive > #downloads-indicator-anchor,
+.toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-icon,
+.toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-text,
+.toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-badge-stack > .toolbarbutton-icon,
+.toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-menu-dropmarker,
+.toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+.toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+  opacity: .5;
+}
+
+#main-window:not([customizing]) .toolbarbutton-1:-moz-window-inactive[disabled="true"] > .toolbarbutton-icon,
+#main-window:not([customizing]) .toolbarbutton-1:-moz-window-inactive[disabled="true"] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
+#main-window:not([customizing]) .toolbarbutton-1:-moz-window-inactive > .toolbarbutton-menubutton-button[disabled="true"] > .toolbarbutton-icon {
+  opacity: .25;
 }
 
 .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
 .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   list-style-image: url(chrome://browser/skin/toolbarbutton-dropmarker.png);
 }
 
 @media (min-resolution: 2dppx) {
@@ -1217,60 +1207,38 @@ toolbar .toolbarbutton-1 > .toolbarbutto
 
 #forward-button > .toolbarbutton-icon {
   /* shift the icon away from the back button */
   margin-left: 3px;
   margin-right: -1px;
 }
 
 #forward-button:not(:-moz-lwtheme) {
-  background: linear-gradient(hsl(0,0%,99%), hsl(0,0%,67%)) padding-box;
+  background-image: linear-gradient(hsla(0,0%,100%,.73), hsla(0,0%,100%,.05) 85%);
   border: 1px solid;
-  border-color: hsl(0,0%,31%) hsla(0,0%,29%,.6) hsl(0,0%,27%);
-  box-shadow: inset 0 1px 0 hsla(0,0%,100%,.35),
+  border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.25) hsla(0,0%,0%,.2);
+  box-shadow: inset 0 1px 0 hsla(0,0%,100%,.2),
+              inset 0 0 1px hsla(0,0%,100%,.1),
               0 1px 0 hsla(0,0%,100%,.2);
 }
 
 #forward-button:hover:active:not(:-moz-lwtheme) {
-  background-image: linear-gradient(hsl(0,0%,74%), hsl(0,0%,61%));
-  box-shadow: inset rgba(0,0,0,.3) 0 -6px 10px,
-              inset #000 0 1px 3px,
-              inset rgba(0,0,0,.2) 0 1px 3px,
+  background-image: linear-gradient(hsla(0,0%,60%,.37), hsla(0,0%,100%,.35) 95%);
+  border-color: hsla(0,0%,0%,.43) hsla(0,0%,0%,.25) hsla(0,0%,0%,.37);
+  box-shadow: inset 0 1px 0 hsla(0,0%,0%,.02),
+              inset 0 1px 2px hsla(0,0%,0%,.2),
               0 1px 0 hsla(0,0%,100%,.2);
 }
 
 #forward-button:-moz-window-inactive:not(:-moz-lwtheme) {
-  border-color: hsl(0,0%,64%) hsl(0,0%,65%) hsl(0,0%,66%);
-  background-image: linear-gradient(hsl(0,0%,99%), hsl(0,0%,82%));
+  background-image: none;
+  border-color: hsla(0,0%,0%,.2);
   box-shadow: inset 0 1px 0 hsla(0,0%,100%,.35);
 }
 
-@media (-moz-mac-lion-theme) {
-  #forward-button:not(:-moz-lwtheme) {
-    background-image: linear-gradient(hsla(0,0%,100%,.73), hsla(0,0%,100%,.05) 85%);
-    border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.25) hsla(0,0%,0%,.2);
-    box-shadow: inset 0 1px 0 hsla(0,0%,100%,.2),
-                inset 0 0 1px hsla(0,0%,100%,.1),
-                0 1px 0 hsla(0,0%,100%,.2);
-  }
-
-  #forward-button:hover:active:not(:-moz-lwtheme) {
-    background-image: linear-gradient(hsla(0,0%,60%,.37), hsla(0,0%,100%,.35) 95%);
-    border-color: hsla(0,0%,0%,.43) hsla(0,0%,0%,.25) hsla(0,0%,0%,.37);
-    box-shadow: inset 0 1px 0 hsla(0,0%,0%,.02),
-                inset 0 1px 2px hsla(0,0%,0%,.2),
-                0 1px 0 hsla(0,0%,100%,.2);
-  }
-
-  #forward-button:-moz-window-inactive:not(:-moz-lwtheme) {
-    background-image: none;
-    border-color: hsla(0,0%,0%,.2);
-  }
-}
-
 @media (-moz-mac-yosemite-theme) {
   /* Base and hover styles */
   #forward-button:not(:-moz-lwtheme),
   #back-button:not(:-moz-lwtheme),
   #forward-button:hover:not(:-moz-lwtheme),
   #back-button:hover:not(:-moz-lwtheme) {
     background-image: none;
     background-color: #fbfbfb;
@@ -1483,46 +1451,31 @@ toolbar .toolbarbutton-1 > .toolbarbutto
 }
 
 /* ::::: nav-bar-inner ::::: */
 
 #urlbar,
 .searchbar-textbox {
   font: icon;
   -moz-appearance: none;
-  box-shadow: 0 1px rgba(255, 255, 255, 0.2), inset 0 1px hsla(0,0%,0%,.05);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.2),
+              inset 0 0 1px hsla(0,0%,0%,.05),
+              inset 0 1px 2px hsla(0,0%,0%,.1);
   margin: 0 4px;
   padding: 1px 0;
   border: 1px solid;
-  border-color: #626262 #787878 #8c8c8c;
+  background-image: linear-gradient(hsl(0,0%,97%), hsl(0,0%,100%));
+  border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.25) hsla(0,0%,0%,.15);
   background-clip: padding-box;
 }
 
 #urlbar[readonly] {
   background-color: -moz-field;
 }
 
-@media (-moz-mac-lion-theme) {
-  #urlbar,
-  .searchbar-textbox {
-    background-image: linear-gradient(hsl(0,0%,97%), hsl(0,0%,100%));
-    border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.25) hsla(0,0%,0%,.15);
-    box-shadow: 0 1px 0 hsla(0,0%,100%,.2),
-                inset 0 0 1px hsla(0,0%,0%,.05),
-                inset 0 1px 2px hsla(0,0%,0%,.1);
-  }
-}
-
-@media not all and (-moz-mac-lion-theme) {
-  #urlbar:-moz-window-inactive,
-  .searchbar-textbox:-moz-window-inactive {
-    border-color: @toolbarbuttonInactiveBorderColor@;
-  }
-}
-
 @media (-moz-mac-yosemite-theme) {
   .searchbar-textbox,
   #urlbar {
     border-color: #fff;
     border-radius: 3px;
     box-shadow: 0 .5px 0 0 rgba(0,0,0,0.2);
     background-image: none;
   }
@@ -2585,20 +2538,18 @@ toolbarbutton.chevron > .toolbarbutton-m
   -moz-appearance: toolbar;
 }
 
 #TabsToolbar:not(:-moz-lwtheme) {
   color: var(--tabs-toolbar-color);
   text-shadow: @loweredShadow@;
 }
 
-@media (-moz-mac-lion-theme) {
-  #navigator-toolbox[inFullscreen] > #TabsToolbar {
-    padding-top: var(--space-above-tabbar);
-  }
+#navigator-toolbox[inFullscreen] > #TabsToolbar {
+  padding-top: var(--space-above-tabbar);
 }
 
 #tabbrowser-tabs {
   -moz-box-align: stretch;
 }
 
 .tabs-newtab-button > .toolbarbutton-icon {
   padding: 6px 0 4px;
@@ -3524,35 +3475,33 @@ menulist.translate-infobar-element > .me
   .private-browsing-indicator {
     background-image: url("chrome://browser/skin/privatebrowsing-mask@2x.png");
   }
   #main-window[privatebrowsingmode=temporary]:not([tabsintitlebar]) > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > .private-browsing-indicator {
     background-image: url("chrome://browser/skin/privatebrowsing-mask-short@2x.png");
   }
 }
 
-@media (-moz-mac-lion-theme) {
-  #TabsToolbar > .private-browsing-indicator {
-    transform: translateY(calc(-1 * var(--space-above-tabbar)));
-    /* We offset by 38px for mask graphic, plus 4px to account for the
-     * margin-left, which sums to 42px.
-     */
-    margin-right: -42px;
-  }
-
-  #main-window[privatebrowsingmode=temporary] .titlebar-placeholder[type="fullscreen-button"],
-  #main-window[privatebrowsingmode=temporary] > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > #titlebar-fullscreen-button {
-    margin-left: 0px;
-  }
-
-  #main-window[privatebrowsingmode=temporary][inFullscreen] .titlebar-placeholder[type="fullscreen-button"] {
-    /* Override display:none for .titlebar-placeholder in fullscreen so we can have consistent
-       position and padding for the private browsing indicator. */
-    display: -moz-box;
-  }
+#TabsToolbar > .private-browsing-indicator {
+  transform: translateY(calc(-1 * var(--space-above-tabbar)));
+  /* We offset by 38px for mask graphic, plus 4px to account for the
+   * margin-left, which sums to 42px.
+   */
+  margin-right: -42px;
+}
+
+#main-window[privatebrowsingmode=temporary] .titlebar-placeholder[type="fullscreen-button"],
+#main-window[privatebrowsingmode=temporary] > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > #titlebar-fullscreen-button {
+  margin-left: 0px;
+}
+
+#main-window[privatebrowsingmode=temporary][inFullscreen] .titlebar-placeholder[type="fullscreen-button"] {
+  /* Override display:none for .titlebar-placeholder in fullscreen so we can have consistent
+     position and padding for the private browsing indicator. */
+  display: -moz-box;
 }
 
 #TabsToolbar > .private-browsing-indicator:-moz-locale-dir(rtl) {
   -moz-box-ordinal-group: 0;
 }
 
 %include ../shared/UITour.inc.css
 

--- a/browser/themes/osx/places/organizer.css
+++ b/browser/themes/osx/places/organizer.css
@@ -151,20 +151,16 @@
 #placesToolbar > toolbarbutton {
   list-style-image: url("chrome://browser/skin/places/toolbar.png");
   margin: 4px 4px 5px;
   padding: 0;
   height: 22px;
   -moz-appearance: toolbarbutton;
 }
 
-#placesToolbar > toolbarbutton[disabled="true"] > .toolbarbutton-icon {
-  opacity: 0.5;
-}
-
 #placesToolbar > toolbarbutton > .toolbarbutton-icon {
   margin: 1px 4px;
 }
 
 #placesToolbar > toolbarbutton:not(#clearDownloadsButton) > .toolbarbutton-text {
   display: none;
 }
 
@@ -180,28 +176,26 @@
     list-style-image: url(chrome://browser/skin/toolbarbutton-dropmarker@2x.png);
   }
 
   #placesToolbar > toolbarbutton[type="menu"] > .toolbarbutton-menu-dropmarker > .dropmarker-icon {
     width: 7px;
   }
 }
 
-@media (-moz-mac-lion-theme) {
-  #placesToolbar > toolbarbutton[disabled="true"] > .toolbarbutton-icon,
-  #placesToolbar > toolbarbutton:not(:hover):-moz-window-inactive > .toolbarbutton-icon,
-  #placesToolbar > toolbarbutton[type="menu"][disabled="true"] > .toolbarbutton-menu-dropmarker,
-  #placesToolbar > toolbarbutton:not(:hover):-moz-window-inactive[type="menu"] > .toolbarbutton-menu-dropmarker {
-    opacity: .5;
-  }
+#placesToolbar > toolbarbutton[disabled="true"] > .toolbarbutton-icon,
+#placesToolbar > toolbarbutton:not(:hover):-moz-window-inactive > .toolbarbutton-icon,
+#placesToolbar > toolbarbutton[type="menu"][disabled="true"] > .toolbarbutton-menu-dropmarker,
+#placesToolbar > toolbarbutton:not(:hover):-moz-window-inactive[type="menu"] > .toolbarbutton-menu-dropmarker {
+  opacity: .5;
+}
 
-  #placesToolbar > toolbarbutton:-moz-window-inactive[disabled="true"] > .toolbarbutton-icon,
-  #placesToolbar > toolbarbutton:-moz-window-inactive[type="menu"][disabled="true"] > .toolbarbutton-menu-dropmarker {
-    opacity: .25;
-  }
+#placesToolbar > toolbarbutton:-moz-window-inactive[disabled="true"] > .toolbarbutton-icon,
+#placesToolbar > toolbarbutton:-moz-window-inactive[type="menu"][disabled="true"] > .toolbarbutton-menu-dropmarker {
+  opacity: .25;
 }
 
 #placesToolbar > toolbarbutton > menupopup {
   margin-top: 1px;
 }
 
 /* back and forward button */
 #back-button:-moz-locale-dir(ltr),