initial commit

160 files changed, 5931 insertions, 0 deletions

diff --git a/themes/osx/Geolocation-16.png b/themes/osx/Geolocation-16.png
new file mode 100644
index 0000000..d710e73
--- /dev/null
+++ b/themes/osx/Geolocation-16.png
diff --git a/themes/osx/Geolocation-64.png b/themes/osx/Geolocation-64.png
new file mode 100644
index 0000000..1bd46ba
--- /dev/null
+++ b/themes/osx/Geolocation-64.png
diff --git a/themes/osx/Info.png b/themes/osx/Info.png
new file mode 100644
index 0000000..d09e82b
--- /dev/null
+++ b/themes/osx/Info.png
diff --git a/themes/osx/KUI-background.png b/themes/osx/KUI-background.png
new file mode 100644
index 0000000..104a49f
--- /dev/null
+++ b/themes/osx/KUI-background.png
diff --git a/themes/osx/KUI-close.png b/themes/osx/KUI-close.png
new file mode 100644
index 0000000..08eeb81
--- /dev/null
+++ b/themes/osx/KUI-close.png
diff --git a/themes/osx/Makefile.in b/themes/osx/Makefile.in
new file mode 100644
index 0000000..173ca68
--- /dev/null
+++ b/themes/osx/Makefile.in
@@ -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/.
+
+ICON_FILES := icon.png
+ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+INSTALL_TARGETS += ICON
diff --git a/themes/osx/Privacy-16.png b/themes/osx/Privacy-16.png
new file mode 100644
index 0000000..a4be3e9
--- /dev/null
+++ b/themes/osx/Privacy-16.png
diff --git a/themes/osx/Privacy-32.png b/themes/osx/Privacy-32.png
new file mode 100644
index 0000000..dd07c1a
--- /dev/null
+++ b/themes/osx/Privacy-32.png
diff --git a/themes/osx/Privacy-48.png b/themes/osx/Privacy-48.png
new file mode 100644
index 0000000..2396f99
--- /dev/null
+++ b/themes/osx/Privacy-48.png
diff --git a/themes/osx/Privacy-64.png b/themes/osx/Privacy-64.png
new file mode 100644
index 0000000..d360501
--- /dev/null
+++ b/themes/osx/Privacy-64.png
diff --git a/themes/osx/Search-glass.png b/themes/osx/Search-glass.png
new file mode 100644
index 0000000..9eb0e25
--- /dev/null
+++ b/themes/osx/Search-glass.png
diff --git a/themes/osx/Secure24.png b/themes/osx/Secure24.png
new file mode 100644
index 0000000..896343a
--- /dev/null
+++ b/themes/osx/Secure24.png
diff --git a/themes/osx/Toolbar-glass.png b/themes/osx/Toolbar-glass.png
new file mode 100644
index 0000000..23cc4bf
--- /dev/null
+++ b/themes/osx/Toolbar-glass.png
diff --git a/themes/osx/Toolbar-inverted.png b/themes/osx/Toolbar-inverted.png
new file mode 100644
index 0000000..2c3253f
--- /dev/null
+++ b/themes/osx/Toolbar-inverted.png
diff --git a/themes/osx/Toolbar.png b/themes/osx/Toolbar.png
new file mode 100644
index 0000000..3d1b80e
--- /dev/null
+++ b/themes/osx/Toolbar.png
diff --git a/themes/osx/aboutCertError.css b/themes/osx/aboutCertError.css
new file mode 100644
index 0000000..dbb3530
--- /dev/null
+++ b/themes/osx/aboutCertError.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/. */
+
+
+html {
+  background: #833;
+}
+
+body {
+  margin: 0;
+  padding: 0 1em;
+  color: -moz-FieldText;
+  font: message-box;
+}
+
+h1 {
+  margin: 0 0 .6em 0;
+  border-bottom: 1px solid ThreeDLightShadow;
+  font-size: 160%;
+}
+
+h2 {
+  font-size: 130%;
+}
+
+#errorPageContainer {
+  position: relative;
+  min-width: 13em;
+  max-width: 52em;
+  margin: 4em auto;
+  border: 2px solid #DD0D09;
+  border-radius: 10px;
+  box-shadow: 0px 0px 8px red;
+  padding: 3em;
+  -moz-padding-start: 30px;
+  background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field;
+  background-origin: content-box;
+}
+
+#errorPageContainer:-moz-dir(rtl) {
+  background-position: right 0;
+}
+
+#errorTitle {
+  -moz-margin-start: 80px;
+}
+
+#errorLongContent {
+  -moz-margin-start: 80px;
+}
+
+.expander > button {
+  -moz-padding-start: 20px;
+  -moz-margin-start: -20px;
+  background: url("chrome://browser/skin/aboutCertError_sectionExpanded.png") left center no-repeat;
+  border: none;
+  font: inherit;
+  color: inherit;
+  cursor: pointer;
+}
+
+.expander > button:-moz-dir(rtl) {
+  background-position: right center;
+}
+
+.expander[collapsed] > button {
+  background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed.png");
+}
+
+.expander[collapsed] > button:-moz-dir(rtl) {
+  background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed-rtl.png");
+}
diff --git a/themes/osx/aboutCertError_sectionCollapsed-rtl.png b/themes/osx/aboutCertError_sectionCollapsed-rtl.png
new file mode 100644
index 0000000..84ba18c
--- /dev/null
+++ b/themes/osx/aboutCertError_sectionCollapsed-rtl.png
diff --git a/themes/osx/aboutCertError_sectionCollapsed.png b/themes/osx/aboutCertError_sectionCollapsed.png
new file mode 100644
index 0000000..c9805f6
--- /dev/null
+++ b/themes/osx/aboutCertError_sectionCollapsed.png
diff --git a/themes/osx/aboutCertError_sectionExpanded.png b/themes/osx/aboutCertError_sectionExpanded.png
new file mode 100644
index 0000000..128cef9
--- /dev/null
+++ b/themes/osx/aboutCertError_sectionExpanded.png
diff --git a/themes/osx/aboutPrivateBrowsing.css b/themes/osx/aboutPrivateBrowsing.css
new file mode 100644
index 0000000..cd6026b
--- /dev/null
+++ b/themes/osx/aboutPrivateBrowsing.css
@@ -0,0 +1,47 @@
+%if 0
+/* 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/. */
+%endif
+
+body.private > #errorPageContainer {
+  background-image: url("chrome://browser/skin/Privacy-48.png");
+}
+
+body.normal > #errorPageContainer {
+  background-image: url("chrome://global/skin/icons/question-48.png");
+}
+
+#clearRecentHistoryDesc {
+  margin-top: 2em;
+}
+
+#clearRecentHistoryDesc > p {
+  font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */
+}
+
+#startPrivateBrowsingDesc > button {
+  -moz-margin-start: 0;
+}
+
+#footerDesc > p {
+  font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */
+}
+
+#moreInfo {
+  font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */
+  -moz-padding-start: 25px;
+  background: url("chrome://global/skin/icons/information-16.png") no-repeat top left;
+}
+
+#moreInfo:-moz-dir(rtl) {
+  background-position: top right;
+}
+
+#moreInfoText {
+  margin-bottom: 0;
+}
+
+#moreInfoLinkContainer {
+  margin-top: 0.5em;
+}
diff --git a/themes/osx/aboutSessionRestore.css b/themes/osx/aboutSessionRestore.css
new file mode 100644
index 0000000..4fa4907
--- /dev/null
+++ b/themes/osx/aboutSessionRestore.css
@@ -0,0 +1,73 @@
+%if 0
+/* 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/. */
+%endif
+
+html {
+  background: #f8ffd0;
+  height: 100%;
+}
+
+body {
+  height: 100%;
+  text-align: center;
+}
+
+#errorPageContainer {
+  background-image: url("chrome://global/skin/icons/warning-large.png");
+  display: -moz-box;
+  width: -moz-available;
+  max-width: 85%;
+  height: 75%;
+  max-height: 85%;
+  -moz-box-orient: vertical;
+  text-align: start;
+  border: 2px solid #efc;
+  box-shadow: 0px 0px 8px #aaa;
+}
+
+#errorShortDesc > p {
+  margin-top: 0.4em;
+  margin-bottom: 0;
+}
+
+#errorLongContent, #errorTrailerDesc {
+  display: -moz-box;
+  -moz-box-flex: 1;
+  -moz-box-orient: vertical;
+}
+
+#tabList {
+  margin-top: 2.5em;
+  width: 100%;
+  min-height: 12em;
+}
+
+treechildren::-moz-tree-image(icon),
+treechildren::-moz-tree-image(noicon) {
+  padding-right: 2px;
+  margin: 0px 2px;
+  width: 16px;
+  height: 16px;
+}
+
+treechildren::-moz-tree-image(noicon) {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+treechildren::-moz-tree-image(container, noicon) {
+  list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png");
+}
+treechildren::-moz-tree-image(checked) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
+}
+treechildren::-moz-tree-image(partial) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
+}
+
+#buttons {
+  width: 100%;
+}
+#buttons > button {
+  margin-top: 2em;
+}
diff --git a/themes/osx/aboutSyncTabs.css b/themes/osx/aboutSyncTabs.css
new file mode 100644
index 0000000..4f21a9d
--- /dev/null
+++ b/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;
+  -moz-margin-start: 2em;
+  -moz-margin-end: 2em;
+}
+
+#tabsListHeading {
+  font-size: 140%;
+  font-weight: bold;
+  -moz-margin-start: 40px;
+}
+
+richlistitem {
+  -moz-margin-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;
+  -moz-margin-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;
+  -moz-margin-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.png");
+}
+richlistitem.desktop[type="client"] {
+  list-style-image: url("chrome://browser/skin/sync-desktopIcon.png");
+}
+
+.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 {
+  -moz-padding-start: 2px;
+  padding-top: 2px;
+}
diff --git a/themes/osx/actionicon-tab.png b/themes/osx/actionicon-tab.png
new file mode 100644
index 0000000..ced958e
--- /dev/null
+++ b/themes/osx/actionicon-tab.png
diff --git a/themes/osx/appmenu-dropmarker.png b/themes/osx/appmenu-dropmarker.png
new file mode 100644
index 0000000..27deaff
--- /dev/null
+++ b/themes/osx/appmenu-dropmarker.png
diff --git a/themes/osx/appmenu-icons.png b/themes/osx/appmenu-icons.png
new file mode 100644
index 0000000..78f3658
--- /dev/null
+++ b/themes/osx/appmenu-icons.png
diff --git a/themes/osx/autocomplete.css b/themes/osx/autocomplete.css
new file mode 100644
index 0000000..a50dbd8
--- /dev/null
+++ b/themes/osx/autocomplete.css
@@ -0,0 +1,198 @@
+/* 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");
+
+/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
+textbox:not(.padded) {
+  cursor: default;
+  padding: 0;
+}
+
+textbox[nomatch="true"][highlightnonmatches="true"] {
+  color: red;
+}
+
+textbox:not(.padded) .textbox-input-box {
+  margin: 0 3px;
+}
+
+.textbox-input-box {
+  -moz-box-align: center;
+}
+
+/* ::::: history button ::::: */
+
+.private-autocomplete-history-dropmarker {
+  -moz-appearance: none !important;
+  border: none !important;
+  background-color: transparent !important;
+  padding: 0px;
+  list-style-image: url("chrome://global/skin/icons/autocomplete-dropmarker.png");
+  margin: 0px;
+}
+
+/* ::::: autocomplete popups ::::: */
+
+panel[type="private-autocomplete"],
+panel[type="private-autocomplete-richlistbox"],
+.private-autocomplete-history-popup {
+  padding: 0px !important;
+  color: -moz-FieldText;
+  background-color: -moz-Field;
+  font: icon;
+  -moz-appearance: none;
+}
+
+.private-autocomplete-history-popup {
+  max-height: 180px;
+}
+
+/* ::::: tree ::::: */
+
+.private-autocomplete-tree {
+  -moz-appearance: none !important;
+  border: none !important;
+  background-color: transparent !important;
+}
+
+.private-autocomplete-treecol {
+  -moz-appearance: none !important;
+  margin: 0 !important;
+  border: none !important;
+  padding: 0 !important;
+}
+
+.private-autocomplete-treebody::-moz-tree-cell-text {
+  padding-left: 2px;
+}
+
+.private-autocomplete-treebody::-moz-tree-row {
+  border-top: none;
+}
+
+treechildren.private-autocomplete-treebody::-moz-tree-row(selected) {
+ background-color: Highlight;
+}
+
+treechildren.private-autocomplete-treebody::-moz-tree-cell-text(selected) {
+  color: HighlightText !important;
+}
+
+.private-autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue) {
+  max-width: 16px;
+  height: 16px;
+}
+
+/* ::::: richlistbox autocomplete ::::: */
+
+.private-autocomplete-richlistbox {
+  -moz-appearance: none;
+  margin: 0;
+}
+
+.private-autocomplete-richlistitem[selected="true"] {
+  background-color: Highlight;
+  color: HighlightText;
+  background-image: linear-gradient(rgba(255,255,255,0.3), transparent);
+}
+
+.private-autocomplete-richlistitem {
+  padding: 5px 2px;
+}
+
+.ac-url-box {
+  /* When setting a vertical margin here, half of that needs to be added
+     .ac-title-box's translateY for when .ac-url-box is hidden (see below). */
+  margin-top: 1px;
+}
+
+.private-autocomplete-richlistitem[actiontype="keyword"] .ac-url-box,
+.private-autocomplete-richlistitem[actiontype="searchengine"] .ac-url-box,
+.private-autocomplete-richlistitem[actiontype="visiturl"] .ac-url-box,
+.private-autocomplete-richlistitem[type~="autofill"] .ac-url-box {
+  visibility: hidden;
+}
+
+.private-autocomplete-richlistitem[actiontype="keyword"] .ac-title-box,
+.private-autocomplete-richlistitem[actiontype="searchengine"] .ac-title-box,
+.private-autocomplete-richlistitem[actiontype="visiturl"] .ac-title-box,
+.private-autocomplete-richlistitem[type~="autofill"] .ac-title-box {
+  /* Center the title by moving it down by half of .ac-url-box's height,
+     including vertical margins (if any). */
+  transform: translateY(.5em);
+}
+
+.ac-site-icon {
+  width: 16px; 
+  height: 16px;
+  margin-bottom: -1px;
+  -moz-margin-start: 7px;
+  -moz-margin-end: 5px;
+}
+
+.ac-type-icon {
+  width: 16px;
+  height: 16px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: 4px;
+}
+
+.ac-url-box > .ac-site-icon,
+.ac-url-box > .ac-type-icon {
+  /* Otherwise the spacer is big enough to stretch its container */
+  height: auto;
+}
+
+.ac-extra > .ac-result-type-tag {
+  margin: 0 4px;
+}
+
+.ac-extra > .ac-comment {
+  padding-right: 4px;
+}
+
+.ac-ellipsis-after {
+  margin: 0 !important;
+  padding: 0; 
+  min-width: 1.1em;
+}
+
+.ac-normal-text {
+  margin: 0 !important;
+  padding: 0;
+}
+
+.ac-normal-text > html|span {
+  margin: 0 !important;
+  padding: 0;
+}
+
+html|span.ac-emphasize-text {
+  box-shadow: inset 0 0 1px 1px rgba(208,208,208,0.4);
+  background-color: rgba(208,208,208,0.2);
+  border-radius: 2px;
+  text-shadow: 0 0 currentColor;
+}
+
+.ac-url-text > html|span.ac-emphasize-text,
+.ac-action-text > html|span.ac-emphasize-text {
+  box-shadow: inset 0 0 1px 1px rgba(183,210,226,0.4);
+  background-color: rgba(183,210,226,0.3);
+}
+
+.ac-title, .ac-url {
+  overflow: hidden;
+}
+
+/* ::::: textboxes inside toolbarpaletteitems ::::: */
+
+toolbarpaletteitem > toolbaritem > textbox > hbox > hbox > html|*.textbox-input {
+  visibility: hidden;
+}
+
+toolbarpaletteitem > toolbaritem > * > textbox > hbox > hbox > html|*.textbox-input {
+  visibility: hidden;
+}
diff --git a/themes/osx/browser.css b/themes/osx/browser.css
new file mode 100644
index 0000000..20e453d
--- /dev/null
+++ b/themes/osx/browser.css
@@ -0,0 +1,2802 @@
+/* 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/");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+%include shared.inc
+%filter substitution
+%define toolbarHighlight rgba(255,255,255,.5)
+%define selectedTabHighlight rgba(255,255,255,.7)
+%define toolbarShadowColor rgba(10%,10%,10%,.4)
+%define toolbarShadowOnTab linear-gradient(to top, rgba(10%,10%,10%,.4) 1px, transparent 1px)
+%define bgTabTexture linear-gradient(transparent, hsla(0,0%,45%,.1) 1px, hsla(0,0%,32%,.2) 80%, hsla(0,0%,0%,.2))
+%define bgTabTextureHover linear-gradient(hsla(0,0%,100%,.3) 1px, hsla(0,0%,75%,.2) 80%, hsla(0,0%,60%,.2))
+%define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32);
+%define navbarLargeIcons #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar
+%define forwardTransitionLength 150ms
+%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button"],#nav-bar:not([currentset])) > #unified-back-forward-button
+%define conditionalForwardWithUrlbarWidth 27
+
+#navigator-toolbox {
+    -moz-appearance: none;
+    background-color: transparent;
+    border-top: none;
+}
+
+#main-window {
+  -moz-appearance: none;
+  background-color: #eeeeee;
+}
+
+#navigator-toolbox::after {
+    content: "";
+    display: -moz-box;
+    -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
+    height: 1px;
+    background-color: ThreeDShadow;
+}
+#navigator-toolbox[tabsontop=false]::after,
+#main-window[disablechrome] #navigator-toolbox::after {
+    visibility: collapse;
+}
+
+#navigator-toolbox > toolbar:not(:-moz-lwtheme) {
+    -moz-appearance: none;
+    border-style: none;
+    background-color: -moz-Dialog;
+}
+
+#nav-bar[tabsontop=true]:not(:-moz-lwtheme),
+#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):not(:-moz-lwtheme) + toolbar,
+#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):not(:-moz-lwtheme) + #customToolbars + #PersonalToolbar {
+    background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
+}
+
+#nav-bar[tabsontop=true]:-moz-lwtheme,
+#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):-moz-lwtheme + toolbar,
+#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):-moz-lwtheme + #customToolbars + #PersonalToolbar {
+    background-image: linear-gradient(rgba(255,255,255,.8), rgba(255,255,255,0));
+}
+
+#nav-bar[tabsontop=true]:-moz-lwtheme-brighttext,
+#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):-moz-lwtheme-brighttext + toolbar,
+#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):-moz-lwtheme-brighttext + #customToolbars + #PersonalToolbar {
+    background-image: linear-gradient(rgba(32,32,32,.8), rgba(32,32,32,0));
+}
+
+#personal-bookmarks {
+    min-height: 24px;
+}
+
+#print-preview-toolbar:not(:-moz-lwtheme) {
+    -moz-appearance: toolbox;
+}
+
+#browser-bottombox:not(:-moz-lwtheme) {
+    background-color: -moz-dialog;
+}
+
+
+
+/* ::::: titlebar ::::: */
+
+#main-window[sizemode="normal"]:not([privatebrowsingmode=temporary]) > #titlebar {
+    -moz-appearance: -moz-window-titlebar;
+}
+
+#main-window[sizemode="maximized"] > #titlebar {
+    -moz-appearance: -moz-window-titlebar-maximized;
+}
+
+#titlebar-buttonbox {
+    -moz-appearance: -moz-window-button-box;
+}
+
+#main-window[sizemode="maximized"] #titlebar-buttonbox {
+    -moz-appearance: -moz-window-button-box-maximized;
+}
+
+.titlebar-placeholder[type="appmenu-button"] {
+    margin-left: 4px;
+}
+
+.titlebar-placeholder[type="caption-buttons"] {
+    margin-left: 10px;
+}
+
+/* titlebar command buttons */
+
+#titlebar-min {
+    -moz-appearance: -moz-window-button-minimize;
+}
+
+#titlebar-max {
+    -moz-appearance: -moz-window-button-maximize;
+}
+
+#main-window[sizemode="maximized"] #titlebar-max {
+    -moz-appearance: -moz-window-button-restore;
+}
+
+#titlebar-close {
+    -moz-appearance: -moz-window-button-close;
+}
+
+/* ensure titlebar on privacy windows is of correct size */
+#titlebar {
+    height: 22px;
+}
+
+/* ensure extra titlebar doesn't appear on normal (e.g. non-privacy) windows */
+#main-window:not([privatebrowsingmode=temporary]):not(:-moz-lwtheme) > #titlebar > #titlebar-content > #titlebar-buttonbox-container,
+#main-window:not([drawintitlebar=true]):not(:-moz-lwtheme) > #titlebar {
+    display: none;
+}
+
+#titlebar-buttonbox-container {
+  margin-left: 7px;
+  margin-top: 3px;
+}
+
+/* ::::: bookmark toolbar ::::: */
+
+#personal-bookmarks {
+  min-height: 17px; /* 16px button height + 1px margin-bottom */
+}
+
+toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/icons/chevron.png");
+  margin: 1px 0 0;
+  padding: 0;
+}
+
+toolbarbutton.chevron > .toolbarbutton-text {
+  display: none;
+}
+
+toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
+  display: -moz-box; /* display chevron icon in text mode */
+}
+
+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");
+  }
+
+  toolbarbutton.chevron > .toolbarbutton-icon {
+    width: 13px;
+  }
+}
+
+/* ::::: bookmark buttons ::::: */
+
+toolbarbutton.bookmark-item {
+  color: #222;
+  border: 0;
+  border-radius: 10000px;
+  padding: 1px 8px;
+  margin: 0 0 1px;
+}
+
+.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;
+  -moz-margin-start: 3px;
+  -moz-margin-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 {
+  display: -moz-box !important; /* prevent [mode="icons"] from hiding the label */
+  margin: 0 !important;
+}
+
+toolbarbutton.bookmark-item:hover,
+toolbarbutton.bookmark-item[open="true"] {
+  background-color: rgba(0, 0, 0, .205);
+}
+
+toolbarbutton.bookmark-item:hover,
+toolbarbutton.bookmark-item[open="true"] {
+  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:active:hover,
+toolbarbutton.bookmark-item[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-top: 2px;
+  -moz-margin-start: 3px;
+}
+
+.bookmark-item > .toolbarbutton-icon {
+  width: 16px;
+  min-height: 16px;
+  max-height: 16px;
+}
+
+.bookmark-item > .toolbarbutton-icon[label]:not([label=""]),
+.bookmark-item > .toolbarbutton-icon[type="menu"] {
+  -moz-margin-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;
+}
+
+@media (min-resolution: 2dppx) {
+  .bookmark-item > .toolbarbutton-icon,
+  .bookmark-item > .menu-iconic-left > .menu-iconic-icon {
+    image-rendering: -moz-crisp-edges;
+  }
+}
+
+#wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
+  background: url("chrome://browser/skin/places/bookmarksToolbar.png") no-repeat center;
+}
+
+.bookmarks-toolbar-customize {
+  max-width: 15em !important;
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;
+}
+
+@media (min-resolution: 2dppx) {
+  #wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
+    background-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png");
+    background-size: 16px;
+  }
+
+  .bookmarks-toolbar-customize {
+    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important;
+  }
+
+  .bookmarks-toolbar-customize > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
+/* ::::: bookmark menus ::::: */
+
+.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
+  width: 16px;
+  height: 16px;
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+.toolbarbutton-1 {
+    list-style-image: url("chrome://browser/skin/Toolbar.png");
+}
+
+toolbar[brighttext] .toolbarbutton-1 {
+    list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
+}
+
+.toolbarbutton-1[disabled=true] > .toolbarbutton-icon,
+.toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker,
+.toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled] > .toolbarbutton-icon {
+    opacity: .4;
+}
+
+.toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
+.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+    list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
+}
+
+toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
+toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+    list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
+}
+
+.toolbarbutton-1 > .toolbarbutton-icon,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+    -moz-margin-end: 0;
+}
+
+toolbar[mode=full] .toolbarbutton-1:not([type=menu-button]) {
+    -moz-box-orient: vertical;
+}
+
+toolbar[mode=full] .toolbarbutton-1,
+toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+    min-width: 57px;
+}
+
+#nav-bar {
+    /* force iconsize="small" on this toolbar */
+    counter-reset: smallicons;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1,
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+    -moz-appearance: none;
+    border: none;
+    padding: 0;
+    background: none;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1:not([type=menu-button]),
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+    padding: 5px 2px;
+    -moz-box-pack: center;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button) {
+    padding-left: 5px;
+    padding-right: 5px;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > menupopup {
+    margin-top: -3px;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+    -moz-padding-end: 0;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+    -moz-padding-start: 0;
+    -moz-box-align: center;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-icon,
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-badge-stack,
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+    padding: 2px 6px;
+    background: hsla(210,32%,93%,.3) padding-box;
+    background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,100%,.1));
+    background-clip: padding-box;
+    border-radius: 2.5px;
+    border: 1px solid;
+    border-color: hsla(210,54%,20%,.2) hsla(210,54%,20%,.2) hsla(210,54%,20%,.2);
+    box-shadow: 0 1px hsla(0,0%,100%,.05) inset,
+        0 1px hsla(210,54%,20%,.05),
+        0 0 2px hsla(210,54%,20%,.05);
+    transition-property: background-image, background-color, border-color, box-shadow;
+    transition-duration: 150ms;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon,
+@navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-badge-stack,
+@navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+    padding: 3px 7px;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button) > .toolbarbutton-icon,
+@navbarLargeIcons@ .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ {
+    -moz-padding-end: 17px;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
+    -moz-margin-start: -15px;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+    -moz-border-end: none;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+    padding: 8px 5px 7px;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
+    content: "";
+    display: -moz-box;
+    width: 1px;
+    height: 18px;
+    -moz-margin-end: -1px;
+    background-image: linear-gradient(hsla(210,54%,20%,.2) 0, hsla(210,54%,20%,.2) 18px);
+    background-clip: padding-box;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 1px 18px;
+    box-shadow: 0 0 0 1px hsla(0,0%,100%,.2);
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(ltr),
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(rtl) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(rtl),
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(ltr) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):hover > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
+@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack,
+@conditionalForwardWithUrlbar@ > .toolbarbutton-1:-moz-any([disabled],:not([open]):not([disabled]):not(:active)) > .toolbarbutton-icon {
+    background-image: linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.5));
+    border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.3) hsla(210,54%,20%,.35);
+    box-shadow: 0 1px hsla(0,0%,100%,.3) inset,
+        0 1px hsla(210,54%,20%,.03),
+        0 0 2px hsla(210,54%,20%,.1);
+    transition-property: background-image, background-color, border-color, box-shadow;
+    transition-duration: 150ms;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):not([open]):not(:active):hover > .toolbarbutton-icon,
+@navbarLargeIcons@ .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon,
+@conditionalForwardWithUrlbar@ > #forward-button:not([open]):not(:active):not([disabled]):hover > .toolbarbutton-icon {
+    border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
+    background-color: hsla(210,48%,96%,.75);
+    box-shadow: 0 0 1px hsla(210,54%,20%,.03),
+        0 0 2px hsla(210,54%,20%,.1);
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover:active > .toolbarbutton-icon,
+@navbarLargeIcons@ .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon,
+@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon,
+@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
+    background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
+    background-color: hsla(210,54%,20%,.15);
+    border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
+    box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
+        0 0 1px hsla(210,54%,20%,.2) inset,
+        /* allows windows-keyhole-forward-clip-path to be used for non-hover as well as hover: */
+        0 1px 0 hsla(210,54%,20%,0),
+        0 0 2px hsla(210,54%,20%,0);
+    text-shadow: none;
+    transition: none;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1:-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon {
+    -moz-border-start-color: hsla(210,54%,20%,.35);
+}
+
+@navbarLargeIcons@ .toolbarbutton-1[checked]:not(:active):hover > .toolbarbutton-icon {
+    background-color: rgba(90%,90%,90%,.4);
+    transition: background-color .4s;
+}
+
+:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1,
+:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+.tabbrowser-arrowscrollbox > .scrollbutton-up,
+.tabbrowser-arrowscrollbox > .scrollbutton-down {
+    -moz-appearance: none;
+    border-style: none;
+    padding: 0 3px;
+}
+
+#TabsToolbar .toolbarbutton-1:not([disabled]):hover,
+#TabsToolbar .toolbarbutton-1[open],
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover,
+.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover,
+.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover {
+    background-image: linear-gradient(rgba(255,255,255,0), rgba(255,255,255,.5)),
+        linear-gradient(transparent, rgba(0,0,0,.25) 30%),
+        linear-gradient(transparent, rgba(0,0,0,.25) 30%);
+    background-position: 1px -1px, 0 -1px, 100% -1px;
+    background-size: calc(100% - 2px) 100%, 1px 100%, 1px 100%;
+    background-repeat: no-repeat;
+}
+
+#addon-bar .toolbarbutton-1:not([disabled]):hover,
+#addon-bar .toolbarbutton-1[open],
+#addon-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover {
+    background-image: linear-gradient(to top, transparent, rgba(0,0,0,.15)),
+        linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%),
+        linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%);
+    background-position: left, left, right;
+    background-size: auto, 1px 100%, 1px 100%;
+    background-repeat: no-repeat;
+}
+
+/* unified back/forward button */
+
+#back-button {
+    -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+#forward-button {
+    -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+#forward-button:-moz-locale-dir(rtl),
+#forward-button:-moz-locale-dir(rtl) > .toolbarbutton-text {
+    transform: scaleX(-1);
+}
+
+@conditionalForwardWithUrlbar@ {
+    -moz-box-align: center;
+}
+
+@conditionalForwardWithUrlbar@ > #forward-button {
+    padding: 0;
+}
+
+@conditionalForwardWithUrlbar@ > #forward-button > menupopup {
+    margin-top: 1px;
+}
+
+@conditionalForwardWithUrlbar@ > #forward-button > .toolbarbutton-icon {
+    /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
+    clip-path: url(chrome://browser/content/browser.xul#windows-keyhole-forward-clip-path);
+    -moz-margin-start: -6px !important;
+    border-left-style: none;
+    border-radius: 0;
+    padding-left: 7px;
+    padding-right: 3px;
+}
+
+@conditionalForwardWithUrlbar@:not([switchingtabs]) > #forward-button {
+    transition: opacity @forwardTransitionLength@ ease-out;
+}
+
+@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] {
+    /*  opacity: 0; */
+}
+
+@conditionalForwardWithUrlbar@ > #back-button {
+    -moz-image-region: rect(18px, 20px, 38px, 0);
+    padding-top: 3px;
+    padding-bottom: 3px;
+    -moz-padding-start: 5px;
+    -moz-padding-end: 0;
+    position: relative;
+    z-index: 1;
+    border-radius: 0 10000px 10000px 0;
+}
+
+@conditionalForwardWithUrlbar@ > #back-button:-moz-locale-dir(rtl) {
+    border-radius: 10000px 0 0 10000px;
+}
+
+@conditionalForwardWithUrlbar@ > #back-button > menupopup {
+    margin-top: -1px;
+}
+
+@conditionalForwardWithUrlbar@ > #back-button > .toolbarbutton-icon {
+    border-radius: 10000px;
+    padding: 5px;
+    border: none;
+    background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
+    box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
+        0 0 0 1px hsla(0,0%,100%,.3) inset,
+        0 0 0 1px hsla(210,54%,20%,.25),
+        0 1px 0 hsla(210,54%,20%,.35);
+    transition-property: background-color, box-shadow;
+    transition-duration: 250ms;
+}
+
+@conditionalForwardWithUrlbar@ > #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon {
+    background-color: hsla(210,48%,96%,.75);
+    box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
+        0 0 0 1px hsla(0,0%,100%,.3) inset,
+        0 0 0 1px hsla(210,54%,20%,.3),
+        0 1px 0 hsla(210,54%,20%,.4),
+        0 0 4px hsla(210,54%,20%,.2);
+}
+
+@conditionalForwardWithUrlbar@ > #back-button:not([disabled="true"]):hover:active > .toolbarbutton-icon,
+@conditionalForwardWithUrlbar@ > #back-button[open="true"] > .toolbarbutton-icon {
+    background-color: hsla(210,54%,20%,.15);
+    box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
+        0 0 1px hsla(210,54%,20%,.2) inset,
+        0 0 0 1px hsla(210,54%,20%,.4),
+        0 1px 0 hsla(210,54%,20%,.2);
+    transition: none;
+}
+
+@conditionalForwardWithUrlbar@ > #back-button[disabled] > .toolbarbutton-icon {
+    box-shadow: 0 0 0 1px hsla(210,54%,20%,.55),
+        0 1px 0 hsla(210,54%,20%,.65);
+    transition: none;
+}
+
+.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;
+}
+
+#stop-button {
+    -moz-image-region: rect(0, 54px, 18px, 36px);
+}
+
+#reload-button {
+    -moz-image-region: rect(0, 72px, 18px, 54px);
+}
+
+#home-button.bookmark-item {
+    list-style-image: url("chrome://browser/skin/Toolbar.png");
+}
+toolbar[brighttext] #home-button.bookmark-item {
+    list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
+}
+
+#home-button {
+    -moz-image-region: rect(0, 90px, 18px, 72px);
+}
+
+#downloads-button {
+    -moz-image-region: rect(0, 108px, 18px, 90px);
+}
+
+#history-button,
+#history-menu-button {
+    -moz-image-region: rect(0, 126px, 18px, 108px);
+}
+
+#bookmarks-button,
+#bookmarks-menu-button {
+    -moz-image-region: rect(0, 144px, 18px, 126px);
+}
+
+#bookmarks-menu-button.bookmark-item {
+    list-style-image: url("chrome://browser/skin/Toolbar.png");
+}
+
+toolbar[brighttext] #bookmarks-menu-button.bookmark-item {
+    list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
+}
+
+#print-button {
+    -moz-image-region: rect(0, 162px, 18px, 144px);
+}
+
+#new-tab-button {
+    -moz-image-region: rect(0, 180px, 18px, 162px);
+}
+
+#new-window-button {
+    -moz-image-region: rect(0, 198px, 18px, 180px);
+}
+
+#cut-button {
+    -moz-image-region: rect(0, 216px, 18px, 198px);
+}
+
+#copy-button {
+    -moz-image-region: rect(0, 234px, 18px, 216px);
+}
+
+#paste-button {
+    -moz-image-region: rect(0, 252px, 18px, 234px);
+}
+
+#fullscreen-button {
+    -moz-image-region: rect(0, 270px, 18px, 252px);
+}
+
+#zoom-out-button {
+    -moz-image-region: rect(0, 288px, 18px, 270px);
+}
+
+#zoom-in-button {
+    -moz-image-region: rect(0, 306px, 18px, 288px);
+}
+
+#sync-button {
+    -moz-image-region: rect(0, 324px, 18px, 306px);
+}
+#sync-button[status="active"] {
+    list-style-image: url("chrome://browser/skin/sync-throbber.png");
+    -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+#feed-button {
+    -moz-image-region: rect(0, 342px, 18px, 324px);
+}
+
+%ifdef MOZ_WEBRTC
+#webrtc-status-button {
+    -moz-image-region: rect(0, 360px, 18px, 342px);
+}
+%endif
+
+/* ::::: Location Bar ::::: */
+
+#urlbar,
+.searchbar-textbox {
+    -moz-appearance: none;
+    margin: 1px 3px;
+    padding: 0;
+    background-clip: padding-box;
+    border: 1px solid ThreeDShadow;
+    border-radius: 2px;
+}
+
+#urlbar {
+    width: 7em;
+    -moz-padding-end: 2px;
+}
+
+@media (-moz-mac-lion-theme) {
+    #urlbar,
+    .searchbar-textbox {
+        @navbarTextboxCustomBorder@
+    }
+}
+
+#urlbar:-moz-lwtheme,
+.searchbar-textbox:-moz-lwtheme {
+    background-color: rgba(255,255,255,.8);
+    @navbarTextboxCustomBorder@
+    color: black;
+}
+
+@conditionalForwardWithUrlbar@ + #urlbar-container {
+    padding-left: @conditionalForwardWithUrlbarWidth@px;
+    -moz-margin-start: -@conditionalForwardWithUrlbarWidth@px;
+    position: relative;
+    pointer-events: none;
+}
+
+@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar {
+    -moz-border-start: none;
+    margin-left: 0;
+    pointer-events: all;
+}
+
+@conditionalForwardWithUrlbar@:not([switchingtabs]) + #urlbar-container > #urlbar {
+    transition: margin-left @forwardTransitionLength@ ease-out;
+}
+
+@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(ltr) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container {
+    clip-path: url("chrome://browser/content/browser.xul#windows-urlbar-back-button-clip-path");
+}
+
+@conditionalForwardWithUrlbar@ + #urlbar-container:-moz-locale-dir(rtl),
+@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
+    /* let windows-urlbar-back-button-mask clip the urlbar's right side for RTL */
+    transform: scaleX(-1);
+}
+
+html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
+.searchbar-textbox:-moz-lwtheme > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input::-moz-placeholder {
+    opacity: 1.0;
+    color: #777;
+}
+
+#urlbar:-moz-lwtheme[focused="true"],
+.searchbar-textbox:-moz-lwtheme[focused="true"] {
+    background-color: white;
+}
+
+#urlbar-container {
+    -moz-box-orient: horizontal;
+    -moz-box-align: stretch;
+}
+
+.urlbar-textbox-container {
+    -moz-box-align: stretch;
+}
+
+.urlbar-input-box {
+    -moz-margin-start: 0;
+    min-width: 4em;
+}
+
+#urlbar-icons {
+    -moz-box-align: center;
+}
+
+.urlbar-icon {
+    padding: 0 3px;
+}
+
+.searchbar-engine-button,
+.search-go-container {
+    padding: 2px 2px;
+}
+
+.urlbar-icon:hover {
+    background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.3), hsla(200,100%,70%,0));
+}
+
+.urlbar-icon[open="true"],
+.urlbar-icon:hover:active {
+    background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.1), hsla(200,100%,70%,0));
+}
+
+#urlbar-search-splitter {
+    min-width: 6px;
+    -moz-margin-start: -3px;
+    border: none;
+    background: transparent;
+}
+
+#urlbar-search-splitter + #urlbar-container > #urlbar ,
+#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
+    -moz-margin-start: 0;
+}
+
+#urlbar-display-box {
+    -moz-border-end: 1px solid #AAA;
+    -moz-margin-end: 3px;
+}
+
+#urlbar-display {
+    margin-top: 0;
+    margin-bottom: 0;
+    -moz-margin-start: 0;
+    color: GrayText;
+}
+
+/* identity box */
+
+#identity-box {
+    padding: 2px;
+    font-size: .9em;
+}
+
+#identity-box:-moz-locale-dir(ltr) {
+    border-top-left-radius: 1.5px;
+    border-bottom-left-radius: 1.5px;
+}
+
+#identity-box:-moz-locale-dir(rtl) {
+    border-top-right-radius: 1.5px;
+    border-bottom-right-radius: 1.5px;
+}
+
+#notification-popup-box:not([hidden]) + #identity-box {
+    -moz-padding-start: 10px;
+    border-radius: 0;
+}
+
+@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box {
+    border-radius: 0;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
+    color: hsl(92,100%,30%);
+    -moz-margin-end: 4px;
+    background-image: -moz-linear-gradient(hsla(92,81%,16%,0),
+        hsla(92,81%,16%,.08) 25%,
+        hsla(92,81%,16%,.08) 75%,
+        hsla(92,81%,16%,0));
+    background-position: right;
+    background-repeat: no-repeat; 
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain {
+    color: rgb(0,79,168);
+    -moz-margin-end: 4px;
+    background-image: -moz-linear-gradient(rgba(0,79,168,0),
+        rgba(0,79,168,.08) 25%,
+        rgba(0,79,168,.08) 75%,
+        rgba(0,79,168,0));
+    background-position: right;
+    background-repeat: no-repeat;
+}
+
+#identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
+    background-position: left;
+}
+
+#identity-box.verifiedIdentity:not(:-moz-lwtheme) {
+    background-color: #fff;
+    box-shadow: inset 0 0 2px rgb(0,168,0);
+}
+
+#identity-box.verifiedDomain:not(:-moz-lwtheme) {
+    background-color: rgb(224,234,247);
+    box-shadow: inset 0 0 2px rgb(0,79,168);
+}
+
+#identity-box:-moz-focusring {
+    outline: 1px dotted #000;
+    outline-offset: -3px;
+}
+
+#identity-icon-labels {
+    -moz-padding-start: 2px;
+    -moz-padding-end: 5px;
+}
+
+/* Address bar shading for SSL */
+
+#urlbar[https_color="all"][security_level="broken"],
+#urlbar[https_color="all"][security_level="low"] {
+  box-shadow: inset 0 0 4px rgb(168,0,0);
+}
+
+#urlbar[https_color="all"][security_level="mixed"],
+#urlbar[https_color="secure-mixed"][security_level="mixed"] {
+  box-shadow: inset 0 0 4px rgb(168,79,0);
+}
+
+#urlbar[https_color="all"][security_level="high"],
+#urlbar[https_color="secure-mixed"][security_level="high"],
+#urlbar[https_color="secure-only"][security_level="high"] {
+  box-shadow: inset 0 0 4px rgb(0,79,168);
+}
+
+#urlbar[https_color="all"][security_level="ev"],
+#urlbar[https_color="secure-mixed"][security_level="ev"],
+#urlbar[https_color="secure-only"][security_level="ev"] {
+  box-shadow: inset 0 0 4px rgb(0,168,0);
+}
+
+#urlbar[https_color="all"]:-moz-lwtheme-darktext,
+#urlbar[https_color="secure-mixed"]:-moz-lwtheme-darktext,
+#urlbar[https_color="secure-only"]:-moz-lwtheme-darktext {
+  box-shadow: inset 0 0 2px;
+}
+
+
+/* Location bar dropmarker */
+
+.urlbar-history-dropmarker {
+    -moz-appearance: none;
+    padding: 0 3px;
+    background-color: transparent;
+    border: none;
+    width: auto;
+    list-style-image: url("chrome://browser/skin/urlbar-history-dropmarker.png");
+    -moz-image-region: rect(0px, 11px, 14px, 0px);
+}
+
+.urlbar-history-dropmarker:hover {
+    background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.3), hsla(205,100%,70%,0));
+    -moz-image-region: rect(0px, 22px, 14px, 11px);
+}
+
+.urlbar-history-dropmarker:hover:active,
+.urlbar-history-dropmarker[open="true"] {
+    background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.1), hsla(205,100%,70%,0));
+    -moz-image-region: rect(0px, 33px, 14px, 22px);
+}
+
+/* page proxy icon */
+
+#page-proxy-favicon {
+    width: 16px;
+    height: 16px;
+    margin-top: 1px;
+    margin-bottom: 1px;
+    -moz-margin-start: 3px;
+    -moz-margin-end: 2px;
+    list-style-image: url(chrome://browser/skin/identity-icons-generic.png);
+    -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box > #page-proxy-favicon {
+    -moz-margin-end: 1px;
+}
+
+/* Since we already have a padlock, always use the generic icon until the favicon loads
+.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] {
+    list-style-image: url(chrome://browser/skin/identity-icons-https.png);
+}
+
+.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] {
+    list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png);
+}
+
+.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] {
+    list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png);
+}
+*/
+
+#identity-box:hover > #page-proxy-favicon {
+    -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+#identity-box:hover:active > #page-proxy-favicon,
+#identity-box[open=true] > #page-proxy-favicon {
+    -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+#page-proxy-favicon[pageproxystate="invalid"] {
+    opacity: 0.3;
+}
+
+/* autocomplete */
+
+#treecolAutoCompleteImage {
+    max-width: 36px;
+}
+
+.ac-result-type-bookmark,
+.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
+    list-style-image: url("chrome://browser/skin/places/bookmark.png");
+    -moz-image-region: rect(0px 48px 16px 32px);
+    width: 16px;
+    height: 16px;
+}
+
+.ac-result-type-keyword,
+.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
+    list-style-image: url(chrome://global/skin/icons/search-textbox.png);
+    margin: 2px;
+    width: 12px;
+    height: 12px;
+}
+
+.ac-result-type-tag,
+.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
+    list-style-image: url("chrome://browser/skin/places/tag.png");
+    width: 16px;
+    height: 16px;
+}
+
+.ac-comment {
+    font-size: 1.06em;
+}
+
+.ac-extra > .ac-comment {
+    font-size: 1em;
+}
+
+.ac-url-text,
+.ac-action-text {
+    font-size: 1em;
+    color: -moz-nativehyperlinktext;
+}
+
+@media (-moz-mac-lion-theme) {
+    .ac-url-text:not([selected="true"]),
+    .ac-action-text:not([selected="true"]) {
+        color: #008800;
+    }
+}
+
+richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon {
+    list-style-image: url("chrome://browser/skin/actionicon-tab.png");
+    -moz-image-region: rect(0, 16px, 11px, 0);
+    padding: 0 3px;
+}
+
+richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-box > .ac-action-icon {
+    -moz-image-region: rect(11px, 16px, 22px, 0);
+}
+
+.ac-comment[selected="true"],
+.ac-url-text[selected="true"],
+.ac-action-text[selected="true"] {
+    color: inherit !important;
+}
+
+.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 */
+
+#go-button,
+#urlbar > toolbarbutton {
+    -moz-appearance: none;
+    padding: 0 2px;
+    background-origin: border-box;
+    border: none;
+    list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+}
+
+#go-button {
+    padding: 0 3px;
+}
+
+#urlbar-reload-button {
+    -moz-image-region: rect(0, 14px, 14px, 0);
+}
+
+#urlbar-reload-button:not([disabled]):hover {
+    background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.2), hsla(200,100%,70%,0));
+    -moz-image-region: rect(14px, 14px, 28px, 0);
+}
+
+#urlbar-reload-button:not([disabled]):hover:active {
+    background-image: radial-gradient(circle closest-side, hsla(200,100%,60%,.1), hsla(200,100%,60%,0));
+    -moz-image-region: rect(28px, 14px, 42px, 0);
+}
+
+#urlbar-reload-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+    transform: scaleX(-1);
+}
+
+#go-button,
+#urlbar-go-button {
+    -moz-image-region: rect(0, 42px, 14px, 28px);
+}
+
+#go-button:hover,
+#urlbar-go-button:hover {
+    background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.2), hsla(110,70%,50%,0));
+    -moz-image-region: rect(14px, 42px, 28px, 28px);
+}
+
+#go-button:hover:active,
+#urlbar-go-button:hover:active {
+    background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.1), hsla(110,70%,50%,0));
+    -moz-image-region: rect(28px, 42px, 42px, 28px);
+}
+
+#go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+    transform: scaleX(-1);
+}
+
+#urlbar-stop-button {
+    -moz-image-region: rect(0, 28px, 14px, 14px);
+}
+
+#urlbar-stop-button:not([disabled]):hover {
+    background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.3), hsla(5,100%,75%,0));
+    -moz-image-region: rect(14px, 28px, 28px, 14px);
+}
+
+#urlbar-stop-button:hover:active {
+    background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.1), hsla(5,100%,75%,0));
+    -moz-image-region: rect(28px, 28px, 42px, 14px);
+}
+
+/* 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 {
+    -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+#page-report-button:hover:active,
+#page-report-button[open="true"] {
+    -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+
+/* star button */
+
+#star-button {
+    list-style-image: url("chrome://browser/skin/places/bookmark.png");
+    -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#star-button:hover {
+    background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.3), hsla(45,100%,73%,0));
+    -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#star-button:hover:active {
+    background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.1), hsla(45,100%,73%,0));
+    -moz-image-region: rect(0px 48px 16px 32px);
+}
+
+#star-button[starred] {
+    list-style-image: url("chrome://browser/skin/places/editBookmark.png");
+}
+
+/* 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");
+}
+
+#editBookmarkPanelTitle {
+    font-size: 130%;
+}
+
+#editBookmarkPanelHeader,
+#editBookmarkPanelContent {
+    margin-bottom: .5em;
+}
+
+/* Implements editBookmarkPanel resizing on folderTree un-collapse. */
+#editBMPanel_folderTree {
+    min-width: 27em;
+}
+
+/* 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");
+}
+
+#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 {
+  -moz-margin-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;
+  -moz-border-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;
+  -moz-padding-start: 8px;
+  -moz-padding-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;
+  -moz-padding-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;
+  -moz-margin-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::-moz-placeholder {
+  opacity: 1.0;
+  color: #bbb;
+}
+
+.editBMPanel_rowLabel {
+  text-align: end;
+}
+
+/* ::::: content area ::::: */
+
+#sidebar {
+    background-color: Window;
+}
+
+#sidebar-title {
+    -moz-padding-start: 0px;
+}
+
+/* ::::: throbber ::::: */
+
+#navigator-throbber {
+    width: 16px;
+    min-height: 16px;
+    margin: 0 3px;
+}
+
+#navigator-throbber[busy="true"] {
+    list-style-image: url("chrome://global/skin/icons/loading_16.png");
+}
+
+#navigator-throbber,
+#wrapper-navigator-throbber > #navigator-throbber {
+    list-style-image: url("chrome://global/skin/icons/notloading_16.png");
+}
+
+/* Tabstrip */
+
+#TabsToolbar {
+    min-height: 0;
+    padding: 0;
+}
+
+#TabsToolbar:not(:-moz-lwtheme),
+#TabsToolbar[tabsontop=false] {
+    background-image: linear-gradient(to top, @toolbarShadowColor@ 1px, rgba(0,0,0,.05) 1px, transparent 50%);
+}
+
+/* When the tab bar is collapsed, show a 1px border in its place. */
+#TabsToolbar[tabsontop="false"][collapsed="true"]:not([customizing="true"]) {
+  visibility: visible;
+  height: 1px;
+  border-bottom-width: 1px;
+  /* !important here to override border-style: none on the toolbar */
+  border-bottom-style: solid !important;
+  border-bottom-color: ThreeDShadow;
+  overflow: hidden;
+}
+
+@media (-moz-mac-lion-theme) {
+    #main-window[sizemode=normal] #TabsToolbar {
+        padding-left: 2px;
+        padding-right: 2px;
+    }
+}
+
+/* remove 5 pixel border on left and right of browser screen */
+.tabbrowser-tabbox {
+    margin: 0;
+}
+
+.tabbrowser-tab,
+.tabs-newtab-button {
+    -moz-appearance: none;
+    background: @toolbarShadowOnTab@, @bgTabTexture@,
+        linear-gradient(-moz-dialog, -moz-dialog);
+    background-clip: padding-box;
+    padding: 3px 1px 4px;
+    /* Setting a transparent outer border allows us to have a 1px gap
+       between the tabs and the top edge of the screen, even when the
+       tabs have a top margin of 0, which is important for Fitts' law
+       compliance */
+    border: 2px solid;
+    border-bottom: none;
+    border-radius: 6px 6px 0px 0px;
+    -moz-border-top-colors: transparent #929292;
+    -moz-border-left-colors: transparent #929292;
+    -moz-border-right-colors: transparent #929292;
+    /* Hide the transparent top border by default */
+    margin-top: -1px;
+    /* Reduce the gap between the tabs */
+    -moz-margin-start: -1px;
+    box-shadow: inset 0.5px 1px 1px rgba(255,255,255,.7);
+}
+
+.tabbrowser-tab {
+    -moz-padding-end: 3px;
+}
+
+/* Override the default (globally-set) tab width values; increase
+   by 2px to compensate for the transparent outer border of the tabs */
+.tabbrowser-tab:not([pinned]) {
+    max-width: 252px;
+    min-width: 102px;
+}
+
+/* When the tabs are on top and the window is maximized or in full-
+   screen mode, unhide the transparent top border of the tabs so we
+   have a 1px gap between the tabs and the top edge of the screen */
+#main-window[sizemode="maximized"][tabsontop=true] .tabbrowser-tab,
+#main-window[sizemode="maximized"][tabsontop=true] .tabs-newtab-button,
+#main-window[sizemode="fullscreen"][tabsontop=true] .tabbrowser-tab,
+#main-window[sizemode="fullscreen"][tabsontop=true] .tabs-newtab-button {
+    margin-top: 0px;
+}
+
+/* make the tab text colors match those of the Windows client */
+@media (-moz-mac-lion-theme) {
+    tab {
+        text-shadow: none;
+        color: black !important;
+    }
+}
+
+.tabbrowser-tab:hover,
+.tabs-newtab-button:hover {
+    background-image: @toolbarShadowOnTab@, @bgTabTextureHover@,
+        linear-gradient(-moz-dialog, -moz-dialog);
+}
+
+.tabbrowser-tab[selected="true"] {
+    background-image: linear-gradient(@selectedTabHighlight@, @toolbarHighlight@ 50%),
+        linear-gradient(-moz-dialog, -moz-dialog);
+}
+
+#main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
+    background-image: @toolbarShadowOnTab@,
+        linear-gradient(@selectedTabHighlight@, @toolbarHighlight@ 50%),
+        linear-gradient(-moz-dialog, -moz-dialog);
+}
+
+.tabbrowser-tab[visuallyselected=true]:not(:-moz-lwtheme) {
+  /* overriding tabbox.css */
+  color: inherit;
+}
+
+.tabbrowser-tab[visuallyselected=true] {
+  /* overriding tabbox.css */
+  text-shadow: inherit;
+}
+
+/* Remove highlight fuzz on dark themes */
+.tabbrowser-tab:-moz-lwtheme-brighttext,
+.tabs-newtab-button:-moz-lwtheme-brighttext {
+    box-shadow:none;
+    -moz-border-top-colors: transparent #707070;
+    -moz-border-left-colors: transparent #707070;
+    -moz-border-right-colors: transparent #707070;
+}
+
+.tabbrowser-tab[selected="true"]:-moz-lwtheme {
+    background-image: linear-gradient(rgba(255,255,255,.6), rgba(255,255,255,.8) 50%);
+}
+
+.tabbrowser-tab[selected="true"]:-moz-lwtheme-brighttext {
+    background-image: linear-gradient(rgba(128,128,128,.9), rgba(32,32,32,.9) 50%, rgba(32,32,32,.9) 80%, rgba(32,32,32,.8) 100%);
+    -moz-border-top-colors: transparent #D0D0D0;
+    -moz-border-left-colors: transparent #D0D0D0;
+    -moz-border-right-colors: transparent #D0D0D0;
+}
+
+.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]),
+.tabs-newtab-button:-moz-lwtheme-brighttext {
+    background-image: linear-gradient(hsla(0,0%,25%,.4), hsla(0,0%,15%,.6) 80%);
+}
+
+.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]):hover,
+.tabs-newtab-button:-moz-lwtheme-brighttext:hover {
+    background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,10%,.8) 80%);
+}
+
+.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]),
+.tabs-newtab-button:-moz-lwtheme-darktext {
+    background-image: linear-gradient(hsla(0,0%,75%,.4), hsla(0,0%,85%,.6) 80%);
+}
+
+.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]):hover,
+.tabs-newtab-button:-moz-lwtheme-darktext:hover {
+    background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,90%,.8) 80%);
+}
+
+.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
+    background-image: radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25));
+}
+.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
+    background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,75%,.4) 80%),
+        radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25));
+}
+
+.tab-throbber,
+.tab-icon-image {
+    width: 16px;
+    height: 16px;
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+    -moz-margin-start: 2px;
+    -moz-margin-end: 3px;
+}
+
+.tab-throbber {
+    list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
+}
+
+.tab-throbber[progress] {
+    list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
+}
+
+.tab-throbber[pinned],
+.tab-icon-image[pinned] {
+    -moz-margin-start: 5px;
+    -moz-margin-end: 5px;
+}
+
+/* tabbrowser-tab focus ring */
+.tabbrowser-tab:focus > .tab-stack {
+    outline: 1px dotted;
+}
+
+/* Tab DnD indicator */
+.tab-drop-indicator {
+    list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png);
+    margin-bottom: -11px;
+}
+
+/* Tab close button */
+.tab-close-button {
+    -moz-appearance: none;
+    border: none;
+    padding: 0px;
+}
+
+.tab-close-button:-moz-lwtheme-brighttext {
+    list-style-image: url("chrome://global/skin/icons/close-inverted.png");
+}
+
+@media (min-resolution: 2dppx) {
+    .tab-close-button:-moz-lwtheme-brighttext {
+        list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
+    }
+}
+  
+/* Tab sound indicator */
+.tab-icon-sound {
+  -moz-margin-start: 4px;
+  width: 16px;
+  height: 16px;
+  padding: 0;
+}
+
+.allTabs-endimage[soundplaying],
+.tab-icon-sound[soundplaying] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio");
+}
+
+.allTabs-endimage[muted],
+.tab-icon-sound[muted] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted");
+}
+
+.allTabs-endimage[blocked],
+.tab-icon-sound[blocked] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked");
+}
+
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[soundplaying],
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[blocked],
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[muted] {
+  filter: invert(1);
+}
+
+.tab-icon-sound[soundplaying-scheduledremoval]:not([muted]):not(:hover),
+.tab-icon-overlay[soundplaying-scheduledremoval]:not([muted]):not(:hover) {
+  transition: opacity .3s linear var(--soundplaying-removal-delay);
+  opacity: 0;
+}
+
+/* Tab icon overlay */
+.tab-icon-overlay {
+  width: 16px;
+  height: 16px;
+  margin-top: -8px;
+  margin-inline-start: -15px;
+  margin-inline-end: -1px;
+  position: relative;
+}
+
+.tab-icon-overlay[soundplaying],
+.tab-icon-overlay[muted]:not([crashed]),
+.tab-icon-overlay[blocked]:not([crashed]) {
+  border-radius: 10px;
+}
+
+.tab-icon-overlay[soundplaying]:hover,
+.tab-icon-overlay[muted]:not([crashed]):hover,
+.tab-icon-overlay[blocked]:not([crashed]):hover {
+  background-color: white;
+}
+
+.tab-icon-overlay[soundplaying] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio");
+}
+
+.tab-icon-overlay[muted] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-muted");
+}
+
+.tab-icon-overlay[blocked] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-blocked");
+}
+
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[soundplaying]:not([selected]):not(:hover),
+.tab-icon-overlay[soundplaying][selected]:-moz-lwtheme-brighttext:not(:hover) {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white");
+}
+
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[muted]:not([crashed]):not([selected]):not(:hover),
+.tab-icon-overlay[muted][selected]:-moz-lwtheme-brighttext:not(:hover) {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-muted");
+}
+
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[blocked]:not([crashed]):not([selected]):not(:hover),
+.tab-icon-overlay[blocked][selected]:-moz-lwtheme-brighttext:not(:hover) {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-blocked");
+}
+
+/* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up,
+.tabbrowser-arrowscrollbox > .scrollbutton-down {
+    list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png");
+    margin: 0;
+    padding-right: 2px;
+    border-right: 2px solid transparent;
+    background-origin: border-box;
+}
+
+toolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-up,
+toolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-down {
+    list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png);
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled],
+.tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] {
+    opacity: .4;
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) {
+    transform: scaleX(-1);
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-down {
+    transition: 1s background-color ease-out;
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-down[notifybgtab] {
+    background-color: Highlight;
+    transition: none;
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]),
+.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]) {
+    border-width: 0 2px 0 0;
+    border-style: solid;
+    border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 fill;
+}
+
+.tabs-newtab-button > .toolbarbutton-icon {
+    margin-top: -1px;
+    margin-bottom: -1px;
+}
+
+.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: auto;
+}
+
+.tabs-newtab-button:-moz-lwtheme-brighttext,
+toolbar[brighttext] #TabsToolbar > #new-tab-button,
+toolbar[brighttext] #TabsToolbar > toolbarpaletteitem > #new-tab-button {
+    list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png);
+}
+
+.tabs-newtab-button {
+    width: 28px;
+}
+
+#TabsToolbar > #new-tab-button {
+    width: 26px;
+}
+
+#alltabs-button {
+    list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png");
+    -moz-image-region: rect(0, 14px, 16px, 0);
+}
+
+#alltabs-button[type="menu"] {
+    list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
+    -moz-image-region: auto;
+}
+
+toolbar[brighttext] #alltabs-button {
+    list-style-image: url("chrome://browser/skin/tabbrowser/alltabs-inverted.png");
+}
+
+toolbar[brighttext] #alltabs-button[type="menu"] {
+    list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
+}
+
+#alltabs-button[type="menu"] > .toolbarbutton-icon {
+    margin: 0 2px;
+}
+
+#alltabs-button[type="menu"] > .toolbarbutton-menu-dropmarker {
+    display: none;
+}
+
+/* All tabs menupopup */
+.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+.alltabs-item[selected="true"] {
+    font-weight: bold; 
+}
+
+.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
+    list-style-image: url("chrome://global/skin/icons/loading_16.png");
+}
+
+.alltabs-item[tabIsVisible] {
+    /* box-shadow instead of background-color to work around native styling */
+    box-shadow: inset -5px 0 ThreeDShadow;
+}
+
+/* Tabstrip close button */
+.tabs-closebutton {
+    -moz-appearance: none;
+    padding: 4px 2px;
+    margin: 0px;
+    border: none;
+}
+
+toolbar[brighttext] .tabs-closebutton {
+    list-style-image: url("chrome://global/skin/icons/close-inverted.png");
+}
+
+@media (min-resolution: 2dppx) {
+    toolbar[brighttext] .tabs-closebutton {
+        list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
+    }
+}
+  
+.tabs-closebutton > .toolbarbutton-icon {
+    -moz-margin-end: 0px !important;
+    -moz-padding-end: 2px !important;
+    -moz-padding-start: 2px !important;
+}
+
+#sidebar-throbber[loading="true"] {
+    list-style-image: url("chrome://global/skin/icons/loading_16.png");
+    -moz-margin-end: 4px;
+}
+
+/* Pale Moon: Feed icon */
+#ub-feed-button,
+#ub-feed-button > .button-box,
+#ub-feed-button:hover:active > .button-box {
+    padding: 0px;
+    margin: 0px;
+    border: 0px; 
+    background-color: transparent !important;
+}
+
+#ub-feed-button {
+    -moz-appearance: none; 
+    min-width: 0px; 
+    list-style-image: url("chrome://browser/skin/feeds/feed-icons-16.png");
+    -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#ub-feed-button:hover {
+    -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#ub-feed-button[open="true"],
+#ub-feed-button:hover:active {
+    -moz-image-region: rect(0px 48px 16px 32px);
+}
+
+
+/* Bookmarks toolbar */
+#PlacesToolbarDropIndicator {
+    list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png);
+}
+
+toolbarbutton.bookmark-item[dragover="true"][open="true"] {
+    -moz-appearance: none;
+    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;
+    -moz-margin-end: -4em;
+    background-color: Highlight;
+}
+
+/* ::::: Identity Indicator Styling ::::: */
+
+/* Popup Icons */
+#identity-popup-icon {
+    height: 64px;
+    width: 64px;
+    padding: 0;
+    list-style-image: url("chrome://browser/skin/identity.png");
+    -moz-image-region: rect(0px, 64px, 64px, 0px);
+}
+
+#identity-popup.verifiedDomain > #identity-popup-container > #identity-popup-icon {
+    -moz-image-region: rect(64px, 64px, 128px, 0px);
+}
+
+#identity-popup.verifiedIdentity > #identity-popup-container > #identity-popup-icon {
+    -moz-image-region: rect(128px, 64px, 192px, 0px);
+}
+
+/* Popup Body Text */
+.identity-popup-description {
+    white-space: pre-wrap;
+    -moz-padding-start: 15px;
+    margin: 2px 0 4px;
+}
+
+.identity-popup-label {
+    white-space: pre-wrap;
+    -moz-padding-start: 15px;
+    margin: 0;
+}
+
+#identity-popup-content-host,
+#identity-popup-content-box.verifiedIdentity > #identity-popup-content-owner {
+    font-size: 1.2em;
+}
+
+#identity-popup-content-host {
+    margin-top: 3px;
+    margin-bottom: 5px;
+    font-weight: bold;
+    max-width: 300px;
+}
+
+#identity-popup-content-owner {
+    margin-top: 4px;
+    margin-bottom: 0 !important;
+    font-weight: bold;
+    max-width: 300px;
+}
+
+.verifiedDomain > #identity-popup-content-owner {
+    font-weight: normal;
+}
+
+#identity-popup-content-verifier {
+    margin: 4px 0 2px;
+}
+
+#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption ,
+#identity-popup-content-box.verifiedDomain > #identity-popup-encryption {
+    margin-top: 10px;
+    -moz-margin-start: -24px;
+}
+
+#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon ,
+#identity-popup-content-box.verifiedDomain > #identity-popup-encryption > vbox > #identity-popup-encryption-icon {
+    list-style-image: url("chrome://browser/skin/Secure24.png");
+}
+
+#identity-popup-more-info-button {
+    margin-top: 6px;
+    margin-bottom: 0;
+    -moz-margin-end: 0;
+}
+
+.popup-notification-icon {
+    width: 64px;
+    height: 64px;
+    -moz-margin-end: 10px;
+}
+
+.popup-notification-icon[popupid="geolocation"] {
+    list-style-image: url(chrome://browser/skin/Geolocation-64.png);
+}
+
+.popup-notification-icon[popupid="xpinstall-disabled"],
+.popup-notification-icon[popupid="addon-progress"],
+.popup-notification-icon[popupid="addon-install-cancelled"],
+.popup-notification-icon[popupid="addon-install-blocked"],
+.popup-notification-icon[popupid="addon-install-origin-blocked"],
+.popup-notification-icon[popupid="addon-install-failed"],
+.popup-notification-icon[popupid="addon-install-complete"] {
+    list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
+    width: 32px;
+    height: 32px;
+}
+
+.popup-notification-icon[popupid="click-to-play-plugins"] {
+    list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png);
+}
+
+.popup-notification-icon[popupid="web-notifications"] {
+    list-style-image: url(chrome://browser/skin/notification-64.png);
+}
+
+.addon-progress-description {
+    width: 350px;
+    max-width: 350px;
+}
+
+.popup-progress-label,
+.popup-progress-meter {
+    -moz-margin-start: 0;
+    -moz-margin-end: 0;
+}
+
+.popup-progress-cancel {
+    -moz-appearance: none;
+    background: transparent;
+    border: none;
+    padding: 0;
+    min-height: 16px;
+    min-width: 16px;
+    max-height: 16px;
+    max-width: 16px;
+    margin: 0 1px 0 1px;
+    list-style-image: url(chrome://mozapps/skin/downloads/buttons.png);
+    -moz-image-region: rect(0px, 16px, 16px, 0px);    
+}
+
+.popup-progress-cancel:hover {
+    -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+.popup-progress-cancel:active {
+    -moz-image-region: rect(32px, 32px, 48px, 16px);
+}
+
+.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
+.popup-notification-icon[popupid="indexedDB-quota-prompt"],
+.popup-notification-icon[popupid*="offline-app-requested"],
+.popup-notification-icon[popupid="offline-app-usage"] {
+    list-style-image: url(chrome://global/skin/icons/question-64.png);
+}
+
+.popup-notification-icon[popupid="password"] {
+    list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png);
+}
+
+.popup-notification-icon[popupid="mixed-content-blocked"] {
+    list-style-image: url(chrome://browser/skin/mixed-content-blocked-64.png);
+}
+
+%ifdef MOZ_WEBRTC
+.popup-notification-icon[popupid="webRTC-sharingDevices"],
+.popup-notification-icon[popupid="webRTC-shareDevices"] {
+    list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png);
+}
+
+%endif
+.popup-notification-icon[popupid="pointerLock"] {
+    list-style-image: url(chrome://browser/skin/pointerLock-64.png);
+}
+
+/* Notification icon box */
+#notification-popup-box {
+    position: relative;
+    background-color: #fff;
+    background-clip: padding-box;
+    padding-left: 3px;
+    border-radius: 2.5px 0 0 2.5px;
+    border-width: 0 8px 0 0;
+    border-style: solid;
+    border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill;
+    -moz-margin-end: -8px;
+}
+
+@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box {
+    padding-left: 5px;
+}
+
+#notification-popup-box:-moz-locale-dir(rtl),
+.notification-anchor-icon:-moz-locale-dir(rtl) {
+    transform: scaleX(-1);
+}
+
+.notification-anchor-icon {
+    width: 16px;
+    height: 16px;
+    margin: 0 2px;
+}
+
+.notification-anchor-icon:-moz-focusring {
+    outline: 1px dotted -moz-DialogText;
+    outline-offset: -3px;
+}
+
+.default-notification-icon,
+#default-notification-icon {
+    list-style-image: url(chrome://global/skin/icons/information-16.png);
+}
+
+.geo-notification-icon,
+#geo-notification-icon {
+    list-style-image: url(chrome://browser/skin/Geolocation-16.png);
+}
+
+#addons-notification-icon {
+    list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png);
+}
+
+.indexedDB-notification-icon,
+#indexedDB-notification-icon {
+    list-style-image: url(chrome://global/skin/icons/question-16.png);
+}
+
+#password-notification-icon {
+    list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png);
+}
+
+#plugins-notification-icon {
+    list-style-image: url(chrome://browser/skin/notification-pluginNormal.png);
+}
+
+#alert-plugins-notification-icon {
+    list-style-image: url(chrome://browser/skin/notification-pluginAlert.png);
+}
+
+#blocked-plugins-notification-icon {
+    list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png);
+}
+
+#plugins-notification-icon,
+#alert-plugins-notification-icon,
+#blocked-plugins-notification-icon {
+    -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+#plugins-notification-icon:hover,
+#alert-plugins-notification-icon:hover,
+#blocked-plugins-notification-icon:hover {
+    -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+#plugins-notification-icon:active,
+#alert-plugins-notification-icon:active,
+#blocked-plugins-notification-icon:active {
+    -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+#notification-popup-box[hidden] {
+    /* Override display:none to make the pluginBlockedNotification animation work
+       when showing the notification repeatedly. */
+    display: -moz-box;
+    visibility: collapse;
+}
+
+#blocked-plugins-notification-icon[showing] {
+    animation: pluginBlockedNotification 500ms ease 0s 5 alternate both;
+}
+
+@keyframes pluginBlockedNotification {
+    from {
+        opacity: 0;
+    }
+    to {
+        opacity: 1;
+    }
+}
+
+.mixed-content-blocked-notification-icon,
+#mixed-content-blocked-notification-icon {
+    list-style-image: url(chrome://browser/skin/mixed-content-blocked-16.png);
+}
+
+%ifdef MOZ_WEBRTC
+.webRTC-shareDevices-notification-icon,
+#webRTC-shareDevices-notification-icon {
+    list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png);
+}
+
+.webRTC-sharingDevices-notification-icon,
+#webRTC-sharingDevices-notification-icon {
+    list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16.png);
+}
+%endif
+
+.web-notifications-notification-icon,
+#web-notifications-notification-icon {
+  list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.web-notifications-notification-icon:hover,
+#web-notifications-notification-icon:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.web-notifications-notification-icon:hover:active,
+#web-notifications-notification-icon:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+#pointerLock-notification-icon {
+    list-style-image: url(chrome://browser/skin/pointerLock-16.png);
+}
+#pointerLock-cancel {
+    margin: 0px;
+}
+
+#identity-popup-container {
+    min-width: 280px;
+}
+
+/* Bookmarks roots menu-items */
+#appmenu_subscribeToPage:not([disabled]),
+#appmenu_subscribeToPageMenu,
+#subscribeToPageMenuitem:not([disabled]),
+#subscribeToPageMenupopup,
+#BMB_subscribeToPageMenuitem:not([disabled]),
+#BMB_subscribeToPageMenupopup {
+    list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
+}
+
+#appmenu_bookmarksToolbar,
+#bookmarksToolbarFolderMenu,
+#BMB_bookmarksToolbar {
+    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
+    -moz-image-region: auto;
+}
+
+@media (min-resolution: 2dppx) {
+  #bookmarksToolbarFolderMenu,
+  #BMB_bookmarksToolbar {
+    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png");
+    -moz-image-region: auto;
+  }
+}
+
+#appmenu_unsortedBookmarks,
+#BMB_unsortedBookmarks {
+    list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
+    -moz-image-region: auto;
+}
+
+/* ::::: Keyboard UI Panel ::::: */
+
+.KUI-panel {
+    -moz-appearance: none;
+    background: rgba(27%,27%,27%,.9) url(KUI-background.png) repeat-x;
+    color: white;
+    border-style: none;
+    border-radius: 20px;
+}
+
+.KUI-panel[level="top"] {
+    background-color: rgba(27%,27%,27%,.65);
+}
+
+.KUI-panel-closebutton {
+    list-style-image: url(KUI-close.png);
+    -moz-appearance: none;
+    border: none;
+    padding: 0;
+    width: 24px;
+    height: 24px;
+}
+
+.KUI-panel-closebutton:not(:hover) {
+    opacity: .6;
+}
+
+.KUI-panel-closebutton > .toolbarbutton-icon {
+    margin: 0;
+}
+
+/* ::::: Ctrl-Tab and All Tabs Panels ::::: */
+
+/* Ctrl-Tab */
+
+#ctrlTab-panel {
+    padding: 20px 10px 10px;
+    font-weight: bold;
+    text-shadow: 0 0 1px rgb(27%,27%,27%), 0 0 2px rgb(27%,27%,27%);
+}
+
+.ctrlTab-favicon[src] {
+    background-color: white;
+    width: 20px;
+    height: 20px;
+    padding: 2px;
+}
+
+.ctrlTab-preview-inner > .tabPreview-canvas {
+    box-shadow: 1px 1px 2px rgb(12%,12%,12%);
+}
+
+.ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner > .tabPreview-canvas {
+    margin-bottom: 2px;
+}
+
+.ctrlTab-preview-inner {
+    padding-bottom: 10px;
+}
+
+#ctrlTab-showAll:not(:focus) > * > .ctrlTab-preview-inner {
+    padding: 10px;
+    background-color: rgba(255,255,255,.2);
+    border-radius: .5em;
+}
+
+.ctrlTab-preview:focus > * > .ctrlTab-preview-inner {
+    color: white;
+    background-color: rgba(0,0,0,.6);
+    text-shadow: none;
+    padding: 8px;
+    border: 2px solid white;
+    border-radius: .5em;
+}
+
+.ctrlTab-preview:not(#ctrlTab-showAll):focus > * > .ctrlTab-preview-inner {
+    margin: -10px -10px 0;
+}
+
+#ctrlTab-showAll {
+    margin-top: .5em;
+}
+
+/* All Tabs */
+
+#allTabs-panel {
+    padding-bottom: 10px;
+    -moz-appearance: none;
+    border: none;
+    background: -moz-dialog;
+    color: -moz-dialogText;
+}
+
+#allTabs-meta {
+    margin: 10px;
+}
+
+#allTabs-filter {
+    -moz-margin-start: 24px;
+    -moz-margin-end: 0;
+}
+
+#allTabs-tab-close-button > .toolbarbutton-icon {
+    margin: 0;
+}
+
+/* Make sure the allTab previews always have regular close buttons */
+#allTabs-tab-close-button:-moz-lwtheme-brighttext {
+    list-style-image: url("chrome://global/skin/icons/close.png");
+}
+
+.allTabs-favicon[src] {
+    background-color: -moz-dialog;
+    width: 22px;
+    height: 22px;
+    padding-top: 1px;
+    padding-bottom: 5px;
+    -moz-padding-start: 1px;
+    -moz-padding-end: 5px;
+    margin-top: -2px;
+    -moz-margin-start: -2px;
+    border-bottom-right-radius: 4px;
+}
+
+.allTabs-favicon[src]:-moz-locale-dir(rtl) {
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 4px;
+}
+
+.allTabs-preview-inner > .tabPreview-canvas {
+    background-color: rgb(60%,60%,60%);
+    box-shadow: 0 0 1.5px ThreeDShadow;
+}
+
+.allTabs-preview:not(:hover):not([closebuttonhover]) > html|canvas {
+    opacity: .8;
+}
+
+.allTabs-preview:focus > * > .allTabs-preview-inner {
+    outline: 1px dotted -moz-dialogText;
+}
+
+/* Add-on bar */
+
+#addon-bar {
+    -moz-appearance: none;
+    min-height: 20px;
+    border-top-style: none;
+    border-bottom-style: none;
+    padding-top: 1px;
+    background-image: linear-gradient(rgba(0,0,0,.15) 1px, rgba(255,255,255,.15) 1px);
+    background-size: 100% 2px;
+    background-repeat: no-repeat;
+}
+
+#status-bar {
+    -moz-appearance: none;
+    background-color: transparent;
+    border: none;
+    min-height: 0;
+}
+
+#addon-bar[customizing] > #status-bar {
+    opacity: .5;
+    background-image: repeating-linear-gradient(135deg,
+        rgba(255,255,255,.3), rgba(255,255,255,.3) 5px,
+        rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px);
+}
+
+#status-bar > statusbarpanel {
+    border-width: 0;
+    -moz-appearance: none;
+}
+
+#addonbar-closebutton {
+    border: none;
+    padding: 0 5px;
+    -moz-appearance: none;
+}
+
+toolbar[brighttext] #addonbar-closebutton {
+    list-style-image: url("chrome://global/skin/icons/close-inverted.png");
+}
+
+@media (min-resolution: 2dppx) {
+    toolbar[brighttext] #addonbar-closebutton {
+        list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
+    }
+}
+
+/* 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;
+    /* disabled for triggering grayscale AA (bug 659213)
+    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;
+    /* disabled for triggering grayscale AA (bug 659213)
+    border-top-left-radius: .3em;
+    */
+    margin-left: 1em;
+}
+
+#full-screen-warning-message {
+    background-color: hsl(0,0%,15%);
+    color: white;
+    border-radius: 8px;
+    margin-top: 30px;
+    padding: 30px 50px;
+    box-shadow: 0 0 2px white;
+}
+
+.full-screen-description {
+    font-size: 150%;
+}
+
+#full-screen-domain-text {
+    font-size: 300%;
+}
+
+%ifdef MOZ_DEVTOOLS
+%include ../../../../devtools/client/themes/responsivedesign.inc.css
+%include ../../../../devtools/client/themes/commandline.inc.css
+%endif
+%include ../shared/plugin-doorhanger.inc.css
+
+%ifdef MOZ_DEVTOOLS
+/* 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;
+    -moz-margin-end: 5px;
+}
+%endif
+
+.toolbarbutton-badge-stack {
+    margin: 0;
+    padding: 0;
+    position: relative;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-badge-stack {
+    padding: 2px 5px;
+}
+
+.toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbar-icon {
+    position: absolute;
+    top: 2px;
+    right: 2px;
+}
+
+.toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) {
+    -moz-margin-end: 0;
+}
+
+@navbarLargeIcons@ *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
+    top: 1px;
+    right: 1px;
+}
+
+.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+    left: 0;
+    right: auto;
+}
+
+@navbarLargeIcons@ *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+    left: 1px;
+    right: auto;
+}
+
+#main-window[privatebrowsingmode=temporary] {
+  background-image: url("chrome://browser/skin/privatebrowsing-mask.png");
+  background-position: top right;
+  background-repeat: no-repeat;
+  background-color: moz-mac-chrome-active;
+}
+
+@media (min-resolution: 2dppx) {
+  #main-window[privatebrowsingmode=temporary] {
+    background-image: url("chrome://browser/skin/privatebrowsing-mask@2x.png");
+    background-size: 38px;
+  }
+}
+
+#main-window[privatebrowsingmode=temporary] {
+  background-position: top right 40px;
+}
+
+#main-window[privatebrowsingmode=temporary][inFullscreen] {
+  background-position: top right 10px;
+}
+
+#main-window[privatebrowsingmode=temporary]:-moz-locale-dir(rtl) {
+  background-position: top left 70px;
+}
+
+#main-window[privatebrowsingmode=temporary][inFullscreen]:-moz-locale-dir(rtl) {
+  background-position: top left 10px;
+}
+
+#main-window[privatebrowsingmode=temporary]:-moz-window-inactive {
+  background-color: -moz-mac-chrome-inactive;
+}
+
+#main-window[privatebrowsingmode=temporary][inFullscreen] #nav-bar[tabsontop=false] {
+  -moz-padding-end: 50px !important;
+}
+
+@media (-moz-mac-lion-theme) {
+  #main-window[privatebrowsingmode=temporary][inFullscreen] #TabsToolbar[tabsontop=true] {
+    -moz-padding-end: 50px;
+  }
+}
+
+@media not all and (-moz-mac-lion-theme) {
+  #main-window[privatebrowsingmode=temporary] {
+    background-position: top right 10px;
+  }
+
+  #main-window[privatebrowsingmode=temporary][inFullscreen][tabsontop=true] #window-controls {
+    -moz-padding-end: 50px;
+  }
+}
diff --git a/themes/osx/click-to-play-warning-stripes.png b/themes/osx/click-to-play-warning-stripes.png
new file mode 100644
index 0000000..29f15f7
--- /dev/null
+++ b/themes/osx/click-to-play-warning-stripes.png
diff --git a/themes/osx/communicator/communicator.css b/themes/osx/communicator/communicator.css
new file mode 100644
index 0000000..0b57574
--- /dev/null
+++ b/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/themes/osx/communicator/jar.mn b/themes/osx/communicator/jar.mn
new file mode 100644
index 0000000..612d133
--- /dev/null
+++ b/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/themes/osx/communicator/moz.build b/themes/osx/communicator/moz.build
new file mode 100644
index 0000000..c97072b
--- /dev/null
+++ b/themes/osx/communicator/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; 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/themes/osx/downloads/allDownloadsViewOverlay.css b/themes/osx/downloads/allDownloadsViewOverlay.css
new file mode 100644
index 0000000..eb99f4c
--- /dev/null
+++ b/themes/osx/downloads/allDownloadsViewOverlay.css
@@ -0,0 +1,146 @@
+/* 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/. */
+
+#downloadsRichListBox {
+  /** The default listbox appearance comes with an unwanted margin. **/
+  -moz-appearance: none;
+  margin: 0;
+}
+
+#downloadsRichListBox > richlistitem.download {
+  height: 6em;
+  padding: 5px 8px;
+}
+
+.downloadTypeIcon {
+  -moz-margin-end: 8px;
+  /* explicitly size the icon, so size doesn't vary on hidpi systems */
+  height: 32px;
+  width: 32px;
+}
+
+.blockedIcon {
+  list-style-image: url("chrome://global/skin/icons/Error.png");
+}
+
+.downloadTarget {
+  margin-bottom: 3px;
+  cursor: inherit;
+}
+
+.downloadDetails {
+  opacity: 0.7;
+  font-size: 95%;
+  cursor: inherit;
+}
+
+.downloadButton {
+  -moz-appearance: none;
+  background: transparent;
+  min-width: 0;
+  min-height: 0;
+  margin: 3px;
+  border: none;
+  padding: 5px;
+  list-style-image: url("chrome://browser/skin/downloads/buttons.png");
+}
+
+/*** Button icons ***/
+
+.downloadButton.downloadCancel {
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+richlistitem.download:hover > .downloadButton.downloadCancel {
+   -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+richlistitem.download:hover > .downloadButton.downloadCancel:hover {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+richlistitem.download:hover > .downloadButton.downloadCancel:active {
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+.downloadButton.downloadShow {
+  -moz-image-region: rect(16px, 16px, 32px, 0px);
+}
+
+richlistitem.download:hover > .downloadButton.downloadShow {
+   -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+richlistitem.download:hover > .downloadButton.downloadShow:hover {
+  -moz-image-region: rect(16px, 48px, 32px, 32px);
+}
+
+richlistitem.download:hover > .downloadButton.downloadShow:active {
+  -moz-image-region: rect(16px, 64px, 32px, 48px);
+}
+
+.downloadButton.downloadRetry {
+  -moz-image-region: rect(32px, 16px, 48px, 0px);
+}
+
+richlistitem.download:hover > .downloadButton.downloadRetry {
+   -moz-image-region: rect(32px, 32px, 48px, 16px);
+}
+
+richlistitem.download:hover > .downloadButton.downloadRetry:hover {
+  -moz-image-region: rect(32px, 48px, 48px, 32px);
+}
+
+richlistitem.download:hover > .downloadButton.downloadRetry:active {
+  -moz-image-region: rect(32px, 64px, 48px, 48px);
+}
+
+richlistitem.download[selected] > .downloadButton.downloadCancel {
+  -moz-image-region: rect(0px, 80px, 16px, 64px);
+}
+
+richlistitem.download[selected]:hover > .downloadButton.downloadCancel {
+  -moz-image-region: rect(0px, 96px, 16px, 80px);
+}
+
+richlistitem.download[selected]:hover > .downloadButton.downloadCancel:hover {
+  -moz-image-region: rect(0px, 112px, 16px, 96px);
+}
+
+richlistitem.download[selected]:hover > .downloadButton.downloadCancel:active {
+  -moz-image-region: rect(0px, 128px, 16px, 112px);
+}
+
+richlistitem.download[selected] > .downloadButton.downloadShow {
+  -moz-image-region: rect(16px, 80px, 32px, 64px);
+}
+
+richlistitem.download[selected]:hover > .downloadButton.downloadShow {
+  -moz-image-region: rect(16px, 96px, 32px, 80px);
+}
+
+richlistitem.download[selected]:hover > .downloadButton.downloadShow:hover {
+  -moz-image-region: rect(16px, 112px, 32px, 96px);
+}
+
+richlistitem.download[selected]:hover > .downloadButton.downloadShow:active {
+  -moz-image-region: rect(16px, 128px, 32px, 112px);
+}
+
+richlistitem.download[selected] > .downloadButton.downloadRetry {
+  -moz-image-region: rect(32px, 80px, 48px, 64px);
+}
+
+richlistitem.download[selected]:hover > .downloadButton.downloadRetry {
+  -moz-image-region: rect(32px, 96px, 48px, 80px);
+}
+
+richlistitem.download[selected]:hover > .downloadButton.downloadRetry:hover {
+  -moz-image-region: rect(32px, 112px, 48px, 96px);
+}
+
+richlistitem.download[selected]:hover > .downloadButton.downloadRetry:active {
+  -moz-image-region: rect(32px, 128px, 48px, 112px);
+}
+
diff --git a/themes/osx/downloads/buttons.png b/themes/osx/downloads/buttons.png
new file mode 100644
index 0000000..ca87b40
--- /dev/null
+++ b/themes/osx/downloads/buttons.png
diff --git a/themes/osx/downloads/contentAreaDownloadsView.css b/themes/osx/downloads/contentAreaDownloadsView.css
new file mode 100644
index 0000000..ece99ea
--- /dev/null
+++ b/themes/osx/downloads/contentAreaDownloadsView.css
@@ -0,0 +1,22 @@
+/* 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/inContentUI.css");
+
+.downloadButton {
+  box-shadow: none;
+}
+
+.downloadButton:not([disabled="true"]):hover:active,
+.downloadButton:not([disabled]):hover:active {
+  background: transparent;
+  border: none;
+  box-shadow: none;
+}
+
+#downloadsListEmptyDescription {
+  margin: 1em;
+  text-align: center;
+  color: GrayText;
+}
diff --git a/themes/osx/downloads/download-glow.png b/themes/osx/downloads/download-glow.png
new file mode 100644
index 0000000..53182d7
--- /dev/null
+++ b/themes/osx/downloads/download-glow.png
diff --git a/themes/osx/downloads/download-notification-finish.png b/themes/osx/downloads/download-notification-finish.png
new file mode 100644
index 0000000..5194f5d
--- /dev/null
+++ b/themes/osx/downloads/download-notification-finish.png
diff --git a/themes/osx/downloads/download-notification-start.png b/themes/osx/downloads/download-notification-start.png
new file mode 100644
index 0000000..bd548b1
--- /dev/null
+++ b/themes/osx/downloads/download-notification-start.png
diff --git a/themes/osx/downloads/download-summary.png b/themes/osx/downloads/download-summary.png
new file mode 100644
index 0000000..67003c7
--- /dev/null
+++ b/themes/osx/downloads/download-summary.png
diff --git a/themes/osx/downloads/downloads.css b/themes/osx/downloads/downloads.css
new file mode 100644
index 0000000..267574e
--- /dev/null
+++ b/themes/osx/downloads/downloads.css
@@ -0,0 +1,394 @@
+/* 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/. */
+
+/*** Panel and outer controls ***/
+
+#downloadsPanel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+}
+
+#downloadsListBox {
+  background-color: transparent;
+  padding: 4px;
+  color: inherit;
+}
+
+#downloadsPanel:not([hasdownloads]) > #downloadsListBox {
+  display: none;
+}
+
+#downloadsPanel[hasdownloads] > #emptyDownloads {
+  display: none;
+}
+
+#emptyDownloads {
+  padding: 10px 20px;
+  max-width: 40ch;
+}
+
+#downloadsHistory {
+  background: transparent;
+  color: -moz-nativehyperlinktext;
+  cursor: pointer;
+}
+
+#downloadsPanel[keyfocus] > #downloadsFooter > #downloadsHistory:focus {
+  outline: 1px -moz-dialogtext dotted;
+  outline-offset: -1px;
+}
+
+#downloadsHistory > .button-box {
+  border: none;
+  margin: 1em;
+}
+
+@media (-moz-mac-lion-theme) {
+  #downloadsFooter {
+    background-color: hsla(216,45%,88%,.98);
+    box-shadow: 0px 1px 2px rgb(204,214,234) inset;
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px;
+  }
+}
+
+/*** Downloads Summary and List items ***/
+
+#downloadsSummary,
+richlistitem[type="download"] {
+  height: 7em;
+  -moz-padding-end: 0;
+  color: inherit;
+}
+
+#downloadsSummary {
+  padding: 8px 38px 8px 12px;
+  cursor: pointer;
+  -moz-user-focus: normal;
+}
+
+#downloadsPanel[keyfocus] > #downloadsFooter > #downloadsSummary:focus {
+  outline: 1px -moz-dialogtext dotted;
+  outline-offset: -5px;
+}
+
+#downloadsSummary > .downloadTypeIcon {
+  list-style-image: url("chrome://browser/skin/downloads/download-summary.png");
+}
+
+#downloadsSummaryDescription {
+  color: -moz-nativehyperlinktext;
+}
+
+richlistitem[type="download"] {
+  margin: 0;
+  border-top: 1px solid hsla(0,0%,100%,.3);
+  border-bottom: 1px solid hsla(220,18%,51%,.25);
+  background: transparent;
+  padding: 8px;
+}
+
+richlistitem[type="download"]:first-child {
+  border-top: 1px solid transparent;
+}
+
+@media (-moz-mac-lion-theme) {
+  richlistitem[type="download"]:last-child {
+    border-bottom: 1px solid transparent;
+  }
+}
+
+#downloadsPanel[keyfocus] > #downloadsListBox:focus > richlistitem[type="download"][selected] {
+  outline: 1px -moz-dialogtext dotted;
+  outline-offset: -1px;
+}
+
+.downloadTypeIcon {
+  -moz-margin-end: 8px;
+  /* Prevent flickering when changing states. */
+  height: 32px;
+  width: 32px;
+}
+
+.blockedIcon {
+  list-style-image: url("chrome://global/skin/icons/Error.png");
+}
+
+/* We hold .downloadDisplayName, .downloadProgress and .downloadDetails
+   inside of a vbox with class .downloadContainer. We set the font-size of
+   the entire container to 90% because:
+
+   1) This is the size that we want .downloadDetails to be
+   2) The container's width is set by localizers by &downloadDetails.width;,
+      which is a ch unit. Since this is the value that should control the
+      panel width, we apply it to the outer container to constrain
+      .downloadDisplayName and .downloadProgress.
+
+   Finally, since we want .downloadDisplayName's font-size to be at 100% of
+   the font-size of .downloadContainer's parent, we use calc to go from the
+   smaller font-size back to the original font-size.
+ */
+#downloadsSummaryDetails,
+.downloadContainer {
+  font-size: 90%;
+}
+
+#downloadsSummaryDescription,
+.downloadDisplayName {
+  margin-bottom: 6px;
+  cursor: inherit;
+}
+
+.downloadDisplayName {
+  font-size: calc(100%/0.9);
+}
+
+#downloadsSummaryDetails,
+.downloadDetails {
+  opacity: 0.6;
+  cursor: inherit;
+}
+
+.downloadButton {
+  -moz-appearance: none;
+  min-width: 0;
+  min-height: 0;
+  margin: 3px;
+  border: none;
+  background: transparent;
+  padding: 5px;
+  list-style-image: url("chrome://browser/skin/downloads/buttons.png");
+}
+
+.downloadButton > .button-box {
+  border: 1px solid transparent;
+  padding: 0;
+}
+
+#downloadsPanel[keyfocus] .downloadButton:focus > .button-box {
+  border: 1px dotted ThreeDDarkShadow;
+}
+
+/*** Highlighted list items ***/
+
+#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover {
+  border-radius: 3px;
+  border-top: 1px solid hsla(0,0%,100%,.2);
+  border-bottom: 1px solid hsla(0,0%,0%,.2);
+  background-color: Highlight;
+  color: HighlightText;
+  cursor: pointer;
+}
+
+/*** Button icons ***/
+
+.downloadButton.downloadCancel {
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:hover {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:active {
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+.downloadButton.downloadShow {
+  -moz-image-region: rect(16px, 16px, 32px, 0px);
+}
+richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow:hover {
+  -moz-image-region: rect(16px, 48px, 32px, 32px);
+}
+richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow:active {
+  -moz-image-region: rect(16px, 64px, 32px, 48px);
+}
+#downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+#downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:hover {
+  -moz-image-region: rect(16px, 48px, 32px, 32px);
+}
+#downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:active {
+  -moz-image-region: rect(16px, 64px, 32px, 48px);
+}
+#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow {
+  -moz-image-region: rect(16px, 96px, 32px, 80px);
+}
+#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:hover {
+  -moz-image-region: rect(16px, 112px, 32px, 96px);
+}
+#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:active {
+  -moz-image-region: rect(16px, 128px, 32px, 112px);
+}
+
+.downloadButton.downloadRetry {
+  -moz-image-region: rect(32px, 16px, 48px, 0px);
+}
+richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry {
+  -moz-image-region: rect(32px, 32px, 48px, 16px);
+}
+richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:hover {
+  -moz-image-region: rect(32px, 48px, 48px, 32px);
+}
+richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:active {
+  -moz-image-region: rect(32px, 64px, 48px, 48px);
+}
+
+/*** Status and progress indicator ***/
+
+#downloads-indicator-anchor {
+  /* Makes the outermost stack 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;
+}
+
+/*** Main indicator icon ***/
+
+#downloads-indicator-icon {
+  background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
+                              0, 108, 18, 90) center no-repeat;
+  min-width: 18px;
+  min-height: 18px;
+}
+
+toolbar[brighttext] #downloads-indicator-icon {
+  background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"),
+                              0, 108, 18, 90) center no-repeat;
+}
+
+#downloads-indicator[attention] > #downloads-indicator-anchor > #downloads-indicator-icon {
+  background-image: url("chrome://browser/skin/downloads/download-glow.png");
+}
+
+/* In the next few rules, we use :not([counter]) as a shortcut that is
+   equivalent to -moz-any([progress], [paused]). */
+
+#downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
+  background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
+                              0, 108, 18, 90) center no-repeat;
+  background-size: 12px;
+}
+
+toolbar[brighttext] #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
+  background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"),
+                              0, 108, 18, 90) center no-repeat;
+}
+
+#downloads-indicator:not([counter])[attention] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
+  background-image: url("chrome://browser/skin/downloads/download-glow.png");
+}
+
+/*** Download notifications ***/
+
+#downloads-indicator-notification {
+  opacity: 0;
+  background-size: 16px;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+
+@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-indicator[notification="start"] > #downloads-indicator-anchor > #downloads-indicator-notification {
+  background-image: url("chrome://browser/skin/downloads/download-notification-start.png");
+  animation-name: downloadsIndicatorNotificationStartRight;
+  animation-duration: 1s;
+}
+
+#downloads-indicator[notification="start"]:-moz-locale-dir(rtl) > #downloads-indicator-anchor > #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-indicator[notification="finish"] > #downloads-indicator-anchor > #downloads-indicator-notification {
+  background-image: url("chrome://browser/skin/downloads/download-notification-finish.png");
+  animation-name: downloadsIndicatorNotificationFinish;
+  animation-duration: 1s;
+}
+
+/*** Progress bar and text ***/
+
+#downloads-indicator-counter {
+  height: 9px;
+  margin: -3px 0px 0px 0px;
+  color: hsl(0,0%,30%);
+  text-shadow: hsla(0,0%,100%,.5) 0 1px;
+  font-size: 9px;
+  line-height: 9px;
+  text-align: center;
+}
+
+toolbar[brighttext] #downloads-indicator-counter {
+  color: white;
+  text-shadow: 0 0 1px rgba(0,0,0,.7),
+               0 1px 1.5px rgba(0,0,0,.5);
+}
+
+#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, 201, 66);
+  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);
+  -moz-border-start: none;
+  border-radius: 0 2px 2px 0;
+}
+
+#downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
+  background-color: rgb(220, 230, 81);
+}
+
+#downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder {
+  background-image: linear-gradient(#4b5000, #515700);
+}
+
+toolbar[mode="full"] > #downloads-indicator > .toolbarbutton-text {
+  margin: 0;
+  text-align: center;
+}
diff --git a/themes/osx/engineManager.css b/themes/osx/engineManager.css
new file mode 100644
index 0000000..18817cd
--- /dev/null
+++ b/themes/osx/engineManager.css
@@ -0,0 +1,16 @@
+%if 0
+/* 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/. */
+%endif
+
+#engineList treechildren::-moz-tree-image(engineName) {
+  -moz-margin-end: 4px;
+  -moz-margin-start: 1px;
+  width: 16px;
+  height: 16px;
+}
+
+#engineList treechildren::-moz-tree-row {
+  height: 20px;
+}
diff --git a/themes/osx/feeds/feed-icons-16.png b/themes/osx/feeds/feed-icons-16.png
new file mode 100644
index 0000000..bcca086
--- /dev/null
+++ b/themes/osx/feeds/feed-icons-16.png
diff --git a/themes/osx/feeds/feedIcon.png b/themes/osx/feeds/feedIcon.png
new file mode 100644
index 0000000..e69bc44
--- /dev/null
+++ b/themes/osx/feeds/feedIcon.png
diff --git a/themes/osx/feeds/feedIcon16.png b/themes/osx/feeds/feedIcon16.png
new file mode 100644
index 0000000..d778807
--- /dev/null
+++ b/themes/osx/feeds/feedIcon16.png
diff --git a/themes/osx/feeds/subscribe-ui.css b/themes/osx/feeds/subscribe-ui.css
new file mode 100644
index 0000000..8ca5328
--- /dev/null
+++ b/themes/osx/feeds/subscribe-ui.css
@@ -0,0 +1,29 @@
+/* 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: 5px;
+}
+
+.handlersMenuPopup > menuitem {
+  -moz-padding-start: 23px;
+}
+
+.handlersMenuPopup > menuitem.menuitem-iconic {
+  -moz-padding-start: 2px;
+}
+
+.handlersMenuPopup > .menuitem-iconic  > .menu-iconic-left {
+  display: -moz-box;
+  min-width: 16px;
+  -moz-padding-end: 2px;
+}
+
+.chooseApplicationMenuItem {
+  list-style-image: url("chrome://browser/skin/preferences/application.png");
+}
+
+#feedHeader[dir="rtl"] .handlersMenuList > menupopup {
+  direction: rtl;
+}
diff --git a/themes/osx/feeds/subscribe.css b/themes/osx/feeds/subscribe.css
new file mode 100644
index 0000000..780a7f8
--- /dev/null
+++ b/themes/osx/feeds/subscribe.css
@@ -0,0 +1,159 @@
+/* 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;
+}
+
+#feedBody {
+  border: 1px solid THreeDShadow;
+  padding: 3em;
+  -moz-padding-start: 30px;
+  margin: 2em auto;
+  background: -moz-Field;
+}
+
+#feedHeaderContainer {
+  border: 1px solid ThreeDShadow;
+  border-radius: 10px;
+  margin: -4em auto 0 auto;
+  background-color: InfoBackground;
+}
+
+#feedHeader {  
+  margin-top: 4.9em;
+  margin-bottom: 1em;
+  -moz-margin-start: 1.4em;
+  -moz-margin-end: 1em;
+  -moz-padding-start: 2.9em;
+  font-size: 110%;
+  color: InfoText;
+}
+
+#feedIntroText {
+  display: none;
+}
+
+.feedBackground {
+  background: url("chrome://browser/skin/feeds/feedIcon.png") 0% 10% no-repeat InfoBackground;
+}
+
+.videoPodcastBackground {
+  background: url("chrome://browser/skin/feeds/videoFeedIcon.png") 0% 10% no-repeat InfoBackground;
+}
+
+.audioPodcastBackground {
+  background: url("chrome://browser/skin/feeds/audioFeedIcon.png") 0% 10% no-repeat InfoBackground;
+}
+
+#feedHeader[dir="rtl"] {
+  background-position: 100% 10%;
+}
+
+#feedHeader[firstrun="true"] #feedIntroText {
+  padding-top: 0.1em;
+  -moz-padding-start: 0.6em;
+  display: block;
+}
+
+#feedHeader[firstrun="true"] > #feedSubscribeLine {
+  -moz-padding-start: 1.8em;
+}
+
+#feedSubscribeLine {
+  padding-top: 0.2em;
+}
+
+/* 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: ThreeDDarkShadow;
+  font-size: 110%;
+  font-weight: normal;
+  margin: 0 0 .6em 0;
+}
+
+#feedTitleLink {
+  float: right;
+  -moz-margin-start: .6em;
+  -moz-margin-end: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+a[href] img {
+  border: none;
+}
+
+#feedTitleContainer {
+  -moz-margin-start: 0;
+  -moz-margin-end: .6em;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+#feedTitleImage {
+  -moz-margin-start: .6em;
+  -moz-margin-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;
+}
+
+.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;
+}
diff --git a/themes/osx/icon.png b/themes/osx/icon.png
new file mode 100644
index 0000000..ff4f21f
--- /dev/null
+++ b/themes/osx/icon.png
diff --git a/themes/osx/identity-icons-generic.png b/themes/osx/identity-icons-generic.png
new file mode 100644
index 0000000..a39e493
--- /dev/null
+++ b/themes/osx/identity-icons-generic.png
diff --git a/themes/osx/identity-icons-https-ev.png b/themes/osx/identity-icons-https-ev.png
new file mode 100644
index 0000000..d49be13
--- /dev/null
+++ b/themes/osx/identity-icons-https-ev.png
diff --git a/themes/osx/identity-icons-https-mixed-active.png b/themes/osx/identity-icons-https-mixed-active.png
new file mode 100644
index 0000000..3c77bc8
--- /dev/null
+++ b/themes/osx/identity-icons-https-mixed-active.png
diff --git a/themes/osx/identity-icons-https.png b/themes/osx/identity-icons-https.png
new file mode 100644
index 0000000..ffd6694
--- /dev/null
+++ b/themes/osx/identity-icons-https.png
diff --git a/themes/osx/identity.png b/themes/osx/identity.png
new file mode 100644
index 0000000..60d5261
--- /dev/null
+++ b/themes/osx/identity.png
diff --git a/themes/osx/imagedocument.png b/themes/osx/imagedocument.png
new file mode 100644
index 0000000..ff4f21f
--- /dev/null
+++ b/themes/osx/imagedocument.png
diff --git a/themes/osx/jar.mn b/themes/osx/jar.mn
new file mode 100644
index 0000000..67339c7
--- /dev/null
+++ b/themes/osx/jar.mn
@@ -0,0 +1,181 @@
+# 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/
+  skin/classic/browser/sanitizeDialog.css
+* skin/classic/browser/aboutPrivateBrowsing.css
+* skin/classic/browser/aboutSessionRestore.css
+  skin/classic/browser/aboutSessionRestore-window-icon.png     (preferences/application.png)
+  skin/classic/browser/aboutCertError.css
+  skin/classic/browser/aboutCertError_sectionCollapsed.png
+  skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png
+  skin/classic/browser/aboutCertError_sectionExpanded.png
+#ifdef MOZ_SERVICES_SYNC
+  skin/classic/browser/aboutSyncTabs.css
+#endif
+* skin/classic/browser/autocomplete.css
+  skin/classic/browser/actionicon-tab.png
+  skin/classic/browser/appmenu-icons.png
+  skin/classic/browser/appmenu-dropmarker.png
+* skin/classic/browser/browser.css
+  skin/classic/browser/click-to-play-warning-stripes.png
+* skin/classic/browser/engineManager.css
+  skin/classic/browser/Geolocation-16.png
+  skin/classic/browser/Geolocation-64.png
+  skin/classic/browser/Info.png
+  skin/classic/browser/identity.png
+  skin/classic/browser/imagedocument.png 
+  skin/classic/browser/identity-icons-generic.png
+  skin/classic/browser/identity-icons-https.png
+  skin/classic/browser/identity-icons-https-ev.png
+  skin/classic/browser/identity-icons-https-mixed-active.png
+  skin/classic/browser/keyhole-forward-mask.svg
+  skin/classic/browser/KUI-background.png
+  skin/classic/browser/KUI-close.png
+  skin/classic/browser/livemark-folder.png
+  skin/classic/browser/menu-back.png
+  skin/classic/browser/menu-forward.png
+  skin/classic/browser/mixed-content-blocked-16.png
+  skin/classic/browser/mixed-content-blocked-64.png
+  skin/classic/browser/monitor.png
+  skin/classic/browser/monitor_16-10.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/pageInfo.css
+  skin/classic/browser/pageInfo.png
+  skin/classic/browser/page-livemarks.png
+  skin/classic/browser/page-livemarks@2x.png
+  skin/classic/browser/pointerLock-16.png
+  skin/classic/browser/pointerLock-64.png
+  skin/classic/browser/Privacy-16.png
+  skin/classic/browser/Privacy-32.png
+  skin/classic/browser/Privacy-48.png
+  skin/classic/browser/privatebrowsing-mask.png
+  skin/classic/browser/privatebrowsing-mask@2x.png
+  skin/classic/browser/privatebrowsing-light.png
+  skin/classic/browser/privatebrowsing-dark.png
+  skin/classic/browser/reload-stop-go.png
+  skin/classic/browser/Search-glass.png
+  skin/classic/browser/searchbar.css
+  skin/classic/browser/searchbar-dropdown-arrow.png
+  skin/classic/browser/Secure24.png
+  skin/classic/browser/setDesktopBackground.css
+  skin/classic/browser/slowStartup-16.png
+  skin/classic/browser/Toolbar.png
+  skin/classic/browser/Toolbar-inverted.png
+  skin/classic/browser/toolbarbutton-dropdown-arrow.png
+  skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
+  skin/classic/browser/urlbar-arrow.png
+  skin/classic/browser/urlbar-popup-blocked.png
+  skin/classic/browser/urlbar-history-dropmarker.png
+  skin/classic/browser/web-notifications-icon.svg
+  skin/classic/browser/web-notifications-tray.svg
+  skin/classic/browser/notification-pluginNormal.png                  (../shared/plugins/notification-pluginNormal.png)
+  skin/classic/browser/notification-pluginAlert.png                   (../shared/plugins/notification-pluginAlert.png)
+  skin/classic/browser/notification-pluginBlocked.png                 (../shared/plugins/notification-pluginBlocked.png)
+#ifdef MOZ_WEBRTC
+  skin/classic/browser/webRTC-shareDevice-16.png
+  skin/classic/browser/webRTC-shareDevice-64.png
+  skin/classic/browser/webRTC-sharingDevice-16.png
+#endif
+  skin/classic/browser/downloads/buttons.png                          (downloads/buttons.png)
+  skin/classic/browser/downloads/download-glow.png                    (downloads/download-glow.png)
+  skin/classic/browser/downloads/download-notification-finish.png     (downloads/download-notification-finish.png)
+  skin/classic/browser/downloads/download-notification-start.png      (downloads/download-notification-start.png)
+  skin/classic/browser/downloads/download-summary.png                 (downloads/download-summary.png)
+* skin/classic/browser/downloads/downloads.css                        (downloads/downloads.css)
+* skin/classic/browser/downloads/allDownloadsViewOverlay.css          (downloads/allDownloadsViewOverlay.css)
+  skin/classic/browser/downloads/contentAreaDownloadsView.css         (downloads/contentAreaDownloadsView.css)
+  skin/classic/browser/feeds/feedIcon.png                             (feeds/feedIcon.png)
+  skin/classic/browser/feeds/feedIcon16.png                           (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/feed-icons-16.png                        (feeds/feed-icons-16.png)
+  skin/classic/browser/feeds/audioFeedIcon.png                        (feeds/feedIcon.png)
+  skin/classic/browser/feeds/audioFeedIcon16.png                      (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/videoFeedIcon.png                        (feeds/feedIcon.png)
+  skin/classic/browser/feeds/videoFeedIcon16.png                      (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/subscribe.css                            (feeds/subscribe.css)
+  skin/classic/browser/feeds/subscribe-ui.css                         (feeds/subscribe-ui.css)
+* skin/classic/browser/newtab/newTab.css                              (newtab/newTab.css)
+  skin/classic/browser/newtab/controls.png                            (../shared/newtab/controls.png)
+  skin/classic/browser/newtab/noise.png                               (../shared/newtab/noise.png)
+  skin/classic/browser/newtab/pinned.png                              (../shared/newtab/pinned.png)
+  skin/classic/browser/places/places.css                              (places/places.css)
+* skin/classic/browser/places/organizer.css                           (places/organizer.css)
+  skin/classic/browser/places/editBookmark.png                        (places/editBookmark.png)
+  skin/classic/browser/places/bookmark.png                            (places/bookmark.png)
+  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/calendar.png                            (places/calendar.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/toolbarDropMarker.png                   (places/toolbarDropMarker.png)
+  skin/classic/browser/places/editBookmarkOverlay.css                 (places/editBookmarkOverlay.css)
+  skin/classic/browser/places/libraryToolbar.png                      (places/libraryToolbar.png)
+  skin/classic/browser/places/starred48.png                           (places/starred48.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/history.png                             (places/history.png)
+  skin/classic/browser/places/history@2x.png                          (places/history@2x.png)
+  skin/classic/browser/places/allBookmarks.png                        (places/allBookmarks.png)
+  skin/classic/browser/places/unsortedBookmarks.png                   (places/unsortedBookmarks.png)
+  skin/classic/browser/places/downloads.png                           (places/downloads.png)
+  skin/classic/browser/places/expander-closed-active.png              (places/expander-closed-active.png)
+  skin/classic/browser/places/expander-open-active.png                (places/expander-open-active.png)
+  skin/classic/browser/places/livemark-item.png                       (places/livemark-item.png)
+  skin/classic/browser/places/expander-closed.png                     (places/expander-closed.png)
+  skin/classic/browser/places/expander-open.png                       (places/expander-open.png)
+  skin/classic/browser/permissions/aboutPermissions.css               (permissions/aboutPermissions.css)
+  skin/classic/browser/preferences/alwaysAsk.png                      (preferences/alwaysAsk.png)
+  skin/classic/browser/preferences/application.png                    (preferences/application.png)
+  skin/classic/browser/preferences/mail.png                           (preferences/mail.png)
+  skin/classic/browser/preferences/Options.png                        (preferences/Options.png)
+#ifdef MOZ_SERVICES_SYNC
+  skin/classic/browser/preferences/Options-sync.png                   (preferences/Options-sync.png)
+#endif
+  skin/classic/browser/preferences/saveFile.png                       (preferences/saveFile.png)
+* skin/classic/browser/preferences/preferences.css                    (preferences/preferences.css)
+  skin/classic/browser/preferences/applications.css                   (preferences/applications.css)
+  skin/classic/browser/statusbar/dynamic.css                          (../shared/statusbar/dynamic.css)
+* skin/classic/browser/statusbar/overlay.css                          (statusbar/overlay.css)
+* skin/classic/browser/statusbar/prefs.css                            (statusbar/prefs.css)
+  skin/classic/browser/statusbar/pulse.png                            (../shared/statusbar/pulse.png)
+  skin/classic/browser/statusbar/pms16.png                            (../shared/statusbar/pms16.png)
+  skin/classic/browser/statusbar/pms24.png                            (../shared/statusbar/pms24.png)
+  skin/classic/browser/statusbar/throbber-idle.png                    (../shared/statusbar/throbber-idle.png)
+  skin/classic/browser/statusbar/throbberStatic.png                   (../shared/statusbar/throbberStatic.png)
+  skin/classic/browser/tabbrowser/alltabs.png                         (tabbrowser/alltabs.png)
+  skin/classic/browser/tabbrowser/alltabs-inverted.png                (tabbrowser/alltabs-inverted.png)
+  skin/classic/browser/tabbrowser/newtab.png                          (tabbrowser/newtab.png)
+  skin/classic/browser/tabbrowser/newtab-inverted.png                 (tabbrowser/newtab-inverted.png)
+  skin/classic/browser/tabbrowser/connecting.png                      (tabbrowser/connecting.png)
+  skin/classic/browser/tabbrowser/loading.png                         (tabbrowser/loading.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left.png                  (tabbrowser/tab-arrow-left.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png         (tabbrowser/tab-arrow-left-inverted.png)
+  skin/classic/browser/tabbrowser/tab-overflow-border.png             (tabbrowser/tab-overflow-border.png)
+  skin/classic/browser/tabbrowser/tabDragIndicator.png                (tabbrowser/tabDragIndicator.png)
+  skin/classic/browser/tabbrowser/tab-audio.svg                       (../shared/tabbrowser/tab-audio.svg)
+  skin/classic/browser/tabbrowser/tab-audio-small.svg                 (../shared/tabbrowser/tab-audio-small.svg)
+#ifdef MOZ_SERVICES_SYNC
+  skin/classic/browser/sync-throbber.png
+  skin/classic/browser/sync-16.png
+  skin/classic/browser/sync-32.png
+  skin/classic/browser/sync-128.png
+  skin/classic/browser/sync-bg.png
+  skin/classic/browser/sync-desktopIcon.png
+  skin/classic/browser/sync-mobileIcon.png
+  skin/classic/browser/syncSetup.css
+  skin/classic/browser/syncCommon.css
+  skin/classic/browser/syncQuota.css
+  skin/classic/browser/syncProgress.css
+#endif
diff --git a/themes/osx/keyhole-forward-mask.svg b/themes/osx/keyhole-forward-mask.svg
new file mode 100644
index 0000000..8355447
--- /dev/null
+++ b/themes/osx/keyhole-forward-mask.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!-- 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">
+  <mask id="mask" maskContentUnits="objectBoundingBox">
+    <rect x="0" y="0" width="1" height="1" fill="white"/>
+    <circle cx="-0.46" cy="0.5" r="0.63"/>
+  </mask>
+  <mask id="mask-hover" maskContentUnits="objectBoundingBox">
+    <rect x="0" y="0" width="1" height="1" fill="white"/>
+    <circle cx="-0.35" cy="0.5" r="0.58"/>
+  </mask>
+</svg>
diff --git a/themes/osx/livemark-folder.png b/themes/osx/livemark-folder.png
new file mode 100644
index 0000000..38a4f10
--- /dev/null
+++ b/themes/osx/livemark-folder.png
diff --git a/themes/osx/menu-back.png b/themes/osx/menu-back.png
new file mode 100644
index 0000000..ecb8ccd
--- /dev/null
+++ b/themes/osx/menu-back.png
diff --git a/themes/osx/menu-forward.png b/themes/osx/menu-forward.png
new file mode 100644
index 0000000..2083492
--- /dev/null
+++ b/themes/osx/menu-forward.png
diff --git a/themes/osx/mixed-content-blocked-16.png b/themes/osx/mixed-content-blocked-16.png
new file mode 100644
index 0000000..7cf33ec
--- /dev/null
+++ b/themes/osx/mixed-content-blocked-16.png
diff --git a/themes/osx/mixed-content-blocked-64.png b/themes/osx/mixed-content-blocked-64.png
new file mode 100644
index 0000000..cac4415
--- /dev/null
+++ b/themes/osx/mixed-content-blocked-64.png
diff --git a/themes/osx/monitor.png b/themes/osx/monitor.png
new file mode 100644
index 0000000..35e7b20
--- /dev/null
+++ b/themes/osx/monitor.png
diff --git a/themes/osx/monitor_16-10.png b/themes/osx/monitor_16-10.png
new file mode 100644
index 0000000..4195034
--- /dev/null
+++ b/themes/osx/monitor_16-10.png
diff --git a/themes/osx/moz.build b/themes/osx/moz.build
new file mode 100644
index 0000000..6a7af20
--- /dev/null
+++ b/themes/osx/moz.build
@@ -0,0 +1,9 @@
+# -*- Mode: python; c-basic-offset: 4; 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']
\ No newline at end of file
diff --git a/themes/osx/newtab/newTab.css b/themes/osx/newtab/newTab.css
new file mode 100644
index 0000000..b8b0fd6
--- /dev/null
+++ b/themes/osx/newtab/newTab.css
@@ -0,0 +1,29 @@
+/* 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.css.inc
+
+.newtab-undo-button {
+  -moz-appearance: none;
+  color: -moz-nativehyperlinktext;
+  color: rgb(0,102,204);
+  cursor: pointer;
+  padding: 0;
+  margin: 0 4px;
+  border: 0;
+  background: transparent;
+  text-decoration: none;
+  min-width: 0;
+}
+
+.newtab-undo-button > .button-box {
+  padding: 0;
+}
+
+#newtab-undo-close-button {
+  -moz-appearance: none;
+  padding: 0;
+  border: none;
+  -moz-user-focus: normal;
+}
diff --git a/themes/osx/page-livemarks.png b/themes/osx/page-livemarks.png
new file mode 100644
index 0000000..e526458
--- /dev/null
+++ b/themes/osx/page-livemarks.png
diff --git a/themes/osx/page-livemarks@2x.png b/themes/osx/page-livemarks@2x.png
new file mode 100644
index 0000000..7b17089
--- /dev/null
+++ b/themes/osx/page-livemarks@2x.png
diff --git a/themes/osx/pageInfo.css b/themes/osx/pageInfo.css
new file mode 100644
index 0000000..f205b57
--- /dev/null
+++ b/themes/osx/pageInfo.css
@@ -0,0 +1,258 @@
+/* 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 */
+#viewGroup {
+  -moz-padding-start: 10px;
+}
+
+#viewGroup > radio {
+  list-style-image: url("chrome://browser/skin/pageInfo.png");
+  -moz-box-orient: vertical;
+  -moz-box-align: center;
+  -moz-appearance: none;
+  padding: 5px 3px 1px 3px;
+  margin: 0 1px;
+  min-width: 4.5em;
+}
+
+#viewGroup > radio:hover {
+  background-color: #E0E8F6;
+  color: black;
+}
+
+#viewGroup > radio[selected="true"] {
+  background-color: #C1D2EE;
+  color: black;
+}
+
+#topBar {
+  border-bottom: 2px groove ThreeDFace;
+  -moz-padding-start: 10px;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
+
+#generalTab {
+  -moz-image-region: rect(0px, 32px, 32px, 0px)
+}
+
+#generalTab:hover, #generalTab[selected="true"] {
+  -moz-image-region: rect(32px, 32px, 64px, 0px)
+}
+
+#mediaTab {
+  -moz-image-region: rect(0px, 64px, 32px, 32px)
+}
+
+#mediaTab:hover, #mediaTab[selected="true"] {
+  -moz-image-region: rect(32px, 64px, 64px, 32px)
+}
+
+#feedTab {
+  -moz-image-region: rect(0px, 96px, 32px, 64px)
+}
+
+#feedTab:hover, #feedTab[selected="true"] {
+  -moz-image-region: rect(32px, 96px, 64px, 64px)
+}
+
+#permTab {
+  -moz-image-region: rect(0px, 128px, 32px, 96px)
+}
+
+#permTab:hover, #permTab[selected="true"] {
+  -moz-image-region: rect(32px, 128px, 64px, 96px)
+}
+
+#securityTab {
+  -moz-image-region: rect(0px, 160px, 32px, 128px)
+}
+
+#securityTab:hover, #securityTab[selected="true"] {
+  -moz-image-region: rect(32px, 160px, 64px, 128px)
+}
+
+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 {
+  -moz-margin-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: 9px;
+  height: 9px;
+  background-repeat: no-repeat;
+  background-position: center;
+  -moz-margin-start: 2px;
+  -moz-margin-end: 2px;
+  background-image: url("chrome://global/skin/tree/twisty-open.png");
+}
+
+groupbox.collapsable[closed="true"] {
+  border: none;
+  margin-bottom: 9px;
+  -moz-appearance: none;
+}
+
+groupbox.collapsable[closed="true"] caption .caption-icon { 
+  background-image: url("chrome://global/skin/tree/twisty-clsd.png");
+}
+
+groupbox tree { 
+  margin: 0 3px;
+  border: none;
+}
+
+#securityBox description { 
+  -moz-margin-start: 10px;
+}
+
+#general-security-identity {
+  white-space: pre-wrap;
+  line-height: 2em;
+}
+
+/* Media Tab */
+#imagetree {
+  min-height: 10em;
+  margin-bottom: 0;
+}
+
+#mediaSplitter {
+  border-style: none;
+  background: none;
+  height: .8em;
+}
+
+#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;
+  -moz-padding-start: 7px;
+  -moz-padding-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;
+  -moz-padding-start: 7px;
+  -moz-padding-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 10px;
+}
+
+#securityPanel .fieldValue {
+  font-weight: bold;
+  margin: 2px 10px 0px 10px;
+}
diff --git a/themes/osx/pageInfo.png b/themes/osx/pageInfo.png
new file mode 100644
index 0000000..237381b
--- /dev/null
+++ b/themes/osx/pageInfo.png
diff --git a/themes/osx/panel-expander-closed.png b/themes/osx/panel-expander-closed.png
new file mode 100644
index 0000000..f0e97b2
--- /dev/null
+++ b/themes/osx/panel-expander-closed.png
diff --git a/themes/osx/panel-expander-closed@2x.png b/themes/osx/panel-expander-closed@2x.png
new file mode 100644
index 0000000..0e7ded5
--- /dev/null
+++ b/themes/osx/panel-expander-closed@2x.png
diff --git a/themes/osx/panel-expander-open.png b/themes/osx/panel-expander-open.png
new file mode 100644
index 0000000..e3febf4
--- /dev/null
+++ b/themes/osx/panel-expander-open.png
diff --git a/themes/osx/panel-expander-open@2x.png b/themes/osx/panel-expander-open@2x.png
new file mode 100644
index 0000000..3913370
--- /dev/null
+++ b/themes/osx/panel-expander-open@2x.png
diff --git a/themes/osx/panel-plus-sign.png b/themes/osx/panel-plus-sign.png
new file mode 100644
index 0000000..375601e
--- /dev/null
+++ b/themes/osx/panel-plus-sign.png
diff --git a/themes/osx/permissions/aboutPermissions.css b/themes/osx/permissions/aboutPermissions.css
new file mode 100644
index 0000000..f9a4a88
--- /dev/null
+++ b/themes/osx/permissions/aboutPermissions.css
@@ -0,0 +1,153 @@
+/* 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/inContentUI.css");
+
+/* header */
+
+#permissions-pagetitle {
+  font-size: 200%;
+  font-weight: bold;
+  padding-bottom: 0.5em;
+}
+
+/* content box */
+#permissions-content {
+  height: 100%;
+}
+
+/* sites box */
+
+#sites-box {
+  padding: 10px;
+  width: 25em;
+}
+
+#sites-filter {
+  margin: 0;
+}
+
+#sites-list {
+  -moz-appearance: none;
+  border: 1px solid rgba(0, 0, 0, 0.32);
+  background-color: rgba(255, 255, 255, 0.4);
+  margin: 5px 0 0 0;
+}
+
+.site {
+  padding: 4px;
+  border-bottom: 1px solid ThreeDLightShadow;
+}
+
+.site-favicon {
+  height: 16px;
+  width: 16px;
+  -moz-margin-end: 4px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+#all-sites-item > .site-container > .site-favicon {
+  list-style-image: none;
+}
+
+/* permissions box */
+
+#permissions-box {
+  padding-top: 10px;
+  overflow-y: auto;
+}
+
+#site-description {
+  font-size: 125%;
+  -moz-margin-start: 6px; /* to match button margin */
+}
+
+#site-label {
+  font-weight: bold;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+#defaults-description {
+  font-size: 125%;
+  font-weight: bold;
+  -moz-margin-start: 6px;
+}
+
+.pref-item {
+  margin-bottom: 10px;
+}
+
+.pref-icon {
+  width: 36px;
+  height: 36px;
+  -moz-margin-end: 10px;
+}
+
+.pref-icon[type="password"] {
+  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png);
+}
+.pref-icon[type="image"] {
+  list-style-image: url(chrome://global/skin/icons/question-64.png);
+}
+.pref-icon[type="popup"] {
+  list-style-image: url(chrome://global/skin/icons/question-64.png);
+}
+.pref-icon[type="cookie"] {
+  list-style-image: url(chrome://global/skin/icons/question-64.png);
+}
+.pref-icon[type="desktop-notification"] {
+  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
+}
+.pref-icon[type="install"] {
+  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
+}
+.pref-icon[type="geo"] {
+  list-style-image: url(chrome://browser/skin/Geolocation-64.png);
+}
+.pref-icon[type="plugins"] {
+  list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
+}
+
+.pref-title {
+  font-size: 125%;
+  margin-bottom: 0;
+  font-weight: bold;
+  margin-right: 0;
+  padding-right: 0;
+}
+
+.pref-default {
+  margin-left: 0.5em;
+  padding-left: 0;
+}
+
+.pref-set-default {
+  visibility: collapse;
+}
+
+.pref-menulist {
+  margin-left: 6px;
+  margin-right: 6px;
+  min-width: 10em; /* native menulists ellipsize their longest entries by default on many themes */
+}
+
+.plugins-label {
+  margin-right: 0;
+  padding-right: 0;
+}
+
+.plugins-vulnerable {
+  margin-left: 0;
+  padding-left: 0;
+  margin-right: 0;
+  padding-right: 0;
+}
+
+.plugins-default {
+  margin-left: 0.5em;
+  padding-left: 0;
+  margin-right: 1em;
+  padding-right: 0;
+}
diff --git a/themes/osx/places/allBookmarks.png b/themes/osx/places/allBookmarks.png
new file mode 100644
index 0000000..d1abe81
--- /dev/null
+++ b/themes/osx/places/allBookmarks.png
diff --git a/themes/osx/places/bookmark.png b/themes/osx/places/bookmark.png
new file mode 100644
index 0000000..2e9a206
--- /dev/null
+++ b/themes/osx/places/bookmark.png
diff --git a/themes/osx/places/bookmarksMenu.png b/themes/osx/places/bookmarksMenu.png
new file mode 100644
index 0000000..c27bd6a
--- /dev/null
+++ b/themes/osx/places/bookmarksMenu.png
diff --git a/themes/osx/places/bookmarksToolbar.png b/themes/osx/places/bookmarksToolbar.png
new file mode 100644
index 0000000..2047bff
--- /dev/null
+++ b/themes/osx/places/bookmarksToolbar.png
diff --git a/themes/osx/places/bookmarksToolbar@2x.png b/themes/osx/places/bookmarksToolbar@2x.png
new file mode 100644
index 0000000..dd45898
--- /dev/null
+++ b/themes/osx/places/bookmarksToolbar@2x.png
diff --git a/themes/osx/places/calendar.png b/themes/osx/places/calendar.png
new file mode 100644
index 0000000..1855c9f
--- /dev/null
+++ b/themes/osx/places/calendar.png
diff --git a/themes/osx/places/downloads.png b/themes/osx/places/downloads.png
new file mode 100644
index 0000000..0756cb6
--- /dev/null
+++ b/themes/osx/places/downloads.png
diff --git a/themes/osx/places/editBookmark.png b/themes/osx/places/editBookmark.png
new file mode 100644
index 0000000..fbca052
--- /dev/null
+++ b/themes/osx/places/editBookmark.png
diff --git a/themes/osx/places/editBookmarkOverlay.css b/themes/osx/places/editBookmarkOverlay.css
new file mode 100644
index 0000000..cc749c1
--- /dev/null
+++ b/themes/osx/places/editBookmarkOverlay.css
@@ -0,0 +1,105 @@
+/* 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 {
+  -moz-appearance: none;
+  margin: 0;
+  margin-left: 8px;
+  padding: 0;
+  min-width: 0;
+}
+
+.expander-up {
+  list-style-image: url("chrome://browser/skin/places/expander-open.png");
+}
+
+.expander-down {
+  list-style-image: url("chrome://browser/skin/places/expander-closed.png");
+}
+
+.expander-down:hover:active {
+  list-style-image: url("chrome://browser/skin/places/expander-closed-active.png");
+}
+
+.expander-up:hover:active {
+  list-style-image: url("chrome://browser/skin/places/expander-open-active.png");
+}
+
+#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/themes/osx/places/expander-closed-active.png b/themes/osx/places/expander-closed-active.png
new file mode 100644
index 0000000..7ef5f04
--- /dev/null
+++ b/themes/osx/places/expander-closed-active.png
diff --git a/themes/osx/places/expander-closed.png b/themes/osx/places/expander-closed.png
new file mode 100644
index 0000000..7850c9e
--- /dev/null
+++ b/themes/osx/places/expander-closed.png
diff --git a/themes/osx/places/expander-open-active.png b/themes/osx/places/expander-open-active.png
new file mode 100644
index 0000000..673ead5
--- /dev/null
+++ b/themes/osx/places/expander-open-active.png
diff --git a/themes/osx/places/expander-open.png b/themes/osx/places/expander-open.png
new file mode 100644
index 0000000..7655357
--- /dev/null
+++ b/themes/osx/places/expander-open.png
diff --git a/themes/osx/places/folderDropArrow.png b/themes/osx/places/folderDropArrow.png
new file mode 100644
index 0000000..8d722cc
--- /dev/null
+++ b/themes/osx/places/folderDropArrow.png
diff --git a/themes/osx/places/folderDropArrow@2x.png b/themes/osx/places/folderDropArrow@2x.png
new file mode 100644
index 0000000..9efb6d9
--- /dev/null
+++ b/themes/osx/places/folderDropArrow@2x.png
diff --git a/themes/osx/places/history.png b/themes/osx/places/history.png
new file mode 100644
index 0000000..e5a00b5
--- /dev/null
+++ b/themes/osx/places/history.png
diff --git a/themes/osx/places/history@2x.png b/themes/osx/places/history@2x.png
new file mode 100644
index 0000000..684b374
--- /dev/null
+++ b/themes/osx/places/history@2x.png
diff --git a/themes/osx/places/libraryToolbar.png b/themes/osx/places/libraryToolbar.png
new file mode 100644
index 0000000..2ed627a
--- /dev/null
+++ b/themes/osx/places/libraryToolbar.png
diff --git a/themes/osx/places/livemark-item.png b/themes/osx/places/livemark-item.png
new file mode 100644
index 0000000..9184b95
--- /dev/null
+++ b/themes/osx/places/livemark-item.png
diff --git a/themes/osx/places/organizer.css b/themes/osx/places/organizer.css
new file mode 100644
index 0000000..611c0c0
--- /dev/null
+++ b/themes/osx/places/organizer.css
@@ -0,0 +1,134 @@
+/* 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/. */
+
+/* Toolbar */
+#placesToolbar {
+  padding: 3px;
+  -moz-padding-end: 6px;
+}
+
+#placesToolbar > toolbarbutton[disabled] > .toolbarbutton-icon {
+  opacity: .4;
+}
+
+#back-button,
+#forward-button {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+}
+
+#back-button {
+  -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+#forward-button {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+#forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
+}
+
+/* organize, view and maintenance buttons icons */
+#organizeButton, 
+#viewMenu, 
+#maintenanceButton {
+  list-style-image: url("chrome://browser/skin/places/libraryToolbar.png");
+}
+
+/* organize button */
+#organizeButton {
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+#organizeButton:hover,
+#organizeButton[open="true"] {
+  -moz-image-region: rect(16px, 16px, 32px, 0px);
+}
+
+/* view button */
+#viewMenu {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+#viewMenu:hover,
+#viewMenu[open="true"] {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+/* maintenance button */
+#maintenanceButton {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+#maintenanceButton:hover,
+#maintenanceButton[open="true"] {
+  -moz-image-region: rect(16px, 48px, 32px, 32px);
+}
+
+/* Root View */
+#placesView {
+  border-top: 1px solid ThreeDDarkShadow;
+}
+
+/* Info box */
+#detailsDeck {
+  border-top: 1px solid ThreeDShadow;
+  padding: 5px;
+}
+
+#infoBoxExpanderLabel {
+  -moz-padding-start: 2px;
+}
+
+#searchFilter {
+  margin: 0;
+}
+
+/**
+ * Downloads pane
+ */
+
+#clearDownloadsButton > .toolbarbutton-icon {
+  display: none;
+}
+
+#clearDownloadsButton {
+  -moz-padding-start: 9px;
+  -moz-padding-end: 9px;
+}
+
+/* hover-over/open button highlighting */
+
+#organizeButton,
+#viewMenu, 
+#maintenanceButton,
+#organizeButton,
+#clearDownloadsButton {
+    color: #222;
+    border: 0;
+    border-radius: 10000px;
+    padding: 1px 8px;
+    margin: 0 0 1px;
+}
+
+#back-button,
+#forward-button {
+    color: #222;
+    border: 0;
+    border-radius: 10000px;
+    padding: 1px 1px;
+    margin: 0 0 1px;
+}
+
+#organizeButton:hover,
+#organizeButton[open="true"], 
+#viewMenu:hover,
+#viewMenu[open="true"],
+#maintenanceButton:hover,
+#maintenanceButton[open="true"],
+#organizeButton:hover,
+#organizeButton[open="true"],
+#clearDownloadsButton:hover,
+#back-button:not([disabled]):hover,
+#forward-button:not([disabled]):hover {
+    background-color: rgba(0, 0, 0, .205);
+}
diff --git a/themes/osx/places/places.css b/themes/osx/places/places.css
new file mode 100644
index 0000000..4243779
--- /dev/null
+++ b/themes/osx/places/places.css
@@ -0,0 +1,146 @@
+/* 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/. */
+
+/* Sidebars */
+.sidebar-placesTree {
+  -moz-appearance: none;
+  border: 0;
+  margin: 0;
+  border-top: 1px solid ThreeDShadow;
+}
+
+.sidebar-placesTreechildren::-moz-tree-cell(leaf) ,
+.sidebar-placesTreechildren::-moz-tree-image(leaf) {
+  cursor: pointer;
+}
+
+.sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) {
+  cursor: pointer;
+  text-decoration: underline;
+}
+
+.sidebar-placesTreechildren::-moz-tree-cell(separator) {
+  cursor: default;
+}
+
+/* Trees */
+treechildren::-moz-tree-image(title) {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  padding-right: 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, separator) {
+  list-style-image: none;
+  width: 0;
+  height: 0;
+}
+
+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, container, livemark) {
+  list-style-image: url("chrome://browser/skin/livemark-folder.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_AllBookmarks) {
+  list-style-image: url("chrome://browser/skin/places/allBookmarks.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksToolbar) {
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksMenu) {
+  list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks) {
+  list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
+  -moz-image-region: auto;
+}
+
+/* query-nodes should be styled even if they're not expandable */
+treechildren::-moz-tree-image(title, query) {
+  list-style-image: url("chrome://browser/skin/places/query.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(title, query, tagContainer),
+treechildren::-moz-tree-image(query, OrganizerQuery_Tags) {
+  list-style-image: url("chrome://browser/skin/places/tag.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(query, OrganizerQuery_Downloads) {
+  list-style-image: url("chrome://browser/skin/places/downloads.png");
+  -moz-image-region: auto;
+}
+
+/* calendar icon for folders grouping items by date */
+treechildren::-moz-tree-image(title, query, dayContainer) {
+  list-style-image: url("chrome://browser/skin/places/calendar.png");
+  -moz-image-region: auto;
+}
+
+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(title, 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-image(cutting) {
+  opacity: 0.5;
+}
+
+treechildren::-moz-tree-cell-text(cutting) {
+  opacity: 0.7;
+}
+
+/* Browser Sidebars */
+
+/* Default button vert. margins are 1px/2px, and this can cause misalignment */
+#viewButton {
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+#viewButton > .button-box > .button-menu-dropmarker {
+  height: auto;
+  width: auto;
+  -moz-margin-end: -3px;
+}
diff --git a/themes/osx/places/query.png b/themes/osx/places/query.png
new file mode 100644
index 0000000..0ccb847
--- /dev/null
+++ b/themes/osx/places/query.png
diff --git a/themes/osx/places/query@2x.png b/themes/osx/places/query@2x.png
new file mode 100644
index 0000000..20b458a
--- /dev/null
+++ b/themes/osx/places/query@2x.png
diff --git a/themes/osx/places/starred48.png b/themes/osx/places/starred48.png
new file mode 100644
index 0000000..bfa1459
--- /dev/null
+++ b/themes/osx/places/starred48.png
diff --git a/themes/osx/places/tag.png b/themes/osx/places/tag.png
new file mode 100644
index 0000000..a4038bb
--- /dev/null
+++ b/themes/osx/places/tag.png
diff --git a/themes/osx/places/tag@2x.png b/themes/osx/places/tag@2x.png
new file mode 100644
index 0000000..673814b
--- /dev/null
+++ b/themes/osx/places/tag@2x.png
diff --git a/themes/osx/places/toolbarDropMarker.png b/themes/osx/places/toolbarDropMarker.png
new file mode 100644
index 0000000..a217b0e
--- /dev/null
+++ b/themes/osx/places/toolbarDropMarker.png
diff --git a/themes/osx/places/unfiledBookmarks.png b/themes/osx/places/unfiledBookmarks.png
new file mode 100644
index 0000000..69495da
--- /dev/null
+++ b/themes/osx/places/unfiledBookmarks.png
diff --git a/themes/osx/places/unfiledBookmarks@2x.png b/themes/osx/places/unfiledBookmarks@2x.png
new file mode 100644
index 0000000..44efd6a
--- /dev/null
+++ b/themes/osx/places/unfiledBookmarks@2x.png
diff --git a/themes/osx/places/unsortedBookmarks.png b/themes/osx/places/unsortedBookmarks.png
new file mode 100644
index 0000000..893e75a
--- /dev/null
+++ b/themes/osx/places/unsortedBookmarks.png
diff --git a/themes/osx/places/unstarred48.png b/themes/osx/places/unstarred48.png
new file mode 100644
index 0000000..8b82aab
--- /dev/null
+++ b/themes/osx/places/unstarred48.png
diff --git a/themes/osx/pointerLock-16.png b/themes/osx/pointerLock-16.png
new file mode 100644
index 0000000..862cd11
--- /dev/null
+++ b/themes/osx/pointerLock-16.png
diff --git a/themes/osx/pointerLock-64.png b/themes/osx/pointerLock-64.png
new file mode 100644
index 0000000..a35ce04
--- /dev/null
+++ b/themes/osx/pointerLock-64.png
diff --git a/themes/osx/preferences/Options-sync.png b/themes/osx/preferences/Options-sync.png
new file mode 100644
index 0000000..89901fb
--- /dev/null
+++ b/themes/osx/preferences/Options-sync.png
diff --git a/themes/osx/preferences/Options.png b/themes/osx/preferences/Options.png
new file mode 100644
index 0000000..448eca6
--- /dev/null
+++ b/themes/osx/preferences/Options.png
diff --git a/themes/osx/preferences/alwaysAsk.png b/themes/osx/preferences/alwaysAsk.png
new file mode 100644
index 0000000..ddd4cb2
--- /dev/null
+++ b/themes/osx/preferences/alwaysAsk.png
diff --git a/themes/osx/preferences/application.png b/themes/osx/preferences/application.png
new file mode 100644
index 0000000..ff2ecc2
--- /dev/null
+++ b/themes/osx/preferences/application.png
diff --git a/themes/osx/preferences/applications.css b/themes/osx/preferences/applications.css
new file mode 100644
index 0000000..80699b4
--- /dev/null
+++ b/themes/osx/preferences/applications.css
@@ -0,0 +1,64 @@
+/* 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-top: 0;
+  margin-bottom: 0;
+  -moz-margin-start: -2px;
+  -moz-margin-end: 0;
+}
+
+.typeIcon,
+.actionIcon {
+  -moz-margin-start: 3px;
+  -moz-margin-end: 3px;
+}
+
+richlistitem label {
+  -moz-margin-start: 1px;
+  margin-top: 2px;
+}
+
+richlistitem {
+  min-height: 22px;
+}
+
+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/application.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");
+}
+
+.actionsMenu .menulist-icon {
+  -moz-margin-end: 3px;
+}
+
+.actionsMenu > menupopup > menuitem > .menu-iconic-left {
+  -moz-padding-start: 0px;
+  -moz-padding-end: 2px;
+}
+
+.actionsMenu > menupopup > menuitem {
+  -moz-padding-start: 4px;
+}
diff --git a/themes/osx/preferences/mail.png b/themes/osx/preferences/mail.png
new file mode 100644
index 0000000..c40d159
--- /dev/null
+++ b/themes/osx/preferences/mail.png
diff --git a/themes/osx/preferences/preferences.css b/themes/osx/preferences/preferences.css
new file mode 100644
index 0000000..4075b1e
--- /dev/null
+++ b/themes/osx/preferences/preferences.css
@@ -0,0 +1,142 @@
+/*
+# -*- 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/.
+*/
+
+/* Global Styles */
+#BrowserPreferences radio[pane] {
+  list-style-image: url("chrome://browser/skin/preferences/Options.png"); 
+  padding: 5px 3px 1px;
+}
+
+radio[pane=paneMain] {
+  -moz-image-region: rect(0, 32px,  32px, 0);
+}
+
+radio[pane=paneTabs] {
+  -moz-image-region: rect(0, 64px, 32px, 32px);
+}
+
+radio[pane=paneContent] {
+  -moz-image-region: rect(0, 96px,  32px, 64px);
+}
+
+radio[pane=paneApplications] {
+  -moz-image-region: rect(0, 128px,  32px, 96px);
+}
+
+radio[pane=panePrivacy] {
+  -moz-image-region: rect(0, 160px,  32px, 128px);
+}
+
+radio[pane=paneSecurity] {
+  -moz-image-region: rect(0, 192px,  32px, 160px);
+}
+
+radio[pane=paneAdvanced] {
+  -moz-image-region: rect(0, 224px, 32px, 192px);
+}
+
+%ifdef MOZ_SERVICES_SYNC
+radio[pane=paneSync] {
+  list-style-image: url("chrome://browser/skin/preferences/Options-sync.png") !important;
+}
+%endif
+
+/* Applications Pane */
+#BrowserPreferences[animated="true"] #handlersView {
+  height: 25em;
+}
+
+#BrowserPreferences[animated="false"] #handlersView {
+  -moz-box-flex: 1;
+}
+
+/* Privacy Pane */
+
+/* styles for the link elements copied from .text-link in global.css */
+.inline-link {
+  color: -moz-nativehyperlinktext;
+  text-decoration: none;
+}
+
+.inline-link:hover {
+  text-decoration: underline;
+}
+
+/* Modeless Window Dialogs */
+.windowDialog,
+.windowDialog prefpane {
+  padding: 0;
+}
+
+#browserHomePage:-moz-locale-dir(rtl) input {
+  unicode-bidi: plaintext;
+  direction: rtl;
+}
+
+.contentPane {
+  margin: 9px 8px 5px;
+}
+
+.actionButtons {
+  margin: 0 3px 6px !important;
+}
+
+/* Cookies Manager */
+#cookiesChildren::-moz-tree-image(domainCol) {
+  width: 16px;
+  height: 16px;
+  margin: 0 2px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png") !important;
+}
+
+#cookiesChildren::-moz-tree-image(domainCol, container),
+#cookiesChildren::-moz-tree-image(domainCol, container, open) {
+  list-style-image: url("chrome://global/skin/tree/folder.png") !important;
+}
+
+#cookieInfoBox {
+  border: 1px solid ThreeDShadow;
+  border-radius: 0;
+  margin: 4px;
+  padding: 0;
+}
+
+/* Advanced Pane */
+
+/* Adding padding-bottom prevents the bottom of the tabpanel from being cutoff
+   when browser.preferences.animateFadeIn = true */
+#advancedPrefs {
+  padding-bottom: 8px;
+}
+
+/* bottom-most box containing a groupbox in a prefpane. Prevents the bottom
+   of the groupbox from being cutoff */
+.bottomBox {
+  padding-bottom: 4px;
+}
+
+%ifdef MOZ_SERVICES_SYNC
+/* Sync Pane */
+
+#syncDesc {
+  padding: 0 8em;
+}
+
+.syncGroupBox {
+  padding: 10px;
+}
+
+#accountCaptionImage {
+  list-style-image: url("chrome://mozapps/skin/profile/profileicon.png");
+}
+
+#syncAddDeviceLabel {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+%endif
diff --git a/themes/osx/preferences/saveFile.png b/themes/osx/preferences/saveFile.png
new file mode 100644
index 0000000..c210e84
--- /dev/null
+++ b/themes/osx/preferences/saveFile.png
diff --git a/themes/osx/privatebrowsing-dark.png b/themes/osx/privatebrowsing-dark.png
new file mode 100644
index 0000000..9eaf3ae
--- /dev/null
+++ b/themes/osx/privatebrowsing-dark.png
diff --git a/themes/osx/privatebrowsing-light.png b/themes/osx/privatebrowsing-light.png
new file mode 100644
index 0000000..c12f507
--- /dev/null
+++ b/themes/osx/privatebrowsing-light.png
diff --git a/themes/osx/privatebrowsing-mask.png b/themes/osx/privatebrowsing-mask.png
new file mode 100644
index 0000000..92f60e2
--- /dev/null
+++ b/themes/osx/privatebrowsing-mask.png
diff --git a/themes/osx/privatebrowsing-mask@2x.png b/themes/osx/privatebrowsing-mask@2x.png
new file mode 100644
index 0000000..ec1cf74
--- /dev/null
+++ b/themes/osx/privatebrowsing-mask@2x.png
diff --git a/themes/osx/reload-stop-go.png b/themes/osx/reload-stop-go.png
new file mode 100644
index 0000000..1017be9
--- /dev/null
+++ b/themes/osx/reload-stop-go.png
diff --git a/themes/osx/sanitizeDialog.css b/themes/osx/sanitizeDialog.css
new file mode 100644
index 0000000..40dc4b2
--- /dev/null
+++ b/themes/osx/sanitizeDialog.css
@@ -0,0 +1,93 @@
+/* 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/. */
+
+#sanitizeDurationChoice {
+  -moz-margin-end: 0;
+}
+
+/* Align the duration label with the warning box and item list */
+#sanitizeDurationLabel {
+  -moz-margin-start: 3px;
+}
+
+
+/* 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: 6px 0;
+}
+
+.expander-up,
+.expander-down {
+  min-width: 0;
+  margin: 0;
+}
+
+.expander-up > .button-box,
+.expander-down > .button-box {
+  padding: 0;
+}
+
+.expander-up {
+  list-style-image: url("chrome://browser/skin/places/expander-open.png");
+}
+
+.expander-down {
+  list-style-image: url("chrome://browser/skin/places/expander-closed.png");
+}
+
+
+/* Make the item list the same width as the warning box */
+#itemList {
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
+}
+
+
+/* Align the last dialog button with the end of the warning box */
+.prefWindow-dlgbuttons {
+  -moz-margin-end: 0;
+}
+.dialog-button[dlgtype="cancel"] {
+  -moz-margin-end: 0;
+}
diff --git a/themes/osx/searchbar-dropdown-arrow.png b/themes/osx/searchbar-dropdown-arrow.png
new file mode 100644
index 0000000..7f5f55e
--- /dev/null
+++ b/themes/osx/searchbar-dropdown-arrow.png
diff --git a/themes/osx/searchbar.css b/themes/osx/searchbar.css
new file mode 100644
index 0000000..55fdfc4
--- /dev/null
+++ b/themes/osx/searchbar.css
@@ -0,0 +1,79 @@
+/* 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/. */
+
+.searchbar-textbox {
+  width: 6em;
+  min-width: 6em;
+}
+
+.autocomplete-textbox-container {
+  -moz-box-align: stretch;
+}
+
+.textbox-input-box {
+  margin: 0;
+}
+
+/* ::::: searchbar-engine-button ::::: */
+
+.searchbar-engine-image {
+  height: 16px;
+  width: 16px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+.searchbar-engine-button {
+  -moz-appearance: none;
+  min-width: 0;
+  margin: 0;
+  padding: 0;
+  -moz-padding-end: 2px;
+  -moz-box-align: center;
+  background: none;
+  border: none;
+}
+
+.searchbar-engine-button > .button-box {
+  -moz-appearance: none;
+  padding: 0;
+  border: 0;
+}
+
+.searchbar-dropmarker-image {
+  list-style-image: url("chrome://browser/skin/searchbar-dropdown-arrow.png");
+  -moz-image-region: rect(0, 13px, 11px, 0);
+}
+
+.searchbar-engine-button[open="true"] > .searchbar-dropmarker-image {
+  -moz-image-region: rect(0, 26px, 11px, 13px);
+}
+
+
+/* ::::: search-go-button ::::: */
+
+.search-go-container {
+  -moz-box-align: center;
+}
+
+.search-go-button {
+  padding: 1px;
+  list-style-image: url("chrome://browser/skin/Search-glass.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+.search-go-button:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+.search-go-button:hover {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+.search-go-button:hover:active {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+.searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {
+  font-weight: bold;
+}
diff --git a/themes/osx/setDesktopBackground.css b/themes/osx/setDesktopBackground.css
new file mode 100644
index 0000000..585284c
--- /dev/null
+++ b/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 32px;
+}
+
+#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/themes/osx/shared.inc b/themes/osx/shared.inc
new file mode 100644
index 0000000..ef27746
--- /dev/null
+++ b/themes/osx/shared.inc
@@ -0,0 +1,6 @@
+%include ../../../../toolkit/themes/osx/global/shared.inc

+%include ../shared/browser.inc

+

+%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/themes/osx/slowStartup-16.png b/themes/osx/slowStartup-16.png
new file mode 100644
index 0000000..5551ef0
--- /dev/null
+++ b/themes/osx/slowStartup-16.png
diff --git a/themes/osx/statusbar/overlay.css b/themes/osx/statusbar/overlay.css
new file mode 100644
index 0000000..ab1cc8f
--- /dev/null
+++ b/themes/osx/statusbar/overlay.css
@@ -0,0 +1,108 @@
+/* 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");
+
+%include ../../shared/statusbar/overlay.css
+
+/*
+ * General
+ */
+
+#status4evar-status-text,
+#status4evar-progress-bar
+{
+	margin: 0px 4px;
+}
+
+/*
+ * Download status
+ */
+
+#status4evar-download-progress-bar
+{
+	height: 5px;
+}
+
+#status4evar-download-button[attention] #status4evar-download-icon
+{
+	background-image: url("chrome://browser/skin/downloads/download-glow.png");
+}
+
+#status-bar
+{
+	padding-right: 0px;
+}
+
+#browser-bottombox > #addon-bar:last-child
+{
+	padding-right: 16px;
+}
+
+#status4evar-download-button #status4evar-download-icon
+{
+	background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 108, 18, 90) center no-repeat;
+  min-width: 18px;
+  min-height: 18px;
+}
+
+#status4evar-download-button:-moz-lwtheme-brighttext #status4evar-download-icon
+{
+	background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 0, 108, 18, 90) center no-repeat;
+}
+
+#status4evar-download-button[attention] #status4evar-download-icon
+{
+	background-image: url("chrome://browser/skin/downloads/download-glow.png");
+}
+
+toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label
+{
+	margin: 0px 2px !important;
+	-moz-margin-start: 3px !important;
+}
+
+/*
+ * Splitter
+ */
+
+splitter.status4evar-status-splitter
+{
+	width: 8px;
+	margin: 0px -4px;
+}
+
+/*
+ * Location bar
+ */
+
+#urlbar-progress-alt
+{
+       margin-right: -1px;
+}
+
+/*
+ * Toolbar progress
+ */
+
+#status4evar-progress-bar[s4estyle="true"]
+{
+	-moz-appearance: none;
+	border: 1px solid gray;
+}
+
+#status4evar-progress-bar[s4estyle="true"] > .progress-remainder
+{
+	background-color: white;
+}
+
+/*
+ * Gripper
+ */
+
+#status4evar-window-gripper
+{
+	display: none;
+}
+
diff --git a/themes/osx/statusbar/prefs.css b/themes/osx/statusbar/prefs.css
new file mode 100644
index 0000000..798a62d
--- /dev/null
+++ b/themes/osx/statusbar/prefs.css
@@ -0,0 +1,13 @@
+/* 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");
+
+%include ../../shared/statusbar/prefs.css
+
+#status4evar-addonbar-windowGripper-check
+{
+	display: none;
+}
+
diff --git a/themes/osx/sync-128.png b/themes/osx/sync-128.png
new file mode 100644
index 0000000..1ea3481
--- /dev/null
+++ b/themes/osx/sync-128.png
diff --git a/themes/osx/sync-16.png b/themes/osx/sync-16.png
new file mode 100644
index 0000000..0afb1c7
--- /dev/null
+++ b/themes/osx/sync-16.png
diff --git a/themes/osx/sync-32.png b/themes/osx/sync-32.png
new file mode 100644
index 0000000..7a762cb
--- /dev/null
+++ b/themes/osx/sync-32.png
diff --git a/themes/osx/sync-bg.png b/themes/osx/sync-bg.png
new file mode 100644
index 0000000..893a27d
--- /dev/null
+++ b/themes/osx/sync-bg.png
diff --git a/themes/osx/sync-desktopIcon.png b/themes/osx/sync-desktopIcon.png
new file mode 100644
index 0000000..d3d1e27
--- /dev/null
+++ b/themes/osx/sync-desktopIcon.png
diff --git a/themes/osx/sync-mobileIcon.png b/themes/osx/sync-mobileIcon.png
new file mode 100644
index 0000000..a3bda57
--- /dev/null
+++ b/themes/osx/sync-mobileIcon.png
diff --git a/themes/osx/sync-throbber.png b/themes/osx/sync-throbber.png
new file mode 100644
index 0000000..d25490b
--- /dev/null
+++ b/themes/osx/sync-throbber.png
diff --git a/themes/osx/syncCommon.css b/themes/osx/syncCommon.css
new file mode 100644
index 0000000..f0beae0
--- /dev/null
+++ b/themes/osx/syncCommon.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/. */
+
+/* The following are used by both sync/setup.xul and sync/genericChange.xul */
+.status {
+  color: -moz-dialogtext;
+}
+
+.statusIcon {
+  -moz-margin-start: 4px;
+  max-height: 16px;
+  max-width: 16px;
+}
+
+.statusIcon[status="active"] {
+  list-style-image: url("chrome://global/skin/icons/loading_16.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/themes/osx/syncProgress.css b/themes/osx/syncProgress.css
new file mode 100644
index 0000000..d7aa599
--- /dev/null
+++ b/themes/osx/syncProgress.css
@@ -0,0 +1,46 @@
+/* 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/inContentUI.css);
+
+:root {
+  height: 100%;
+  width: 100%;
+  padding: 0;
+}
+
+body {
+  margin: 0;
+  padding: 0 2em;
+}
+
+#floatingBox {
+  margin: 4em auto;
+  max-width: 40em;
+  min-width: 23em;
+  padding: 1em 1.5em;
+  position: relative;
+  text-align: center;
+}
+
+#successLogo {
+  margin: 1em 2em;
+}
+
+#loadingText {
+  margin: 2em 6em;
+}
+
+#progressBar {
+  margin: 2em 10em;
+}
+
+#uploadProgressBar{
+  width: 100%;
+}
+
+#bottomRow {
+  margin-top: 2em;
+  padding: 0;
+  text-align: end;
+}
diff --git a/themes/osx/syncQuota.css b/themes/osx/syncQuota.css
new file mode 100644
index 0000000..1577de8
--- /dev/null
+++ b/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/themes/osx/syncSetup.css b/themes/osx/syncSetup.css
new file mode 100644
index 0000000..fff65e9
--- /dev/null
+++ b/themes/osx/syncSetup.css
@@ -0,0 +1,132 @@
+/* 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 {
+  -moz-margin-end: 2px
+}
+
+.pin {
+  font-size: 18pt;
+  width: 4em;
+  text-align: center; 
+}
+
+#passphraseHelpSpacer {
+  width: 0.5em;
+}
+
+#pairDeviceThrobber > image,
+#login-throbber > image {
+  list-style-image: url("chrome://global/skin/icons/loading_16.png");
+}
+
+#captchaFeedback {
+  visibility: hidden;
+}
+
+#successPageIcon {
+  /* TODO replace this with a 128px version (bug 591122) */
+  list-style-image: url("chrome://browser/skin/sync-32.png");
+}
+
+#tosDesc {
+  margin-left: -7px;
+  margin-bottom: 3px;
+}
\ No newline at end of file
diff --git a/themes/osx/tabbrowser/alltabs-inverted.png b/themes/osx/tabbrowser/alltabs-inverted.png
new file mode 100644
index 0000000..002bdd4
--- /dev/null
+++ b/themes/osx/tabbrowser/alltabs-inverted.png
diff --git a/themes/osx/tabbrowser/alltabs.png b/themes/osx/tabbrowser/alltabs.png
new file mode 100644
index 0000000..172d425
--- /dev/null
+++ b/themes/osx/tabbrowser/alltabs.png
diff --git a/themes/osx/tabbrowser/connecting.png b/themes/osx/tabbrowser/connecting.png
new file mode 100644
index 0000000..e564fb5
--- /dev/null
+++ b/themes/osx/tabbrowser/connecting.png
diff --git a/themes/osx/tabbrowser/loading.png b/themes/osx/tabbrowser/loading.png
new file mode 100644
index 0000000..ba54836
--- /dev/null
+++ b/themes/osx/tabbrowser/loading.png
diff --git a/themes/osx/tabbrowser/newtab-glass.png b/themes/osx/tabbrowser/newtab-glass.png
new file mode 100644
index 0000000..15185be
--- /dev/null
+++ b/themes/osx/tabbrowser/newtab-glass.png
diff --git a/themes/osx/tabbrowser/newtab-inverted.png b/themes/osx/tabbrowser/newtab-inverted.png
new file mode 100644
index 0000000..4ac1eba
--- /dev/null
+++ b/themes/osx/tabbrowser/newtab-inverted.png
diff --git a/themes/osx/tabbrowser/newtab.png b/themes/osx/tabbrowser/newtab.png
new file mode 100644
index 0000000..7cea7bd
--- /dev/null
+++ b/themes/osx/tabbrowser/newtab.png
diff --git a/themes/osx/tabbrowser/tab-arrow-left-glass.png b/themes/osx/tabbrowser/tab-arrow-left-glass.png
new file mode 100644
index 0000000..aac93a7
--- /dev/null
+++ b/themes/osx/tabbrowser/tab-arrow-left-glass.png
diff --git a/themes/osx/tabbrowser/tab-arrow-left-inverted.png b/themes/osx/tabbrowser/tab-arrow-left-inverted.png
new file mode 100644
index 0000000..16cd7a2
--- /dev/null
+++ b/themes/osx/tabbrowser/tab-arrow-left-inverted.png
diff --git a/themes/osx/tabbrowser/tab-arrow-left.png b/themes/osx/tabbrowser/tab-arrow-left.png
new file mode 100644
index 0000000..e0fb348
--- /dev/null
+++ b/themes/osx/tabbrowser/tab-arrow-left.png
diff --git a/themes/osx/tabbrowser/tab-overflow-border.png b/themes/osx/tabbrowser/tab-overflow-border.png
new file mode 100644
index 0000000..77f2462
--- /dev/null
+++ b/themes/osx/tabbrowser/tab-overflow-border.png
diff --git a/themes/osx/tabbrowser/tabDragIndicator.png b/themes/osx/tabbrowser/tabDragIndicator.png
new file mode 100644
index 0000000..c67c233
--- /dev/null
+++ b/themes/osx/tabbrowser/tabDragIndicator.png
diff --git a/themes/osx/toolbarbutton-dropdown-arrow-inverted.png b/themes/osx/toolbarbutton-dropdown-arrow-inverted.png
new file mode 100644
index 0000000..f3261f1
--- /dev/null
+++ b/themes/osx/toolbarbutton-dropdown-arrow-inverted.png
diff --git a/themes/osx/toolbarbutton-dropdown-arrow.png b/themes/osx/toolbarbutton-dropdown-arrow.png
new file mode 100644
index 0000000..a7abe73
--- /dev/null
+++ b/themes/osx/toolbarbutton-dropdown-arrow.png
diff --git a/themes/osx/urlbar-arrow.png b/themes/osx/urlbar-arrow.png
new file mode 100644
index 0000000..fcab253
--- /dev/null
+++ b/themes/osx/urlbar-arrow.png
diff --git a/themes/osx/urlbar-history-dropmarker.png b/themes/osx/urlbar-history-dropmarker.png
new file mode 100644
index 0000000..fc8b0be
--- /dev/null
+++ b/themes/osx/urlbar-history-dropmarker.png
diff --git a/themes/osx/urlbar-popup-blocked.png b/themes/osx/urlbar-popup-blocked.png
new file mode 100644
index 0000000..e6fd29f
--- /dev/null
+++ b/themes/osx/urlbar-popup-blocked.png
diff --git a/themes/osx/web-notifications-icon.svg b/themes/osx/web-notifications-icon.svg
new file mode 100644
index 0000000..f7186c7
--- /dev/null
+++ b/themes/osx/web-notifications-icon.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid" width="64" height="64" viewBox="0 0 64 64">
+  <defs>
+    <style>
+      .icon {
+        fill: #a6a6a6;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <path d="M57,48 L46,48 L46,60.016 L32.482,48 L7,48 C5.343,48 4,46.657 4,45 L4,11.031 C4,9.374 5.343,8.031 7,8.031 L57,8.031 C58.657,8.031 60,9.374 60,11.031 L60,45 C60,46.657 58.657,48 57,48 ZM36,16.031 C36,14.927 35.105,14.031 34,14.031 L30,14.031 C28.895,14.031 28,14.927 28,16.031 L28,30.031 C28,31.136 28.895,32.031 30,32.031 L34,32.031 C35.105,32.031 36,31.136 36,30.031 L36,16.031 ZM36,37.5 C36,36.672 35.328,36 34.5,36 L29.5,36 C28.672,36 28,36.672 28,37.5 L28,40.5 C28,41.328 28.672,42 29.5,42 L34.5,42 C35.328,42 36,41.328 36,40.5 L36,37.5 Z" class="icon"/>
+</svg>
diff --git a/themes/osx/web-notifications-tray.svg b/themes/osx/web-notifications-tray.svg
new file mode 100644
index 0000000..314026a
--- /dev/null
+++ b/themes/osx/web-notifications-tray.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="16" viewBox="0 0 96 32">
+  <defs>
+    <style>
+      .style-icon-notification {
+        fill: #666666;
+      }
+      .style-icon-notification.hover {
+        fill: #808080;
+      }
+      .style-icon-notification.active {
+        fill: #4d4d4d;
+      }
+    </style>
+    <path id="shape-notifcations-push" d="M27,23.969 L24,23.969 L24,29.977 L17.241,23.969 L5,23.969 C3.343,23.969 2,22.626 2,20.969 L2,6.969 C2,5.312 3.343,3.969 5,3.969 L27,3.969 C28.657,3.969 30,5.312 30,6.969 L30,20.969 C30,22.626 28.657,23.969 27,23.969 ZM18,8.969 C18,7.864 17.105,6.969 16,6.969 C14.895,6.969 14,7.864 14,8.969 L14,13.969 C14,15.073 14.895,15.969 16,15.969 C17.105,15.969 18,15.073 18,13.969 L18,8.969 ZM16.5,17.969 L15.5,17.969 C14.672,17.969 14,18.640 14,19.469 C14,20.297 14.672,20.969 15.5,20.969 L16.5,20.969 C17.328,20.969 18,20.297 18,19.469 C18,18.640 17.328,17.969 16.5,17.969 Z"/>
+  </defs>
+  <use xlink:href="#shape-notifcations-push" class="style-icon-notification"/>
+  <use xlink:href="#shape-notifcations-push" transform="translate(32)" class="style-icon-notification hover"/>
+  <use xlink:href="#shape-notifcations-push" transform="translate(64)" class="style-icon-notification active"/>
+</svg>
diff --git a/themes/osx/webRTC-shareDevice-16.png b/themes/osx/webRTC-shareDevice-16.png
new file mode 100644
index 0000000..df01b33
--- /dev/null
+++ b/themes/osx/webRTC-shareDevice-16.png
diff --git a/themes/osx/webRTC-shareDevice-64.png b/themes/osx/webRTC-shareDevice-64.png
new file mode 100644
index 0000000..d125789
--- /dev/null
+++ b/themes/osx/webRTC-shareDevice-64.png
diff --git a/themes/osx/webRTC-sharingDevice-16.png b/themes/osx/webRTC-sharingDevice-16.png
new file mode 100644
index 0000000..a670676
--- /dev/null
+++ b/themes/osx/webRTC-sharingDevice-16.png