Add m-esr52 at 52.6.0

204 files changed, 6672 insertions, 0 deletions

diff --git a/browser/themes/osx/Info.png b/browser/themes/osx/Info.png
new file mode 100644
index 000000000..7dd795ac9
--- /dev/null
+++ b/browser/themes/osx/Info.png
diff --git a/browser/themes/osx/Privacy-16.png b/browser/themes/osx/Privacy-16.png
new file mode 100644
index 000000000..5291abce4
--- /dev/null
+++ b/browser/themes/osx/Privacy-16.png
diff --git a/browser/themes/osx/Toolbar-background-noise.png b/browser/themes/osx/Toolbar-background-noise.png
new file mode 100644
index 000000000..aab0a02c8
--- /dev/null
+++ b/browser/themes/osx/Toolbar-background-noise.png
diff --git a/browser/themes/osx/Toolbar-inverted.png b/browser/themes/osx/Toolbar-inverted.png
new file mode 100644
index 000000000..60f001ffa
--- /dev/null
+++ b/browser/themes/osx/Toolbar-inverted.png
diff --git a/browser/themes/osx/Toolbar-inverted@2x.png b/browser/themes/osx/Toolbar-inverted@2x.png
new file mode 100644
index 000000000..511470b21
--- /dev/null
+++ b/browser/themes/osx/Toolbar-inverted@2x.png
diff --git a/browser/themes/osx/Toolbar-yosemite.png b/browser/themes/osx/Toolbar-yosemite.png
new file mode 100644
index 000000000..05594f2f5
--- /dev/null
+++ b/browser/themes/osx/Toolbar-yosemite.png
diff --git a/browser/themes/osx/Toolbar-yosemite@2x.png b/browser/themes/osx/Toolbar-yosemite@2x.png
new file mode 100644
index 000000000..369e2385b
--- /dev/null
+++ b/browser/themes/osx/Toolbar-yosemite@2x.png
diff --git a/browser/themes/osx/Toolbar.png b/browser/themes/osx/Toolbar.png
new file mode 100644
index 000000000..45d616d94
--- /dev/null
+++ b/browser/themes/osx/Toolbar.png
diff --git a/browser/themes/osx/Toolbar@2x.png b/browser/themes/osx/Toolbar@2x.png
new file mode 100644
index 000000000..25ab9feba
--- /dev/null
+++ b/browser/themes/osx/Toolbar@2x.png
diff --git a/browser/themes/osx/aboutSessionRestore-window-icon.png b/browser/themes/osx/aboutSessionRestore-window-icon.png
new file mode 100644
index 000000000..02dc44208
--- /dev/null
+++ b/browser/themes/osx/aboutSessionRestore-window-icon.png
diff --git a/browser/themes/osx/aboutSyncTabs.css b/browser/themes/osx/aboutSyncTabs.css
new file mode 100644
index 000000000..4cedad649
--- /dev/null
+++ b/browser/themes/osx/aboutSyncTabs.css
@@ -0,0 +1,101 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#tabs-display,
+#tabsList {
+  background-color: transparent;
+  -moz-appearance: none;
+  margin: 0;
+}
+
+#tabsList {
+  width: 100%;
+}
+
+#tabs-display {
+  background: #fff url(chrome://browser/skin/sync-bg.png) repeat-x center -80px;
+}
+
+#headers {
+  background: url(chrome://browser/skin/sync-32.png) no-repeat;
+  margin-top: 4px;
+  width: 45em;
+  height: 32px;
+  margin-inline-start: 2em;
+  margin-inline-end: 2em;
+}
+
+#tabsListHeading {
+  font-size: 140%;
+  font-weight: bold;
+  margin-inline-start: 40px;
+}
+
+richlistitem {
+  margin-inline-end: 2em;
+}
+
+richlistitem[selected="true"],
+richlistitem:focus {
+  outline-style: none;
+}
+
+richlistitem[type="tab"] {
+  min-height: 3em;
+  border: #999999 1px solid !important;
+  padding: 2px 5px;
+  margin-bottom: 4px;
+  margin-inline-start: 4em;
+  border-radius: 6px;
+  background-color: menu;
+  width: 44em;
+  opacity: 0.9;
+  box-shadow:
+    inset rgba(255, 255, 255, 0.5) 0 1px 0px,
+    inset rgba(0, 0, 0, 0.1) 0 -2px 0px,
+    rgba(0, 0, 0, 0.1) 0px 1px 0px;
+}
+
+richlistitem[type="tab"][selected="true"] {
+  background-color: -moz-MenuHover;
+}
+
+richlistitem[type="client"] {
+  min-height: 2em;
+  color: #000000;
+  margin-inline-start: 2em;
+  margin-top: 2px;
+  margin-bottom: 3px;
+  width: 42em;
+  border-radius: 6px;
+  background-color: transparent;
+  -moz-user-focus: ignore !important;
+}
+richlistitem.mobile[type="client"] {
+  list-style-image: url("chrome://browser/skin/sync-mobileIcon.svg#icon");
+}
+richlistitem.desktop[type="client"] {
+  list-style-image: url("chrome://browser/skin/sync-desktopIcon.svg#icon");
+}
+
+.title,
+.clientName {
+  color: #000000;
+  font-size: 1.1em;
+}
+
+.title[selected="true"],
+.url[selected="true"] {
+  color: inherit;
+}
+
+.url {
+  color: -moz-nativehyperlinktext;
+  font-size: 0.95em;
+}
+
+.tabIcon {
+  padding-inline-start: 2px;
+  padding-top: 2px;
+}
diff --git a/browser/themes/osx/actionicon-tab.png b/browser/themes/osx/actionicon-tab.png
new file mode 100644
index 000000000..ab7861313
--- /dev/null
+++ b/browser/themes/osx/actionicon-tab.png
diff --git a/browser/themes/osx/actionicon-tab@2x.png b/browser/themes/osx/actionicon-tab@2x.png
new file mode 100644
index 000000000..f53fdda57
--- /dev/null
+++ b/browser/themes/osx/actionicon-tab@2x.png
diff --git a/browser/themes/osx/browser-lightweightTheme.css b/browser/themes/osx/browser-lightweightTheme.css
new file mode 100644
index 000000000..aeae9d925
--- /dev/null
+++ b/browser/themes/osx/browser-lightweightTheme.css
@@ -0,0 +1,38 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%include shared.inc
+
+/*
+ * LightweightThemeListener will append the current lightweight theme's header
+ * image to the background-image for each of the following rulesets.
+ */
+
+/* Lightweight theme on tabs */
+#tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-start[selected=true]:-moz-lwtheme::before,
+#tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-end[selected=true]:-moz-lwtheme::before {
+  background-attachment: scroll, fixed;
+  background-color: transparent;
+  background-image: @fgTabTextureLWT@;/*, lwtHeader;*/
+  background-position: 0 0, right top;
+  background-repeat: repeat-x, no-repeat;
+}
+
+#tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-middle[selected=true]:-moz-lwtheme {
+  background-attachment: scroll, scroll, fixed;
+  background-color: transparent;
+  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
+                    @fgTabTextureLWT@;/*,
+                    lwtHeader;*/
+  background-position: 0 0, 0 0, right top;
+  background-repeat: repeat-x, repeat-x, no-repeat;
+}
+
+@media (min-resolution: 2dppx) {
+  #tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-middle[selected=true]:-moz-lwtheme {
+    background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle@2x.png),
+                      @fgTabTextureLWT@;/*,
+                      lwtHeader;*/
+  }
+}
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
new file mode 100644
index 000000000..e8ac9163e
--- /dev/null
+++ b/browser/themes/osx/browser.css
@@ -0,0 +1,3406 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url("chrome://global/skin/");
+
+%include shared.inc
+%filter substitution
+%define forwardTransitionLength 150ms
+%define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-wrapper
+%define toolbarButtonPressed :hover:active:not([disabled="true"]):not([cui-areatype="menu-panel"])
+%define windowButtonMarginTop 11px
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+@namespace svg url("http://www.w3.org/2000/svg");
+
+:root {
+  --space-above-tabbar: 9px;
+  --tabs-toolbar-color: #333;
+
+  --backbutton-urlbar-overlap: 6px;
+  /* icon width + border + horizontal padding (without the overlap from backbutton-urlbar-overlap) */
+  --forwardbutton-width: 26px;
+
+  --toolbarbutton-hover-background: hsla(0,0%,100%,.1) linear-gradient(hsla(0,0%,100%,.3), hsla(0,0%,100%,.1)) padding-box;
+  --toolbarbutton-hover-bordercolor: hsla(0,0%,0%,.2);
+  --toolbarbutton-hover-boxshadow: 0 1px 0 hsla(0,0%,100%,.5),
+                                   0 1px 0 hsla(0,0%,100%,.5) inset;
+
+  --toolbarbutton-active-background: hsla(0,0%,0%,.02) linear-gradient(hsla(0,0%,0%,.12), transparent) border-box;
+  --toolbarbutton-active-bordercolor: hsla(0,0%,0%,.3);
+  --toolbarbutton-active-boxshadow: 0 1px 0 hsla(0,0%,100%,.5),
+                                    0 1px 0 hsla(0,0%,0%,.05) inset,
+                                    0 1px 1px hsla(0,0%,0%,.2) inset;
+
+  --toolbarbutton-checkedhover-backgroundcolor: hsla(0,0%,0%,.09);
+
+  --urlbar-dropmarker-url: url("chrome://browser/skin/urlbar-history-dropmarker.png");
+  --urlbar-dropmarker-region: rect(0, 11px, 14px, 0);
+  --urlbar-dropmarker-active-region: rect(0, 22px, 14px, 11px);
+  --urlbar-dropmarker-2x-url: url("chrome://browser/skin/urlbar-history-dropmarker@2x.png");
+  --urlbar-dropmarker-2x-region: rect(0, 22px, 28px, 0);
+  --urlbar-dropmarker-active-2x-region: rect(0, 44px, 28px, 22px);
+
+  --panel-separator-color: hsla(210,4%,10%,.14);
+  --arrowpanel-dimmed: hsla(210,4%,10%,.07);
+  --arrowpanel-dimmed-further: hsla(210,4%,10%,.12);
+  --arrowpanel-dimmed-even-further: hsla(210,4%,10%,.17);
+
+  --urlbar-separator-color: hsla(0,0%,16%,.2);
+}
+
+#urlbar:-moz-lwtheme:not([focused="true"]),
+.searchbar-textbox:-moz-lwtheme:not([focused="true"]) {
+  opacity: .9;
+}
+
+#navigator-toolbox::after {
+  -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
+  content: "";
+  display: -moz-box;
+  border-top: 1px solid hsla(0,0%,100%,.15);
+  border-bottom: 1px solid hsla(0,0%,0%,.15);
+  margin-top: -2px;
+  position: relative;
+  z-index: 2; /* navbar is at 1 */
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #navigator-toolbox:-moz-window-inactive::after {
+    border-top-style: none;
+    border-bottom-color: hsla(0,0%,0%,.1);
+    margin-top: -1px;
+  }
+}
+
+#navigator-toolbox toolbarbutton:-moz-lwtheme {
+  color: inherit;
+  text-shadow: inherit;
+}
+
+#main-window {
+  -moz-appearance: none;
+  background-color: #eeeeee;
+}
+
+/** Begin titlebar **/
+
+#titlebar-buttonbox > .titlebar-button {
+  display: none;
+}
+
+/* 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;
+}
+
+.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. */
+}
+
+/**
+ * For tabs in titlebar on OS X, we stretch the titlebar down so that the
+ * tabstrip can overlap it.
+ */
+#main-window[tabsintitlebar] > #titlebar {
+  min-height: calc(var(--tab-min-height) + var(--space-above-tabbar) - var(--tab-toolbar-navbar-overlap));
+}
+
+/**
+ * We also vertically center the window buttons.
+ */
+#titlebar-buttonbox-container {
+  -moz-box-align: start;
+}
+
+#main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-buttonbox-container,
+#main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > #titlebar-fullscreen-button {
+  margin-top: @windowButtonMarginTop@;
+}
+
+#main-window:not([tabsintitlebar]) > #titlebar > #titlebar-content > #titlebar-buttonbox-container,
+#main-window:not([tabsintitlebar]) > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > #titlebar-fullscreen-button {
+  margin-top: 3px;
+}
+
+#main-window[customize-entered] > #titlebar {
+  -moz-appearance: none;
+}
+
+/** End titlebar **/
+
+#main-window[chromehidden~="toolbar"][chromehidden~="location"][chromehidden~="directories"] {
+  border-top: 1px solid rgba(0,0,0,0.65);
+}
+
+#navigator-toolbox > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwtheme) {
+  -moz-appearance: none;
+  background: url(chrome://browser/skin/Toolbar-background-noise.png) hsl(0,0%,83%);
+}
+
+/* remove noise texture on Yosemite */
+@media (-moz-mac-yosemite-theme) {
+  #navigator-toolbox > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwtheme) {
+    background-image: none;
+  }
+
+  #navigator-toolbox > toolbar:-moz-window-inactive:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwtheme) {
+    background-color: hsl(0,0%,95%);
+  }
+}
+
+#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(#addon-bar) {
+  overflow: -moz-hidden-unscrollable;
+  max-height: 4em;
+  transition: min-height 170ms ease-out, max-height 170ms ease-out;
+}
+
+#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(#addon-bar)[collapsed=true] {
+  min-height: 0.1px;
+  max-height: 0;
+  transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear;
+}
+
+#nav-bar {
+  -moz-appearance: none;
+  background: url(chrome://browser/skin/Toolbar-background-noise.png),
+              linear-gradient(hsl(0,0%,93%), hsl(0,0%,83%));
+  background-clip: border-box;
+  background-origin: border-box !important;
+
+  /* Move the noise texture out of the top 1px strip because that overlaps
+     with the tabbar and we don't want to repaint it when animating tabs.
+     The noise image is at least 100px high, so repeating it only horizontally
+     is enough. */
+  background-repeat: repeat-x, no-repeat;
+  background-position: 0 1px, 0 0;
+
+  box-shadow: inset 0 1px 0 hsla(0,0%,100%,.4);
+}
+
+@media (min-resolution: 2dppx) {
+  #nav-bar {
+    background-size: 100px 100px, auto;
+  }
+}
+
+/* remove noise texture on Yosemite */
+@media (-moz-mac-yosemite-theme) {
+  #nav-bar {
+    background: linear-gradient(hsl(0,0%,93%), hsl(0,0%,83%));
+  }
+
+  #nav-bar:-moz-window-inactive {
+    background: linear-gradient(hsl(0,0%,97%), hsl(0,0%,95%));
+  }
+}
+
+/* Draw the bottom border of the tabs toolbar when it's not using
+   -moz-appearance: toolbar. */
+#main-window:-moz-any([sizemode="fullscreen"],[customize-entered]) #TabsToolbar:not([collapsed="true"]) + #nav-bar,
+#main-window:not([tabsintitlebar]) #TabsToolbar:not([collapsed="true"]) + #nav-bar,
+#TabsToolbar:not([collapsed="true"]) + #nav-bar:-moz-lwtheme {
+  border-top: 1px solid hsla(0,0%,0%,.3);
+  background-clip: padding-box;
+  margin-top: calc(-1 * var(--navbar-tab-toolbar-highlight-overlap));
+  /* Position the toolbar above the bottom of background tabs */
+  position: relative;
+  z-index: 1;
+}
+
+/* Always draw a border on Yosemite to ensure the border is well-defined there
+ * (the default border is too light). */
+@media (-moz-mac-yosemite-theme) {
+  #main-window[tabsintitlebar] #TabsToolbar:not([collapsed="true"]) + #nav-bar:not(:-moz-lwtheme) {
+    border-top: 1px solid hsla(0,0%,0%,.2);
+    background-clip: padding-box;
+    margin-top: calc(-1 * var(--navbar-tab-toolbar-highlight-overlap));
+    /* Position the toolbar above the bottom of background tabs */
+    position: relative;
+    z-index: 1;
+  }
+
+  #main-window[tabsintitlebar] #TabsToolbar:not([collapsed="true"]) + #nav-bar:-moz-window-inactive:not(:-moz-lwtheme) {
+    border-top-color: hsla(0,0%,0%,.05);
+  }
+}
+
+#nav-bar-customization-target {
+  padding: 4px;
+}
+
+#PersonalToolbar {
+  padding: 0 4px 4px;
+}
+
+#PersonalToolbar:not([collapsed=true]) {
+  /* 4px padding ^  plus 19px personal-bookmarks (see below) */
+  min-height: 23px;
+}
+
+#navigator-toolbox > toolbar:not(#TabsToolbar):-moz-lwtheme {
+  background-color: @toolbarColorLWT@;
+  background-image: url(chrome://browser/skin/Toolbar-background-noise.png);
+}
+
+#PersonalToolbar:not(:-moz-lwtheme):-moz-window-inactive,
+#nav-bar:not(:-moz-lwtheme):-moz-window-inactive {
+  background-color: -moz-mac-chrome-inactive;
+}
+
+/* ----- BOOKMARK TOOLBAR ----- */
+
+#personal-bookmarks {
+  min-height: 19px; /* 16px button height + 2px padding + 1px margin-bottom */
+}
+
+#nav-bar-customization-target > #wrapper-personal-bookmarks > #personal-bookmarks {
+  min-height: 32px;
+  -moz-box-align: center;
+}
+
+toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/icons/chevron.png");
+  margin: 1px 0 0;
+  padding: 0;
+}
+
+toolbar[brighttext] toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/icons/chevron-inverted.png");
+}
+
+toolbarbutton.chevron > .toolbarbutton-text {
+  display: none;
+}
+
+toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
+}
+
+@media (min-resolution: 2dppx) {
+  toolbarbutton.chevron {
+    list-style-image: url("chrome://global/skin/icons/chevron@2x.png");
+  }
+
+  toolbar[brighttext] toolbarbutton.chevron {
+    list-style-image: url("chrome://global/skin/icons/chevron-inverted@2x.png");
+  }
+
+  toolbarbutton.chevron > .toolbarbutton-icon {
+    width: 13px;
+  }
+}
+
+/* ----- BOOKMARK BUTTONS ----- */
+
+toolbarbutton.bookmark-item:not(.subviewbutton),
+#personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder {
+  border: 0;
+  border-radius: 10000px;
+  padding: 1px 8px;
+  margin: 0 0 1px;
+}
+
+#personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder {
+  -moz-box-orient: horizontal;
+}
+
+.bookmark-item > .toolbarbutton-menu-dropmarker {
+  list-style-image: url("chrome://browser/skin/places/folderDropArrow.png");
+  -moz-image-region: rect(0, 7px, 5px, 0);
+  margin-top: 1px;
+  margin-inline-start: 3px;
+  margin-inline-end: -2px;
+}
+
+@media (min-resolution: 2dppx) {
+  .bookmark-item > .toolbarbutton-menu-dropmarker {
+    list-style-image: url("chrome://browser/skin/places/folderDropArrow@2x.png");
+    -moz-image-region: rect(0, 14px, 10px, 0);
+  }
+
+  .bookmark-item > .toolbarbutton-menu-dropmarker > .dropmarker-icon {
+    width: 7px;
+  }
+}
+
+.bookmark-item > .toolbarbutton-text,
+#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-text {
+  display: -moz-box !important; /* Force the display of the label for bookmarks */
+}
+
+toolbarbutton.bookmark-item:not(.subviewbutton):hover {
+  background-color: rgba(0, 0, 0, .205);
+}
+
+toolbarbutton.bookmark-item:hover:not(.subviewbutton),
+toolbarbutton.bookmark-item[open="true"]:not(.subviewbutton) {
+  color: #FFF !important;
+  text-shadow: 0 1px rgba(0, 0, 0, .4) !important;
+}
+
+.bookmark-item:hover > .toolbarbutton-menu-dropmarker,
+.bookmark-item[open="true"] > .toolbarbutton-menu-dropmarker {
+  -moz-image-region: rect(5px, 7px, 10px, 0);
+}
+
+@media (min-resolution: 2dppx) {
+  .bookmark-item:hover > .toolbarbutton-menu-dropmarker,
+  .bookmark-item[open="true"] > .toolbarbutton-menu-dropmarker {
+    -moz-image-region: rect(10px, 14px, 20px, 0);
+  }
+}
+
+toolbarbutton.bookmark-item:not(.subviewbutton):active:hover,
+toolbarbutton.bookmark-item:not(.subviewbutton)[open="true"] {
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4), 0 1px rgba(255, 255, 255, 0.4);
+  background-color: rgba(0, 0, 0, .5);
+}
+
+toolbarbutton.bookmark-item > menupopup {
+  margin-inline-start: 3px;
+}
+
+.bookmark-item > .toolbarbutton-icon,
+#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
+  width: 16px;
+  min-height: 16px;
+  max-height: 16px;
+}
+
+.bookmark-item > .toolbarbutton-icon[label]:not([label=""]),
+.bookmark-item > .toolbarbutton-icon[type="menu"] {
+  margin-inline-end: 5px;
+}
+
+.bookmark-item[container] {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+}
+
+.bookmark-item[container][livemark] {
+  list-style-image: url("chrome://browser/skin/page-livemarks.png");
+}
+
+.bookmark-item[container][livemark] .bookmark-item {
+  list-style-image: url("chrome://browser/skin/places/livemark-item.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.bookmark-item[container][livemark] .bookmark-item[visited] {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+.bookmark-item[container][query] {
+  list-style-image: url("chrome://browser/skin/places/query.png");
+}
+
+.bookmark-item[query][tagContainer] {
+  list-style-image: url("chrome://browser/skin/places/tag.png");
+}
+
+.bookmark-item[query][dayContainer] {
+  list-style-image: url("chrome://browser/skin/places/history.png");
+}
+
+.bookmark-item[query][hostContainer] {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+}
+
+.bookmark-item[query][hostContainer][open] {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+}
+
+@media (min-resolution: 2dppx) {
+  .bookmark-item[container] {
+    list-style-image: url("chrome://global/skin/tree/folder@2x.png");
+  }
+
+  .bookmark-item[container][livemark] {
+    list-style-image: url("chrome://browser/skin/page-livemarks@2x.png");
+  }
+
+  .bookmark-item[container][livemark] .bookmark-item {
+    list-style-image: url("chrome://browser/skin/places/livemark-item.png");
+  }
+
+  .bookmark-item[container][query] {
+    list-style-image: url("chrome://browser/skin/places/query@2x.png");
+  }
+
+  .bookmark-item[query][tagContainer] {
+    list-style-image: url("chrome://browser/skin/places/tag@2x.png");
+  }
+
+  .bookmark-item[query][dayContainer] {
+    list-style-image: url("chrome://browser/skin/places/history@2x.png");
+  }
+
+  .bookmark-item[query][hostContainer] {
+    list-style-image: url("chrome://global/skin/tree/folder@2x.png");
+  }
+
+  .bookmark-item[query][hostContainer][open] {
+    list-style-image: url("chrome://global/skin/tree/folder@2x.png");
+  }
+}
+
+/* Workaround for native menubar inheritance */
+.openintabs-menuitem,
+.openlivemarksite-menuitem,
+.livemarkstatus-menuitem {
+  list-style-image: none;
+}
+
+.bookmark-item[cutting] > .toolbarbutton-icon,
+.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-icon {
+  opacity: 0.5;
+}
+
+.bookmark-item[cutting] > .toolbarbutton-text,
+.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text {
+  opacity: 0.7;
+}
+
+#bookmarks-toolbar-placeholder {
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;
+}
+
+toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-placeholder,
+#personal-bookmarks[cui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder {
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar-menuPanel.png") !important;
+}
+
+@media (min-resolution: 2dppx) {
+  #bookmarks-toolbar-placeholder {
+    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important;
+  }
+
+  toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-placeholder,
+  #personal-bookmarks[cui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder {
+    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar-menuPanel@2x.png") !important;
+  }
+
+  #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
+/* ----- BOOKMARK STAR ANIMATION ----- */
+
+@keyframes animation-bookmarkAdded {
+  from { transform: rotate(0deg) translateX(-14px) rotate(0deg) scale(1); opacity: 0; }
+  60%  { transform: rotate(180deg) translateX(-14px) rotate(-180deg) scale(2.2); opacity: 1; }
+  80%  { opacity: 1; }
+  to   { transform: rotate(180deg) translateX(-14px) rotate(-180deg) scale(1); opacity: 0; }
+}
+
+@keyframes animation-bookmarkPulse {
+  from { transform: scale(1); }
+  50%  { transform: scale(1.3); }
+  to   { transform: scale(1); }
+}
+
+#bookmarked-notification-container {
+  min-height: 1px;
+  min-width: 1px;
+  height: 1px;
+  margin-bottom: -1px;
+  z-index: 5;
+  position: relative;
+}
+
+#bookmarked-notification {
+  background-size: 16px;
+  background-position: center;
+  background-repeat: no-repeat;
+  width: 16px;
+  height: 16px;
+  opacity: 0;
+}
+
+#bookmarked-notification-dropmarker-anchor {
+  z-index: -1;
+  position: relative;
+}
+
+#bookmarked-notification-dropmarker-icon {
+  width: 18px;
+  height: 18px;
+  visibility: hidden;
+}
+
+#bookmarked-notification-anchor[notification="finish"] > #bookmarked-notification {
+  background-image: url("chrome://browser/skin/places/bookmarks-notification-finish.png");
+  animation: animation-bookmarkAdded 800ms;
+  animation-timing-function: ease, ease, ease;
+}
+
+@media (min-resolution: 2dppx) {
+  #bookmarked-notification-anchor[notification="finish"] > #bookmarked-notification {
+    background-image: url("chrome://browser/skin/places/bookmarks-notification-finish@2x.png");
+  }
+}
+
+#bookmarks-menu-button[notification="finish"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  list-style-image: none !important;
+}
+
+#bookmarked-notification-dropmarker-anchor[notification="finish"] > #bookmarked-notification-dropmarker-icon {
+  visibility: visible;
+  animation: animation-bookmarkPulse 300ms;
+  animation-delay: 600ms;
+  animation-timing-function: ease-out;
+}
+
+/* ----- BOOKMARK MENUS ----- */
+
+.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
+  width: 16px;
+  height: 16px;
+}
+
+#bookmarksToolbarFolderMenu,
+#BMB_bookmarksToolbar,
+#panelMenu_bookmarksToolbar {
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
+}
+
+#menu_unsortedBookmarks,
+#BMB_unsortedBookmarks,
+#panelMenu_unsortedBookmarks {
+  list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.png");
+}
+
+@media (min-resolution: 2dppx) {
+  #bookmarksToolbarFolderMenu,
+  #BMB_bookmarksToolbar {
+    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png");
+  }
+
+  #BMB_unsortedBookmarks {
+    list-style-image: url("chrome://browser/skin/places/unfiledBookmarks@2x.png");
+  }
+}
+
+/* ----- PRIMARY TOOLBAR BUTTONS ----- */
+
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
+  max-width: 16px;
+  margin: 1px;
+}
+
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
+  max-width: 18px;
+  margin: 0;
+}
+
+toolbar .toolbarbutton-1:not([type="menu-button"]),
+.toolbarbutton-1 > .toolbarbutton-menubutton-button,
+.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+  -moz-box-orient: vertical;
+  height: 24px;
+  padding: 0;
+  border: 0;
+}
+
+.findbar-button,
+toolbar .toolbarbutton-1:not(:-moz-any([type="menu-button"],#back-button,#forward-button)),
+toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+  border: 1px solid transparent;
+  border-radius: @toolbarbuttonCornerRadius@;
+  transition-property: background, border-color;
+  transition-duration: 250ms;
+}
+
+.findbar-button {
+  background: none;
+  box-shadow: none;
+}
+
+toolbar .toolbarbutton-1:not(:-moz-any([type="menu-button"],#back-button,#forward-button)) {
+  padding: 0 4px;
+}
+
+.findbar-button:not(:-moz-any([checked="true"],[disabled="true"])):hover,
+toolbar .toolbarbutton-1:not(:-moz-any([type="menu-button"],[disabled],[open],#back-button,#forward-button)):hover,
+toolbar .toolbarbutton-1[type="menu-button"]:not([disabled]) > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker,
+toolbar .toolbarbutton-1[type="menu-button"]:not([disabled]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button,
+toolbar .toolbarbutton-1[type="menu-button"]:not([disabled]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker,
+toolbar .toolbaritem-combined-buttons:hover > .toolbarbutton-combined {
+  border-color: var(--toolbarbutton-hover-bordercolor);
+  box-shadow: var(--toolbarbutton-hover-boxshadow);
+}
+
+.findbar-button:not(:-moz-any([checked="true"],[disabled="true"])):hover,
+toolbar .toolbarbutton-1:not(:-moz-any([type="menu-button"],[disabled],[open],#back-button,#forward-button)):hover,
+toolbar .toolbarbutton-1[type="menu-button"]:not(:-moz-any([disabled],[open]))[buttonover] > .toolbarbutton-menubutton-button,
+toolbar .toolbarbutton-1[type="menu-button"]:not(:-moz-any([disabled],[open],[buttonover])):hover > .toolbarbutton-menubutton-dropmarker {
+  background: var(--toolbarbutton-hover-background);
+}
+
+.findbar-button:not([disabled=true]):-moz-any([checked="true"],:hover:active),
+toolbar .toolbarbutton-1:not(:-moz-any([type="menu-button"],[disabled],#back-button,#forward-button)):-moz-any(:hover:active,[open],[checked]),
+toolbar .toolbarbutton-1[type="menu-button"]:not([disabled]) > .toolbarbutton-menubutton-button[open],
+toolbar .toolbarbutton-1[type="menu-button"]:not(:-moz-any([disabled],[open]))[buttonover]:active > .toolbarbutton-menubutton-button,
+toolbar .toolbarbutton-1[type="menu-button"]:not(:-moz-any([disabled],[open],[buttonover])):hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbar .toolbarbutton-1[type="menu-button"][open]:not([disabled]) > .toolbarbutton-menubutton-dropmarker {
+  background: var(--toolbarbutton-active-background);
+  border-color: var(--toolbarbutton-active-bordercolor);
+  box-shadow: var(--toolbarbutton-active-boxshadow);
+  transition-duration: 10ms;
+}
+
+.findbar-button[checked="true"]:not(:active):hover,
+toolbar .toolbarbutton-1[checked]:not(:active):hover {
+  background-color: var(--toolbarbutton-checkedhover-backgroundcolor);
+  transition: background-color 250ms;
+}
+
+.toolbarbutton-1[type="menu-button"]:not([overflowedItem=true]) {
+  padding: 0;
+}
+
+toolbar .toolbarbutton-1[type="menu-button"] {
+  margin: 0;
+}
+
+.toolbarbutton-1 > .toolbarbutton-menubutton-button,
+.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+  margin: 0;
+}
+
+.toolbarbutton-1 {
+  margin: 0 4px;
+}
+
+toolbar .toolbarbutton-1:not([type="menu-button"]) {
+  margin: 0 2px;
+}
+
+/**
+ * Draw seperators before toolbar button dropmarkers, as well as between
+ * consecutive toolbarbutton-1's within a toolbaritem.
+ */
+toolbar .toolbaritem-combined-buttons:not(:hover) > separator,
+toolbar .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
+  content: "";
+  display: -moz-box;
+  width: 1px;
+  height: 18px;
+  margin-inline-start: -1px;
+  background-image: linear-gradient(currentColor 0, currentColor 100%);
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 1px 18px;
+  opacity: .2;
+}
+
+toolbar[brighttext] .toolbaritem-combined-buttons > separator,
+toolbar[brighttext] .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
+  opacity: .3;
+}
+
+toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+  -moz-box-orient: horizontal;
+}
+
+toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  margin: 0 4px;
+}
+
+#nav-bar .toolbarbutton-1:not(#back-button):not(#forward-button) {
+  margin-top: 4px;
+  margin-bottom: 4px;
+}
+
+#nav-bar #PanelUI-button {
+  -moz-box-align: center;
+}
+
+#nav-bar #PanelUI-menu-button {
+  margin-top: 0;
+  margin-bottom: 0;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  margin-inline-start: 7px;
+  margin-inline-end: 7px;
+}
+
+%include ../shared/toolbarbuttons.inc.css
+%include ../shared/menupanel.inc.css
+
+@media not all and (min-resolution: 1.1dppx) {
+  #back-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(18px, 36px, 36px, 18px);
+  }
+
+  #forward-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(18px, 72px, 36px, 54px);
+  }
+
+  #home-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 126px, 36px, 108px);
+  }
+
+  #bookmarks-menu-button[buttonover]@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 144px, 36px, 126px);
+  }
+
+  #bookmarks-menu-button[starred][buttonover]@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 162px, 36px, 144px);
+  }
+
+  #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+    -moz-image-region: rect(0px, 630px, 18px, 612px);
+  }
+
+  #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker:hover:active:not([disabled="true"]) > .dropmarker-icon {
+    -moz-image-region: rect(18px, 630px, 36px, 612px);
+  }
+
+  #history-panelmenu@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 180px, 36px, 162px);
+  }
+
+  #downloads-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 198px, 36px, 180px);
+  }
+
+  #add-ons-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 216px, 36px, 198px);
+  }
+
+  #open-file-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 234px, 36px, 216px);
+  }
+
+  #save-page-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 252px, 36px, 234px);
+  }
+
+  #sync-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 792px, 36px, 774px);
+  }
+
+  #containers-panelmenu@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 810px, 36px, 792px);
+  }
+
+  #feed-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 288px, 36px, 270px);
+  }
+
+  #social-share-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 306px, 36px, 288px);
+  }
+
+  #characterencoding-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 324px, 36px, 306px);
+  }
+
+  #new-window-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 342px, 36px, 324px);
+  }
+
+  #e10s-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 342px, 36px, 324px);
+  }
+
+  #webide-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 738px, 36px, 720px);
+  }
+
+  #new-tab-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 360px, 36px, 342px);
+  }
+
+  #privatebrowsing-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 378px, 36px, 360px);
+  }
+
+  #find-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 396px, 36px, 378px);
+  }
+
+  #print-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 414px, 36px, 396px);
+  }
+
+  #restore-button:hover:active:not([disabled="true"]),
+  #fullscreen-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 432px, 36px, 414px);
+  }
+
+  #developer-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 450px, 36px, 432px);
+  }
+
+  #preferences-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 468px, 36px, 450px);
+  }
+
+  #PanelUI-menu-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 486px, 36px, 468px);
+  }
+
+  #edit-controls[cui-areatype="toolbar"] > #cut-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(18px, 504px, 36px, 486px);
+  }
+
+  #edit-controls[cui-areatype="toolbar"] > #copy-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(18px, 522px, 36px, 504px);
+  }
+
+  #edit-controls[cui-areatype="toolbar"] > #paste-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(18px, 540px, 36px, 522px);
+  }
+
+  #zoom-controls[cui-areatype="toolbar"] > #zoom-out-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(18px, 558px, 36px, 540px);
+  }
+
+  #zoom-controls[cui-areatype="toolbar"] > #zoom-in-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(18px, 576px, 36px, 558px);
+  }
+
+  #nav-bar-overflow-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(18px, 612px, 36px, 594px);
+  }
+
+  #email-link-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 666px, 36px, 648px);
+  }
+
+  #sidebar-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 684px, 36px, 666px);
+  }
+
+  #panic-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(18px, 702px, 36px, 684px);
+  }
+
+  /**
+   * OSX has a unique set of icons when fullscreen is in the checked state.
+   */
+
+  #fullscreen-button[checked="true"]:not([cui-areatype="menu-panel"]) {
+    -moz-image-region: rect(36px, 432px, 54px, 414px);
+  }
+
+  #fullscreen-button[checked="true"]@toolbarButtonPressed@ {
+    -moz-image-region: rect(54px, 432px, 72px, 414px);
+  }
+}
+
+@media (min-resolution: 1.1dppx) {
+  #back-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(36px, 72px, 72px, 36px);
+  }
+
+  #forward-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(36px, 144px, 72px, 108px);
+  }
+
+  #home-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 252px, 72px, 216px);
+  }
+
+  #bookmarks-menu-button@toolbarButtonPressed@[buttonover] {
+    -moz-image-region: rect(36px, 288px, 72px, 252px);
+  }
+
+  #bookmarks-menu-button@toolbarButtonPressed@[starred][buttonover] {
+    -moz-image-region: rect(36px, 324px, 72px, 288px);
+  }
+
+  #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker:hover:active:not([disabled="true"]) > .dropmarker-icon {
+    -moz-image-region: rect(36px, 1260px, 72px, 1224px);
+  }
+
+  #history-panelmenu@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 360px, 72px, 324px);
+  }
+
+  #downloads-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 396px, 72px, 360px);
+  }
+
+  #add-ons-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 432px, 72px, 396px);
+  }
+
+  #open-file-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 468px, 72px, 432px);
+  }
+
+  #save-page-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 504px, 72px, 468px);
+  }
+
+  #sync-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 1584px, 72px, 1548px);
+  }
+
+  #containers-panelmenu@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 1620px, 72px, 1584px);
+  }
+
+  #feed-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 576px, 72px, 540px);
+  }
+
+  #social-share-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 612px, 72px, 576px);
+  }
+
+  #characterencoding-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 648px, 72px, 612px);
+  }
+
+  #new-window-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 684px, 72px, 648px);
+  }
+
+  #e10s-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 684px, 72px, 648px);
+  }
+
+  #e10s-button > .toolbarbutton-icon {
+    transform: scaleY(-1);
+  }
+
+  #webide-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 1476px, 72px, 1440px);
+  }
+
+  #new-tab-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 720px, 72px, 684px);
+  }
+
+  #privatebrowsing-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 756px, 72px, 720px);
+  }
+
+  #find-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 792px, 72px, 756px);
+  }
+
+  #print-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 828px, 72px, 792px);
+  }
+
+  #restore-button:hover:active:not([disabled="true"]),
+  #fullscreen-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 864px, 72px, 828px);
+  }
+
+  #fullscreen-button[cui-areatype="toolbar"][checked="true"] {
+    -moz-image-region: rect(72px, 864px, 108px, 828px);
+  }
+
+  #fullscreen-button@toolbarButtonPressed@[checked="true"] {
+    -moz-image-region: rect(108px, 864px, 144px, 828px);
+  }
+
+  #developer-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 900px, 72px, 864px);
+  }
+
+  #preferences-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 936px, 72px, 900px);
+  }
+
+  #PanelUI-menu-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(36px, 972px, 72px, 936px);
+  }
+
+  #edit-controls[cui-areatype="toolbar"] > #cut-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(36px, 1008px, 72px, 972px);
+  }
+
+  #edit-controls[cui-areatype="toolbar"] > #copy-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(36px, 1044px, 72px, 1008px);
+  }
+
+  #edit-controls[cui-areatype="toolbar"] > #paste-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(36px, 1080px, 72px, 1044px);
+  }
+
+  #zoom-controls[cui-areatype="toolbar"] > #zoom-out-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(36px, 1116px, 72px, 1080px);
+  }
+
+  #zoom-controls[cui-areatype="toolbar"] > #zoom-in-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(36px, 1152px, 72px, 1116px);
+  }
+
+  #nav-bar-overflow-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(36px, 1224px, 72px, 1188px);
+  }
+
+  #email-link-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 1332px, 72px, 1296px);
+  }
+
+  #sidebar-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 1368px, 72px, 1332px);
+  }
+
+  #panic-button@toolbarButtonPressed@ {
+    -moz-image-region: rect(36px, 1404px, 72px, 1368px);
+  }
+}
+
+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,
+#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) {
+  .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
+  .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+    list-style-image: url(chrome://browser/skin/toolbarbutton-dropmarker@2x.png);
+  }
+
+  .toolbarbutton-1 > .toolbarbutton-menu-dropmarker > .dropmarker-icon,
+  .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+    width: 7px;
+  }
+}
+
+.toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
+  margin-inline-end: 1px;
+}
+
+.toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  border-inline-end: none !important;
+}
+
+.toolbarbutton-1 > .toolbarbutton-menubutton-button:-moz-locale-dir(rtl),
+.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.toolbarbutton-1 > .toolbarbutton-menubutton-button:-moz-locale-dir(ltr),
+.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-locale-dir(rtl) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.toolbarbutton-1 > menupopup {
+  margin-top: 1px;
+}
+
+.toolbarbutton-1 > menupopup.cui-widget-panel {
+  margin-top: -5px;
+}
+
+/* Common back and forward button styles */
+
+#back-button,
+#forward-button {
+  background: linear-gradient(rgba(255,255,255,0.5),
+                              rgba(255,255,255,0.2) 50%,
+                              rgba(255,255,255,0.1) 50%,
+                              rgba(255,255,255,0.2)) repeat-x;
+}
+
+#back-button:-moz-lwtheme,
+#forward-button:-moz-lwtheme {
+  background-origin: border-box;
+  border: 1px solid rgba(0,0,0,0.4);
+  box-shadow: inset 0 1px rgba(255,255,255,0.3), 0 1px rgba(255,255,255,0.2);
+}
+
+#back-button:active:hover:-moz-lwtheme,
+#forward-button:active:hover:-moz-lwtheme {
+  background-color: rgba(0,0,0,0.2);
+  box-shadow: inset 0 2px 5px rgba(0,0,0,0.6), 0 1px rgba(255,255,255,0.2);
+}
+
+#back-button:-moz-window-inactive,
+#forward-button:-moz-window-inactive {
+  background-color: rgba(0,0,0,0.04);
+  border-color: rgba(0,0,0,0.2);
+}
+
+#back-button > .toolbarbutton-icon,
+#forward-button > .toolbarbutton-icon {
+  max-width: none;
+  width: 18px;
+}
+
+/* Back button styles */
+
+#back-button {
+  width: 32px;
+  height: 32px;
+  padding: 4px 5px 4px 3px;
+  margin-inline-end: 0;
+  border-radius: 10000px;
+}
+
+#back-button:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+#back-button:not(:-moz-lwtheme) {
+  height: 33px;
+  padding: 4px 5px 5px 3px;
+  margin-bottom: -1px;
+  background: url(chrome://browser/skin/keyhole-circle.png) 0 0 no-repeat;
+}
+
+@media (min-resolution: 2dppx) {
+  #back-button:not(:-moz-lwtheme) {
+    background-image: url(chrome://browser/skin/keyhole-circle@2x.png);
+    background-size: 96px;
+  }
+}
+
+#back-button:-moz-window-inactive:not(:-moz-lwtheme) {
+  background-position: -64px 0;
+}
+
+#back-button:not([disabled="true"]):active:hover:not(:-moz-lwtheme),
+#back-button[open="true"]:not(:-moz-lwtheme) {
+  background-position: -32px 0;
+}
+
+/* Forward button styles */
+
+#forward-button {
+  margin-left: -2px;
+  margin-right: 0;
+  padding-left: 2px;
+  width: 32px;
+}
+
+#forward-button > .toolbarbutton-icon {
+  /* shift the icon away from the back button */
+  margin-left: 3px;
+  margin-right: -1px;
+}
+
+#forward-button:not(:-moz-lwtheme) {
+  background-image: linear-gradient(hsla(0,0%,100%,.73), hsla(0,0%,100%,.05) 85%);
+  border: 1px solid;
+  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);
+  box-shadow: inset 0 1px 0 hsla(0,0%,100%,.35);
+}
+
+@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;
+    background-clip: border-box;
+    border: 1px solid #aeaeae;
+    box-shadow: none;
+  }
+
+  #back-button:not(:-moz-lwtheme) {
+    /* On non-lwtheme OS X, we use a 32-px image in a 33px container with negative margin bottom.
+     * Except that on Yosemite, we want to use a border instead of an image - like for lwthemes.
+     * So we need to readjust the height, padding and margin-bottom of the back button
+     * similarly to how we do this for lwthemes (but keep a specific enough selector to
+     * override the other :not(:-moz-lwtheme) selector above): */
+    height: 32px;
+    padding: 4px 5px 4px 3px;
+    margin-bottom: 0;
+  }
+
+  /* White inset shadow on top of the back button */
+  #back-button:not(:-moz-lwtheme),
+  #back-button:hover:not(:-moz-lwtheme) {
+    box-shadow: inset 0 1px 0.5px 0 #fff;
+  }
+
+  /* Bottom shadow and right border for the forward button to match the location bar */
+  #forward-button:hover:not(:-moz-lwtheme),
+  #forward-button:not(:-moz-lwtheme) {
+    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2);
+    border: 0 none;
+    border-right: 1px solid rgba(0,0,0,0.3);
+  }
+
+  /* Active styling: transparent white over toolbar colors */
+  #forward-button:hover:active:not(:-moz-lwtheme),
+  #back-button:not([disabled="true"]):hover:active:not(:-moz-lwtheme) {
+    background-image: linear-gradient(to bottom, rgba(255,255,255, 0.3), rgba(255,255,255, 0.4));
+    background-color: transparent;
+    box-shadow: none;
+  }
+
+  /* Add white detail on top of forward button only when active */
+  #forward-button:hover:active:not(:-moz-lwtheme) {
+    box-shadow: inset 0 1px 0 #f1f1f1, 0 1px 0 0 rgba(0,0,0,0.2);
+  }
+
+  /* Inactive window styling (hover styling is identical;
+   * we need to make this explicit because it is different on lion, see above. */
+  #forward-button:-moz-window-inactive:not(:-moz-lwtheme),
+  #back-button:-moz-window-inactive:not(:-moz-lwtheme),
+  #forward-button:hover:-moz-window-inactive:not(:-moz-lwtheme),
+  #back-button:hover:-moz-window-inactive:not(:-moz-lwtheme) {
+    background-image: none;
+    background-color: #f0f0f0;
+    background-clip: border-box;
+    border: 1px solid rgba(0,0,0,0.1);
+    box-shadow: none;
+  }
+
+  /* Lightweight theme styles */
+  #forward-button:-moz-lwtheme,
+  #forward-button:hover:-moz-lwtheme {
+    border: 0 none;
+    border-right: 1px solid rgba(0,0,0,0.3);
+    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2);
+  }
+
+  #forward-button:-moz-lwtheme,
+  #forward-button:hover:-moz-lwtheme,
+  #back-button:-moz-lwtheme,
+  #back-button:hover:-moz-lwtheme {
+    background-color: rgba(255,255,255,0.5);
+    background-image: none;
+    background-clip: border-box;
+  }
+
+  #forward-button:hover:active:-moz-lwtheme,
+  #back-button:hover:active:-moz-lwtheme {
+    background-image: linear-gradient(to bottom, rgba(255,255,255, 0.7), rgba(255,255,255, 0.8));
+    background-color: transparent;
+    box-shadow: none;
+  }
+
+  #forward-button:hover:active:-moz-lwtheme {
+    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2);
+  }
+}
+
+@conditionalForwardWithUrlbar@:not([switchingtabs]) > #forward-button {
+  transition: margin-left @forwardTransitionLength@ ease-out;
+}
+
+@conditionalForwardWithUrlbar@ > #forward-button[disabled] {
+  margin-left: calc(0px - var(--forwardbutton-width) - var(--backbutton-urlbar-overlap));
+}
+
+@conditionalForwardWithUrlbar@:hover:not([switchingtabs]) > #forward-button[disabled] {
+  /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
+  transition-delay: 100s;
+}
+
+@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] {
+  /* when not hovered anymore, trigger a new transition to hide the forward button immediately */
+  margin-left: calc(-0.01px - var(--forwardbutton-width) - var(--backbutton-urlbar-overlap));
+}
+
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr),
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/menu-back.png") !important;
+}
+
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr),
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
+}
+
+/* undo close tab menu item */
+#alltabs_undoCloseTab {
+  list-style-image: url(chrome://browser/skin/undoCloseTab.png);
+}
+
+@media (min-resolution: 2dppx) {
+  #alltabs_undoCloseTab {
+    list-style-image: url(chrome://browser/skin/undoCloseTab@2x.png);
+  }
+  #alltabs_undoCloseTab > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
+#cut-button {
+  margin-inline-end: 0;
+}
+
+#edit-controls[cui-areatype="toolbar"] > #cut-button {
+  border-inline-end: 0;
+}
+
+#paste-button {
+  border-inline-start: none;
+  margin-inline-start: 0;
+}
+
+#cut-button:-moz-locale-dir(ltr),
+#paste-button:-moz-locale-dir(rtl) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#cut-button:-moz-locale-dir(rtl),
+#paste-button:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+#copy-button {
+  border-radius: 0;
+  margin-right: 0;
+  margin-left: 0;
+}
+
+/* zoom controls */
+
+#zoom-out-button {
+  margin-inline-end: 0;
+}
+
+#zoom-in-button {
+  margin-inline-start: 0;
+  border-inline-start: 0;
+}
+
+#zoom-controls[cui-areatype="toolbar"] > #zoom-out-button {
+  border-inline-end: 0;
+}
+
+#zoom-controls[cui-areatype="toolbar"] > #zoom-in-button {
+  border-inline-start-width: 1px;
+}
+
+#zoom-controls[cui-areatype="toolbar"] > #zoom-reset-button {
+  border-radius: 0;
+}
+
+#zoom-out-button:-moz-locale-dir(ltr),
+#zoom-in-button:-moz-locale-dir(rtl) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#zoom-out-button:-moz-locale-dir(rtl),
+#zoom-in-button:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+#zoom-controls[cui-areatype="toolbar"]:not([overflowedItem=true]) > #zoom-reset-button {
+  min-width: 0;
+  margin: 0;
+  -moz-box-orient: horizontal;
+  -moz-box-align: center;
+}
+
+/* ----- FULLSCREEN WINDOW CONTROLS ----- */
+
+#minimize-button,
+#close-button,
+#fullscreen-button ~ #window-controls > #restore-button {
+  display: none;
+}
+
+/* ::::: nav-bar-inner ::::: */
+
+#urlbar,
+.searchbar-textbox {
+  font: icon;
+  -moz-appearance: none;
+  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;
+  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-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;
+  }
+  .searchbar-textbox:-moz-window-inactive,
+  #urlbar:-moz-window-inactive {
+    box-shadow: none;
+    border-color: rgba(0,0,0,0.1);
+  }
+}
+
+#urlbar[focused="true"],
+.searchbar-textbox[focused="true"] {
+  border-color: -moz-mac-focusring;
+  box-shadow: @focusRingShadow@;
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #urlbar[focused="true"],
+  .searchbar-textbox[focused="true"] {
+    box-shadow: @yosemiteFocusRingShadow@;
+  }
+}
+
+#urlbar-container {
+  -moz-box-align: center;
+}
+
+#urlbar {
+  border-radius: @toolbarbuttonCornerRadius@;
+}
+
+@conditionalForwardWithUrlbar@ > #urlbar {
+  border-inline-start: none;
+  margin-left: 0;
+}
+
+@conditionalForwardWithUrlbar@ > #urlbar:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+@conditionalForwardWithUrlbar@ > #urlbar:-moz-locale-dir(rtl) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+@conditionalForwardWithUrlbar@ {
+  clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path");
+  margin-inline-start: calc(-1 * var(--backbutton-urlbar-overlap));
+}
+
+@conditionalForwardWithUrlbar@:-moz-locale-dir(rtl),
+@conditionalForwardWithUrlbar@ > #urlbar:-moz-locale-dir(rtl) {
+  /* let urlbar-back-button-clip-path clip the urlbar's right side for RTL */
+  transform: scaleX(-1);
+}
+
+@conditionalForwardWithUrlbar@:-moz-locale-dir(rtl) {
+  -moz-box-direction: reverse;
+}
+
+%include ../shared/identity-block/identity-block.inc.css
+
+#identity-box {
+  padding-top: 2px;
+  padding-bottom: 2px;
+}
+
+#urlbar:not([focused="true"]) > #identity-box {
+  margin-top: -1px;
+  margin-bottom: -1px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #urlbar:not([focused="true"]):not(:-moz-window-inactive) > #identity-box {
+    margin-top: -2px;
+    margin-bottom: -2px;
+    padding-top: 4px;
+    padding-bottom: 4px;
+  }
+}
+
+#identity-box:-moz-locale-dir(ltr) {
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+
+#identity-box:-moz-locale-dir(rtl) {
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+
+#identity-box:-moz-focusring {
+  box-shadow: 0 0 2px 1px -moz-mac-focusring inset,
+              0 0 2px 2px -moz-mac-focusring;
+  border-inline-end-style: none;
+  padding-inline-end: 5px;
+}
+
+.urlbar-input-box {
+  margin-inline-start: 0;
+  padding: 3px 0 2px;
+}
+
+.urlbar-input-box,
+#urlbar-display-box {
+  padding-inline-start: 4px;
+  border-inline-start: 1px solid var(--urlbar-separator-color);
+  border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
+  border-image-slice: 1;
+}
+
+.urlbar-history-dropmarker {
+  padding: 0 3px;
+  list-style-image: var(--urlbar-dropmarker-url);
+  -moz-image-region: var(--urlbar-dropmarker-region);
+  transition: opacity 0.15s ease;
+}
+
+#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker {
+  transition: none;
+}
+
+#navigator-toolbox:not(:hover) #nav-bar:not([customizing="true"]) #urlbar:not([focused]) > .urlbar-textbox-container > .urlbar-history-dropmarker {
+  opacity: 0;
+}
+
+.urlbar-history-dropmarker[open="true"],
+.urlbar-history-dropmarker:hover:active {
+  -moz-image-region: var(--urlbar-dropmarker-active-region);
+}
+
+@media (min-resolution: 2dppx) {
+  .urlbar-history-dropmarker {
+    list-style-image: var(--urlbar-dropmarker-2x-url);
+    -moz-image-region: var(--urlbar-dropmarker-2x-region);
+  }
+
+  .urlbar-history-dropmarker[open="true"],
+  .urlbar-history-dropmarker:hover:active {
+    -moz-image-region: var(--urlbar-dropmarker-active-2x-region);
+  }
+
+  .urlbar-history-dropmarker > .dropmarker-icon {
+    width: 11px;
+  }
+}
+
+#urlbar-icons {
+  -moz-box-align: center;
+}
+
+.urlbar-icon {
+  padding: 0 3px;
+  /* 16x16 icon with border-box sizing */
+  width: 22px;
+  height: 16px;
+}
+
+/* ::::: URL Bar Zoom Reset Button ::::: */
+@keyframes urlbar-zoom-reset-pulse {
+  0% {
+    transform: scale(0);
+  }
+  75% {
+    transform: scale(1.5);
+  }
+  100% {
+    transform: scale(1.0);
+  }
+}
+
+#urlbar-zoom-button {
+  margin: 0 3px;
+  font-size: .8em;
+  padding: 0 8px;
+  border-radius: 1em;
+  background-color: hsla(0,0%,0%,.05);
+  border: 1px solid ThreeDLightShadow;
+}
+
+#urlbar-zoom-button[animate="true"] {
+  animation-name: urlbar-zoom-reset-pulse;
+  animation-duration: 250ms;
+}
+
+#urlbar-zoom-button:hover {
+  background-color: hsla(0,0%,0%,.1);
+}
+
+#urlbar-zoom-button:hover:active {
+  background-color: hsla(0,0%,0%,.15);
+}
+
+#urlbar-zoom-button > .toolbarbutton-text {
+  display: -moz-box;
+}
+
+#urlbar-zoom-button > .toolbarbutton-icon {
+  display: none;
+}
+
+#urlbar-search-footer {
+  border-top: 1px solid var(--panel-separator-color);
+  background-color: var(--arrowpanel-dimmed);
+}
+
+#urlbar-search-settings {
+  -moz-appearance: none;
+  -moz-user-focus: ignore;
+  color: GrayText;
+  margin: 0;
+  padding: 8px 20px;
+}
+
+#urlbar-search-settings:hover {
+  background-color: var(--arrowpanel-dimmed);
+}
+
+#urlbar-search-settings:hover:active {
+  background-color: var(--arrowpanel-dimmed-further);
+}
+
+#urlbar-search-splitter {
+  min-width: 8px;
+  width: 8px;
+  background-image: none;
+  margin: 0 -4px;
+  position: relative;
+  height: 22px;
+}
+
+#search-container {
+  min-width: calc(54px + 11ch);
+}
+
+#wrapper-urlbar-container[place="palette"] {
+  max-width: 20em;
+}
+
+.urlbar-display {
+  margin-top: 0;
+  margin-bottom: 0;
+  color: GrayText;
+}
+
+%include ../shared/urlbarSearchSuggestionsNotification.inc.css
+
+/* ----- AUTOCOMPLETE ----- */
+
+%include ../shared/autocomplete.inc.css
+
+#PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] {
+  border-top: 1px solid #C7C7C7;
+}
+
+#treecolAutoCompleteImage {
+  max-width: 36px;
+}
+
+.autocomplete-richlistbox {
+  padding: 4px;
+}
+
+.autocomplete-richlistitem {
+  height: 30px;
+  min-height: 30px;
+  font: message-box;
+  border-radius: 2px;
+  border: 1px solid transparent;
+}
+
+.autocomplete-richlistitem[selected] {
+  background-color: hsl(210, 80%, 52%);
+}
+
+.ac-title {
+  font-size: 14px;
+  color: hsl(0, 0%, 0%);
+}
+
+.ac-tags {
+  font-size: 12px;
+}
+
+html|span.ac-tag {
+  background-color: hsl(216, 0%, 88%);
+  color: hsl(0, 0%, 0%);
+  border-radius: 2px;
+  border: 1px solid transparent;
+  padding: 0 1px;
+}
+
+.ac-separator,
+.ac-url,
+.ac-action {
+  font-size: 12px;
+}
+
+.ac-separator {
+  color: hsl(0, 0%, 50%);
+}
+
+.ac-url {
+  color: hsl(210, 77%, 47%);
+}
+
+.ac-action {
+  color: hsl(178, 100%, 28%);
+}
+
+.ac-title[selected],
+.ac-separator[selected],
+.ac-url[selected],
+.ac-action[selected] {
+  color: hsl(0, 0%, 100%);
+}
+
+.ac-tags-text[selected] > html|span.ac-tag {
+  background-color: hsl(0, 0%, 100%);
+  color: hsl(210, 80%, 40%);
+}
+
+html|span.ac-emphasize-text-title,
+html|span.ac-emphasize-text-tag,
+html|span.ac-emphasize-text-url {
+  font-weight: 600;
+}
+
+.ac-type-icon[type=bookmark] {
+  list-style-image: url("chrome://browser/skin/urlbar-star.svg#star");
+}
+
+.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
+  list-style-image: url("chrome://browser/skin/places/autocomplete-star.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.autocomplete-treebody::-moz-tree-image(selected, current, bookmark, treecolAutoCompleteImage) {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.ac-type-icon[type=bookmark][selected][current] {
+  list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted");
+}
+
+.ac-type-icon[type=keyword],
+.ac-site-icon[type=searchengine],
+.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
+  list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon);
+}
+
+.ac-type-icon[type=keyword][selected],
+.ac-site-icon[type=searchengine][selected],
+.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) {
+  list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted);
+}
+
+.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
+  list-style-image: url("chrome://browser/skin/places/tag.png");
+}
+
+.ac-type-icon[type=switchtab],
+.ac-type-icon[type=remotetab] {
+  list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab");
+}
+
+.ac-type-icon[type=switchtab][selected],
+.ac-type-icon[type=remotetab][selected] {
+  list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab-inverted");
+}
+
+.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
+  color: GrayText;
+}
+
+.autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment),
+.autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment)
+{
+  color: GrayText;
+  font-size: smaller;
+}
+
+.autocomplete-treebody::-moz-tree-cell(suggesthint) {
+  border-top: 1px solid GrayText;
+}
+
+
+/* ----- COMBINED GO/RELOAD/STOP BUTTON IN LOCATION BAR ----- */
+
+#urlbar-go-button,
+#urlbar-reload-button,
+#urlbar-stop-button {
+  margin: 0;
+  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+  padding: 0 9px;
+  margin-inline-start: 5px;
+  border-inline-start: 1px solid var(--urlbar-separator-color);
+  border-image: linear-gradient(transparent 15%,
+                                var(--urlbar-separator-color) 15%,
+                                var(--urlbar-separator-color) 85%,
+                                transparent 85%);
+  border-image-slice: 1;
+}
+
+#urlbar-go-button {
+  -moz-image-region: rect(0, 42px, 14px, 28px);
+}
+
+#urlbar-go-button:hover:active {
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
+}
+
+#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
+}
+
+#urlbar-reload-button {
+  -moz-image-region: rect(0, 14px, 14px, 0);
+}
+
+#urlbar-reload-button:not([disabled]):hover:active {
+  -moz-image-region: rect(14px, 14px, 28px, 0);
+}
+
+#urlbar-reload-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
+}
+
+#urlbar-stop-button {
+  -moz-image-region: rect(0, 28px, 14px, 14px);
+}
+
+#urlbar-stop-button:hover:active {
+  -moz-image-region: rect(14px, 28px, 28px, 14px);
+}
+
+@media (min-resolution: 2dppx) {
+  #urlbar-go-button,
+  #urlbar-reload-button,
+  #urlbar-stop-button {
+    list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
+  }
+
+  #urlbar-go-button > .toolbarbutton-icon,
+  #urlbar-reload-button > .toolbarbutton-icon,
+  #urlbar-stop-button > .toolbarbutton-icon {
+    width: 14px;
+  }
+
+  #urlbar-go-button {
+    -moz-image-region: rect(0, 84px, 28px, 56px);
+  }
+
+  #urlbar-go-button:hover:active {
+    -moz-image-region: rect(28px, 84px, 56px, 56px);
+  }
+
+  #urlbar-reload-button {
+    -moz-image-region: rect(0, 28px, 28px, 0);
+  }
+
+  #urlbar-reload-button:not([disabled]):hover:active {
+    -moz-image-region: rect(28px, 28px, 56px, 0);
+  }
+
+  #urlbar-stop-button {
+    -moz-image-region: rect(0, 56px, 28px, 28px);
+  }
+
+  #urlbar-stop-button:hover:active {
+    -moz-image-region: rect(28px, 56px, 56px, 28px);
+  }
+}
+
+#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  width: 18px;
+  height: 18px;
+}
+
+#bookmarks-menu-button[cui-areatype="toolbar"].bookmark-item > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  width: 16px;
+  height: 16px;
+}
+
+#BMB_bookmarksPopup[side="top"],
+#BMB_bookmarksPopup[side="bottom"] {
+  margin-left: -26px;
+  margin-right: -26px;
+}
+
+#BMB_bookmarksPopup[side="left"],
+#BMB_bookmarksPopup[side="right"] {
+  margin-top: -26px;
+  margin-bottom: -26px;
+}
+
+/* POPUP BLOCKER BUTTON */
+#page-report-button {
+  list-style-image: url("chrome://browser/skin/urlbar-popup-blocked.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+#page-report-button:hover:active,
+#page-report-button[open="true"] {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+@media (min-resolution: 2dppx) {
+  #page-report-button {
+    list-style-image: url("chrome://browser/skin/urlbar-popup-blocked@2x.png");
+    -moz-image-region: rect(0, 32px, 32px, 0);
+  }
+
+  #page-report-button:hover:active,
+  #page-report-button[open="true"] {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+}
+
+/* Reader mode button */
+
+#reader-mode-button {
+  list-style-image: url("chrome://browser/skin/readerMode.svg");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+#reader-mode-button:hover:active {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+#reader-mode-button[readeractive] {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+/* social share panel */
+.social-share-frame {
+  border-top: 1px solid #f8f8f8;
+  min-width: 756px;
+  height: 150px;
+  /* we resize our panels dynamically, make it look nice */
+}
+
+#share-container {
+  min-width: 756px;
+  background-repeat: no-repeat;
+  background-position: center center;
+}
+#share-container[loading] {
+  background-image: url(chrome://browser/skin/tabbrowser/pendingpaint.png);
+}
+#share-container > browser {
+  transition: opacity 150ms ease-in-out;
+  opacity: 1;
+}
+#share-container[loading] > browser {
+  opacity: 0;
+}
+
+#manage-share-providers {
+  -moz-image-region: rect(18px, 468px, 36px, 450px);
+}
+
+.social-share-toolbar {
+  border-bottom: 1px solid #dedede;
+  padding: 2px;
+}
+
+#social-share-provider-buttons {
+  padding: 0;
+  margin: 0;
+}
+
+.share-provider-button {
+  padding: 5px;
+  margin: 2px;
+}
+
+.share-provider-button > .toolbarbutton-text {
+  display: none;
+}
+
+.share-provider-button > .toolbarbutton-icon {
+  width: 16px;
+  min-height: 16px;
+  max-height: 16px;
+}
+
+/* BOOKMARKING PANEL */
+#editBookmarkPanelStarIcon {
+  list-style-image: url("chrome://browser/skin/places/starred48.png");
+  width: 48px;
+  height: 48px;
+}
+
+#editBookmarkPanelStarIcon[unstarred] {
+  list-style-image: url("chrome://browser/skin/places/unstarred48.png");
+}
+
+@media (min-resolution: 2dppx) {
+  #editBookmarkPanelStarIcon {
+    list-style-image: url("chrome://browser/skin/places/starred48@2x.png");
+    -moz-image-region: rect(0px 96px 96px 0px);
+  }
+}
+
+#editBookmarkPanelTitle {
+  font-size: 130%;
+  font-weight: bold;
+}
+
+#editBMPanel_rows > row {
+  margin-bottom: 8px;
+}
+
+#editBMPanel_rows > row:last-of-type {
+  margin-bottom: 0;
+}
+
+/**** Input elements ****/
+
+#editBMPanel_rows > row > textbox,
+#editBMPanel_rows > row > hbox > textbox {
+  -moz-appearance: none;
+  background: linear-gradient(#fafafa, #fff);
+  background-clip: padding-box;
+  border-radius: 3px;
+  border: 1px solid rgba(0,0,0,.3) !important;
+  box-shadow: inset 0 1px 1px 1px rgba(0,0,0,.05),
+              0 1px rgba(255,255,255,.3);
+  margin: 0;
+  padding: 3px 6px;
+}
+
+#editBMPanel_rows > row > textbox[focused="true"],
+#editBMPanel_rows > row > hbox > textbox[focused="true"] {
+  border-color: -moz-mac-focusring !important;
+  box-shadow: @focusRingShadow@;
+}
+
+/**** HUD style buttons ****/
+
+.editBookmarkPanelHeaderButton,
+.editBookmarkPanelBottomButton {
+  @hudButton@
+  margin: 0;
+  min-width: 82px;
+  min-height: 22px;
+}
+
+.editBookmarkPanelHeaderButton:hover:active,
+.editBookmarkPanelBottomButton:hover:active {
+  @hudButtonPressed@
+}
+
+.editBookmarkPanelHeaderButton:-moz-focusring,
+.editBookmarkPanelBottomButton:-moz-focusring {
+  @hudButtonFocused@
+}
+
+.editBookmarkPanelBottomButton[default="true"] {
+  background-color: #666;
+}
+
+#editBookmarkPanelHeader {
+  margin-bottom: 6px;
+}
+
+.editBookmarkPanelBottomButton:last-child {
+  margin-inline-start: 8px;
+}
+
+/* The following elements come from editBookmarkOverlay.xul. Styling that's
+   specific to the editBookmarkPanel should be in browser.css. Styling that
+   should be shared by all editBookmarkOverlay.xul consumers should be in
+   editBookmarkOverlay.css. */
+
+#editBMPanel_newFolderBox {
+  background: linear-gradient(#fff, #f2f2f2);
+  background-origin: padding-box;
+  background-clip: padding-box;
+  border-radius: 0 0 3px 3px;
+  border: 1px solid #a5a5a5;
+  box-shadow: inset 0 1px rgba(255,255,255,.8),
+              inset 0 0 1px rgba(255,255, 255,.25),
+              0 1px rgba(255,255,255,.3);
+  margin: 0;
+  padding: 0;
+  height:  20px;
+}
+
+#editBMPanel_newFolderButton {
+  -moz-appearance: none;
+  border: 0 solid #a5a5a5;
+  border-inline-end-width: 1px;
+  padding: 0 9px;
+  margin: 0;
+  min-width: 21px;
+  min-height: 20px;
+  height:  20px;
+  color: #fff;
+  list-style-image: url("chrome://browser/skin/panel-plus-sign.png");
+  position: relative;
+}
+
+#editBMPanel_newFolderButton:hover:active {
+  background: linear-gradient(rgba(40,40,40,.9), rgba(70,70,70,.9));
+  box-shadow: inset 0 0 3px rgba(0,0,0,.2), inset 0 1px 7px rgba(0,0,0,.4);
+}
+
+#editBMPanel_newFolderButton:-moz-focusring {
+  @hudButtonFocused@
+}
+
+#editBMPanel_newFolderButton .button-text {
+  display: none;
+}
+
+#editBMPanel_folderMenuList {
+  @hudButton@
+  background-clip: padding-box;
+  margin: 0;
+  min-height: 22px;
+  padding-top: 2px;
+  padding-bottom: 1px;
+  padding-inline-start: 8px;
+  padding-inline-end: 4px;
+}
+
+#editBMPanel_folderMenuList:-moz-focusring {
+  @hudButtonFocused@
+}
+
+#editBMPanel_folderMenuList[open="true"],
+#editBMPanel_folderMenuList:hover:active {
+  @hudButtonPressed@
+}
+
+#editBMPanel_folderMenuList > .menulist-dropmarker {
+  -moz-appearance: none;
+  display: -moz-box;
+  background-color: transparent;
+  border: 0;
+  margin: 0;
+  padding: 0;
+  padding-inline-end: 4px;
+  width: 7px;
+}
+
+#editBMPanel_folderMenuList > .menulist-dropmarker > .dropmarker-icon {
+  list-style-image: url("chrome://global/skin/icons/panel-dropmarker.png");
+}
+
+/**** folder tree and tag selector ****/
+
+#editBMPanel_folderTree,
+#editBMPanel_tagsSelector {
+  -moz-appearance: none;
+  background: linear-gradient(#fafafa, #fff);
+  background-clip: padding-box;
+  border-radius: 3px;
+  border: 1px solid rgba(0,0,0,.3);
+  box-shadow: inset 0 1px 1px 1px rgba(0,0,0,.05),
+              0 1px rgba(255,255,255,.3);
+  margin: 0;
+}
+
+#editBMPanel_folderTree:-moz-focusring,
+#editBMPanel_tagsSelector:-moz-focusring {
+  border-color: -moz-mac-focusring;
+  box-shadow: @focusRingShadow@;
+}
+
+#editBMPanel_folderTree {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  /* Implements editBookmarkPanel resizing on folderTree un-collapse. */
+  margin: 0 !important;
+  min-width: 27em;
+  position: relative;
+}
+
+/**** expanders ****/
+
+#editBookmarkPanel .expander-up,
+#editBookmarkPanel .expander-down {
+  @hudButton@
+  margin: 0;
+  margin-inline-start: 4px;
+  min-width: 27px;
+  min-height: 22px;
+}
+
+#editBookmarkPanel .expander-up:-moz-focusring,
+#editBookmarkPanel .expander-down:-moz-focusring {
+  @hudButtonFocused@
+}
+
+#editBookmarkPanel .expander-up:hover:active,
+#editBookmarkPanel .expander-down:hover:active {
+  @hudButtonPressed@
+}
+
+#editBookmarkPanel .expander-up {
+  list-style-image: url("chrome://browser/skin/panel-expander-open.png");
+}
+
+#editBookmarkPanel .expander-down {
+  list-style-image: url("chrome://browser/skin/panel-expander-closed.png");
+}
+
+#editBookmarkPanel .expander-up > .button-box > .button-icon,
+#editBookmarkPanel .expander-down > .button-box > .button-icon {
+  margin: 1px 0 0;
+}
+
+#editBookmarkPanel .expander-up > .button-box > .button-text,
+#editBookmarkPanel .expander-down > .button-box > .button-text {
+  display: none;
+}
+
+@media (min-resolution: 2dppx) {
+  #editBookmarkPanel .expander-up {
+    list-style-image: url("chrome://browser/skin/panel-expander-open@2x.png");
+  }
+
+  #editBookmarkPanel .expander-down {
+    list-style-image: url("chrome://browser/skin/panel-expander-closed@2x.png");
+  }
+
+  #editBookmarkPanel .expander-up > .button-box > .button-icon,
+  #editBookmarkPanel .expander-down > .button-box > .button-icon {
+    width: 9px;
+  }
+}
+
+#editBMPanel_tagsField > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input::placeholder {
+  opacity: 1.0;
+  color: #bbb;
+}
+
+.editBMPanel_rowLabel {
+  text-align: end;
+}
+
+/* History Swipe Animation */
+
+#historySwipeAnimationCurrentPage,
+#historySwipeAnimationNextPage {
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.6);
+}
+
+#historySwipeAnimationContainer {
+  background: url("chrome://browser/skin/subtle-pattern.png") #B3B9C1;
+}
+
+/* ----- SIDEBAR ELEMENTS ----- */
+
+#sidebar-box {
+  -moz-appearance: -moz-mac-source-list;
+  box-shadow: inset -2px 0 0 hsla(0,0%,100%,.2);
+}
+
+sidebarheader {
+  padding: 2px 2px 0;
+  text-shadow: 0 1px 0 hsla(0,0%,100%,.5);
+}
+
+.sidebar-splitter {
+  border-inline-start: none;
+  border-inline-end: 1px solid #b4b4b4;
+  min-width: 1px;
+  width: 3px;
+  background-image: none !important;
+  background-color: transparent;
+  margin-inline-start: -3px;
+  position: relative;
+}
+
+#appcontent ~ .sidebar-splitter {
+  border-inline-start: 1px solid #ccc;
+  border-inline-end: none;
+  margin-inline-start: 0;
+  margin-inline-end: -3px;
+}
+
+.sidebar-title,
+#sidebar-title {
+  color: #596c80;
+  font-weight: bold;
+}
+
+.sidebar-title:-moz-window-inactive,
+#sidebar-title:-moz-window-inactive {
+  color: #868b92;
+}
+
+.sidebar-throbber[loading="true"],
+#sidebar-throbber[loading="true"] {
+  list-style-image: url("chrome://global/skin/icons/loading.png");
+}
+
+@media (min-resolution: 2dppx) {
+  .sidebar-throbber[loading="true"],
+  #sidebar-throbber[loading="true"] {
+    list-style-image: url("chrome://global/skin/icons/loading@2x.png");
+    width: 16px;
+  }
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #sidebar-box {
+    box-shadow: none;
+  }
+
+  sidebarheader {
+    text-shadow: none;
+    font-weight: 500;
+  }
+
+  .sidebar-title,
+  #sidebar-title {
+    color: #636363;
+    font-weight: 500;
+  }
+}
+
+
+/* ----- CONTENT ----- */
+
+.browserContainer > findbar {
+  background: @scopeBarBackground@;
+  border-top: @scopeBarSeparatorBorder@;
+  color: -moz-DialogText;
+  text-shadow: none;
+}
+
+toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+.bookmark-item {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+@media (min-resolution: 2dppx) {
+  .bookmark-item {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+
+  image.bookmark-item {
+    width: 16px;
+  }
+}
+
+.openintabs-menuitem {
+  list-style-image: none;
+}
+
+/* ::::: tabbrowser ::::: */
+
+.tabbrowser-tabbox {
+  margin: 0;
+}
+
+%include ../shared/tabs.inc.css
+
+.tab-label {
+  margin-top: 1px;
+  margin-bottom: 0;
+  text-align: center;
+}
+
+@media (-moz-mac-yosemite-theme) {
+  /* image preloading hack from shared/tabs.inc.css */
+  #tabbrowser-tabs::before {
+    background-image:
+      url(chrome://browser/skin/yosemite/tab-selected-end-inactive.svg),
+      url(chrome://browser/skin/yosemite/tab-selected-start-inactive.svg),
+      url(chrome://browser/skin/yosemite/tab-stroke-start-inactive.png),
+      url(chrome://browser/skin/yosemite/tab-active-middle-inactive.png),
+      url(chrome://browser/skin/yosemite/tab-stroke-end-inactive.png),
+      url(chrome://browser/skin/tabbrowser/tab-selected-end.svg),
+      url(chrome://browser/skin/tabbrowser/tab-selected-start.svg),
+      url(chrome://browser/skin/tabbrowser/tab-stroke-end.png),
+      url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
+      url(chrome://browser/skin/tabbrowser/tab-stroke-start.png),
+      url(chrome://browser/skin/tabbrowser/tab-background-end.png),
+      url(chrome://browser/skin/tabbrowser/tab-background-middle.png),
+      url(chrome://browser/skin/tabbrowser/tab-background-start.png);
+  }
+
+  .tab-background-middle[selected=true]:-moz-window-inactive {
+    background-image: url(chrome://browser/skin/yosemite/tab-active-middle-inactive.png),
+                      @fgTabTextureYosemiteInactive@,
+                      none;
+  }
+
+  .tab-background-start[selected=true]:-moz-window-inactive:-moz-locale-dir(ltr)::after,
+  .tab-background-end[selected=true]:-moz-window-inactive:-moz-locale-dir(rtl)::after {
+    background-image: url(chrome://browser/skin/yosemite/tab-stroke-start-inactive.png);
+  }
+
+  .tab-background-end[selected=true]:-moz-window-inactive:-moz-locale-dir(ltr)::after,
+  .tab-background-start[selected=true]:-moz-window-inactive:-moz-locale-dir(rtl)::after {
+    background-image: url(chrome://browser/skin/yosemite/tab-stroke-end-inactive.png);
+  }
+
+  .tab-background-start[selected=true]:-moz-window-inactive:-moz-locale-dir(ltr):not(:-moz-lwtheme)::before,
+  .tab-background-end[selected=true]:-moz-window-inactive:-moz-locale-dir(rtl):not(:-moz-lwtheme)::before {
+    background-image: url(chrome://browser/skin/yosemite/tab-selected-start-inactive.svg);
+    background-size: 100% 100%;
+  }
+
+  .tab-background-end[selected=true]:-moz-window-inactive:-moz-locale-dir(ltr):not(:-moz-lwtheme)::before,
+  .tab-background-start[selected=true]:-moz-window-inactive:-moz-locale-dir(rtl):not(:-moz-lwtheme)::before {
+    background-image: url(chrome://browser/skin/yosemite/tab-selected-end-inactive.svg);
+    background-size: 100% 100%;
+  }
+
+  @media (min-resolution: 2dppx) {
+    /* image preloading hack from shared/tabs.inc.css */
+    #tabbrowser-tabs::before {
+      background-image:
+        url(chrome://browser/skin/yosemite/tab-selected-end-inactive.svg),
+        url(chrome://browser/skin/yosemite/tab-selected-start-inactive.svg),
+        url(chrome://browser/skin/yosemite/tab-stroke-start-inactive@2x.png),
+        url(chrome://browser/skin/yosemite/tab-active-middle-inactive@2x.png),
+        url(chrome://browser/skin/yosemite/tab-stroke-end-inactive@2x.png),
+        url(chrome://browser/skin/tabbrowser/tab-selected-end.svg),
+        url(chrome://browser/skin/tabbrowser/tab-selected-start.svg),
+        url(chrome://browser/skin/tabbrowser/tab-stroke-end@2x.png),
+        url(chrome://browser/skin/tabbrowser/tab-active-middle@2x.png),
+        url(chrome://browser/skin/tabbrowser/tab-stroke-start@2x.png),
+        url(chrome://browser/skin/tabbrowser/tab-background-end@2x.png),
+        url(chrome://browser/skin/tabbrowser/tab-background-middle@2x.png),
+        url(chrome://browser/skin/tabbrowser/tab-background-start@2x.png);
+    }
+
+    .tab-background-middle[selected=true]:-moz-window-inactive {
+      background-image: url(chrome://browser/skin/yosemite/tab-active-middle-inactive@2x.png),
+                        @fgTabTextureYosemiteInactive@,
+                        none;
+    }
+
+    .tab-background-start[selected=true]:-moz-window-inactive:-moz-locale-dir(ltr)::after,
+    .tab-background-end[selected=true]:-moz-window-inactive:-moz-locale-dir(rtl)::after {
+      background-image: url(chrome://browser/skin/yosemite/tab-stroke-start-inactive@2x.png);
+    }
+
+    .tab-background-end[selected=true]:-moz-window-inactive:-moz-locale-dir(ltr)::after,
+    .tab-background-start[selected=true]:-moz-window-inactive:-moz-locale-dir(rtl)::after {
+      background-image: url(chrome://browser/skin/yosemite/tab-stroke-end-inactive@2x.png);
+    }
+  }
+}
+
+.tabbrowser-tab:not(:hover) > .tab-stack > .tab-content > .tab-icon-image:not([selected="true"]) {
+  opacity: .9;
+}
+
+/*
+ * Force the overlay to create a new stacking context so it always appears on
+ * top of the icon.
+ */
+.tab-icon-overlay {
+  opacity: 0.9999;
+}
+
+.tab-label:not([selected="true"]) {
+  opacity: .7;
+}
+
+.tabbrowser-tab,
+.tabs-newtab-button {
+  font: message-box;
+  border: none;
+}
+
+.tabbrowser-tab[visuallyselected=true]:not(:-moz-lwtheme) {
+  /* overriding tabbox.css */
+  color: inherit;
+}
+
+.tabbrowser-tab[visuallyselected=true] {
+  /* overriding tabbox.css */
+  text-shadow: inherit;
+}
+
+.tabs-newtab-button > .toolbarbutton-icon {
+  -moz-box-align: center;
+  border: solid transparent;
+  border-width: 0 11px;
+}
+
+.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label:not([pinned]),
+.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-icon-image[pinned],
+.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-throbber[pinned] {
+  box-shadow: @focusRingShadow@;
+}
+
+#TabsToolbar {
+  -moz-appearance: none;
+  /* overlap the nav-bar's top border */
+  margin-bottom: calc(-1 * var(--tab-toolbar-navbar-overlap));
+}
+
+#main-window:not([customizing]) #navigator-toolbox[inFullscreen] > #TabsToolbar:not(:-moz-lwtheme),
+#main-window:not(:-moz-any([customizing],[tabsintitlebar])) #navigator-toolbox > #TabsToolbar:not(:-moz-lwtheme) {
+  -moz-appearance: toolbar;
+}
+
+#TabsToolbar:not(:-moz-lwtheme) {
+  color: var(--tabs-toolbar-color);
+  text-shadow: @loweredShadow@;
+}
+
+#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;
+}
+
+/**
+ * Tab Drag and Drop
+ */
+
+.tab-drop-indicator {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png);
+  margin-top: -2px;
+  z-index: 3;
+}
+
+@media (min-resolution: 2dppx) {
+  .tab-drop-indicator {
+    list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator@2x.png);
+    width: 12px;
+  }
+}
+
+/**
+ * In-tab close button
+ */
+
+.tab-close-button > .toolbarbutton-icon {
+  margin-inline-end: 0px !important;
+}
+
+.tab-close-button {
+  -moz-appearance: none;
+  border: none !important;
+  background: none;
+  cursor: default;
+}
+
+#TabsToolbar[brighttext] .tab-close-button.close-icon:not([selected=true]):not(:hover) {
+  -moz-image-region: rect(0, 64px, 16px, 48px);
+}
+
+@media (min-resolution: 2dppx) {
+  #TabsToolbar[brighttext] .tab-close-button.close-icon:not([selected=true]):not(:hover) {
+    -moz-image-region: rect(0, 128px, 32px, 96px);
+  }
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up,
+.tabbrowser-arrowscrollbox > .scrollbutton-down {
+  -moz-image-region: rect(0, 13px, 20px, 0);
+  margin: 0 0 var(--tab-toolbar-navbar-overlap);
+  padding: 0 4px;
+  border: none;
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up {
+  border-inline-end: 2px solid transparent;
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-down {
+  border-inline-start: 2px solid transparent;
+  transition: 1s background-color ease-out;
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-down[notifybgtab] {
+  background-color: Highlight;
+  transition: none;
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(ltr),
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png");
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr),
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-right.png");
+}
+
+#TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(ltr),
+#TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png");
+}
+
+#TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr),
+#TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-right-inverted.png");
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:hover,
+.tabbrowser-arrowscrollbox > .scrollbutton-down:hover {
+  -moz-image-region: rect(0, 26px, 20px, 13px);
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:hover:active,
+.tabbrowser-arrowscrollbox > .scrollbutton-down:hover:active {
+  -moz-image-region: rect(0, 39px, 20px, 26px);
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+.tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+  -moz-image-region: rect(0, 13px, 20px, 0) !important;
+  opacity: .5;
+}
+
+@media (min-resolution: 2dppx) {
+  .tabbrowser-arrowscrollbox > .scrollbutton-up,
+  .tabbrowser-arrowscrollbox > .scrollbutton-down {
+    -moz-image-region: rect(0, 26px, 40px, 0);
+  }
+
+  .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(ltr),
+  .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(rtl) {
+    list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left@2x.png");
+  }
+
+  .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr),
+  .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) {
+    list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-right@2x.png");
+  }
+
+  #TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(ltr),
+  #TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(rtl) {
+    list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left-inverted@2x.png");
+  }
+
+  #TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr),
+  #TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) {
+    list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-right-inverted@2x.png");
+  }
+
+  .tabbrowser-arrowscrollbox > .scrollbutton-up:hover,
+  .tabbrowser-arrowscrollbox > .scrollbutton-down:hover {
+    -moz-image-region: rect(0, 52px, 40px, 26px);
+  }
+
+  .tabbrowser-arrowscrollbox > .scrollbutton-up:hover:active,
+  .tabbrowser-arrowscrollbox > .scrollbutton-down:hover:active {
+    -moz-image-region: rect(0, 78px, 40px, 52px);
+  }
+
+  .tabbrowser-arrowscrollbox > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+  .tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+    -moz-image-region: rect(0, 26px, 40px, 0) !important;
+  }
+
+  .tabbrowser-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon,
+  .tabbrowser-arrowscrollbox > .scrollbutton-down > .toolbarbutton-icon {
+    width: 13px;
+  }
+}
+
+/**
+ * Tabstrip & add-on bar toolbar buttons
+ */
+
+#TabsToolbar .toolbarbutton-1,
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+  -moz-appearance: none;
+  margin: 0;
+  /* !important flags needed because of bug 561154: */
+  /* Bug 990390: -moz-any is no longer used in the selector so the !important aren't necessary for that anymore. */
+  padding: 0 !important;
+  border: none !important;
+  border-radius: 0 !important;
+  background: none !important;
+  box-shadow: none !important;
+}
+
+#TabsToolbar .toolbarbutton-1:not([type="menu-button"]),
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  padding: 0 1px;
+}
+
+#TabsToolbar .toolbarbutton-1 {
+  margin-bottom: var(--tab-toolbar-navbar-overlap);
+}
+
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+  padding-left: 4px;
+  padding-right: 4px;
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover,
+.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover,
+#TabsToolbar .toolbarbutton-1:not([type="menu-button"]):not([disabled=true]):not([open]):hover,
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover,
+#TabsToolbar .toolbarbutton-1:not([disabled=true]):not([buttonover]):hover > .toolbarbutton-menubutton-dropmarker {
+  background-image: linear-gradient(transparent, rgba(0,0,0,.15)) !important;
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover:active,
+.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover:active,
+#TabsToolbar .toolbarbutton-1:not([type="menu-button"]):not([disabled=true]):hover:active,
+#TabsToolbar .toolbarbutton-1[type="menu"][open],
+#TabsToolbar .toolbarbutton-1[type="panel"][open],
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover:active,
+#TabsToolbar .toolbarbutton-1[open]:not([disabled=true]):hover > .toolbarbutton-menubutton-dropmarker {
+  background-image: linear-gradient(transparent, rgba(0,0,0,.3)) !important;
+}
+
+.tabs-newtab-button,
+#TabsToolbar > #new-tab-button,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button {
+  list-style-image: url(chrome://browser/skin/tabbrowser/newtab.png);
+  -moz-image-region: rect(0, 18px, 20px, 0);
+}
+
+#TabsToolbar[brighttext] .tabs-newtab-button,
+#TabsToolbar[brighttext] > #new-tab-button,
+#TabsToolbar[brighttext] > toolbarpaletteitem > #new-tab-button {
+  list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png);
+}
+
+.tabs-newtab-button:hover,
+#TabsToolbar > #new-tab-button:hover {
+  -moz-image-region: rect(0, 36px, 20px, 18px);
+}
+
+.tabs-newtab-button:hover:active,
+#TabsToolbar > #new-tab-button:hover:active {
+  -moz-image-region: rect(0, 54px, 20px, 36px);
+}
+
+@media (min-resolution: 2dppx) {
+  .tabs-newtab-button,
+  #TabsToolbar > #new-tab-button,
+  #TabsToolbar > toolbarpaletteitem > #new-tab-button {
+    list-style-image: url(chrome://browser/skin/tabbrowser/newtab@2x.png);
+    -moz-image-region: rect(0, 36px, 40px, 0);
+  }
+
+  #TabsToolbar[brighttext] .tabs-newtab-button,
+  #TabsToolbar[brighttext] > #new-tab-button,
+  #TabsToolbar[brighttext] > toolbarpaletteitem > #new-tab-button {
+    list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted@2x.png);
+  }
+
+  .tabs-newtab-button:hover,
+  #TabsToolbar > #new-tab-button:hover {
+    -moz-image-region: rect(0, 72px, 40px, 36px);
+  }
+
+  .tabs-newtab-button:hover:active,
+  #TabsToolbar > #new-tab-button:hover:active {
+    -moz-image-region: rect(0, 108px, 40px, 72px);
+  }
+
+  .tabs-newtab-button > .toolbarbutton-icon {
+    width: 40px;
+  }
+
+  #TabsToolbar > #new-tab-button > .toolbarbutton-icon,
+  #TabsToolbar > toolbarpaletteitem > #new-tab-button > .toolbarbutton-icon {
+    width: 18px;
+  }
+}
+
+#alltabs-button {
+  list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon.png);
+  -moz-image-region: rect(0, 17px, 20px, 0);
+}
+
+#TabsToolbar[brighttext] #alltabs-button {
+  list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon-inverted.png);
+}
+
+#alltabs-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(0, 34px, 20px, 17px);
+}
+
+#alltabs-button[open="true"]:not([disabled="true"]),
+#alltabs-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0, 51px, 20px, 34px);
+}
+
+@media (min-resolution: 2dppx) {
+  #alltabs-button {
+    list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon@2x.png);
+    -moz-image-region: rect(0, 34px, 40px, 0);
+  }
+
+  #TabsToolbar[brighttext] #alltabs-button {
+    list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png);
+  }
+
+  #alltabs-button:not([disabled="true"]):hover {
+    -moz-image-region: rect(0, 68px, 40px, 34px);
+  }
+
+  #alltabs-button[open="true"]:not([disabled="true"]),
+  #alltabs-button:not([disabled="true"]):hover:active {
+    -moz-image-region: rect(0, 102px, 40px, 68px);
+  }
+
+  #alltabs-button > .toolbarbutton-icon {
+    width: 17px;
+  }
+}
+
+#alltabs-button > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+#alltabs-button > .toolbarbutton-icon {
+  margin-inline-end: 2px;
+}
+
+/* All Tabs Menupopup */
+.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://global/skin/icons/loading.png") !important;
+}
+
+@media (min-resolution: 2dppx) {
+  .alltabs-item > .menu-iconic-left > .menu-iconic-icon {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+
+  .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
+    list-style-image: url("chrome://global/skin/icons/loading@2x.png") !important;
+  }
+}
+
+/* Bookmarks toolbar */
+#PlacesToolbarDropIndicator {
+  list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png);
+}
+
+/* Bookmark drag and drop styles */
+
+.bookmark-item[dragover-into="true"] {
+  background: Highlight !important;
+  color: HighlightText !important;
+}
+
+/* rules for menupopup drop indicators */
+.menupopup-drop-indicator-bar {
+  position: relative;
+  /* these two margins must together compensate the indicator's height */
+  margin-top: -1px;
+  margin-bottom: -1px;
+}
+
+.menupopup-drop-indicator {
+  list-style-image: none;
+  height: 2px;
+  margin-inline-end: -4em;
+  background-color: Highlight;
+}
+
+%include ../shared/notification-icons.inc.css
+
+.notification-anchor-icon:-moz-focusring {
+  box-shadow: 0 0 2px 1px -moz-mac-focusring inset,
+              0 0 3px 2px -moz-mac-focusring;
+}
+
+/* Translation */
+
+%include ../shared/translation/infobar.inc.css
+
+notification[value="translation"] {
+  color: #484848;
+  background-color: #EFEFEF;
+  background-image: none;
+  border-top: none;
+  border-bottom: 1px solid #c4c4c4;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  min-height: 35px;
+}
+
+.translate-infobar-element {
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+}
+
+button.translate-infobar-element {
+  background: linear-gradient(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.1)) repeat scroll 0% 0% padding-box transparent;
+  color: #333333;
+  border: 1px solid;
+  border-color: rgba(23, 51, 78, 0.15) rgba(23, 51, 78, 0.17) rgba(23, 51, 78, 0.2);
+  box-shadow: 0px 0px 2px rgba(255, 255, 255, 0.5) inset, 0px 1px 0px rgba(255, 255, 255, 0.2);
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 150ms;
+  min-height: 22px;
+  min-width: 0;
+  padding: 0 0.8em !important;
+  margin-left: 0.25em;
+  margin-right: 0.25em;
+}
+
+button.translate-infobar-element .button-text {
+  margin-left: 0 !important;
+  margin-right: 0 !important;
+}
+
+label.translate-infobar-element {
+  padding-top: 2px;
+}
+
+button.translate-infobar-element:hover {
+  background: #f0f0f0;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.1) inset,  0 0 0 1px hsla(0,0%,100%,.05) inset,  0 1px 0 hsla(210,54%,20%,.01),  0 0 4px hsla(206,100%,20%,.1);
+}
+
+button.translate-infobar-element:active {
+  box-shadow: 0 1px 1px hsla(211,79%,6%,.1) inset,  0 0 1px hsla(211,79%,6%,.2) inset;
+  transition-duration: 0ms;
+}
+
+button.translate-infobar-element[anonid="translate"] {
+  color: #ffffff;
+  background: linear-gradient(#4cb1ff, #1793e5);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,  0 0 0 1px hsla(0,0%,100%,.1) inset,  0 1px 0 hsla(210,54%,20%,.03);
+  border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2);
+  padding: 0 1.1em  !important;;
+}
+
+button.translate-infobar-element[anonid="translate"]:hover {
+  background-image: linear-gradient(#66bdff, #0d9eff);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,  0 0 0 1px hsla(0,0%,100%,.1) inset,  0 1px 0 hsla(210,54%,20%,.03),  0 0 4px hsla(206,100%,20%,.2);
+}
+
+button.translate-infobar-element.options-menu-button {
+  padding-inline-start: 0.5em !important;
+  padding-inline-end: 0em !important;
+}
+
+button.translate-infobar-element.options-menu-button > .button-box > .button-menu-dropmarker {
+  display: -moz-box;
+  list-style-image: url("chrome://global/skin/icons/glyph-dropdown.png");
+  padding: 0 !important;
+  margin: 0 !important;
+}
+
+@media (min-resolution: 2dppx) {
+  button.translate-infobar-element.options-menu-button > .button-box > .button-menu-dropmarker {
+    list-style-image: url("chrome://global/skin/icons/glyph-dropdown@2x.png");
+  }
+
+  button.translate-infobar-element.options-menu-button > .button-box > .button-menu-dropmarker > .dropmarker-icon {
+    width: 8px;
+  }
+}
+
+menulist.translate-infobar-element {
+  text-shadow: 0 1px 1px #FEFFFE;
+  border: 1px solid;
+  border-color: rgba(23, 51, 78, 0.15) rgba(23, 51, 78, 0.17) rgba(23, 51, 78, 0.2);
+  box-shadow: 0 1px 1px 0 #FFFFFF, inset 0 2px 2px 0 #FFFFFF;
+  background-color: #F1F1F1;
+  background-image: linear-gradient(#FFFFFF, rgba(255,255,255,0.1));
+  color: #333333;
+  padding: 0;
+  min-height: 22px !important;
+}
+
+menulist.translate-infobar-element > .menulist-label-box {
+  padding-top: 1px;
+  padding-inline-start: 0.3em;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+menulist.translate-infobar-element:hover {
+  background: #f0f0f0;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.1) inset,  0 0 0 1px hsla(0,0%,100%,.05) inset,  0 1px 0 hsla(210,54%,20%,.01),  0 0 4px hsla(206,100%,20%,.1);
+}
+
+menulist.translate-infobar-element[open="true"] {
+  background-image: linear-gradient(rgba(255,255,255,0.1),
+                                    rgba(255,255,255,0.6));
+}
+
+menulist.translate-infobar-element > .menulist-dropmarker {
+  display: -moz-box;
+  list-style-image: url("chrome://global/skin/icons/glyph-dropdown.png");
+}
+
+@media (min-resolution: 2dppx) {
+  menulist.translate-infobar-element > .menulist-dropmarker {
+    list-style-image: url("chrome://global/skin/icons/glyph-dropdown@2x.png");
+  }
+
+  menulist.translate-infobar-element > .menulist-dropmarker > .dropmarker-icon {
+    width: 8px;
+  }
+}
+
+.popup-notification-body[popupid="addon-progress"],
+.popup-notification-body[popupid="addon-install-confirmation"] {
+  width: 28em;
+  max-width: 28em;
+}
+
+.addon-install-confirmation-name {
+  font-weight: bold;
+}
+
+/* Status panel */
+
+.statuspanel-label {
+  margin: 0;
+  padding: 2px 4px;
+  background: linear-gradient(#fff, #ddd);
+  border: 1px none #ccc;
+  border-top-style: solid;
+  color: #333;
+  text-shadow: none;
+}
+
+.statuspanel-label:-moz-locale-dir(ltr):not([mirror]),
+.statuspanel-label:-moz-locale-dir(rtl)[mirror] {
+  border-right-style: solid;
+  border-top-right-radius: .3em;
+  margin-right: 1em;
+}
+
+.statuspanel-label:-moz-locale-dir(rtl):not([mirror]),
+.statuspanel-label:-moz-locale-dir(ltr)[mirror] {
+  border-left-style: solid;
+  border-top-left-radius: .3em;
+  margin-left: 1em;
+}
+
+%include ../shared/fullscreen/warning.inc.css
+%include ../shared/ctrlTab.inc.css
+%include ../../../devtools/client/themes/responsivedesign.inc.css
+%include ../../../devtools/client/themes/commandline.inc.css
+%include ../shared/plugin-doorhanger.inc.css
+
+%include downloads/indicator.css
+
+/* On mac, the popup notification contents are indented by default and so
+  the default closebutton margins from notification.css require adjustment */
+
+.click-to-play-plugins-notification-description-box > .popup-notification-closebutton {
+  margin-inline-end: -6px;
+  margin-top: -7px;
+}
+
+
+
+.gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
+  color: hsl(210,11%,16%);
+}
+
+/* Error counter */
+
+#developer-toolbar-toolbox-button[error-count]:before {
+  color: #FDF3DE;
+  min-width: 16px;
+  text-shadow: none;
+  background-image: linear-gradient(#B4211B, #8A1915);
+  border-radius: 1px;
+}
+
+/* Share */
+%include ../shared/social/social.inc.css
+
+#social-share-panel {
+  min-height: 100px;
+  min-width: 300px;
+  transition: height .3s ease-in-out, width .3s ease-in-out;
+}
+
+#share-container,
+.social-share-frame {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: inherit;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: inherit;
+}
+
+#social-share-panel > .social-share-toolbar {
+  border-top-left-radius: inherit;
+  border-top-right-radius: inherit;
+}
+
+#social-share-provider-buttons {
+  border-top-left-radius: inherit;
+  border-top-right-radius: inherit;
+}
+
+/* Customization mode */
+
+%include ../shared/customizableui/customizeMode.inc.css
+
+#main-window[customizing] {
+  background-color: rgb(178,178,178);
+}
+
+#main-window[tabsintitlebar][customize-entered] > #titlebar,
+#main-window[privatebrowsingmode=temporary]:not([tabsintitlebar])[customize-entered] > #titlebar,
+#main-window[customize-entered] > #tab-view-deck {
+  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"),
+                    url("chrome://browser/skin/customizableui/background-noise-toolbar.png"),
+                    linear-gradient(to bottom, rgb(233,233,233), rgb(178,178,178) 40px);
+  background-attachment: fixed;
+}
+
+#main-window[tabsintitlebar][customization-lwtheme] > #titlebar:-moz-lwtheme,
+#main-window[customization-lwtheme] > #tab-view-deck:-moz-lwtheme {
+  background-repeat: no-repeat;
+  background-position: right top;
+  background-attachment: fixed;
+  /* The image will get set from CustomizeMode.jsm */
+  background-image: none;
+  background-color: transparent;
+}
+
+#main-window[customization-lwtheme]:-moz-lwtheme {
+  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"),
+                    url("chrome://browser/skin/customizableui/background-noise-toolbar.png");
+  background-color: rgb(178,178,178);
+  background-repeat: repeat;
+  background-attachment: fixed;
+  background-position: left top;
+}
+
+#main-window[customize-entered] #browser-bottombox,
+#main-window[customize-entered] #navigator-toolbox > toolbar:not(#TabsToolbar),
+#main-window[customize-entered] #customization-container {
+  border: 3px solid hsla(0,0%,0%,.1);
+  border-top-width: 0;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  -moz-border-right-colors: hsla(0,0%,0%,.05) hsla(0,0%,0%,.1) hsla(0,0%,0%,.2);
+  -moz-border-bottom-colors: hsla(0,0%,0%,.05) hsla(0,0%,0%,.1) hsla(0,0%,0%,.2);
+  -moz-border-left-colors: hsla(0,0%,0%,.05) hsla(0,0%,0%,.1) hsla(0,0%,0%,.2);
+}
+
+#main-window[customize-entered] #customization-container,
+#main-window[customize-entered] #navigator-toolbox > toolbar:not(#TabsToolbar) {
+  border-bottom-width: 0;
+}
+
+#main-window[customize-entered] #nav-bar {
+  border-top-left-radius: 2.5px;
+  border-top-right-radius: 2.5px;
+}
+
+/* Compensate for the border set above for this horizontal line. */
+#main-window[customize-entered] #navigator-toolbox::after {
+  margin-left: 3px;
+  margin-right: 3px;
+}
+
+#main-window[customize-entered] #TabsToolbar {
+  background-clip: padding-box;
+  border-right: 3px solid transparent;
+  border-left: 3px solid transparent;
+}
+
+@media (min-resolution: 2dppx) {
+  .customization-tipPanel-infoBox {
+    background-image: url(chrome://browser/skin/customizableui/info-icon-customizeTip@2x.png);
+    background-size: 25px 25px;
+  }
+
+  .customization-tipPanel-contentImage {
+    list-style-image: url(chrome://browser/skin/customizableui/customize-illustration@2x.png);
+  }
+
+  .customization-tipPanel-contentImage:-moz-locale-dir(rtl) {
+    list-style-image: url(chrome://browser/skin/customizableui/customize-illustration-rtl@2x.png);
+  }
+
+  #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"],
+  #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] {
+    list-style-image: url("chrome://browser/skin/customizableui/panelarrow-customizeTip@2x.png");
+  }
+
+  .customization-lwtheme-menu-theme[defaulttheme] {
+    list-style-image: url(chrome://browser/skin/theme-switcher-icon@2x.png);
+  }
+}
+
+/* End customization mode */
+
+.private-browsing-indicator {
+  background-image: url("chrome://browser/skin/privatebrowsing-mask.png");
+  background-repeat: no-repeat;
+  background-size: 100% auto;
+  width: 38px;
+  height: 28px;
+  /**
+   * The private browsing mask graphic has a 3px flare at the top. The distance
+   * we want between the mask and items on either side is 7px, so we use 4px,
+   * since the other 3px is accounted for by the empty space on either side.
+   */
+  margin-left: 4px;
+  margin-right: 4px;
+}
+
+#titlebar-secondary-buttonbox > .private-browsing-indicator {
+  position: relative;
+}
+
+#main-window[privatebrowsingmode=temporary]:not([tabsintitlebar]) > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > .private-browsing-indicator {
+  background-image: url("chrome://browser/skin/privatebrowsing-mask-short.png");
+  height: 20px;
+}
+
+#main-window:not([privatebrowsingmode=temporary]) .private-browsing-indicator,
+#main-window[privatebrowsingmode=temporary][inFullscreen] > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > .private-browsing-indicator,
+#main-window[privatebrowsingmode=temporary]:not([inFullscreen]) > #tab-view-deck > #browser-panel > #navigator-toolbox > #TabsToolbar > .private-browsing-indicator {
+  display: none;
+}
+
+@media (min-resolution: 2dppx) {
+  .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");
+  }
+}
+
+#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
+
+#UITourTooltipDescription {
+  font-size: 1.18rem;
+  line-height: 2rem;
+}
+
+#UITourTooltipClose {
+  margin-inline-end: -10px;
+  margin-top: -14px;
+}
+
+@media (min-resolution: 2dppx) {
+  #UITourTooltipClose > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
+%include ../shared/contextmenu.inc.css
+
+#context-navigation > .menuitem-iconic {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+  overflow: hidden;
+}
+
+.cui-widget-panelview[id^=PanelUI-webext-] {
+  border-radius: 3.5px;
+}
+
+.webextension-popup-browser {
+  border-radius: inherit;
+}
diff --git a/browser/themes/osx/click-to-play-warning-stripes.png b/browser/themes/osx/click-to-play-warning-stripes.png
new file mode 100644
index 000000000..29f15f7b8
--- /dev/null
+++ b/browser/themes/osx/click-to-play-warning-stripes.png
diff --git a/browser/themes/osx/communicator/communicator.css b/browser/themes/osx/communicator/communicator.css
new file mode 100644
index 000000000..0b57574fd
--- /dev/null
+++ b/browser/themes/osx/communicator/communicator.css
@@ -0,0 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url("chrome://global/skin/");
+
diff --git a/browser/themes/osx/communicator/jar.mn b/browser/themes/osx/communicator/jar.mn
new file mode 100644
index 000000000..dfd20c523
--- /dev/null
+++ b/browser/themes/osx/communicator/jar.mn
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+browser.jar:
+% skin communicator classic/1.0 %skin/classic/communicator/
+        skin/classic/communicator/communicator.css
diff --git a/browser/themes/osx/communicator/moz.build b/browser/themes/osx/communicator/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/browser/themes/osx/communicator/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/browser/themes/osx/controlcenter/panel.css b/browser/themes/osx/controlcenter/panel.css
new file mode 100644
index 000000000..b87fa2ac9
--- /dev/null
+++ b/browser/themes/osx/controlcenter/panel.css
@@ -0,0 +1,54 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%include ../shared.inc
+%include ../../shared/controlcenter/panel.inc.css
+
+#identity-popup {
+  margin-top: 1px;
+}
+
+.identity-popup-expander:-moz-focusring {
+  padding: 2px;
+}
+
+.identity-popup-expander:-moz-focusring > .button-box {
+  @hudButtonFocused@
+}
+
+.identity-popup-permission-remove-button:-moz-focusring {
+  box-shadow: @focusRingShadow@;
+}
+
+#identity-popup-multiView > .panel-viewcontainer > .panel-viewstack > .panel-subviews {
+  border-bottom-right-radius: 3.5px;
+}
+
+#identity-popup-multiView > .panel-viewcontainer > .panel-viewstack > .panel-subviews:-moz-locale-dir(rtl) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 3.5px;
+}
+
+#tracking-action-block,
+#tracking-action-unblock,
+#tracking-action-unblock-private,
+#identity-popup-securityView-body > button {
+  @hudButton@
+  min-height: 30px;
+}
+
+#tracking-action-block:hover:active,
+#tracking-action-unblock:hover:active,
+#tracking-action-unblock-private:hover:active,
+#identity-popup-securityView-body > button:hover:active {
+  @hudButtonPressed@
+}
+
+#tracking-action-block:-moz-focusring,
+#tracking-action-unblock:-moz-focusring,
+#tracking-action-unblock-private:-moz-focusring,
+#identity-popup-securityView-body > button:-moz-focusring {
+  @hudButtonFocused@
+}
+
diff --git a/browser/themes/osx/customizableui/background-noise-toolbar.png b/browser/themes/osx/customizableui/background-noise-toolbar.png
new file mode 100644
index 000000000..d09ba9daf
--- /dev/null
+++ b/browser/themes/osx/customizableui/background-noise-toolbar.png
diff --git a/browser/themes/osx/customizableui/customize-titleBar-toggle.png b/browser/themes/osx/customizableui/customize-titleBar-toggle.png
new file mode 100644
index 000000000..fb0edd256
--- /dev/null
+++ b/browser/themes/osx/customizableui/customize-titleBar-toggle.png
diff --git a/browser/themes/osx/customizableui/customize-titleBar-toggle@2x.png b/browser/themes/osx/customizableui/customize-titleBar-toggle@2x.png
new file mode 100644
index 000000000..7200e74c2
--- /dev/null
+++ b/browser/themes/osx/customizableui/customize-titleBar-toggle@2x.png
diff --git a/browser/themes/osx/customizableui/customizeMode-gridTexture.png b/browser/themes/osx/customizableui/customizeMode-gridTexture.png
new file mode 100644
index 000000000..a7c2775cf
--- /dev/null
+++ b/browser/themes/osx/customizableui/customizeMode-gridTexture.png
diff --git a/browser/themes/osx/customizableui/customizeMode-separatorHorizontal.png b/browser/themes/osx/customizableui/customizeMode-separatorHorizontal.png
new file mode 100644
index 000000000..5e17cb4db
--- /dev/null
+++ b/browser/themes/osx/customizableui/customizeMode-separatorHorizontal.png
diff --git a/browser/themes/osx/customizableui/customizeMode-separatorVertical.png b/browser/themes/osx/customizableui/customizeMode-separatorVertical.png
new file mode 100644
index 000000000..dc4caee81
--- /dev/null
+++ b/browser/themes/osx/customizableui/customizeMode-separatorVertical.png
diff --git a/browser/themes/osx/customizableui/panelUI.css b/browser/themes/osx/customizableui/panelUI.css
new file mode 100644
index 000000000..09f23b398
--- /dev/null
+++ b/browser/themes/osx/customizableui/panelUI.css
@@ -0,0 +1,89 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%include ../../shared/customizableui/panelUI.inc.css
+
+.panel-subviews {
+  background-color: hsla(0,0%,100%,.97);
+}
+
+.panelUI-grid .toolbarbutton-1 {
+  margin-right: 0;
+  margin-left: 0;
+  margin-bottom: 0;
+}
+
+.subviewbutton > .toolbarbutton-text {
+  margin: 2px 0 !important; /* !important for overriding toolbarbutton.css */
+}
+
+.subviewbutton:-moz-any([image],[targetURI],.cui-withicon, .bookmark-item) > .toolbarbutton-text {
+  margin: 2px 6px !important; /* !important for overriding toolbarbutton.css */
+}
+
+.restoreallitem > .toolbarbutton-icon {
+  display: none;
+}
+
+.subviewbutton {
+  padding-inline-start: 18px;
+}
+
+.subviewbutton[checked="true"] {
+  background-position: top 5px left 4px;
+}
+
+.subviewbutton[checked="true"]:-moz-locale-dir(rtl) {
+  background-position: top 5px right 4px;
+}
+
+.subviewbutton:not(:-moz-any([image],[targetURI],.cui-withicon, .bookmark-item)) > .menu-iconic-left {
+  display: none;
+}
+
+menu.subviewbutton,
+menuitem.subviewbutton:not(.panel-subview-footer) {
+  padding-top: 2px;
+  padding-bottom: 2px;
+}
+
+/* Override OSX-specific toolkit styles for the bookmarks panel */
+menu.subviewbutton > .menu-right {
+  margin-inline-end: 0;
+  -moz-appearance: none;
+}
+
+menu.subviewbutton > .menu-right > image {
+ /* We don't want the arrow to highlight when the .subviewbutton is hovered,
+  * so we set the -moz-appearance rule on the image
+  * (which doesn't inherit the _moz-menuactive attribute) instead.
+  */
+  -moz-appearance: menuarrow;
+}
+
+.widget-overflow-list .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+  margin-inline-start: 4px;
+}
+
+.PanelUI-subView menuseparator,
+.cui-widget-panelview menuseparator {
+  padding: 0 !important;
+}
+
+toolbarpaletteitem[place="palette"] > .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  padding: 3px 1px;
+}
+
+#PanelUI-remotetabs-tabslist > label[itemtype="client"] {
+  padding-inline-start: 6px;
+}
+
+.PanelUI-remotetabs-notabsforclient-label {
+  margin-left: 19px;
+  font-size: 13px;
+}
+
+#PanelUI-remotetabs-tabslist {
+  padding-bottom: 4px;
+}
diff --git a/browser/themes/osx/devedition.css b/browser/themes/osx/devedition.css
new file mode 100644
index 000000000..c7a2bdd71
--- /dev/null
+++ b/browser/themes/osx/devedition.css
@@ -0,0 +1,121 @@
+% This Source Code Form is subject to the terms of the Mozilla Public
+% License, v. 2.0. If a copy of the MPL was not distributed with this
+% file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+%include ../shared/devedition.inc.css
+
+:root {
+  --forwardbutton-width: 32px;
+}
+
+/* Use only 1px separator between nav toolbox and page content */
+#navigator-toolbox::after {
+  border-top-style: none;
+  margin-top: -1px;
+}
+
+/* Include extra space on left/right for dragging since there is no space above
+   the tabs */
+#main-window[tabsintitlebar] #TabsToolbar {
+  padding-left: 50px;
+  padding-right: 50px;
+  margin-bottom: 0; /* Don't overlap the inner highlight at the top of the nav-bar */
+}
+
+/* Get rid of 1px bright strip at the top of window */
+#main-window[tabsintitlebar] #titlebar-content {
+  background: var(--chrome-background-color);
+}
+
+/* Resize things so that the native titlebar is in line with the tabs */
+#main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-buttonbox-container,
+#main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > #titlebar-fullscreen-button {
+  margin-top: 6px;
+}
+
+/* Square back and forward buttons.  Need !important on these because there
+   are a lot of more specific selectors sprinkled around elsewhere for changing
+   background / shadows for different states */
+#back-button,
+#forward-button {
+  height: 24px !important;
+  box-shadow: none !important;
+  border: 1px solid var(--chrome-nav-bar-controls-border-color) !important;
+  background: var(--chrome-nav-buttons-background) !important;
+}
+
+#forward-button {
+  border-inline-start: none !important;
+  /* browser.css and friends set up the width of the button to be 32px.
+   * They then set margin-left to -2px to ensure the button is not too wide
+   * compared to the back button, and set padding-left to center the icon
+   * correctly.
+   * In our theme, the back and forward buttons are the same width, with the
+   * back button being 32px with 1px border on both sides. To ensure the
+   * forward button's content box looks like it is the same size with width
+   * set to 32px and a 1px border on only 1 side, we overlap by 1px, so both
+   * buttons end up with a content box that looks like it's 30px.
+   */
+  margin-left: -1px;
+  padding-left: 1px;
+}
+
+#forward-button > .toolbarbutton-icon {
+  margin-left: 0;
+  margin-right: 0;
+}
+
+#back-button:hover:not([disabled="true"]),
+#forward-button:hover:not([disabled="true"]) {
+  background: var(--chrome-nav-buttons-hover-background) !important;
+}
+
+#back-button {
+  border-radius: 3px 0 0 3px !important;
+  padding: 0 !important;
+  margin: 0 !important;
+}
+
+#back-button:hover:active:not([disabled="true"]) {
+  -moz-image-region: rect(18px, 54px, 36px, 36px);
+}
+
+/* Use smaller back button icon */
+@media (min-resolution: 2dppx) {
+  #back-button:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(36px, 108px, 72px, 72px);
+  }
+}
+
+/* Don't use the default background for tabs toolbar */
+#TabsToolbar {
+  -moz-appearance: none !important;
+}
+
+/* Prevent the hover styling from on the identity icon from overlapping the
+   urlbar border. */
+#identity-box {
+  margin-top: -1px !important;
+  margin-bottom: -1px !important;
+  padding-top: 3px !important;
+  padding-bottom: 3px !important;
+}
+
+:root[devtoolstheme="dark"] .findbar-closebutton:not(:hover),
+/* Tab styling - make sure to use an inverted icon for the selected tab
+   (brighttext only covers the unselected tabs) */
+.tab-close-button[selected=true]:not(:hover) {
+  -moz-image-region: rect(0, 64px, 16px, 48px);
+}
+@media (min-resolution: 2dppx) {
+  :root[devtoolstheme="dark"] .findbar-closebutton:not(:hover),
+  .tab-close-button[selected=true]:not(:hover) {
+    -moz-image-region: rect(0, 128px, 32px, 96px);
+  }
+}
+
+.ac-type-icon {
+  /* Left-align the type icon in awesomebar popup results with the icon in the
+     urlbar. */
+  margin-inline-start: 14px;
+}
diff --git a/browser/themes/osx/downloads/allDownloadsViewOverlay.css b/browser/themes/osx/downloads/allDownloadsViewOverlay.css
new file mode 100644
index 000000000..dbdced970
--- /dev/null
+++ b/browser/themes/osx/downloads/allDownloadsViewOverlay.css
@@ -0,0 +1,19 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%include ../../shared/downloads/allDownloadsViewOverlay.inc.css
+
+/*** List items ***/
+
+:root {
+  --downloads-item-height: 6em;
+}
+
+.downloadProgress > .progress-bar {
+  background-color: #3c9af8;
+}
+
+.downloadProgress[paused="true"] > .progress-bar {
+  background-color: #a6a6a6;
+}
diff --git a/browser/themes/osx/downloads/download-glow-menuPanel.png b/browser/themes/osx/downloads/download-glow-menuPanel.png
new file mode 100644
index 000000000..583dac86e
--- /dev/null
+++ b/browser/themes/osx/downloads/download-glow-menuPanel.png
diff --git a/browser/themes/osx/downloads/download-glow-menuPanel@2x.png b/browser/themes/osx/downloads/download-glow-menuPanel@2x.png
new file mode 100644
index 000000000..9b48fbd12
--- /dev/null
+++ b/browser/themes/osx/downloads/download-glow-menuPanel@2x.png
diff --git a/browser/themes/osx/downloads/download-notification-finish.png b/browser/themes/osx/downloads/download-notification-finish.png
new file mode 100644
index 000000000..139bf0b53
--- /dev/null
+++ b/browser/themes/osx/downloads/download-notification-finish.png
diff --git a/browser/themes/osx/downloads/download-notification-finish@2x.png b/browser/themes/osx/downloads/download-notification-finish@2x.png
new file mode 100644
index 000000000..4a2512181
--- /dev/null
+++ b/browser/themes/osx/downloads/download-notification-finish@2x.png
diff --git a/browser/themes/osx/downloads/download-notification-start.png b/browser/themes/osx/downloads/download-notification-start.png
new file mode 100644
index 000000000..bd548b183
--- /dev/null
+++ b/browser/themes/osx/downloads/download-notification-start.png
diff --git a/browser/themes/osx/downloads/download-notification-start@2x.png b/browser/themes/osx/downloads/download-notification-start@2x.png
new file mode 100644
index 000000000..1d6278050
--- /dev/null
+++ b/browser/themes/osx/downloads/download-notification-start@2x.png
diff --git a/browser/themes/osx/downloads/downloads.css b/browser/themes/osx/downloads/downloads.css
new file mode 100644
index 000000000..af78dcfe9
--- /dev/null
+++ b/browser/themes/osx/downloads/downloads.css
@@ -0,0 +1,49 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%include ../../shared/downloads/downloads.inc.css
+
+/*** Panel and outer controls ***/
+
+#downloadsPanel {
+  margin-top: -1px;
+}
+
+@keyfocus@ #downloadsSummary:focus,
+@keyfocus@ .downloadsPanelFooterButton:focus {
+  outline: 2px -moz-mac-focusring solid;
+  outline-offset: -2px;
+}
+
+/*** List items and similar elements in the summary ***/
+
+:root {
+  --downloads-item-height: 6em;
+  --downloads-item-font-size-factor: 0.95;
+  --downloads-item-details-opacity: 0.7;
+}
+
+.downloadButton:focus > .button-box {
+  outline: 2px -moz-mac-focusring solid;
+  outline-offset: -2px;
+}
+
+@item@[verdict="Malware"] {
+  color: #aa1b08;
+}
+
+.downloadProgress > .progress-bar {
+  background-color: #3c9af8;
+}
+
+.downloadProgress[paused="true"] > .progress-bar {
+  background-color: #a6a6a6;
+}
+
+/*** Highlighted list items ***/
+
+@keyfocus@ @itemFocused@ {
+  outline: 2px -moz-mac-focusring solid;
+  outline-offset: -2px;
+}
diff --git a/browser/themes/osx/downloads/indicator.css b/browser/themes/osx/downloads/indicator.css
new file mode 100644
index 000000000..eb88f074e
--- /dev/null
+++ b/browser/themes/osx/downloads/indicator.css
@@ -0,0 +1,250 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*** Status and progress indicator ***/
+
+#downloads-indicator-anchor {
+  min-width: 18px;
+  min-height: 18px;
+}
+
+#downloads-animation-container {
+  min-height: 1px;
+  min-width: 1px;
+  height: 1px;
+  margin-bottom: -1px;
+  /* Makes the outermost animation container element positioned, so that its
+     contents are rendered over the main browser window in the Z order.
+     This is required by the animated event notification. */
+  position: relative;
+  /* The selected tab may overlap #downloads-indicator-notification */
+  z-index: 5;
+}
+
+/*** Main indicator icon ***/
+
+#downloads-indicator-icon {
+  background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
+                              0, 198, 18, 180) center no-repeat;
+}
+
+toolbar[brighttext] #downloads-indicator-icon {
+  background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 0, 198, 18, 180);
+}
+
+#downloads-button[attention="warning"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
+#downloads-button[attention="severe"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
+  display: -moz-box;
+  height: 8px;
+  width: 8px;
+  min-width: 0;
+  border-radius: 50%;
+  /* "!important" is necessary to override the rule in toolbarbutton.css */
+  margin-top: -1px !important;
+  margin-right: -2px !important;
+}
+
+#downloads-button[cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
+  height: 7px;
+  width: 7px;
+}
+
+#downloads-button[attention="severe"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
+  background: #D90000;
+}
+
+#downloads-button[attention="warning"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
+  background: #FFBF00;
+}
+
+#downloads-button[attention="severe"] > .toolbarbutton-badge-stack > .toolbarbutton-badge:-moz-window-inactive,
+#downloads-button[attention="warning"] > .toolbarbutton-badge-stack > .toolbarbutton-badge:-moz-window-inactive {
+  filter: none;
+}
+
+#downloads-button[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-icon {
+  background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 36, 198, 54, 180);
+}
+
+toolbar[brighttext] #downloads-button[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-icon {
+  background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 36, 198, 54, 180);
+}
+
+#downloads-button[cui-areatype="menu-panel"][attention="success"] {
+  list-style-image: url("chrome://browser/skin/downloads/download-glow-menuPanel.png");
+  -moz-image-region: auto;
+}
+
+/* In the next few rules, we use :not([counter]) as a shortcut that is
+   equivalent to -moz-any([progress], [paused]). */
+
+#downloads-button:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
+  background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
+                              0, 198, 18, 180) center no-repeat;
+  background-size: 12px;
+}
+
+toolbar[brighttext] #downloads-button:not([counter]):not([attention="success"]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
+  background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 0, 198, 18, 180);
+}
+
+#downloads-button:not([counter])[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
+  background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 36, 198, 54, 180);
+}
+
+toolbar[brighttext] #downloads-button:not([counter])[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
+  background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 36, 198, 54, 180);
+}
+
+@media (min-resolution: 2dppx) {
+  #downloads-indicator-icon {
+    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar@2x.png"), 0, 396, 36, 360);
+    background-size: 18px;
+  }
+
+  toolbar[brighttext] #downloads-indicator-icon {
+    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted@2x.png"), 0, 396, 36, 360);
+  }
+
+  #downloads-button:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
+    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar@2x.png"), 0, 396, 36, 360);
+  }
+
+  toolbar[brighttext] #downloads-button:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
+    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted@2x.png"),
+                                      0, 396, 36, 360);
+  }
+
+  #downloads-button[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-icon {
+    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar@2x.png"), 72, 396, 108, 360);
+  }
+
+  toolbar[brighttext] #downloads-button[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-icon {
+    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted@2x.png"), 72, 396, 108, 360);
+  }
+
+  #downloads-button[cui-areatype="menu-panel"][attention="success"] {
+    list-style-image: url("chrome://browser/skin/downloads/download-glow-menuPanel@2x.png");
+  }
+
+  #downloads-button:not([counter])[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
+    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar@2x.png"), 72, 396, 108, 360);
+  }
+
+  toolbar[brighttext] #downloads-button:not([counter])[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
+    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted@2x.png"), 72, 396, 108, 360);
+  }
+}
+
+/*** Download notifications ***/
+
+#downloads-indicator-notification {
+  opacity: 0;
+  background-size: 16px;
+  background-position: center;
+  background-repeat: no-repeat;
+  width: 16px;
+  height: 16px;
+}
+
+@keyframes downloadsIndicatorNotificationStartRight {
+  from { opacity: 0; transform: translate(-128px, 128px) scale(8); }
+  20%  { opacity: .85; animation-timing-function: ease-out; }
+  to   { opacity: 0; transform: translate(0) scale(1); }
+}
+
+@keyframes downloadsIndicatorNotificationStartLeft {
+  from { opacity: 0; transform: translate(128px, 128px) scale(8); }
+  20%  { opacity: .85; animation-timing-function: ease-out; }
+  to   { opacity: 0; transform: translate(0) scale(1); }
+}
+
+#downloads-notification-anchor[notification="start"] > #downloads-indicator-notification {
+  background-image: url("chrome://browser/skin/downloads/download-notification-start.png");
+  animation-name: downloadsIndicatorNotificationStartRight;
+  animation-duration: 1s;
+}
+
+@media (min-resolution: 2dppx) {
+  #downloads-notification-anchor[notification="start"] > #downloads-indicator-notification {
+    background-image: url("chrome://browser/skin/downloads/download-notification-start@2x.png");
+  }
+}
+
+#downloads-notification-anchor[notification="start"]:-moz-locale-dir(rtl) > #downloads-indicator-notification {
+  animation-name: downloadsIndicatorNotificationStartLeft;
+}
+
+@keyframes downloadsIndicatorNotificationFinish {
+  from { opacity: 0; transform: scale(1); }
+  20%  { opacity: .65; animation-timing-function: ease-in; }
+  to   { opacity: 0; transform: scale(8); }
+}
+
+#downloads-notification-anchor[notification="finish"] > #downloads-indicator-notification {
+  background-image: url("chrome://browser/skin/downloads/download-notification-finish.png");
+  animation-name: downloadsIndicatorNotificationFinish;
+  animation-duration: 1s;
+}
+
+@media (min-resolution: 2dppx) {
+  #downloads-notification-anchor[notification="finish"] > #downloads-indicator-notification {
+    background-image: url("chrome://browser/skin/downloads/download-notification-finish@2x.png");
+  }
+}
+
+/*** Progress bar and text ***/
+
+#downloads-indicator-counter {
+  height: 9px;
+  margin: -3px 0 0;
+  color: hsl(0,0%,30%);
+  text-shadow: 0 1px 0 hsla(0,0%,100%,.5);
+  font-size: 9px;
+  line-height: 9px;
+  text-align: center;
+}
+
+#downloads-indicator-progress {
+  width: 16px;
+  height: 5px;
+  min-width: 0;
+  min-height: 0;
+  margin-top: 1px;
+  margin-bottom: 2px;
+  border-radius: 2px;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.4);
+}
+
+#downloads-indicator-progress > .progress-bar {
+  -moz-appearance: none;
+  min-width: 0;
+  min-height: 0;
+  /* The background-clip: border-box; and background-image: none; are there to expand the background-color behind the border */
+  background-clip: padding-box, border-box;
+  background-color: rgb(90, 185, 255);
+  background-image: linear-gradient(transparent 1px, rgba(255, 255, 255, 0.4) 1px, rgba(255, 255, 255, 0.4) 2px, transparent 2px), none;
+  border: 1px solid;
+  border-color: rgba(0,43,86,.6) rgba(0,43,86,.4) rgba(0,43,86,.4);
+  border-radius: 2px 0 0 2px;
+}
+
+#downloads-indicator-progress > .progress-remainder {
+  -moz-appearance: none;
+  min-width: 0;
+  min-height: 0;
+  background-image: linear-gradient(#505050, #575757);
+  border: 1px solid;
+  border-color: hsla(0,0%,0%,.6) hsla(0,0%,0%,.4) hsla(0,0%,0%,.4);
+  border-inline-start: none;
+  border-radius: 0 2px 2px 0;
+}
+
+#downloads-button[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
+  background-color: rgb(220, 230, 81);
+}
+
+#downloads-button[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder {
+  background-image: linear-gradient(#4b5000, #515700);
+}
diff --git a/browser/themes/osx/feeds/feedIcon.png b/browser/themes/osx/feeds/feedIcon.png
new file mode 100644
index 000000000..236b5f821
--- /dev/null
+++ b/browser/themes/osx/feeds/feedIcon.png
diff --git a/browser/themes/osx/feeds/feedIcon16.png b/browser/themes/osx/feeds/feedIcon16.png
new file mode 100644
index 000000000..a489de3bf
--- /dev/null
+++ b/browser/themes/osx/feeds/feedIcon16.png
diff --git a/browser/themes/osx/feeds/subscribe-ui.css b/browser/themes/osx/feeds/subscribe-ui.css
new file mode 100644
index 000000000..4d0744b3a
--- /dev/null
+++ b/browser/themes/osx/feeds/subscribe-ui.css
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+.alwaysUse {
+  padding: 3px;
+}
+
diff --git a/browser/themes/osx/feeds/subscribe.css b/browser/themes/osx/feeds/subscribe.css
new file mode 100644
index 000000000..6d1fa8da2
--- /dev/null
+++ b/browser/themes/osx/feeds/subscribe.css
@@ -0,0 +1,178 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+html {
+  background: -moz-Dialog;
+  font: 3mm tahoma,arial,helvetica,sans-serif;
+}
+
+#subscribeUsingDescription,
+#subscribeButton {
+  display: block;
+}
+
+#subscribeUsingDescription {
+  margin-bottom: 0.5em;
+}
+
+#subscribeButton {
+  margin-top: 0.5em;
+  margin-inline-start: auto;
+}
+
+#feedBody {
+  border: 1px solid THreeDShadow;
+  padding: 3em;
+  padding-inline-start: 30px;
+  margin: 2em auto;
+  background: -moz-Field;
+}
+
+#feedHeaderContainer {
+  display: flex;
+}
+
+#feedHeaderContainerSpacer {
+  flex-grow: 1;
+}
+
+#feedHeader {
+  border: 1px solid ThreeDShadow;
+  border-radius: 10px;
+  padding-top: 4em;
+  padding-bottom: .3em;
+  padding-inline-start: .3em;
+  padding-inline-end: .3em;
+  margin: -4em auto 0 auto;
+  font-size: 110%;
+  color: InfoText;
+  padding: 5em 3em 0 3em;
+}
+
+.feedBackground {
+  background: url("chrome://browser/skin/feeds/feedIcon.png") 1.4em 5.9em no-repeat rgb(255,255,225);
+}
+
+.videoPodcastBackground {
+  background: url("chrome://browser/skin/feeds/videoFeedIcon.png") 1.4em 5.9em no-repeat rgb(255,255,225);
+}
+
+.audioPodcastBackground {
+  background: url("chrome://browser/skin/feeds/audioFeedIcon.png") 1.4em 5.9em no-repeat rgb(255,255,225);
+}
+
+#feedHeader[firstrun="true"] #feedIntroText {
+  display: block;
+}
+
+#feedIntroText {
+  display: none;
+  margin-inline-start: 2em;
+}
+
+#feedSubscribeLine {
+  padding: 0 1em 1em 2em;
+}
+
+#feedHeader[firstrun="true"] #feedSubscribeLine {
+  padding-left: 3.7em;
+}
+
+/* Don't print subscription UI */
+@media print {
+  #feedHeaderContainer {
+    display: none;
+  }
+}
+
+body {
+  margin: 0;
+  padding: 0 3em;
+  color: -moz-fieldText;
+  font: message-box;
+}
+
+h1 {
+  font-size: 160%;
+  border-bottom: 2px solid ThreeDLightShadow;
+  margin: 0 0 .2em 0;
+}
+
+h2 {
+  color: #C0C0C0;
+  font-size: 110%;
+  font-weight: normal;
+  margin: 0 0 .6em 0;
+}
+
+#feedTitleLink {
+  float: right;
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+a[href] img {
+  border: none;
+}
+
+#feedTitleContainer {
+  margin-inline-start: 0;
+  margin-inline-end: .6em;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+#feedTitleImage {
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+  max-width: 300px;
+  max-height: 150px;
+}
+
+.feedEntryContent {
+  font-size: 110%;
+}
+
+.link {
+  color: #0000FF;
+  text-decoration: underline;
+  cursor: pointer;
+  margin-top: -2px;
+}
+
+.link:hover:active {
+  color: #FF0000;
+}
+
+.lastUpdated {
+  font-size: 85%;
+  font-weight: normal;
+}
+
+.type-icon {
+  vertical-align: bottom;
+  height: 16px;
+  width: 16px;
+}
+
+.enclosures {
+  border: 1px solid THreeDShadow;
+  padding: 1em;
+  margin: 1em auto;
+  background: -moz-Dialog;
+}
+
+.enclosure {
+  vertical-align: middle;
+  margin-left: 2px;
+}
+
+.handlersMenuList > .menulist-label-box > .menulist-icon {
+  max-width: 16px;
+  max-height: 16px;
+}
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
new file mode 100644
index 000000000..fd9b6127d
--- /dev/null
+++ b/browser/themes/osx/jar.mn
@@ -0,0 +1,235 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+browser.jar:
+% skin browser classic/1.0 %skin/classic/browser/
+#include ../shared/jar.inc.mn
+  skin/classic/browser/sanitizeDialog.css
+  skin/classic/browser/aboutSessionRestore-window-icon.png
+  skin/classic/browser/aboutSyncTabs.css
+* skin/classic/browser/syncedtabs/sidebar.css          (syncedtabs/sidebar.css)
+  skin/classic/browser/actionicon-tab.png
+  skin/classic/browser/actionicon-tab@2x.png
+* skin/classic/browser/browser.css
+* skin/classic/browser/devedition.css
+* skin/classic/browser/browser-lightweightTheme.css
+  skin/classic/browser/click-to-play-warning-stripes.png
+  skin/classic/browser/Info.png
+  skin/classic/browser/keyhole-circle.png
+  skin/classic/browser/keyhole-circle@2x.png
+  skin/classic/browser/subtle-pattern.png
+  skin/classic/browser/menu-back.png
+  skin/classic/browser/menu-forward.png
+  skin/classic/browser/menuPanel-customize.png
+  skin/classic/browser/menuPanel-customize@2x.png
+  skin/classic/browser/menuPanel-exit.png
+  skin/classic/browser/menuPanel-exit@2x.png
+  skin/classic/browser/menuPanel-help.png
+  skin/classic/browser/menuPanel-help@2x.png
+  skin/classic/browser/panel-expander-closed.png
+  skin/classic/browser/panel-expander-closed@2x.png
+  skin/classic/browser/panel-expander-open.png
+  skin/classic/browser/panel-expander-open@2x.png
+  skin/classic/browser/panel-plus-sign.png
+  skin/classic/browser/page-livemarks.png
+  skin/classic/browser/page-livemarks@2x.png
+  skin/classic/browser/pageInfo.css
+  skin/classic/browser/privatebrowsing-mask.png
+  skin/classic/browser/privatebrowsing-mask@2x.png
+  skin/classic/browser/privatebrowsing-mask-short.png
+  skin/classic/browser/privatebrowsing-mask-short@2x.png
+  skin/classic/browser/reload-stop-go.png
+  skin/classic/browser/reload-stop-go@2x.png
+  skin/classic/browser/searchbar.css
+  skin/classic/browser/slowStartup-16.png
+  skin/classic/browser/Toolbar.png
+  skin/classic/browser/Toolbar@2x.png
+  skin/classic/browser/Toolbar-inverted.png
+  skin/classic/browser/Toolbar-inverted@2x.png
+  skin/classic/browser/toolbarbutton-dropmarker.png
+  skin/classic/browser/urlbar-history-dropmarker.png
+  skin/classic/browser/urlbar-history-dropmarker@2x.png
+  skin/classic/browser/urlbar-popup-blocked.png
+  skin/classic/browser/urlbar-popup-blocked@2x.png
+  skin/classic/browser/webRTC-sharingDevice-menubar.png
+  skin/classic/browser/webRTC-sharingDevice-menubar@2x.png
+  skin/classic/browser/webRTC-sharingMicrophone-menubar.png
+  skin/classic/browser/webRTC-sharingMicrophone-menubar@2x.png
+  skin/classic/browser/webRTC-sharingScreen-menubar.png
+  skin/classic/browser/webRTC-sharingScreen-menubar@2x.png
+  skin/classic/browser/webRTC-indicator.css
+* skin/classic/browser/controlcenter/panel.css        (controlcenter/panel.css)
+  skin/classic/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
+  skin/classic/browser/customizableui/customize-titleBar-toggle.png  (customizableui/customize-titleBar-toggle.png)
+  skin/classic/browser/customizableui/customize-titleBar-toggle@2x.png  (customizableui/customize-titleBar-toggle@2x.png)
+  skin/classic/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
+  skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
+  skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
+* skin/classic/browser/customizableui/panelUI.css    (customizableui/panelUI.css)
+* skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css)
+  skin/classic/browser/downloads/download-glow-menuPanel.png (downloads/download-glow-menuPanel.png)
+  skin/classic/browser/downloads/download-glow-menuPanel@2x.png (downloads/download-glow-menuPanel@2x.png)
+  skin/classic/browser/downloads/download-notification-finish.png  (downloads/download-notification-finish.png)
+  skin/classic/browser/downloads/download-notification-finish@2x.png  (downloads/download-notification-finish@2x.png)
+  skin/classic/browser/downloads/download-notification-start.png  (downloads/download-notification-start.png)
+  skin/classic/browser/downloads/download-notification-start@2x.png  (downloads/download-notification-start@2x.png)
+* skin/classic/browser/downloads/downloads.css              (downloads/downloads.css)
+  skin/classic/browser/feeds/subscribe.css                  (feeds/subscribe.css)
+  skin/classic/browser/feeds/subscribe-ui.css               (feeds/subscribe-ui.css)
+  skin/classic/browser/feeds/feedIcon.png                   (feeds/feedIcon.png)
+  skin/classic/browser/feeds/feedIcon16.png                 (feeds/feedIcon16.png)
+* skin/classic/browser/newtab/newTab.css                    (newtab/newTab.css)
+  skin/classic/browser/setDesktopBackground.css
+  skin/classic/browser/monitor.png
+  skin/classic/browser/monitor_16-10.png
+  skin/classic/browser/places/allBookmarks.png              (places/allBookmarks.png)
+  skin/classic/browser/places/autocomplete-star.png         (places/autocomplete-star.png)
+  skin/classic/browser/places/autocomplete-star@2x.png      (places/autocomplete-star@2x.png)
+* skin/classic/browser/places/places.css                    (places/places.css)
+  skin/classic/browser/places/organizer.css                 (places/organizer.css)
+  skin/classic/browser/places/query.png                     (places/query.png)
+  skin/classic/browser/places/query@2x.png                  (places/query@2x.png)
+  skin/classic/browser/places/bookmarksMenu.png             (places/bookmarksMenu.png)
+  skin/classic/browser/places/bookmarksToolbar.png          (places/bookmarksToolbar.png)
+  skin/classic/browser/places/bookmarksToolbar@2x.png       (places/bookmarksToolbar@2x.png)
+  skin/classic/browser/places/bookmarks-notification-finish.png  (places/bookmarks-notification-finish.png)
+  skin/classic/browser/places/bookmarks-notification-finish@2x.png  (places/bookmarks-notification-finish@2x.png)
+  skin/classic/browser/places/bookmarksToolbar-menuPanel.png    (places/bookmarksToolbar-menuPanel.png)
+  skin/classic/browser/places/bookmarksToolbar-menuPanel@2x.png (places/bookmarksToolbar-menuPanel@2x.png)
+  skin/classic/browser/places/history.png                   (places/history.png)
+  skin/classic/browser/places/history@2x.png                (places/history@2x.png)
+  skin/classic/browser/places/toolbar.png                   (places/toolbar.png)
+  skin/classic/browser/places/toolbarDropMarker.png         (places/toolbarDropMarker.png)
+  skin/classic/browser/places/folderDropArrow.png           (places/folderDropArrow.png)
+  skin/classic/browser/places/folderDropArrow@2x.png        (places/folderDropArrow@2x.png)
+  skin/classic/browser/places/editBookmarkOverlay.css       (places/editBookmarkOverlay.css)
+  skin/classic/browser/places/minus.png                     (places/minus.png)
+  skin/classic/browser/places/minus-active.png              (places/minus-active.png)
+  skin/classic/browser/places/plus.png                      (places/plus.png)
+  skin/classic/browser/places/plus-active.png               (places/plus-active.png)
+  skin/classic/browser/places/starred48.png                 (places/starred48.png)
+  skin/classic/browser/places/starred48@2x.png              (places/starred48@2x.png)
+  skin/classic/browser/places/unstarred48.png               (places/unstarred48.png)
+  skin/classic/browser/places/unfiledBookmarks.png          (places/unfiledBookmarks.png)
+  skin/classic/browser/places/unfiledBookmarks@2x.png       (places/unfiledBookmarks@2x.png)
+  skin/classic/browser/places/tag.png                       (places/tag.png)
+  skin/classic/browser/places/tag@2x.png                    (places/tag@2x.png)
+  skin/classic/browser/places/downloads.png                 (places/downloads.png)
+  skin/classic/browser/places/livemark-item.png             (places/livemark-item.png)
+  skin/classic/browser/preferences/alwaysAsk.png            (preferences/alwaysAsk.png)
+  skin/classic/browser/preferences/application.png          (preferences/application.png)
+  skin/classic/browser/preferences/saveFile.png             (preferences/saveFile.png)
+* skin/classic/browser/preferences/preferences.css          (preferences/preferences.css)
+* skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
+* skin/classic/browser/preferences/in-content/dialog.css      (preferences/in-content/dialog.css)
+  skin/classic/browser/preferences/applications.css         (preferences/applications.css)
+  skin/classic/browser/social/services-16.png               (social/services-16.png)
+  skin/classic/browser/social/services-16@2x.png            (social/services-16@2x.png)
+  skin/classic/browser/social/services-64.png               (social/services-64.png)
+  skin/classic/browser/social/services-64@2x.png            (social/services-64@2x.png)
+  skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon.png             (tabbrowser/alltabs-box-bkgnd-icon.png)
+  skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon-inverted.png    (tabbrowser/alltabs-box-bkgnd-icon-inverted.png)
+  skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png (tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png)
+  skin/classic/browser/tabbrowser/newtab.png                             (tabbrowser/newtab.png)
+  skin/classic/browser/tabbrowser/newtab@2x.png                          (tabbrowser/newtab@2x.png)
+  skin/classic/browser/tabbrowser/newtab-inverted.png                    (tabbrowser/newtab-inverted.png)
+  skin/classic/browser/tabbrowser/newtab-inverted@2x.png                 (tabbrowser/newtab-inverted@2x.png)
+  skin/classic/browser/tabbrowser/tab-active-middle.png                  (tabbrowser/tab-active-middle.png)
+  skin/classic/browser/tabbrowser/tab-active-middle@2x.png               (tabbrowser/tab-active-middle@2x.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left.png                     (tabbrowser/tab-arrow-left.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left@2x.png                  (tabbrowser/tab-arrow-left@2x.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png            (tabbrowser/tab-arrow-left-inverted.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left-inverted@2x.png         (tabbrowser/tab-arrow-left-inverted@2x.png)
+  skin/classic/browser/tabbrowser/tab-arrow-right.png                    (tabbrowser/tab-arrow-right.png)
+  skin/classic/browser/tabbrowser/tab-arrow-right@2x.png                 (tabbrowser/tab-arrow-right@2x.png)
+  skin/classic/browser/tabbrowser/tab-arrow-right-inverted.png           (tabbrowser/tab-arrow-right-inverted.png)
+  skin/classic/browser/tabbrowser/tab-arrow-right-inverted@2x.png        (tabbrowser/tab-arrow-right-inverted@2x.png)
+  skin/classic/browser/tabbrowser/tab-background-end.png                 (tabbrowser/tab-background-end.png)
+  skin/classic/browser/tabbrowser/tab-background-end@2x.png              (tabbrowser/tab-background-end@2x.png)
+  skin/classic/browser/tabbrowser/tab-background-middle.png              (tabbrowser/tab-background-middle.png)
+  skin/classic/browser/tabbrowser/tab-background-middle@2x.png           (tabbrowser/tab-background-middle@2x.png)
+  skin/classic/browser/tabbrowser/tab-background-start.png               (tabbrowser/tab-background-start.png)
+  skin/classic/browser/tabbrowser/tab-background-start@2x.png            (tabbrowser/tab-background-start@2x.png)
+
+# NOTE: The following two files (tab-selected-end.svg, tab-selected-start.svg) get pre-processed in
+#       Makefile.in with a non-default marker of "%" and the result of that gets packaged.
+  skin/classic/browser/tabbrowser/tab-selected-end.svg                   (tab-selected-end.svg)
+  skin/classic/browser/tabbrowser/tab-selected-start.svg                 (tab-selected-start.svg)
+
+  skin/classic/browser/tabbrowser/tab-stroke-end.png                     (tabbrowser/tab-stroke-end.png)
+  skin/classic/browser/tabbrowser/tab-stroke-end@2x.png                  (tabbrowser/tab-stroke-end@2x.png)
+  skin/classic/browser/tabbrowser/tab-stroke-start.png                   (tabbrowser/tab-stroke-start.png)
+  skin/classic/browser/tabbrowser/tab-stroke-start@2x.png                (tabbrowser/tab-stroke-start@2x.png)
+  skin/classic/browser/tabbrowser/tabDragIndicator.png                   (tabbrowser/tabDragIndicator.png)
+  skin/classic/browser/tabbrowser/tabDragIndicator@2x.png                (tabbrowser/tabDragIndicator@2x.png)
+  skin/classic/browser/sync-16.png
+  skin/classic/browser/sync-32.png
+  skin/classic/browser/sync-bg.png
+  skin/classic/browser/sync-128.png
+  skin/classic/browser/sync-desktopIcon.svg  (../shared/sync-desktopIcon.svg)
+  skin/classic/browser/sync-horizontalbar.png
+  skin/classic/browser/sync-horizontalbar@2x.png
+  skin/classic/browser/sync-mobileIcon.svg  (../shared/sync-mobileIcon.svg)
+  skin/classic/browser/sync-notification-24.png
+  skin/classic/browser/syncSetup.css
+  skin/classic/browser/syncCommon.css
+  skin/classic/browser/syncQuota.css
+  skin/classic/browser/syncProgress-horizontalbar.png
+  skin/classic/browser/syncProgress-horizontalbar@2x.png
+  skin/classic/browser/syncProgress-menuPanel.png
+  skin/classic/browser/syncProgress-menuPanel@2x.png
+  skin/classic/browser/syncProgress-toolbar.png
+  skin/classic/browser/syncProgress-toolbar@2x.png
+  skin/classic/browser/syncProgress-toolbar-inverted.png
+  skin/classic/browser/syncProgress-toolbar-inverted@2x.png
+  skin/classic/browser/Toolbar-background-noise.png         (Toolbar-background-noise.png)
+  skin/classic/browser/lion/toolbarbutton-dropmarker.png    (toolbarbutton-dropmarker-lion.png)
+  skin/classic/browser/toolbarbutton-dropmarker@2x.png      (toolbarbutton-dropmarker-lion@2x.png)
+  skin/classic/browser/lion/tabbrowser/alltabs-box-bkgnd-icon.png      (tabbrowser/alltabs-box-bkgnd-icon-lion.png)
+  skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon@2x.png        (tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png)
+  skin/classic/browser/lion/places/toolbar.png                         (places/toolbar-lion.png)
+  skin/classic/browser/yosemite/Toolbar.png                            (Toolbar-yosemite.png)
+  skin/classic/browser/yosemite/Toolbar@2x.png                         (Toolbar-yosemite@2x.png)
+  skin/classic/browser/yosemite/menuPanel-customize.png                (menuPanel-customize-yosemite.png)
+  skin/classic/browser/yosemite/menuPanel-customize@2x.png             (menuPanel-customize-yosemite@2x.png)
+  skin/classic/browser/yosemite/menuPanel-exit.png                     (menuPanel-exit-yosemite.png)
+  skin/classic/browser/yosemite/menuPanel-exit@2x.png                  (menuPanel-exit-yosemite@2x.png)
+  skin/classic/browser/yosemite/menuPanel-help.png                     (menuPanel-help-yosemite.png)
+  skin/classic/browser/yosemite/menuPanel-help@2x.png                  (menuPanel-help-yosemite@2x.png)
+  skin/classic/browser/yosemite/reload-stop-go.png                     (reload-stop-go-yosemite.png)
+  skin/classic/browser/yosemite/reload-stop-go@2x.png                  (reload-stop-go-yosemite@2x.png)
+  skin/classic/browser/yosemite/sync-horizontalbar.png                 (sync-horizontalbar-yosemite.png)
+  skin/classic/browser/yosemite/sync-horizontalbar@2x.png              (sync-horizontalbar-yosemite@2x.png)
+  skin/classic/browser/yosemite/tab-selected-end-inactive.svg          (tabbrowser/tab-selected-end-yosemite-inactive.svg)
+  skin/classic/browser/yosemite/tab-selected-start-inactive.svg        (tabbrowser/tab-selected-start-yosemite-inactive.svg)
+  skin/classic/browser/yosemite/tab-active-middle-inactive.png         (tabbrowser/tab-active-middle-yosemite-inactive.png)
+  skin/classic/browser/yosemite/tab-active-middle-inactive@2x.png      (tabbrowser/tab-active-middle-yosemite-inactive@2x.png)
+  skin/classic/browser/yosemite/tab-stroke-end-inactive.png            (tabbrowser/tab-stroke-end-yosemite-inactive.png)
+  skin/classic/browser/yosemite/tab-stroke-end-inactive@2x.png         (tabbrowser/tab-stroke-end-yosemite-inactive@2x.png)
+  skin/classic/browser/yosemite/tab-stroke-start-inactive.png          (tabbrowser/tab-stroke-start-yosemite-inactive.png)
+  skin/classic/browser/yosemite/tab-stroke-start-inactive@2x.png       (tabbrowser/tab-stroke-start-yosemite-inactive@2x.png)
+#ifdef E10S_TESTING_ONLY
+  skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
+#endif
+
+[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
+% override chrome://browser/skin/feeds/audioFeedIcon.png                   chrome://browser/skin/feeds/feedIcon.png
+% override chrome://browser/skin/feeds/audioFeedIcon16.png                 chrome://browser/skin/feeds/feedIcon16.png
+% override chrome://browser/skin/feeds/videoFeedIcon.png                   chrome://browser/skin/feeds/feedIcon.png
+% override chrome://browser/skin/feeds/videoFeedIcon16.png                 chrome://browser/skin/feeds/feedIcon16.png
+% override chrome://browser/skin/toolbarbutton-dropmarker.png              chrome://browser/skin/lion/toolbarbutton-dropmarker.png                 os=Darwin osversion>=10.7
+% override chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon.png     chrome://browser/skin/lion/tabbrowser/alltabs-box-bkgnd-icon.png        os=Darwin osversion>=10.7
+% override chrome://browser/skin/places/toolbar.png                        chrome://browser/skin/lion/places/toolbar.png                           os=Darwin osversion>=10.7
+% override chrome://browser/skin/Toolbar.png                               chrome://browser/skin/yosemite/Toolbar.png                              os=Darwin osversion>=10.10
+% override chrome://browser/skin/Toolbar@2x.png                            chrome://browser/skin/yosemite/Toolbar@2x.png                           os=Darwin osversion>=10.10
+% override chrome://browser/skin/menuPanel-customize.png                   chrome://browser/skin/yosemite/menuPanel-customize.png                  os=Darwin osversion>=10.10
+% override chrome://browser/skin/menuPanel-customize@2x.png                chrome://browser/skin/yosemite/menuPanel-customize@2x.png               os=Darwin osversion>=10.10
+% override chrome://browser/skin/menuPanel-exit.png                        chrome://browser/skin/yosemite/menuPanel-exit.png                       os=Darwin osversion>=10.10
+% override chrome://browser/skin/menuPanel-exit@2x.png                     chrome://browser/skin/yosemite/menuPanel-exit@2x.png                    os=Darwin osversion>=10.10
+% override chrome://browser/skin/menuPanel-help.png                        chrome://browser/skin/yosemite/menuPanel-help.png                       os=Darwin osversion>=10.10
+% override chrome://browser/skin/menuPanel-help@2x.png                     chrome://browser/skin/yosemite/menuPanel-help@2x.png                    os=Darwin osversion>=10.10
+% override chrome://browser/skin/reload-stop-go.png                        chrome://browser/skin/yosemite/reload-stop-go.png                       os=Darwin osversion>=10.10
+% override chrome://browser/skin/reload-stop-go@2x.png                     chrome://browser/skin/yosemite/reload-stop-go@2x.png                    os=Darwin osversion>=10.10
+% override chrome://browser/skin/sync-horizontalbar.png                    chrome://browser/skin/yosemite/sync-horizontalbar.png               os=Darwin osversion>=10.10
+% override chrome://browser/skin/sync-horizontalbar@2x.png                 chrome://browser/skin/yosemite/sync-horizontalbar@2x.png            os=Darwin osversion>=10.10
diff --git a/browser/themes/osx/keyhole-circle.png b/browser/themes/osx/keyhole-circle.png
new file mode 100644
index 000000000..fc177587f
--- /dev/null
+++ b/browser/themes/osx/keyhole-circle.png
diff --git a/browser/themes/osx/keyhole-circle@2x.png b/browser/themes/osx/keyhole-circle@2x.png
new file mode 100644
index 000000000..288702805
--- /dev/null
+++ b/browser/themes/osx/keyhole-circle@2x.png
diff --git a/browser/themes/osx/menu-back.png b/browser/themes/osx/menu-back.png
new file mode 100644
index 000000000..82a74c7b8
--- /dev/null
+++ b/browser/themes/osx/menu-back.png
diff --git a/browser/themes/osx/menu-forward.png b/browser/themes/osx/menu-forward.png
new file mode 100644
index 000000000..b3b40e394
--- /dev/null
+++ b/browser/themes/osx/menu-forward.png
diff --git a/browser/themes/osx/menuPanel-customize-yosemite.png b/browser/themes/osx/menuPanel-customize-yosemite.png
new file mode 100644
index 000000000..93b660692
--- /dev/null
+++ b/browser/themes/osx/menuPanel-customize-yosemite.png
diff --git a/browser/themes/osx/menuPanel-customize-yosemite@2x.png b/browser/themes/osx/menuPanel-customize-yosemite@2x.png
new file mode 100644
index 000000000..43cde4a68
--- /dev/null
+++ b/browser/themes/osx/menuPanel-customize-yosemite@2x.png
diff --git a/browser/themes/osx/menuPanel-customize.png b/browser/themes/osx/menuPanel-customize.png
new file mode 100644
index 000000000..b0772d822
--- /dev/null
+++ b/browser/themes/osx/menuPanel-customize.png
diff --git a/browser/themes/osx/menuPanel-customize@2x.png b/browser/themes/osx/menuPanel-customize@2x.png
new file mode 100644
index 000000000..aba481aeb
--- /dev/null
+++ b/browser/themes/osx/menuPanel-customize@2x.png
diff --git a/browser/themes/osx/menuPanel-exit-yosemite.png b/browser/themes/osx/menuPanel-exit-yosemite.png
new file mode 100644
index 000000000..4115b53ec
--- /dev/null
+++ b/browser/themes/osx/menuPanel-exit-yosemite.png
diff --git a/browser/themes/osx/menuPanel-exit-yosemite@2x.png b/browser/themes/osx/menuPanel-exit-yosemite@2x.png
new file mode 100644
index 000000000..af3160621
--- /dev/null
+++ b/browser/themes/osx/menuPanel-exit-yosemite@2x.png
diff --git a/browser/themes/osx/menuPanel-exit.png b/browser/themes/osx/menuPanel-exit.png
new file mode 100644
index 000000000..126cde088
--- /dev/null
+++ b/browser/themes/osx/menuPanel-exit.png
diff --git a/browser/themes/osx/menuPanel-exit@2x.png b/browser/themes/osx/menuPanel-exit@2x.png
new file mode 100644
index 000000000..1ccdd65b9
--- /dev/null
+++ b/browser/themes/osx/menuPanel-exit@2x.png
diff --git a/browser/themes/osx/menuPanel-help-yosemite.png b/browser/themes/osx/menuPanel-help-yosemite.png
new file mode 100644
index 000000000..ad1783de6
--- /dev/null
+++ b/browser/themes/osx/menuPanel-help-yosemite.png
diff --git a/browser/themes/osx/menuPanel-help-yosemite@2x.png b/browser/themes/osx/menuPanel-help-yosemite@2x.png
new file mode 100644
index 000000000..4a4c3bcae
--- /dev/null
+++ b/browser/themes/osx/menuPanel-help-yosemite@2x.png
diff --git a/browser/themes/osx/menuPanel-help.png b/browser/themes/osx/menuPanel-help.png
new file mode 100644
index 000000000..a9b34c132
--- /dev/null
+++ b/browser/themes/osx/menuPanel-help.png
diff --git a/browser/themes/osx/menuPanel-help@2x.png b/browser/themes/osx/menuPanel-help@2x.png
new file mode 100644
index 000000000..acf2e531c
--- /dev/null
+++ b/browser/themes/osx/menuPanel-help@2x.png
diff --git a/browser/themes/osx/monitor.png b/browser/themes/osx/monitor.png
new file mode 100644
index 000000000..ad90e5520
--- /dev/null
+++ b/browser/themes/osx/monitor.png
diff --git a/browser/themes/osx/monitor_16-10.png b/browser/themes/osx/monitor_16-10.png
new file mode 100644
index 000000000..fb3fdbc4f
--- /dev/null
+++ b/browser/themes/osx/monitor_16-10.png
diff --git a/browser/themes/osx/moz.build b/browser/themes/osx/moz.build
new file mode 100644
index 000000000..b787ab08e
--- /dev/null
+++ b/browser/themes/osx/moz.build
@@ -0,0 +1,13 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['communicator']
+
+JAR_MANIFESTS += ['jar.mn']
+
+DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
+
+include('../tab-svgs.mozbuild')
diff --git a/browser/themes/osx/newtab/newTab.css b/browser/themes/osx/newtab/newTab.css
new file mode 100644
index 000000000..0a5bace75
--- /dev/null
+++ b/browser/themes/osx/newtab/newTab.css
@@ -0,0 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%include ../../shared/newtab/newTab.inc.css
+
+
+.newtab-undo-button {
+  color: rgb(20,79,174);
+}
+
+.newtab-title {
+  font-family: Lucida Grande;
+}
diff --git a/browser/themes/osx/page-livemarks.png b/browser/themes/osx/page-livemarks.png
new file mode 100644
index 000000000..e52645846
--- /dev/null
+++ b/browser/themes/osx/page-livemarks.png
diff --git a/browser/themes/osx/page-livemarks@2x.png b/browser/themes/osx/page-livemarks@2x.png
new file mode 100644
index 000000000..7b170897c
--- /dev/null
+++ b/browser/themes/osx/page-livemarks@2x.png
diff --git a/browser/themes/osx/pageInfo.css b/browser/themes/osx/pageInfo.css
new file mode 100644
index 000000000..748b7b3fa
--- /dev/null
+++ b/browser/themes/osx/pageInfo.css
@@ -0,0 +1,194 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import "chrome://global/skin/";
+
+/* View buttons */
+@import "chrome://global/skin/viewbuttons.css";
+
+/* Extensions will provide icons because the view buttons have icons
+   on the windows and linux themes. We don't want to display them */
+.viewButtonIcon {
+  display: none;
+}
+
+deck {
+  padding: 10px 10px 10px 10px;
+}
+
+/* Misc */
+tree {
+  margin: .5em;
+}
+
+.gridSeparator {
+  width: .5em;
+}
+
+textbox {
+  background: transparent !important;
+  border: none;
+  padding: 0px;
+  margin-top: 1px;
+  -moz-appearance: none;
+}
+
+textbox.header {
+  margin-inline-start: 0;
+}
+
+.iframe {
+  margin: .5em;
+  background: white;
+  overflow: auto;
+}
+
+.fixedsize {
+  height: 8.5em;
+}
+
+textbox[disabled] {
+  font-style: italic;
+}
+
+/* General Tab */
+groupbox.collapsable caption .caption-icon {
+  width: 11px;
+  height: 11px;
+  background-repeat: no-repeat;
+  background-position: center;
+  margin-inline-end: 2px;
+  background-image: url("chrome://global/skin/arrow/arrow-dn.gif");
+}
+
+groupbox.collapsable[closed="true"] caption .caption-icon {
+  background-image: url("chrome://global/skin/arrow/arrow-rit.gif");
+}
+
+groupbox tree {
+  margin: 0;
+  border: none;
+}
+
+groupbox.treebox .groupbox-body {
+  padding: 0;
+}
+
+#securityBox description {
+  margin-inline-start: 10px;
+}
+
+#general-security-identity {
+  white-space: pre-wrap;
+  line-height: 2em;
+}
+
+/* Media Tab */
+#imagetree {
+  min-height: 10em;
+  margin-bottom: 0;
+}
+
+#mediaSplitter {
+  background: none;
+}
+
+#mediaGrid {
+  min-height: 9em;
+}
+
+#mediaLabelColumn {
+  min-width: 10em;
+}
+
+#thepreviewimage {
+  margin: 1em;
+}
+
+treechildren::-moz-tree-cell-text(broken) {
+  font-style: italic;
+  color: graytext;
+}
+
+/* Feeds Tab */
+#feedtree {
+  margin-bottom: 0px;
+}
+
+#feedListbox richlistitem {
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
+  min-height: 25px;
+  border-bottom: 1px dotted #C0C0C0;
+}
+
+#feedListbox richlistitem[selected="true"] {
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+}
+
+#feedListbox {
+  border: 2px solid;
+  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
+  -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
+  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
+  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
+}
+
+.feedTitle {
+  font-weight: bold;
+}
+
+/* Permissions Tab */
+#permList {
+  margin-top: .5em;
+  overflow: auto;
+  border: 2px solid;
+  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
+  -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
+  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
+  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
+  background-color: -moz-field;
+}
+
+.permission {
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
+  min-height: 25px;
+  border-bottom: 1px dotted #C0C0C0;
+}
+
+.permissionLabel {
+  font-weight: bold;
+}
+
+.permission:hover {
+  background-color: -moz-dialog;
+}
+
+/* Security Tab */
+#securityPanel .caption-icon {
+  display: none;
+}
+
+#securityPanel .header {
+  font-size: 120%;
+}
+
+#securityPanel .fieldLabel {
+  margin: 2px 10px 3px;
+}
+
+#securityPanel .fieldValue {
+  font-weight: bold;
+  margin: 2px 10px 3px;
+}
+
+#securityPanel row {
+  -moz-box-align: center;
+}
diff --git a/browser/themes/osx/panel-expander-closed.png b/browser/themes/osx/panel-expander-closed.png
new file mode 100644
index 000000000..f0e97b22e
--- /dev/null
+++ b/browser/themes/osx/panel-expander-closed.png
diff --git a/browser/themes/osx/panel-expander-closed@2x.png b/browser/themes/osx/panel-expander-closed@2x.png
new file mode 100644
index 000000000..0e7ded50f
--- /dev/null
+++ b/browser/themes/osx/panel-expander-closed@2x.png
diff --git a/browser/themes/osx/panel-expander-open.png b/browser/themes/osx/panel-expander-open.png
new file mode 100644
index 000000000..e3febf4ff
--- /dev/null
+++ b/browser/themes/osx/panel-expander-open.png
diff --git a/browser/themes/osx/panel-expander-open@2x.png b/browser/themes/osx/panel-expander-open@2x.png
new file mode 100644
index 000000000..391337030
--- /dev/null
+++ b/browser/themes/osx/panel-expander-open@2x.png
diff --git a/browser/themes/osx/panel-plus-sign.png b/browser/themes/osx/panel-plus-sign.png
new file mode 100644
index 000000000..375601e68
--- /dev/null
+++ b/browser/themes/osx/panel-plus-sign.png
diff --git a/browser/themes/osx/places/allBookmarks.png b/browser/themes/osx/places/allBookmarks.png
new file mode 100644
index 000000000..d1abe8192
--- /dev/null
+++ b/browser/themes/osx/places/allBookmarks.png
diff --git a/browser/themes/osx/places/autocomplete-star.png b/browser/themes/osx/places/autocomplete-star.png
new file mode 100644
index 000000000..4ad9a95cf
--- /dev/null
+++ b/browser/themes/osx/places/autocomplete-star.png
diff --git a/browser/themes/osx/places/autocomplete-star@2x.png b/browser/themes/osx/places/autocomplete-star@2x.png
new file mode 100644
index 000000000..4a9c203ff
--- /dev/null
+++ b/browser/themes/osx/places/autocomplete-star@2x.png
diff --git a/browser/themes/osx/places/bookmarks-notification-finish.png b/browser/themes/osx/places/bookmarks-notification-finish.png
new file mode 100644
index 000000000..cb4b53e07
--- /dev/null
+++ b/browser/themes/osx/places/bookmarks-notification-finish.png
diff --git a/browser/themes/osx/places/bookmarks-notification-finish@2x.png b/browser/themes/osx/places/bookmarks-notification-finish@2x.png
new file mode 100644
index 000000000..8db41cd75
--- /dev/null
+++ b/browser/themes/osx/places/bookmarks-notification-finish@2x.png
diff --git a/browser/themes/osx/places/bookmarksMenu.png b/browser/themes/osx/places/bookmarksMenu.png
new file mode 100644
index 000000000..c27bd6a6f
--- /dev/null
+++ b/browser/themes/osx/places/bookmarksMenu.png
diff --git a/browser/themes/osx/places/bookmarksToolbar-menuPanel.png b/browser/themes/osx/places/bookmarksToolbar-menuPanel.png
new file mode 100644
index 000000000..892125ad3
--- /dev/null
+++ b/browser/themes/osx/places/bookmarksToolbar-menuPanel.png
diff --git a/browser/themes/osx/places/bookmarksToolbar-menuPanel@2x.png b/browser/themes/osx/places/bookmarksToolbar-menuPanel@2x.png
new file mode 100644
index 000000000..c81710a0e
--- /dev/null
+++ b/browser/themes/osx/places/bookmarksToolbar-menuPanel@2x.png
diff --git a/browser/themes/osx/places/bookmarksToolbar.png b/browser/themes/osx/places/bookmarksToolbar.png
new file mode 100644
index 000000000..2047bffe5
--- /dev/null
+++ b/browser/themes/osx/places/bookmarksToolbar.png
diff --git a/browser/themes/osx/places/bookmarksToolbar@2x.png b/browser/themes/osx/places/bookmarksToolbar@2x.png
new file mode 100644
index 000000000..dd458981e
--- /dev/null
+++ b/browser/themes/osx/places/bookmarksToolbar@2x.png
diff --git a/browser/themes/osx/places/downloads.png b/browser/themes/osx/places/downloads.png
new file mode 100644
index 000000000..0756cb680
--- /dev/null
+++ b/browser/themes/osx/places/downloads.png
diff --git a/browser/themes/osx/places/editBookmarkOverlay.css b/browser/themes/osx/places/editBookmarkOverlay.css
new file mode 100644
index 000000000..584a830ac
--- /dev/null
+++ b/browser/themes/osx/places/editBookmarkOverlay.css
@@ -0,0 +1,94 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+/**** folder menulist ****/
+.folder-icon > .menulist-label-box > .menulist-icon,
+.folder-icon > .menu-iconic-left > .menu-iconic-icon {
+  width: 16px;
+  height: 16px;
+}
+
+.folder-icon > .menu-iconic-left {
+  display: -moz-box;
+}
+
+.folder-icon {
+  list-style-image: url("chrome://global/skin/tree/folder.png") !important;
+}
+
+@media (min-resolution: 2dppx) {
+  .folder-icon {
+    list-style-image: url("chrome://global/skin/tree/folder@2x.png") !important;
+  }
+}
+
+.menulist-icon {
+  margin: 0 !important;
+}
+
+/**** expanders ****/
+
+.expander-up,
+.expander-down {
+  margin: 0 4px 1px 8px;
+  padding: 0;
+}
+
+.expander-up {
+  -moz-appearance: -moz-mac-disclosure-button-open;
+}
+
+.expander-down {
+  -moz-appearance: -moz-mac-disclosure-button-closed;
+}
+
+#editBookmarkPanelContent {
+  min-width: 23em;
+}
+
+#editBMPanel_folderTree {
+  margin: 6px 4px 0 4px;
+}
+
+/* Hide the value column of the tag autocomplete popup
+ * leaving only the comment column visible. This is
+ * so that only the tag being edited is shown in the
+ * popup.
+ */
+#editBMPanel_tagsField #treecolAutoCompleteValue {
+  visibility: collapse;
+}
+
+
+/* ----- BOOKMARK PANEL DROPDOWN MENU ITEMS ----- */
+
+#editBMPanel_folderMenuList[selectedIndex="0"],
+#editBMPanel_toolbarFolderItem {
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;  
+}
+
+#editBMPanel_folderMenuList[selectedIndex="1"],
+#editBMPanel_bmRootItem {
+  list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png") !important;  
+}
+
+#editBMPanel_folderMenuList[selectedIndex="2"],
+#editBMPanel_unfiledRootItem {
+  list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.png") !important;  
+}
+
+@media (min-resolution: 2dppx) {
+  #editBMPanel_folderMenuList[selectedIndex="0"],
+  #editBMPanel_toolbarFolderItem {
+    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important;
+  }
+
+  #editBMPanel_folderMenuList[selectedIndex="2"],
+  #editBMPanel_unfiledRootItem {
+    list-style-image: url("chrome://browser/skin/places/unfiledBookmarks@2x.png") !important;
+  }
+}
diff --git a/browser/themes/osx/places/folderDropArrow.png b/browser/themes/osx/places/folderDropArrow.png
new file mode 100644
index 000000000..8d722ccd5
--- /dev/null
+++ b/browser/themes/osx/places/folderDropArrow.png
diff --git a/browser/themes/osx/places/folderDropArrow@2x.png b/browser/themes/osx/places/folderDropArrow@2x.png
new file mode 100644
index 000000000..9efb6d95d
--- /dev/null
+++ b/browser/themes/osx/places/folderDropArrow@2x.png
diff --git a/browser/themes/osx/places/history.png b/browser/themes/osx/places/history.png
new file mode 100644
index 000000000..e5a00b56d
--- /dev/null
+++ b/browser/themes/osx/places/history.png
diff --git a/browser/themes/osx/places/history@2x.png b/browser/themes/osx/places/history@2x.png
new file mode 100644
index 000000000..684b374ff
--- /dev/null
+++ b/browser/themes/osx/places/history@2x.png
diff --git a/browser/themes/osx/places/livemark-item.png b/browser/themes/osx/places/livemark-item.png
new file mode 100644
index 000000000..9184b9518
--- /dev/null
+++ b/browser/themes/osx/places/livemark-item.png
diff --git a/browser/themes/osx/places/minus-active.png b/browser/themes/osx/places/minus-active.png
new file mode 100644
index 000000000..d43c58fe0
--- /dev/null
+++ b/browser/themes/osx/places/minus-active.png
diff --git a/browser/themes/osx/places/minus.png b/browser/themes/osx/places/minus.png
new file mode 100644
index 000000000..ba868c1b2
--- /dev/null
+++ b/browser/themes/osx/places/minus.png
diff --git a/browser/themes/osx/places/organizer.css b/browser/themes/osx/places/organizer.css
new file mode 100644
index 000000000..4e3682d4c
--- /dev/null
+++ b/browser/themes/osx/places/organizer.css
@@ -0,0 +1,319 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Places Organizer Sidebars */
+
+#placesList > treechildren::-moz-tree-row {
+  background-color: transparent;
+  border-color: transparent;
+  padding-bottom: 1px;
+  height: 24px;
+}
+
+#placesList > treechildren::-moz-tree-cell-text {
+  font-size: 12px;
+  margin-inline-end: 6px;
+}
+
+#placesList > treechildren::-moz-tree-row(selected) {  
+  -moz-appearance: -moz-mac-source-list-selection;
+}
+
+#placesList > treechildren::-moz-tree-row(selected,focus) {  
+  -moz-appearance: -moz-mac-active-source-list-selection;
+}
+
+#placesList > treechildren::-moz-tree-row(History),
+#placesList > treechildren::-moz-tree-row(history)  {
+  background-color: blue;
+}
+
+#placesList > treechildren::-moz-tree-cell(separator) {
+  cursor: default;
+}
+
+#placesList > treechildren::-moz-tree-separator {
+  border-top: 1px solid #505d6d;
+  margin: 0 10px;
+}
+
+#placesList > treechildren::-moz-tree-cell-text(selected) {  
+  color: #fff;
+  font-weight: bold;
+}
+
+#placesList > treechildren::-moz-tree-twisty {
+  -moz-appearance: none;
+  padding: 0 2px;
+  list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed");
+}
+
+#placesList > treechildren::-moz-tree-twisty(closed, selected) {
+  list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted");
+}
+
+#placesList > treechildren::-moz-tree-twisty(open) {
+  list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded");
+}
+
+#placesList > treechildren::-moz-tree-twisty(open, selected) {
+  list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted");
+}
+
+#placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed) {
+  list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-rtl");
+}
+
+#placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed, selected) {
+  list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted-rtl");
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #placesList > treechildren::-moz-tree-cell-text(selected) {
+    color: -moz-dialogtext;
+    font-weight: 500;
+  }
+
+  #placesList > treechildren::-moz-tree-cell-text(selected, focus) {
+    color: #fff;
+  }
+
+  #placesList > treechildren::-moz-tree-twisty(closed, selected) {
+    list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed");
+  }
+
+  #placesList > treechildren::-moz-tree-twisty(closed, selected, focus) {
+    list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted");
+  }
+
+  #placesList > treechildren::-moz-tree-twisty(open, selected) {
+    list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded");
+  }
+
+  #placesList > treechildren::-moz-tree-twisty(open, selected, focus) {
+    list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted");
+  }
+
+  #placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed, selected) {
+    list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-rtl");
+  }
+
+  #placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed, selected, focus) {
+    list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted-rtl");
+  }
+}
+
+#placesToolbar {
+  padding: 0 4px 3px;
+}
+
+#placesView {
+  border-top: none !important;
+}
+
+#placesView > splitter {
+  border-inline-start: none !important;
+  border-inline-end: 1px solid #b4b4b4;
+  min-width: 1px;
+  width: 3px;
+  margin-inline-start: -3px;
+  position: relative;
+  background-image: none !important;
+}
+
+#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 > .toolbarbutton-icon {
+  margin: 1px 4px;
+}
+
+#placesToolbar > toolbarbutton:not(#clearDownloadsButton) > .toolbarbutton-text {
+  display: none;
+}
+
+#placesToolbar > toolbarbutton[type="menu"] > .toolbarbutton-menu-dropmarker {
+  list-style-image: url(chrome://browser/skin/toolbarbutton-dropmarker.png);
+  padding: 0;
+  margin-top: 1px;
+  margin-inline-end: 2px;
+}
+
+@media (min-resolution: 2dppx) {
+  #placesToolbar > toolbarbutton[type="menu"] > .toolbarbutton-menu-dropmarker {
+    list-style-image: url(chrome://browser/skin/toolbarbutton-dropmarker@2x.png);
+  }
+
+  #placesToolbar > toolbarbutton[type="menu"] > .toolbarbutton-menu-dropmarker > .dropmarker-icon {
+    width: 7px;
+  }
+}
+
+#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 > menupopup {
+  margin-top: 1px;
+}
+
+/* back and forward button */
+#back-button:-moz-locale-dir(ltr),
+#forward-button:-moz-locale-dir(rtl) {
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+  margin-right: 0;
+}
+
+#forward-button:-moz-locale-dir(ltr),
+#back-button:-moz-locale-dir(rtl) {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+  margin-left: 0;
+}
+
+#back-button > .toolbarbutton-icon {
+  margin-inline-start: 3px !important;
+  margin-inline-end: 2px !important;
+}
+
+#forward-button > .toolbarbutton-icon {
+  margin-inline-start: 2px !important;
+  margin-inline-end: 3px !important;
+}
+
+/* organize button */
+#organizeButton {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+/* view button */
+#viewMenu {
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+/* maintenance button */
+#maintenanceButton {
+  -moz-image-region: rect(0px, 80px, 16px, 64px);
+}
+
+/* Root View */
+#placesView {
+  border-top: 1px solid ThreeDDarkShadow;
+  -moz-user-focus: ignore;
+}
+
+/* Place List, Place Content */
+#placesList {
+  -moz-appearance: -moz-mac-source-list;
+  box-shadow: inset -2px 0 0 hsla(0,0%,100%,.2);
+  width: 160px;
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #placesList {
+    box-shadow: none;
+  }
+}
+
+/* Info box */
+#detailsDeck {
+  border-top: 1px solid #919191;
+  background-color: #f0f0f0;
+  padding: 10px;
+}
+
+#placeContent {
+  -moz-appearance: none;
+  border: 0px;
+}
+
+#placeContent > treechildren::-moz-tree-row {
+  border-top: none !important;
+  padding-top: 1px;
+}
+
+#placeContent > treechildren::-moz-tree-row(odd) {
+  background-color: #edf3fe;
+}
+
+#placeContent > treechildren::-moz-tree-row(selected),
+#placeContent > treechildren::-moz-tree-row(odd, selected) {
+  background-color: -moz-mac-secondaryhighlight;
+}
+
+#placeContent > treechildren::-moz-tree-row(selected, focus), 
+#placeContent > treechildren::-moz-tree-row(odd, selected, focus) {
+  background-color: Highlight;
+  color: HighlightText !important;
+}
+
+#placeContent > treechildren::-moz-tree-cell,
+#placeContent > treechildren::-moz-tree-column {
+  border-right: 1px solid #d7dad7;
+}
+
+#placeContent > treechildren::-moz-tree-cell(separator) {
+  border-color: transparent;
+}
+
+/**** expanders ****/
+
+.expander-up,
+.expander-down {
+  margin: 0 4px 1px 8px;
+  padding: 0;
+}
+
+.expander-up {
+  -moz-appearance: -moz-mac-disclosure-button-open;
+}
+
+.expander-down {
+  -moz-appearance: -moz-mac-disclosure-button-closed;
+}
+
+/**
+ * info pane
+ */
+
+#infoBoxExpander {
+  margin: 2px;
+}
+
+#infoBoxExpanderLabel {
+  display: none;
+}
+
+#itemsCountText,
+#selectItemDescription {
+  color: GrayText;
+}
+
+.editBMPanel_rowLabel {
+  text-align: end;
+}
+
+/**
+ * Downloads pane
+ */
+
+#clearDownloadsButton {
+  list-style-image: none !important;
+}
+
+#clearDownloadsButton > .toolbarbutton-icon {
+  display: none;
+}
diff --git a/browser/themes/osx/places/places.css b/browser/themes/osx/places/places.css
new file mode 100644
index 000000000..5eaad2791
--- /dev/null
+++ b/browser/themes/osx/places/places.css
@@ -0,0 +1,280 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%include ../shared.inc
+
+/* Sidebars */
+
+#bookmarksPanel, 
+#history-panel,
+#sidebar-search-container,
+#tabs-panel {
+  -moz-appearance: none !important;
+  background-color: transparent !important;
+  border-top: none !important;
+}
+
+.sidebar-placesTree,
+.sidebar-placesTreechildren::-moz-tree-row {
+  padding-bottom: 1px;
+  margin: 0;
+  height: 24px;
+  font-size: 12px;
+}
+
+.sidebar-placesTree {
+  -moz-appearance: -moz-mac-source-list;
+}
+
+.sidebar-placesTreechildren {
+  border-top: 1px solid #bebebe;
+}
+
+.sidebar-placesTreechildren::-moz-tree-separator {
+  border-top: 1px solid #505d6d;
+  margin: 0 10px;
+}
+
+.sidebar-placesTreechildren::-moz-tree-row {
+  background-color: transparent;
+}
+
+.sidebar-placesTreechildren::-moz-tree-row(selected) {
+  -moz-appearance: -moz-mac-source-list-selection;
+}
+
+.sidebar-placesTreechildren::-moz-tree-row(selected,focus) {
+  -moz-appearance: -moz-mac-active-source-list-selection;
+}
+
+.sidebar-placesTreechildren::-moz-tree-cell-text {
+  margin-inline-end: 6px;
+}
+
+.sidebar-placesTreechildren::-moz-tree-cell-text(selected) {
+  color: #fff;
+  font-weight: bold;
+}
+
+#sidebar-search-label {
+  display: none;
+}
+
+.sidebar-placesTreechildren::-moz-tree-twisty {
+  -moz-appearance: none;
+  padding: 0 2px;
+  list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed");
+}
+
+.sidebar-placesTreechildren::-moz-tree-twisty(closed, selected) {
+  list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted");
+}
+
+.sidebar-placesTreechildren::-moz-tree-twisty(open) {
+  list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded");
+}
+
+.sidebar-placesTreechildren::-moz-tree-twisty(open, selected) {
+  list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted");
+}
+
+.sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed) {
+  list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-rtl");
+}
+
+.sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed, selected) {
+  list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted-rtl");
+}
+
+@media (-moz-mac-yosemite-theme) {
+  .sidebar-placesTreechildren::-moz-tree-cell-text(selected) {
+    color: -moz-dialogtext;
+    font-weight: 500;
+  }
+
+  .sidebar-placesTreechildren::-moz-tree-cell-text(selected, focus) {
+    color: #fff;
+  }
+
+  .sidebar-placesTreechildren::-moz-tree-twisty(closed, selected) {
+    list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed");
+  }
+
+  .sidebar-placesTreechildren::-moz-tree-twisty(closed, selected, focus) {
+    list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted");
+  }
+
+  .sidebar-placesTreechildren::-moz-tree-twisty(open, selected) {
+    list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded");
+  }
+
+  .sidebar-placesTreechildren::-moz-tree-twisty(open, selected, focus) {
+    list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted");
+  }
+
+  .sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed, selected) {
+    list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-rtl");
+  }
+
+  .sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed, selected, focus) {
+    list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted-rtl")
+  }
+}
+
+#viewButton {
+  -moz-appearance: none;
+  padding-bottom: 1px;
+  padding-inline-start: 5px;
+  padding-inline-end: 0px;
+  margin: 0;
+  margin-inline-end: 4px;
+  min-width: 0px;
+  min-height: 0px;
+  border: 1px solid #a2a9b1;
+  border-radius: 10px;
+  background-image: linear-gradient(hsla(0,0%,100%,.75),hsla(0,0%,100%,.1));
+  box-shadow: inset 0 0 1px hsla(0,0%,100%,.85),
+                    0 1px hsla(0,0%,100%,.35);
+}
+
+#viewButton:hover:active,
+#viewButton[open=true] {
+  background-image: linear-gradient(hsla(0,0%,100%,.1),hsla(0,0%,100%,.75));
+  box-shadow: @roundButtonPressedShadow@;
+  color: -moz-dialogText;
+}
+
+#viewButton:-moz-window-inactive {
+  border-color: #b6b6b6;
+  background-image: linear-gradient(hsla(0,0%,100%,.3),hsla(0,0%,100%,0));
+}
+
+#viewButton .button-menu-dropmarker {
+  display: -moz-box;
+  list-style-image: url("chrome://global/skin/icons/menulist-dropmarker.png");
+}
+
+#viewButton:focus {
+  box-shadow: 0 1px 0 hsla(0, 0%, 0%, .15),
+              0 0 0 1px hsla(210, 100%, 60%, .45) inset,
+              0 0 0 2px hsla(210, 100%, 60%, .45);
+  border-color: hsla(210, 100%, 60%, 1);
+}
+
+#sidebar-search-container {
+  margin: 0 4px 6px;
+}
+
+/* Trees */
+
+treechildren::-moz-tree-image(title) {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  padding-inline-end: 2px;
+  margin: 0px 2px;
+  width: 16px;
+  height: 16px;
+}
+
+treechildren::-moz-tree-image(title, livemarkItem) {
+  list-style-image: url("chrome://browser/skin/places/livemark-item.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+treechildren::-moz-tree-image(title, livemarkItem, visited) {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+treechildren::-moz-tree-image(title, container),
+treechildren::-moz-tree-image(title, open) {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+treechildren::-moz-tree-image(title, separator) {
+  list-style-image: none;
+  width: 0 !important;
+  height: 0 !important;
+  margin: 0;
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_AllBookmarks) {
+  list-style-image: url("chrome://browser/skin/places/allBookmarks.png");
+}
+
+treechildren::-moz-tree-image(container, livemark) {
+  list-style-image: url("chrome://browser/skin/page-livemarks.png");
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksToolbar) {
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksMenu) {
+  list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png");
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks) {
+  list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.png");
+}
+
+/* query-nodes should be styled even if they're not expandable */
+treechildren::-moz-tree-image(query) {
+  list-style-image: url("chrome://browser/skin/places/query.png");
+}
+
+treechildren::-moz-tree-image(query, OrganizerQuery_Downloads) {
+  list-style-image: url("chrome://browser/skin/places/downloads.png");
+}
+
+treechildren::-moz-tree-image(title, query, tagContainer),
+treechildren::-moz-tree-image(query, OrganizerQuery_Tags) {
+  list-style-image: url("chrome://browser/skin/places/tag.png");
+}
+
+/* calendar icon for folders grouping items by date */
+treechildren::-moz-tree-image(title, query, dayContainer) {
+  list-style-image: url("chrome://browser/skin/places/history.png");
+}
+
+treechildren::-moz-tree-image(title, query, hostContainer) {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+}
+
+treechildren::-moz-tree-image(title, query, hostContainer, open) {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+}
+
+treechildren::-moz-tree-image(query, OrganizerQuery_History) {
+  list-style-image: url("chrome://browser/skin/places/history.png");
+}
+
+/* We want some queries to look like ordinary folders. This must come
+   after the (title, query) selector, or it would get overridden. */
+treechildren::-moz-tree-image(title, query, folder),
+treechildren::-moz-tree-image(title, query, folder, open) {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+treechildren::-moz-tree-cell-text(title, separator) {
+  color: ThreeDShadow;
+  margin: 0px 5px;
+}
+
+treechildren::-moz-tree-cell-text(title, separator, selected, focus) {
+  color: HighlightText;
+}
+
+treechildren::-moz-tree-twisty(title, separator) {
+  -moz-appearance: none;
+  padding: 0px;
+}
+
+treechildren::-moz-tree-image(cutting) {
+  opacity: 0.5;
+}
+
+treechildren::-moz-tree-cell-text(cutting) {
+  opacity: 0.7;
+}
diff --git a/browser/themes/osx/places/plus-active.png b/browser/themes/osx/places/plus-active.png
new file mode 100644
index 000000000..2d1dd11be
--- /dev/null
+++ b/browser/themes/osx/places/plus-active.png
diff --git a/browser/themes/osx/places/plus.png b/browser/themes/osx/places/plus.png
new file mode 100644
index 000000000..c1cc60688
--- /dev/null
+++ b/browser/themes/osx/places/plus.png
diff --git a/browser/themes/osx/places/query.png b/browser/themes/osx/places/query.png
new file mode 100644
index 000000000..0ccb84702
--- /dev/null
+++ b/browser/themes/osx/places/query.png
diff --git a/browser/themes/osx/places/query@2x.png b/browser/themes/osx/places/query@2x.png
new file mode 100644
index 000000000..20b458aac
--- /dev/null
+++ b/browser/themes/osx/places/query@2x.png
diff --git a/browser/themes/osx/places/starred48.png b/browser/themes/osx/places/starred48.png
new file mode 100644
index 000000000..bdcc7e757
--- /dev/null
+++ b/browser/themes/osx/places/starred48.png
diff --git a/browser/themes/osx/places/starred48@2x.png b/browser/themes/osx/places/starred48@2x.png
new file mode 100644
index 000000000..0ed76af19
--- /dev/null
+++ b/browser/themes/osx/places/starred48@2x.png
diff --git a/browser/themes/osx/places/tag.png b/browser/themes/osx/places/tag.png
new file mode 100644
index 000000000..a4038bb4f
--- /dev/null
+++ b/browser/themes/osx/places/tag.png
diff --git a/browser/themes/osx/places/tag@2x.png b/browser/themes/osx/places/tag@2x.png
new file mode 100644
index 000000000..673814bb5
--- /dev/null
+++ b/browser/themes/osx/places/tag@2x.png
diff --git a/browser/themes/osx/places/toolbar-lion.png b/browser/themes/osx/places/toolbar-lion.png
new file mode 100644
index 000000000..ac3358c91
--- /dev/null
+++ b/browser/themes/osx/places/toolbar-lion.png
diff --git a/browser/themes/osx/places/toolbar.png b/browser/themes/osx/places/toolbar.png
new file mode 100644
index 000000000..168daf9ce
--- /dev/null
+++ b/browser/themes/osx/places/toolbar.png
diff --git a/browser/themes/osx/places/toolbarDropMarker.png b/browser/themes/osx/places/toolbarDropMarker.png
new file mode 100644
index 000000000..a217b0ed8
--- /dev/null
+++ b/browser/themes/osx/places/toolbarDropMarker.png
diff --git a/browser/themes/osx/places/unfiledBookmarks.png b/browser/themes/osx/places/unfiledBookmarks.png
new file mode 100644
index 000000000..69495dac0
--- /dev/null
+++ b/browser/themes/osx/places/unfiledBookmarks.png
diff --git a/browser/themes/osx/places/unfiledBookmarks@2x.png b/browser/themes/osx/places/unfiledBookmarks@2x.png
new file mode 100644
index 000000000..44efd6aba
--- /dev/null
+++ b/browser/themes/osx/places/unfiledBookmarks@2x.png
diff --git a/browser/themes/osx/places/unstarred48.png b/browser/themes/osx/places/unstarred48.png
new file mode 100644
index 000000000..8b82aab4b
--- /dev/null
+++ b/browser/themes/osx/places/unstarred48.png
diff --git a/browser/themes/osx/preferences/alwaysAsk.png b/browser/themes/osx/preferences/alwaysAsk.png
new file mode 100644
index 000000000..c792d1488
--- /dev/null
+++ b/browser/themes/osx/preferences/alwaysAsk.png
diff --git a/browser/themes/osx/preferences/application.png b/browser/themes/osx/preferences/application.png
new file mode 100644
index 000000000..b4c1ca7d0
--- /dev/null
+++ b/browser/themes/osx/preferences/application.png
diff --git a/browser/themes/osx/preferences/applications.css b/browser/themes/osx/preferences/applications.css
new file mode 100644
index 000000000..8a4a01500
--- /dev/null
+++ b/browser/themes/osx/preferences/applications.css
@@ -0,0 +1,73 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Line up the actions menu with action labels above and below it.
+ * Equalize the distance from the left side of the action box to the left side
+ * of the icon for both the menu and the non-menu versions of the action box.
+ * Also make sure the labels are the same distance away from the icons.
+ */
+.actionsMenu {
+  margin-inline-start: -2px;
+  margin-top: 0;
+  margin-bottom: -1px;
+}
+
+#handlersView > richlistitem label {
+  margin-inline-start: 3px;
+  margin-top: 2px;
+}
+
+#handlersView > richlistitem {
+  min-height: 22px;
+}
+
+.typeIcon,
+.actionIcon {
+  margin-inline-start: 3px;
+}
+
+.typeIcon,
+.actionIcon,
+.actionsMenu .menulist-icon {
+  margin-inline-end: 2px;
+}
+
+.actionsMenu > menupopup > menuitem > .menu-iconic-left {
+  /* Undo content/browser/preferences/handlers.css - we don't
+   * want icon-less labels to line up with the other labels.
+   */
+  min-width: 0;
+}
+
+richlistitem[appHandlerIcon="ask"],
+menuitem[appHandlerIcon="ask"] {
+  list-style-image: url("chrome://browser/skin/preferences/alwaysAsk.png");
+}
+
+richlistitem[appHandlerIcon="save"],
+menuitem[appHandlerIcon="save"] {
+  list-style-image: url("chrome://browser/skin/preferences/saveFile.png");
+}
+
+richlistitem[appHandlerIcon="feed"],
+menuitem[appHandlerIcon="feed"] {
+  list-style-image: url("chrome://browser/skin/page-livemarks.png");
+}
+
+richlistitem[appHandlerIcon="plugin"],
+menuitem[appHandlerIcon="plugin"] {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+}
+
+/* Repeat what menu.css does for .menuitem-iconic */
+menuitem[appHandlerIcon] {
+  padding-top: 1px;
+  padding-bottom: 3px;
+}
+
+menuitem[appHandlerIcon] > .menu-iconic-left > .menu-iconic-icon {
+  margin-inline-start: 0;
+  width: 16px;
+}
diff --git a/browser/themes/osx/preferences/in-content/dialog.css b/browser/themes/osx/preferences/in-content/dialog.css
new file mode 100644
index 000000000..46a6cb91c
--- /dev/null
+++ b/browser/themes/osx/preferences/in-content/dialog.css
@@ -0,0 +1,36 @@
+/* - This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%include ../../../shared/incontentprefs/dialog.inc.css
+
+prefwindow,
+.windowDialog {
+  font: message-box !important;
+}
+
+label:not(.menu-text),
+textbox,
+description,
+.tab-text,
+caption > label {
+  font-size: 1.3em;
+}
+
+/* Create a separate rule to unset these styles on .tree-input instead of
+   using :not(.tree-input) so the selector specifity doesn't change. */
+textbox.tree-input {
+  font-size: unset;
+}
+
+button {
+  font-size: 1em;
+}
+
+caption {
+  font: message-box;
+}
+
+.prefWindow-dlgbuttons {
+  margin: 0;
+}
diff --git a/browser/themes/osx/preferences/in-content/preferences.css b/browser/themes/osx/preferences/in-content/preferences.css
new file mode 100644
index 000000000..c59b08283
--- /dev/null
+++ b/browser/themes/osx/preferences/in-content/preferences.css
@@ -0,0 +1,53 @@
+/* - This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%include ../../../shared/incontentprefs/preferences.inc.css
+
+prefpane .groupbox-title {
+  background: none;
+  margin-bottom: 0;
+}
+
+.actionsMenu > .menulist-label-box > .menulist-icon {
+  margin-top: 2px;
+  margin-inline-start: 2px;
+  margin-inline-end: 8px !important;
+}
+
+#downloadFolder > .fileFieldContentBox {
+  padding-inline-start: 3px;
+}
+
+#fxaProfileImage {
+  -moz-user-focus: normal;
+}
+
+textbox + button {
+  margin-inline-start: -4px;
+}
+
+filefield + button {
+  margin-inline-start: -8px;
+}
+
+#popupPolicyRow {
+  /* Override styles from
+     browser/themes/osx/preferences/preferences.css */
+  margin-bottom: 0 !important;
+  padding-bottom: 0 !important;
+  border-bottom: none;
+}
+
+#advancedPrefs {
+  margin-right: 0; /*override margin from normal preferences.css */
+  margin-left: 0;
+}
+
+/**
+ * Dialog
+ */
+
+#dialogTitle {
+  font-size: 1.1em;
+}
diff --git a/browser/themes/osx/preferences/preferences.css b/browser/themes/osx/preferences/preferences.css
new file mode 100644
index 000000000..da0e66b6e
--- /dev/null
+++ b/browser/themes/osx/preferences/preferences.css
@@ -0,0 +1,131 @@
+/*
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+%include ../../../../toolkit/themes/osx/global/shared.inc
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+.windowDialog {
+  padding: 12px;
+  font: -moz-dialog;
+}
+
+/* ----- APPLICATIONS PREFPANE ----- */
+description {
+  font: small-caption;
+  font-weight: normal;
+  line-height: 1.3em;
+  margin-bottom: 4px !important;
+}
+
+prefpane .groupbox-body {
+  -moz-appearance: none;
+  padding: 8px 4px 4px 4px;
+}
+
+prefpane .groupbox-title {
+  background: url("chrome://global/skin/50pct_transparent_grey.png") repeat-x bottom left;
+  margin-bottom: 4px;
+}
+
+tabpanels {
+  padding: 20px 7px 7px;
+}
+
+caption {
+  padding-inline-start: 5px;
+  padding-top: 4px;
+  padding-bottom: 2px;
+}
+
+#popupPolicyRow {
+  margin-bottom: 4px !important;
+  padding-bottom: 4px !important;
+  border-bottom: 1px solid #ccc;
+}
+
+#translationAttributionImage {
+  width: 70px;
+  cursor: pointer;
+}
+
+#browserUseCurrent,
+#browserUseBookmark,
+#browserUseBlank {
+  margin-top: 10px;
+}
+
+#advancedPrefs {
+  margin: 0 8px;
+}
+
+#privacyPrefs {
+  padding: 0 4px;
+}
+
+#privacyPrefs > tabpanels {
+  padding: 18px 10px 10px;
+}
+
+#OCSPDialogPane {
+  font: message-box !important;
+}
+
+/* General Pane */
+
+#useFirefoxSync,
+#getStarted {
+  font-size: 90%;
+}
+
+#isNotDefaultLabel {
+  font-weight: bold;
+}
+
+/**
+ * Update Preferences
+ */
+#autoInstallOptions {
+  margin-inline-start: 20px;
+}
+
+.updateControls {
+  margin-inline-start: 10px;
+}
+
+/**
+ * Clear Private Data
+ */
+#SanitizeDialogPane > groupbox {
+  margin-top: 0;
+}
+
+
+/* ----- SYNC PANE ----- */
+
+#syncDesc {
+  padding: 0 8em;
+}
+
+#accountCaptionImage {
+  list-style-image: url("chrome://mozapps/skin/profile/profileicon.png");
+}
+
+#syncAddDeviceLabel {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+#noFxaAccount {
+  margin: 12px 4px;
+  line-height: 1.2em;
+}
+
+#noFxaAccount > label:first-child {
+  margin-bottom: 0.6em;
+}
diff --git a/browser/themes/osx/preferences/saveFile.png b/browser/themes/osx/preferences/saveFile.png
new file mode 100644
index 000000000..7177f8df3
--- /dev/null
+++ b/browser/themes/osx/preferences/saveFile.png
diff --git a/browser/themes/osx/privatebrowsing-mask-short.png b/browser/themes/osx/privatebrowsing-mask-short.png
new file mode 100644
index 000000000..92f60e29f
--- /dev/null
+++ b/browser/themes/osx/privatebrowsing-mask-short.png
diff --git a/browser/themes/osx/privatebrowsing-mask-short@2x.png b/browser/themes/osx/privatebrowsing-mask-short@2x.png
new file mode 100644
index 000000000..ec1cf7452
--- /dev/null
+++ b/browser/themes/osx/privatebrowsing-mask-short@2x.png
diff --git a/browser/themes/osx/privatebrowsing-mask.png b/browser/themes/osx/privatebrowsing-mask.png
new file mode 100644
index 000000000..586d3d9f0
--- /dev/null
+++ b/browser/themes/osx/privatebrowsing-mask.png
diff --git a/browser/themes/osx/privatebrowsing-mask@2x.png b/browser/themes/osx/privatebrowsing-mask@2x.png
new file mode 100644
index 000000000..efb6d9b80
--- /dev/null
+++ b/browser/themes/osx/privatebrowsing-mask@2x.png
diff --git a/browser/themes/osx/reload-stop-go-yosemite.png b/browser/themes/osx/reload-stop-go-yosemite.png
new file mode 100644
index 000000000..5efbf0b94
--- /dev/null
+++ b/browser/themes/osx/reload-stop-go-yosemite.png
diff --git a/browser/themes/osx/reload-stop-go-yosemite@2x.png b/browser/themes/osx/reload-stop-go-yosemite@2x.png
new file mode 100644
index 000000000..b681f8930
--- /dev/null
+++ b/browser/themes/osx/reload-stop-go-yosemite@2x.png
diff --git a/browser/themes/osx/reload-stop-go.png b/browser/themes/osx/reload-stop-go.png
new file mode 100644
index 000000000..699ef2326
--- /dev/null
+++ b/browser/themes/osx/reload-stop-go.png
diff --git a/browser/themes/osx/reload-stop-go@2x.png b/browser/themes/osx/reload-stop-go@2x.png
new file mode 100644
index 000000000..704c7a894
--- /dev/null
+++ b/browser/themes/osx/reload-stop-go@2x.png
diff --git a/browser/themes/osx/sanitizeDialog.css b/browser/themes/osx/sanitizeDialog.css
new file mode 100644
index 000000000..14a6ce527
--- /dev/null
+++ b/browser/themes/osx/sanitizeDialog.css
@@ -0,0 +1,91 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Align the duration label with the warning box and item list */
+#sanitizeDurationLabel {
+  margin-inline-start: 1px;
+}
+
+
+/* Hide the duration dropdown suffix label if it's empty.  Otherwise it
+   takes up a little space, causing the end of the dropdown to not be aligned
+   with the warning box. */
+#sanitizeDurationSuffixLabel[value=""] {
+  display: none;
+}
+
+
+/* Places tree */
+#placesTreechildren::-moz-tree-row(selected),
+#placesTreechildren::-moz-tree-row(grippyRow) {
+  background: #999;
+}
+
+#placesTreechildren::-moz-tree-cell-text(selected) {
+  color: #111;
+}
+
+
+/* Sanitize everything warning box */
+#sanitizeEverythingWarningBox {
+  background-color: Window;
+  border: 1px solid ThreeDDarkShadow;
+  border-radius: 5px;
+  padding: 16px;
+}
+
+#sanitizeEverythingWarningIcon {
+  list-style-image: url("chrome://global/skin/icons/warning-large.png");
+  padding: 0;
+  margin: 0;
+}
+
+#sanitizeEverythingWarningDescBox {
+  padding: 0 16px;
+  margin: 0;
+}
+
+
+/* Progressive disclosure button */
+#detailsExpanderWrapper {
+  padding: 0;
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+
+.expander-up,
+.expander-down {
+  padding: 0;
+  margin: 0;
+}
+
+.expander-up {
+  -moz-appearance: -moz-mac-disclosure-button-open;
+}
+
+.expander-down {
+  -moz-appearance: -moz-mac-disclosure-button-closed;
+}
+
+/* Make the item list the same width as the warning box */
+#itemList {
+  margin-inline-start: 0;
+  margin-inline-end: 0;
+}
+
+/* Without this a useless scrollbar appears in the listbox when its rows
+   attribute is set to the total number of listitems, as it is currently.  See
+   bug 489958 comment 14 and bug 491788. */
+#itemList > listitem {
+  padding: 1px 0;
+}
+
+
+/* Align the last dialog button with the end of the warning box */
+.prefWindow-dlgbuttons {
+  margin-inline-end: 0;
+}
+.dialog-button[dlgtype="accept"] {
+  margin-inline-end: 0;
+}
diff --git a/browser/themes/osx/searchbar.css b/browser/themes/osx/searchbar.css
new file mode 100644
index 000000000..4b6aeeb21
--- /dev/null
+++ b/browser/themes/osx/searchbar.css
@@ -0,0 +1,318 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#PopupSearchAutoComplete {
+  /* JS code forces the panel to have the width of the searchbar rather than
+   * the width of the textfield. Alignment of the panel with the searchbar is
+   * obtained with negative margins here: margin-inline-start when the text
+   * field is in the same direction as the rest of the UI, margin-inline-end
+   * when the textfield's direction has been reversed.
+   * (eg. using command+shift+X) */
+  margin-inline-start: -23px;
+  margin-inline-end: -21px;
+}
+
+.searchbar-textbox {
+  border-radius: 10000px;
+}
+
+.searchbar-popup {
+  margin-top: 4px;
+  margin-inline-start: 3px;
+}
+
+.searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box {
+  margin: 0;
+  padding: 3px 0 2px;
+  height: 20px;
+}
+
+.searchbar-engine-image {
+  width: 16px;
+  height: 16px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+.search-go-container {
+  -moz-box-align: center;
+  padding-inline-end: 6px;
+}
+
+.searchbar-search-button-container {
+  -moz-box-align: center;
+}
+
+.search-go-button {
+  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+  -moz-image-region: rect(0, 42px, 14px, 28px);
+}
+
+.search-go-button:hover:active {
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
+}
+
+.search-go-button:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+.searchbar-search-button {
+  list-style-image: url("chrome://browser/skin/search-indicator.png");
+  -moz-image-region: rect(0, 20px, 20px, 0);
+  margin-inline-start: 3px;
+  margin-inline-end: 1px;
+}
+
+.searchbar-search-button[addengines="true"] {
+  list-style-image: url("chrome://browser/skin/search-indicator-badge-add.png");
+}
+
+.searchbar-search-button:hover {
+  -moz-image-region: rect(0, 40px, 20px, 20px);
+}
+
+.searchbar-search-button:hover:active {
+  -moz-image-region: rect(0, 60px, 20px, 40px);
+}
+
+@media (min-resolution: 2dppx) {
+  .searchbar-engine-image {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+
+  .search-go-button {
+    list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
+    -moz-image-region: rect(0, 84px, 28px, 56px);
+    width: 14px;
+  }
+
+  .search-go-button:hover:active {
+    list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
+    -moz-image-region: rect(28px, 84px, 56px, 56px);
+    width: 14px;
+  }
+
+  .searchbar-search-button {
+    list-style-image: url("chrome://browser/skin/search-indicator@2x.png");
+    width: 20px;
+    -moz-image-region: rect(0, 40px, 40px, 0);
+  }
+
+  .searchbar-search-button[addengines="true"] {
+    list-style-image: url("chrome://browser/skin/search-indicator-badge-add@2x.png");
+  }
+
+  .searchbar-search-button:hover {
+    -moz-image-region: rect(0, 80px, 40px, 40px);
+  }
+
+  .searchbar-search-button:hover:active {
+    -moz-image-region: rect(0, 120px, 40px, 80px);
+  }
+}
+
+.search-panel-current-engine {
+  border-radius: 4px 4px 0 0;
+}
+
+/**
+ * The borders of the various elements are specified as follows.
+ *
+ * The current engine always has a bottom border.
+ * The search results never have a border.
+ *
+ * When the search results are not collapsed:
+ * - The elements underneath the search results all have a top border.
+ *
+ * When the search results are collapsed:
+ * - The elements underneath the search results all have a bottom border, except
+ *   the lowest one: search-setting-button.
+ */
+
+.search-panel-current-engine {
+  border-top: none !important;
+  border-bottom: 1px solid var(--panel-separator-color);
+}
+
+.search-panel-tree[collapsed=true] + .search-one-offs > .search-panel-header,
+.search-panel-tree[collapsed=true] + .search-one-offs > .search-panel-one-offs,
+.search-panel-tree[collapsed=true] + .search-one-offs > vbox > .addengine-item:first-of-type {
+  border-top: none;
+}
+
+.search-panel-tree[collapsed=true] + .search-one-offs > .searchbar-engine-one-off-item,
+.search-panel-tree[collapsed=true] + .search-one-offs > .search-panel-current-input,
+.search-panel-tree[collapsed=true] + .search-one-offs > .search-panel-one-offs,
+.search-panel-tree[collapsed=true] + .search-one-offs > vbox > .addengine-item:last-of-type {
+  border-bottom: 1px solid var(--panel-separator-color);
+}
+
+.search-panel-header {
+  font-size: 10px;
+  font-weight: normal;
+  background-color: var(--arrowpanel-dimmed);
+  border-top: 1px solid var(--panel-separator-color);
+  margin: 0;
+  padding: 3px 6px;
+  color: GrayText;
+}
+
+.search-panel-header > label {
+  margin-top: 2px !important;
+  margin-bottom: 2px !important;
+}
+
+.search-panel-current-input > label {
+  margin: 2px 0 !important;
+}
+
+.search-panel-input-value {
+  color: -moz-fieldtext;
+}
+
+.search-panel-one-offs {
+  margin: 0 !important;
+  border-top: 1px solid var(--panel-separator-color);
+}
+
+.searchbar-engine-one-off-item {
+  -moz-appearance: none;
+  display: inline-block;
+  min-width: 48px;
+  height: 32px;
+  margin: 0;
+  padding: 0;
+  background: linear-gradient(transparent 15%, var(--panel-separator-color) 15%, var(--panel-separator-color) 85%, transparent 85%);
+  background-size: 1px auto;
+  background-repeat: no-repeat;
+  background-position: right center;
+  color: GrayText;
+}
+
+.searchbar-engine-one-off-item:-moz-locale-dir(rtl) {
+  background-position: left center;
+}
+
+.searchbar-engine-one-off-item:not(.last-row) {
+  box-sizing: content-box;
+  border-bottom: 1px solid var(--panel-separator-color);
+}
+
+.search-setting-button-compact {
+  border-bottom: none !important;
+}
+
+.search-panel-one-offs:not([compact=true]) > .searchbar-engine-one-off-item.last-of-row,
+.search-panel-one-offs[compact=true] > .searchbar-engine-one-off-item.last-of-row:not(.dummy),
+.search-panel-one-offs[compact=true] > .searchbar-engine-one-off-item.dummy:not(.last-of-row),
+.search-panel-one-offs[compact=true] > .searchbar-engine-one-off-item.last-engine,
+.search-setting-button-compact {
+  background-image: none;
+}
+
+.searchbar-engine-one-off-item[selected] {
+  background-color: Highlight;
+  background-image: none;
+  color: HighlightText;
+}
+
+.searchbar-engine-one-off-item > .button-box > .button-text {
+  display: none;
+}
+
+.searchbar-engine-one-off-item > .button-box > .button-icon {
+  margin-inline-start: 0;
+  width: 16px;
+  height: 16px;
+}
+
+.addengine-item {
+  -moz-appearance: none;
+  font-size: 10px;
+  height: 32px;
+  margin: 0;
+  padding: 0 10px;
+}
+
+.addengine-item > .button-box {
+  -moz-box-pack: start;
+}
+
+.addengine-item:first-of-type {
+  border-top: 1px solid var(--panel-separator-color);
+}
+
+.addengine-item[selected] {
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.addengine-icon {
+  width: 16px;
+}
+
+.addengine-badge {
+  width: 16px;
+  height: 16px;
+  margin: -7px -9px 7px 9px;
+  list-style-image: url("chrome://browser/skin/badge-add-engine.png");
+}
+
+.addengine-item > .button-box > .button-text {
+  -moz-box-flex: 1;
+  text-align: start;
+  padding-inline-start: 10px;
+}
+
+.addengine-item:not([image]) {
+  list-style-image: url("chrome://browser/skin/search-engine-placeholder.png");
+}
+
+@media (min-resolution: 2dppx) {
+  .addengine-badge {
+    list-style-image: url("chrome://browser/skin/badge-add-engine@2x.png");
+  }
+
+  .addengine-item:not([image]) {
+    list-style-image: url("chrome://browser/skin/search-engine-placeholder@2x.png");
+  }
+}
+
+.search-panel-tree > .autocomplete-treebody::-moz-tree-cell {
+  border-top: none !important;
+}
+
+.search-panel-tree > .autocomplete-treebody::-moz-tree-image {
+  padding-inline-start: 4px;
+  padding-inline-end: 2px;
+  width: 14px;
+  height: 14px;
+}
+
+.search-panel-tree > .autocomplete-treebody::-moz-tree-image(fromhistory) {
+  list-style-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon");
+}
+
+.search-panel-tree > .autocomplete-treebody::-moz-tree-image(fromhistory, selected) {
+  list-style-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon-active");
+}
+
+#PopupSearchAutoComplete {
+  border-radius: 4px;
+}
+
+.search-setting-button {
+  -moz-appearance: none;
+  border-radius: 0 0 4px 4px;
+  min-height: 32px;
+}
+
+.search-setting-button[selected] {
+  background-color: var(--arrowpanel-dimmed-further);
+}
+
+.search-setting-button-compact > .button-box > .button-icon {
+  list-style-image: url("chrome://browser/skin/gear.svg");
+  filter: url(chrome://browser/skin/filters.svg#fill);
+  fill: currentColor;
+}
diff --git a/browser/themes/osx/setDesktopBackground.css b/browser/themes/osx/setDesktopBackground.css
new file mode 100644
index 000000000..f9b16ec2b
--- /dev/null
+++ b/browser/themes/osx/setDesktopBackground.css
@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+html|canvas#screen {
+  margin: 12px 11px 38px;
+}
+
+#monitor {
+  list-style-image: url("chrome://browser/skin/monitor.png");
+}
+
+#monitor[aspectratio="16:10"] {
+  list-style-image: url("chrome://browser/skin/monitor_16-10.png");
+}
diff --git a/browser/themes/osx/shared.inc b/browser/themes/osx/shared.inc
new file mode 100644
index 000000000..b3ea4e199
--- /dev/null
+++ b/browser/themes/osx/shared.inc
@@ -0,0 +1,13 @@
+%include ../../../toolkit/themes/osx/global/shared.inc

+%include ../shared/browser.inc

+

+%filter substitution

+

+%define fgTabTexture linear-gradient(transparent 2px, hsl(0,0%,99%) 2px, hsl(0,0%,93%))

+%define fgTabTextureYosemiteInactive linear-gradient(transparent 2px, hsl(0,0%,99%) 2px, hsl(0,0%,97%))

+%define toolbarColorLWT rgba(253,253,253,0.45)

+%define fgTabTextureLWT linear-gradient(transparent 2px, rgba(254,254,254,.72) 2px, @toolbarColorLWT@)

+%define fgTabBackgroundColor transparent

+%define hudButton -moz-appearance: none; color: #434343; border-radius: 4px; border: 1px solid #b5b5b5; background: linear-gradient(#fff, #f2f2f2); box-shadow: inset 0 1px rgba(255,255,255,.8), inset 0 0 1px rgba(255,255, 255,.25), 0 1px rgba(255,255,255,.3); background-clip: padding-box; background-origin: padding-box; padding: 2px 6px;

+%define hudButtonPressed box-shadow: inset 0 1px 4px -3px #000, 0 1px rgba(255,255,255,.3);

+%define hudButtonFocused box-shadow: 0 0 1px -moz-mac-focusring inset, 0 0 4px 1px -moz-mac-focusring, 0 0 2px 1px -moz-mac-focusring;

diff --git a/browser/themes/osx/slowStartup-16.png b/browser/themes/osx/slowStartup-16.png
new file mode 100644
index 000000000..439bec340
--- /dev/null
+++ b/browser/themes/osx/slowStartup-16.png
diff --git a/browser/themes/osx/social/services-16.png b/browser/themes/osx/social/services-16.png
new file mode 100644
index 000000000..7001ea1f0
--- /dev/null
+++ b/browser/themes/osx/social/services-16.png
diff --git a/browser/themes/osx/social/services-16@2x.png b/browser/themes/osx/social/services-16@2x.png
new file mode 100644
index 000000000..019110ce2
--- /dev/null
+++ b/browser/themes/osx/social/services-16@2x.png
diff --git a/browser/themes/osx/social/services-64.png b/browser/themes/osx/social/services-64.png
new file mode 100644
index 000000000..e787bddc3
--- /dev/null
+++ b/browser/themes/osx/social/services-64.png
diff --git a/browser/themes/osx/social/services-64@2x.png b/browser/themes/osx/social/services-64@2x.png
new file mode 100644
index 000000000..e252b80bc
--- /dev/null
+++ b/browser/themes/osx/social/services-64@2x.png
diff --git a/browser/themes/osx/subtle-pattern.png b/browser/themes/osx/subtle-pattern.png
new file mode 100644
index 000000000..701239ec0
--- /dev/null
+++ b/browser/themes/osx/subtle-pattern.png
diff --git a/browser/themes/osx/sync-128.png b/browser/themes/osx/sync-128.png
new file mode 100644
index 000000000..1ea34818c
--- /dev/null
+++ b/browser/themes/osx/sync-128.png
diff --git a/browser/themes/osx/sync-16.png b/browser/themes/osx/sync-16.png
new file mode 100644
index 000000000..0afb1c719
--- /dev/null
+++ b/browser/themes/osx/sync-16.png
diff --git a/browser/themes/osx/sync-32.png b/browser/themes/osx/sync-32.png
new file mode 100644
index 000000000..7a762cb98
--- /dev/null
+++ b/browser/themes/osx/sync-32.png
diff --git a/browser/themes/osx/sync-bg.png b/browser/themes/osx/sync-bg.png
new file mode 100644
index 000000000..893a27d76
--- /dev/null
+++ b/browser/themes/osx/sync-bg.png
diff --git a/browser/themes/osx/sync-horizontalbar-yosemite.png b/browser/themes/osx/sync-horizontalbar-yosemite.png
new file mode 100644
index 000000000..43e911462
--- /dev/null
+++ b/browser/themes/osx/sync-horizontalbar-yosemite.png
diff --git a/browser/themes/osx/sync-horizontalbar-yosemite@2x.png b/browser/themes/osx/sync-horizontalbar-yosemite@2x.png
new file mode 100644
index 000000000..c9472b70e
--- /dev/null
+++ b/browser/themes/osx/sync-horizontalbar-yosemite@2x.png
diff --git a/browser/themes/osx/sync-horizontalbar.png b/browser/themes/osx/sync-horizontalbar.png
new file mode 100644
index 000000000..4223d3bcb
--- /dev/null
+++ b/browser/themes/osx/sync-horizontalbar.png
diff --git a/browser/themes/osx/sync-horizontalbar@2x.png b/browser/themes/osx/sync-horizontalbar@2x.png
new file mode 100644
index 000000000..fdc126681
--- /dev/null
+++ b/browser/themes/osx/sync-horizontalbar@2x.png
diff --git a/browser/themes/osx/sync-notification-24.png b/browser/themes/osx/sync-notification-24.png
new file mode 100644
index 000000000..8d2ec8fa8
--- /dev/null
+++ b/browser/themes/osx/sync-notification-24.png
diff --git a/browser/themes/osx/syncCommon.css b/browser/themes/osx/syncCommon.css
new file mode 100644
index 000000000..2d39aa179
--- /dev/null
+++ b/browser/themes/osx/syncCommon.css
@@ -0,0 +1,55 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* The following are used by both sync/setup.xul and sync/genericChange.xul */
+.status {
+  color: -moz-dialogtext;
+}
+
+.statusIcon {
+  margin-inline-start: 4px;
+  max-height: 16px;
+  max-width: 16px;
+}
+
+.statusIcon[status="active"] {
+  list-style-image: url("chrome://global/skin/icons/loading.png");
+}
+
+@media (min-resolution: 2dppx) {
+  .statusIcon[status="active"] {
+    list-style-image: url("chrome://global/skin/icons/loading@2x.png");
+  }
+}
+
+.statusIcon[status="error"] {
+  list-style-image: url("chrome://global/skin/icons/error-16.png");
+}
+
+.statusIcon[status="success"] {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
+}
+
+/* .data is only used by sync/genericChange.xul, but it seems unnecessary to have
+   a separate stylesheet for it. */
+.data {
+  font-size: 90%;
+  font-weight: bold;
+}
+
+dialog#change-dialog {
+  width: 40em;
+}
+
+image#syncIcon {
+  list-style-image: url("chrome://browser/skin/sync-32.png");
+}
+
+#introText {
+  margin-top: 2px;
+}
+
+#feedback {
+  height: 2em;
+}
diff --git a/browser/themes/osx/syncProgress-horizontalbar.png b/browser/themes/osx/syncProgress-horizontalbar.png
new file mode 100644
index 000000000..48cd11055
--- /dev/null
+++ b/browser/themes/osx/syncProgress-horizontalbar.png
diff --git a/browser/themes/osx/syncProgress-horizontalbar@2x.png b/browser/themes/osx/syncProgress-horizontalbar@2x.png
new file mode 100644
index 000000000..741dd2ed4
--- /dev/null
+++ b/browser/themes/osx/syncProgress-horizontalbar@2x.png
diff --git a/browser/themes/osx/syncProgress-menuPanel.png b/browser/themes/osx/syncProgress-menuPanel.png
new file mode 100644
index 000000000..6fd6f9c16
--- /dev/null
+++ b/browser/themes/osx/syncProgress-menuPanel.png
diff --git a/browser/themes/osx/syncProgress-menuPanel@2x.png b/browser/themes/osx/syncProgress-menuPanel@2x.png
new file mode 100644
index 000000000..04b2cae00
--- /dev/null
+++ b/browser/themes/osx/syncProgress-menuPanel@2x.png
diff --git a/browser/themes/osx/syncProgress-toolbar-inverted.png b/browser/themes/osx/syncProgress-toolbar-inverted.png
new file mode 100644
index 000000000..42f3da363
--- /dev/null
+++ b/browser/themes/osx/syncProgress-toolbar-inverted.png
diff --git a/browser/themes/osx/syncProgress-toolbar-inverted@2x.png b/browser/themes/osx/syncProgress-toolbar-inverted@2x.png
new file mode 100644
index 000000000..eee4a5dd0
--- /dev/null
+++ b/browser/themes/osx/syncProgress-toolbar-inverted@2x.png
diff --git a/browser/themes/osx/syncProgress-toolbar.png b/browser/themes/osx/syncProgress-toolbar.png
new file mode 100644
index 000000000..49e224f0d
--- /dev/null
+++ b/browser/themes/osx/syncProgress-toolbar.png
diff --git a/browser/themes/osx/syncProgress-toolbar@2x.png b/browser/themes/osx/syncProgress-toolbar@2x.png
new file mode 100644
index 000000000..fd2038725
--- /dev/null
+++ b/browser/themes/osx/syncProgress-toolbar@2x.png
diff --git a/browser/themes/osx/syncQuota.css b/browser/themes/osx/syncQuota.css
new file mode 100644
index 000000000..1577de8a3
--- /dev/null
+++ b/browser/themes/osx/syncQuota.css
@@ -0,0 +1,26 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#quotaDialog {
+  width: 33em;
+  height: 25em;
+}
+
+treechildren::-moz-tree-checkbox {
+  list-style-image: none;
+}
+treechildren::-moz-tree-checkbox(checked) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
+}
+treechildren::-moz-tree-checkbox(disabled) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
+}
+
+#treeCaption {
+  height: 4em;
+}
+
+.captionWarning {
+  font-weight: bold;
+}
diff --git a/browser/themes/osx/syncSetup.css b/browser/themes/osx/syncSetup.css
new file mode 100644
index 000000000..0861df831
--- /dev/null
+++ b/browser/themes/osx/syncSetup.css
@@ -0,0 +1,139 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+wizard {
+  -moz-appearance: none;
+  width: 55em;
+  height: 45em;
+  padding: 0;
+  background-color: Window;
+}
+
+.wizard-page-box {
+  -moz-appearance: none;
+  padding-left: 0;
+  padding-right: 0;
+  margin: 0;
+}
+
+wizardpage {
+  -moz-box-pack: center;
+  -moz-box-align: center;
+  margin: 0;
+  padding: 0 6em;
+  background-color: Window;
+}
+
+.wizard-header {
+  -moz-appearance: none;
+  border: none;
+  padding: 2em 0 1em 0;
+  text-align: center;
+}
+.wizard-header-label {
+  font-size: 24pt;
+  font-weight: normal;
+}
+
+.wizard-buttons {
+  background-color: rgba(0,0,0,0.1);
+  padding: 1em;
+}
+
+.wizard-buttons-separator {
+  visibility: collapse;
+}
+
+.wizard-header-icon {
+  visibility: collapse;
+}
+
+.accountChoiceButton {
+  font: menu;
+}
+
+.confirm {
+  border: 1px solid black;
+  padding: 1em;
+  border-radius: 5px;
+}
+
+/* Override the text-link style from global.css */
+description > .text-link,
+description > .text-link:focus {
+  margin: 0px;
+  padding: 0px;
+  border: 0px;
+}
+
+.success,
+.error {
+  padding: 2px;
+  border-radius: 2px;
+}
+
+.error {
+  background-color: #FF0000 !important;
+  color: #FFFFFF !important;
+}
+
+.success {
+  background-color: #00FF00 !important;
+}
+
+.warning {
+  font-weight: bold;
+  font-size: 100%;
+  color: red;
+}
+
+.mainDesc {
+  font-weight: bold;
+  font-size: 100%;
+}
+
+.normal {
+  font-size: 100%;
+}
+
+.inputColumn {
+  margin-inline-end: 2px
+}
+
+.pin {
+  font-size: 18pt;
+  width: 4em;
+  text-align: center; 
+}
+
+#passphraseHelpSpacer {
+  width: 0.5em;
+}
+
+#pairDeviceThrobber,
+#login-throbber {
+  -moz-box-align: center;
+}
+
+#pairDeviceThrobber > image,
+#login-throbber > image {
+  width: 16px;
+  list-style-image: url("chrome://global/skin/icons/loading.png");
+}
+
+@media (min-resolution: 2dppx) {
+  #pairDeviceThrobber > image,
+  #login-throbber > image {
+    list-style-image: url("chrome://global/skin/icons/loading@2x.png");
+  }
+}
+
+#captchaFeedback {
+  visibility: hidden;
+}
+
+#successPageIcon {
+  /* TODO replace this with a 128px version (bug 591122) */
+  list-style-image: url("chrome://browser/skin/sync-32.png");
+}
diff --git a/browser/themes/osx/syncedtabs/sidebar.css b/browser/themes/osx/syncedtabs/sidebar.css
new file mode 100644
index 000000000..4d1de766c
--- /dev/null
+++ b/browser/themes/osx/syncedtabs/sidebar.css
@@ -0,0 +1,154 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%include ../../shared/syncedtabs/sidebar.inc.css
+
+/* These styles are intended to mimic XUL trees and the XUL search box. */
+
+.content-container {
+  -moz-appearance: -moz-mac-source-list;
+}
+
+.item {
+  color: -moz-DialogText;
+}
+
+.item-title-container {
+  box-sizing: border-box;
+  align-items: center;
+  height: 24px;
+  font-size: 12px;
+}
+
+.item.selected > .item-title-container {
+  color: HighlightText;
+  font-weight: bold;
+}
+
+.item.selected > .item-title-container {
+  -moz-appearance: -moz-mac-source-list-selection;
+}
+
+.item.selected:focus > .item-title-container {
+  -moz-appearance: -moz-mac-active-source-list-selection;
+}
+
+.item.client .item-twisty-container {
+  min-width: 16px;
+  height: 16px;
+  background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded");
+}
+
+@media not all and (-moz-mac-yosemite-theme) {
+  .item.client.selected .item-twisty-container {
+    background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted");
+  }
+
+  .item.client.selected.closed .item-twisty-container {
+    background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted");
+  }
+
+  .item.client.selected .item-twisty-container:dir(rtl) {
+    background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted");
+  }
+
+  .item.client.selected.closed .item-twisty-container:dir(rtl) {
+    background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted-rtl");
+  }
+}
+
+.item.client.closed .item-twisty-container {
+  background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed");
+}
+
+.item.client.selected:focus .item-twisty-container {
+  background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted");
+}
+
+.item.client.selected.closed:focus .item-twisty-container {
+  background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted");
+}
+
+.item.client .item-twisty-container:dir(rtl) {
+  background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded");
+}
+
+.item.client.closed .item-twisty-container:dir(rtl) {
+  background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-rtl");
+}
+
+.item.client.selected:focus .item-twisty-container:dir(rtl) {
+  background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted");
+}
+
+.item.client.selected.closed:focus .item-twisty-container:dir(rtl) {
+  background-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted-rtl");
+}
+
+@media (-moz-mac-yosemite-theme) {
+  .item.selected > .item-title-container {
+    color: -moz-dialogtext;
+    font-weight: 500;
+  }
+
+  .item.selected:focus > .item-title-container {
+    color: #fff;
+  }
+}
+
+.sidebar-search-container {
+  border-bottom: 1px solid #bdbdbd;
+}
+
+.search-box {
+  -moz-appearance: searchfield;
+  padding: 1px;
+  font-size: 12px;
+  cursor: text;
+  margin: 4px 8px 10px;
+  border-width: 3px;
+  border-style: solid;
+  border-color: currentcolor;
+  border-image: none;
+  -moz-border-top-colors: transparent #888 #000;
+  -moz-border-right-colors: transparent #FFF #000;
+  -moz-border-bottom-colors: transparent #FFF #000;
+  -moz-border-left-colors: transparent #888 #000;
+  border-top-right-radius: 2px;
+  border-bottom-left-radius: 2px;
+  background-color: #FFF;
+  color: #000;
+  -moz-user-select: text;
+  text-shadow: none;
+}
+
+.search-box.compact > .textbox-input-box > .textbox-search-icons > .textbox-search-clear {
+  background-image: url(chrome://global/skin/icons/searchfield-cancel.svg);
+  background-repeat: no-repeat;
+  background-size: 11px 11px;
+  width: 11px;
+  height: 11px;
+}
+
+.search-box.compact > .textbox-input-box > .textbox-search-icons > .textbox-search-icon {
+  display: none;
+}
+
+.search-box[focused="true"] {
+  -moz-border-top-colors: -moz-mac-focusring -moz-mac-focusring #000000;
+  -moz-border-right-colors: -moz-mac-focusring -moz-mac-focusring #000000;
+  -moz-border-bottom-colors: -moz-mac-focusring -moz-mac-focusring #000000;
+  -moz-border-left-colors: -moz-mac-focusring -moz-mac-focusring #000000;
+}
+
+.search-box.compact {
+    padding: 0px;
+    /* font size is in px because the XUL it was copied from uses px */
+    font-size: 11px;
+}
+
+.textbox-search-clear,
+.textbox-search-icon {
+  margin-top: 1px;
+}
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted.png b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted.png
new file mode 100644
index 000000000..295b4ad74
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted.png
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png
new file mode 100644
index 000000000..23889d7cc
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png
new file mode 100644
index 000000000..4d71308d2
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png
new file mode 100644
index 000000000..875f73c5e
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png
new file mode 100644
index 000000000..94a11fe5f
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png
diff --git a/browser/themes/osx/tabbrowser/newtab-inverted.png b/browser/themes/osx/tabbrowser/newtab-inverted.png
new file mode 100644
index 000000000..2d29c2cbe
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/newtab-inverted.png
diff --git a/browser/themes/osx/tabbrowser/newtab-inverted@2x.png b/browser/themes/osx/tabbrowser/newtab-inverted@2x.png
new file mode 100644
index 000000000..6feba0e83
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/newtab-inverted@2x.png
diff --git a/browser/themes/osx/tabbrowser/newtab.png b/browser/themes/osx/tabbrowser/newtab.png
new file mode 100644
index 000000000..32e42b04c
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/newtab.png
diff --git a/browser/themes/osx/tabbrowser/newtab@2x.png b/browser/themes/osx/tabbrowser/newtab@2x.png
new file mode 100644
index 000000000..ffde5f050
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/newtab@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive.png b/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive.png
new file mode 100644
index 000000000..9f74c4e76
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive.png
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive@2x.png b/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive@2x.png
new file mode 100644
index 000000000..50961db7e
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle.png b/browser/themes/osx/tabbrowser/tab-active-middle.png
new file mode 100644
index 000000000..c3e5e18ba
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-active-middle.png
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle@2x.png b/browser/themes/osx/tabbrowser/tab-active-middle@2x.png
new file mode 100644
index 000000000..6cdc4472e
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-active-middle@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-left-inverted.png b/browser/themes/osx/tabbrowser/tab-arrow-left-inverted.png
new file mode 100644
index 000000000..b0826024d
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-arrow-left-inverted.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-left-inverted@2x.png b/browser/themes/osx/tabbrowser/tab-arrow-left-inverted@2x.png
new file mode 100644
index 000000000..4ca8ec0ba
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-arrow-left-inverted@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-left.png b/browser/themes/osx/tabbrowser/tab-arrow-left.png
new file mode 100644
index 000000000..61ad41ae9
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-arrow-left.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-left@2x.png b/browser/themes/osx/tabbrowser/tab-arrow-left@2x.png
new file mode 100644
index 000000000..20bf78db2
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-arrow-left@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-right-inverted.png b/browser/themes/osx/tabbrowser/tab-arrow-right-inverted.png
new file mode 100644
index 000000000..0cd8f37a6
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-arrow-right-inverted.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-right-inverted@2x.png b/browser/themes/osx/tabbrowser/tab-arrow-right-inverted@2x.png
new file mode 100644
index 000000000..e4ab8cbaa
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-arrow-right-inverted@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-right.png b/browser/themes/osx/tabbrowser/tab-arrow-right.png
new file mode 100644
index 000000000..37ccf8cfe
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-arrow-right.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-right@2x.png b/browser/themes/osx/tabbrowser/tab-arrow-right@2x.png
new file mode 100644
index 000000000..d319accc5
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-arrow-right@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-background-end.png b/browser/themes/osx/tabbrowser/tab-background-end.png
new file mode 100644
index 000000000..2e515a39e
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-background-end.png
diff --git a/browser/themes/osx/tabbrowser/tab-background-end@2x.png b/browser/themes/osx/tabbrowser/tab-background-end@2x.png
new file mode 100644
index 000000000..18dba9693
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-background-end@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-background-middle.png b/browser/themes/osx/tabbrowser/tab-background-middle.png
new file mode 100644
index 000000000..addb64b13
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-background-middle.png
diff --git a/browser/themes/osx/tabbrowser/tab-background-middle@2x.png b/browser/themes/osx/tabbrowser/tab-background-middle@2x.png
new file mode 100644
index 000000000..41eba94af
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-background-middle@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-background-start.png b/browser/themes/osx/tabbrowser/tab-background-start.png
new file mode 100644
index 000000000..243bf0099
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-background-start.png
diff --git a/browser/themes/osx/tabbrowser/tab-background-start@2x.png b/browser/themes/osx/tabbrowser/tab-background-start@2x.png
new file mode 100644
index 000000000..86403921d
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-background-start@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-selected-end-yosemite-inactive.svg b/browser/themes/osx/tabbrowser/tab-selected-end-yosemite-inactive.svg
new file mode 100644
index 000000000..decefab6e
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-selected-end-yosemite-inactive.svg
@@ -0,0 +1,24 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="30px" height="31px" preserveAspectRatio="none">
+  <defs>
+    <style>
+      #tab-background-fill {
+        background-color: transparent;
+        background-image: linear-gradient(transparent, transparent 2px, hsl(0,0%,99%) 2px, hsl(0,0%,97%));
+        background-repeat: no-repeat;
+        height: 100%;
+        width: 100%;
+      }
+    </style>
+
+    <clipPath id="tab-curve-clip-path-end" clipPathUnits="objectBoundingBox">
+      <path d="m 0,0.0625 -0.05,0 0,0.938 1,0 0,-0.028 C 0.67917542,0.95840561 0.56569036,0.81970962 0.51599998,0.5625 0.48279998,0.3905 0.465,0.0659 0,0.0625 z"/>
+    </clipPath>
+  </defs>
+
+  <foreignObject width="30" height="31" clip-path="url(#tab-curve-clip-path-end)">
+    <div id="tab-background-fill" xmlns="http://www.w3.org/1999/xhtml"></div>
+  </foreignObject>
+</svg>
diff --git a/browser/themes/osx/tabbrowser/tab-selected-start-yosemite-inactive.svg b/browser/themes/osx/tabbrowser/tab-selected-start-yosemite-inactive.svg
new file mode 100644
index 000000000..e29bab297
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-selected-start-yosemite-inactive.svg
@@ -0,0 +1,24 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="30px" height="31px" preserveAspectRatio="none">
+  <defs>
+    <style>
+      #tab-background-fill {
+        background-color: transparent;
+        background-image: linear-gradient(transparent, transparent 2px, hsl(0,0%,99%) 2px, hsl(0,0%,97%));
+        background-repeat: no-repeat;
+        height: 100%;
+        width: 100%;
+      }
+    </style>
+
+    <clipPath id="tab-curve-clip-path-start" clipPathUnits="objectBoundingBox">
+      <path d="m 1,0.0625 0.05,0 0,0.938 -1,0 0,-0.028 C 0.32082458,0.95840561 0.4353096,0.81970962 0.48499998,0.5625 0.51819998,0.3905 0.535,0.0659 1,0.0625 z"/>
+    </clipPath>
+  </defs>
+
+  <foreignObject width="30" height="31" clip-path="url(#tab-curve-clip-path-start)">
+    <div id="tab-background-fill" xmlns="http://www.w3.org/1999/xhtml"></div>
+  </foreignObject>
+</svg>
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive.png b/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive.png
new file mode 100644
index 000000000..4206f0c7d
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive@2x.png b/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive@2x.png
new file mode 100644
index 000000000..21ac89270
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end.png b/browser/themes/osx/tabbrowser/tab-stroke-end.png
new file mode 100755
index 000000000..099978580
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-stroke-end.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end@2x.png b/browser/themes/osx/tabbrowser/tab-stroke-end@2x.png
new file mode 100644
index 000000000..d321ca579
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-stroke-end@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive.png b/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive.png
new file mode 100644
index 000000000..2acbac438
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive@2x.png b/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive@2x.png
new file mode 100644
index 000000000..a12fc39a7
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start.png b/browser/themes/osx/tabbrowser/tab-stroke-start.png
new file mode 100755
index 000000000..e5a7b5ee9
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-stroke-start.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start@2x.png b/browser/themes/osx/tabbrowser/tab-stroke-start@2x.png
new file mode 100644
index 000000000..64449115c
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tab-stroke-start@2x.png
diff --git a/browser/themes/osx/tabbrowser/tabDragIndicator.png b/browser/themes/osx/tabbrowser/tabDragIndicator.png
new file mode 100644
index 000000000..a373cae53
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tabDragIndicator.png
diff --git a/browser/themes/osx/tabbrowser/tabDragIndicator@2x.png b/browser/themes/osx/tabbrowser/tabDragIndicator@2x.png
new file mode 100644
index 000000000..b51b873cb
--- /dev/null
+++ b/browser/themes/osx/tabbrowser/tabDragIndicator@2x.png
diff --git a/browser/themes/osx/toolbarbutton-dropmarker-lion.png b/browser/themes/osx/toolbarbutton-dropmarker-lion.png
new file mode 100644
index 000000000..09d80a1b2
--- /dev/null
+++ b/browser/themes/osx/toolbarbutton-dropmarker-lion.png
diff --git a/browser/themes/osx/toolbarbutton-dropmarker-lion@2x.png b/browser/themes/osx/toolbarbutton-dropmarker-lion@2x.png
new file mode 100644
index 000000000..631fb1352
--- /dev/null
+++ b/browser/themes/osx/toolbarbutton-dropmarker-lion@2x.png
diff --git a/browser/themes/osx/toolbarbutton-dropmarker.png b/browser/themes/osx/toolbarbutton-dropmarker.png
new file mode 100644
index 000000000..f4cdb664b
--- /dev/null
+++ b/browser/themes/osx/toolbarbutton-dropmarker.png
diff --git a/browser/themes/osx/urlbar-history-dropmarker.png b/browser/themes/osx/urlbar-history-dropmarker.png
new file mode 100644
index 000000000..53bd1cb0c
--- /dev/null
+++ b/browser/themes/osx/urlbar-history-dropmarker.png
diff --git a/browser/themes/osx/urlbar-history-dropmarker@2x.png b/browser/themes/osx/urlbar-history-dropmarker@2x.png
new file mode 100644
index 000000000..e7d4937b8
--- /dev/null
+++ b/browser/themes/osx/urlbar-history-dropmarker@2x.png
diff --git a/browser/themes/osx/urlbar-popup-blocked.png b/browser/themes/osx/urlbar-popup-blocked.png
new file mode 100644
index 000000000..8c4f4d96f
--- /dev/null
+++ b/browser/themes/osx/urlbar-popup-blocked.png
diff --git a/browser/themes/osx/urlbar-popup-blocked@2x.png b/browser/themes/osx/urlbar-popup-blocked@2x.png
new file mode 100644
index 000000000..4d6aa6f20
--- /dev/null
+++ b/browser/themes/osx/urlbar-popup-blocked@2x.png
diff --git a/browser/themes/osx/webRTC-indicator.css b/browser/themes/osx/webRTC-indicator.css
new file mode 100644
index 000000000..759dbd813
--- /dev/null
+++ b/browser/themes/osx/webRTC-indicator.css
@@ -0,0 +1,35 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#webRTC-sharingCamera-menu {
+  list-style-image: url("chrome://browser/skin/webRTC-sharingDevice-menubar.png");
+}
+
+#webRTC-sharingMicrophone-menu {
+  list-style-image: url("chrome://browser/skin/webRTC-sharingMicrophone-menubar.png");
+}
+
+#webRTC-sharingScreen-menu {
+  list-style-image: url("chrome://browser/skin/webRTC-sharingScreen-menubar.png");
+}
+
+@media (min-resolution: 2dppx) {
+  #webRTC-sharingCamera-menu {
+    list-style-image: url("chrome://browser/skin/webRTC-sharingDevice-menubar@2x.png");
+  }
+
+  #webRTC-sharingMicrophone-menu {
+    list-style-image: url("chrome://browser/skin/webRTC-sharingMicrophone-menubar@2x.png");
+  }
+
+  #webRTC-sharingScreen-menu {
+    list-style-image: url("chrome://browser/skin/webRTC-sharingScreen-menubar@2x.png");
+  }
+}
+
+#webRTC-sharingCamera-menu > menupopup,
+#webRTC-sharingMicrophone-menu > menupopup,
+#webRTC-sharingScreen-menu > menupopup {
+  list-style-image: none; /* don't inherit into menu items */
+}
diff --git a/browser/themes/osx/webRTC-sharingDevice-menubar.png b/browser/themes/osx/webRTC-sharingDevice-menubar.png
new file mode 100644
index 000000000..fb74738dd
--- /dev/null
+++ b/browser/themes/osx/webRTC-sharingDevice-menubar.png
diff --git a/browser/themes/osx/webRTC-sharingDevice-menubar@2x.png b/browser/themes/osx/webRTC-sharingDevice-menubar@2x.png
new file mode 100644
index 000000000..8f64887a8
--- /dev/null
+++ b/browser/themes/osx/webRTC-sharingDevice-menubar@2x.png
diff --git a/browser/themes/osx/webRTC-sharingMicrophone-menubar.png b/browser/themes/osx/webRTC-sharingMicrophone-menubar.png
new file mode 100644
index 000000000..c47f5827d
--- /dev/null
+++ b/browser/themes/osx/webRTC-sharingMicrophone-menubar.png
diff --git a/browser/themes/osx/webRTC-sharingMicrophone-menubar@2x.png b/browser/themes/osx/webRTC-sharingMicrophone-menubar@2x.png
new file mode 100644
index 000000000..2c45c8bcc
--- /dev/null
+++ b/browser/themes/osx/webRTC-sharingMicrophone-menubar@2x.png
diff --git a/browser/themes/osx/webRTC-sharingScreen-menubar.png b/browser/themes/osx/webRTC-sharingScreen-menubar.png
new file mode 100644
index 000000000..6d9e49cfd
--- /dev/null
+++ b/browser/themes/osx/webRTC-sharingScreen-menubar.png
diff --git a/browser/themes/osx/webRTC-sharingScreen-menubar@2x.png b/browser/themes/osx/webRTC-sharingScreen-menubar@2x.png
new file mode 100644
index 000000000..0f3d62ec5
--- /dev/null
+++ b/browser/themes/osx/webRTC-sharingScreen-menubar@2x.png