Recommit working copy to repo with proper line endings.

282 files changed, 10973 insertions, 0 deletions

diff --git a/browser/themes/windows/Geolocation-16.png b/browser/themes/windows/Geolocation-16.png
new file mode 100644
index 000000000..d710e7336
--- /dev/null
+++ b/browser/themes/windows/Geolocation-16.png
diff --git a/browser/themes/windows/Geolocation-64.png b/browser/themes/windows/Geolocation-64.png
new file mode 100644
index 000000000..1bd46ba5e
--- /dev/null
+++ b/browser/themes/windows/Geolocation-64.png
diff --git a/browser/themes/windows/Info-aero.png b/browser/themes/windows/Info-aero.png
new file mode 100644
index 000000000..f9c6ef2fd
--- /dev/null
+++ b/browser/themes/windows/Info-aero.png
diff --git a/browser/themes/windows/Info.png b/browser/themes/windows/Info.png
new file mode 100644
index 000000000..d09e82b6c
--- /dev/null
+++ b/browser/themes/windows/Info.png
diff --git a/browser/themes/windows/KUI-background.png b/browser/themes/windows/KUI-background.png
new file mode 100644
index 000000000..104a49f7b
--- /dev/null
+++ b/browser/themes/windows/KUI-background.png
diff --git a/browser/themes/windows/KUI-close.png b/browser/themes/windows/KUI-close.png
new file mode 100644
index 000000000..08eeb8183
--- /dev/null
+++ b/browser/themes/windows/KUI-close.png
diff --git a/browser/themes/windows/Makefile.in b/browser/themes/windows/Makefile.in
new file mode 100644
index 000000000..353289fb2
--- /dev/null
+++ b/browser/themes/windows/Makefile.in
@@ -0,0 +1,16 @@
+# 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/.
+
+DEPTH		= @DEPTH@
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+ICON_FILES := icon.png
+ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+INSTALL_TARGETS += ICON
+
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/themes/windows/Privacy-16-aero.png b/browser/themes/windows/Privacy-16-aero.png
new file mode 100644
index 000000000..f801bfee2
--- /dev/null
+++ b/browser/themes/windows/Privacy-16-aero.png
diff --git a/browser/themes/windows/Privacy-16.png b/browser/themes/windows/Privacy-16.png
new file mode 100644
index 000000000..a4be3e9ac
--- /dev/null
+++ b/browser/themes/windows/Privacy-16.png
diff --git a/browser/themes/windows/Privacy-32-aero.png b/browser/themes/windows/Privacy-32-aero.png
new file mode 100644
index 000000000..41ecd5d93
--- /dev/null
+++ b/browser/themes/windows/Privacy-32-aero.png
diff --git a/browser/themes/windows/Privacy-32.png b/browser/themes/windows/Privacy-32.png
new file mode 100644
index 000000000..dd07c1a12
--- /dev/null
+++ b/browser/themes/windows/Privacy-32.png
diff --git a/browser/themes/windows/Privacy-48-aero.png b/browser/themes/windows/Privacy-48-aero.png
new file mode 100644
index 000000000..372b8235a
--- /dev/null
+++ b/browser/themes/windows/Privacy-48-aero.png
diff --git a/browser/themes/windows/Privacy-48.png b/browser/themes/windows/Privacy-48.png
new file mode 100644
index 000000000..2396f99e5
--- /dev/null
+++ b/browser/themes/windows/Privacy-48.png
diff --git a/browser/themes/windows/Privacy-64-aero.png b/browser/themes/windows/Privacy-64-aero.png
new file mode 100644
index 000000000..bd8d19154
--- /dev/null
+++ b/browser/themes/windows/Privacy-64-aero.png
diff --git a/browser/themes/windows/Privacy-64.png b/browser/themes/windows/Privacy-64.png
new file mode 100644
index 000000000..d3605015b
--- /dev/null
+++ b/browser/themes/windows/Privacy-64.png
diff --git a/browser/themes/windows/Secure24-aero.png b/browser/themes/windows/Secure24-aero.png
new file mode 100644
index 000000000..265d79ba1
--- /dev/null
+++ b/browser/themes/windows/Secure24-aero.png
diff --git a/browser/themes/windows/Secure24.png b/browser/themes/windows/Secure24.png
new file mode 100644
index 000000000..896343afc
--- /dev/null
+++ b/browser/themes/windows/Secure24.png
diff --git a/browser/themes/windows/Toolbar-glass.png b/browser/themes/windows/Toolbar-glass.png
new file mode 100644
index 000000000..23cc4bfaf
--- /dev/null
+++ b/browser/themes/windows/Toolbar-glass.png
diff --git a/browser/themes/windows/Toolbar-inverted.png b/browser/themes/windows/Toolbar-inverted.png
new file mode 100644
index 000000000..2c3253fe8
--- /dev/null
+++ b/browser/themes/windows/Toolbar-inverted.png
diff --git a/browser/themes/windows/Toolbar.png b/browser/themes/windows/Toolbar.png
new file mode 100644
index 000000000..3d1b80ec7
--- /dev/null
+++ b/browser/themes/windows/Toolbar.png
diff --git a/browser/themes/windows/aboutCertError.css b/browser/themes/windows/aboutCertError.css
new file mode 100644
index 000000000..c7caf531e
--- /dev/null
+++ b/browser/themes/windows/aboutCertError.css
@@ -0,0 +1,72 @@
+/* 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;
+}
+
+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: 1px solid #FFBD09; /* pale yellow extracted from yellow passport icon */
+  border-radius: 10px;
+  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/browser/themes/windows/aboutCertError_sectionCollapsed-rtl.png b/browser/themes/windows/aboutCertError_sectionCollapsed-rtl.png
new file mode 100644
index 000000000..84ba18c0a
--- /dev/null
+++ b/browser/themes/windows/aboutCertError_sectionCollapsed-rtl.png
diff --git a/browser/themes/windows/aboutCertError_sectionCollapsed.png b/browser/themes/windows/aboutCertError_sectionCollapsed.png
new file mode 100644
index 000000000..c9805f654
--- /dev/null
+++ b/browser/themes/windows/aboutCertError_sectionCollapsed.png
diff --git a/browser/themes/windows/aboutCertError_sectionExpanded.png b/browser/themes/windows/aboutCertError_sectionExpanded.png
new file mode 100644
index 000000000..128cef90a
--- /dev/null
+++ b/browser/themes/windows/aboutCertError_sectionExpanded.png
diff --git a/browser/themes/windows/aboutPrivateBrowsing.css b/browser/themes/windows/aboutPrivateBrowsing.css
new file mode 100644
index 000000000..cd6026b8e
--- /dev/null
+++ b/browser/themes/windows/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/browser/themes/windows/aboutSessionRestore-window-icon-aero.png b/browser/themes/windows/aboutSessionRestore-window-icon-aero.png
new file mode 100644
index 000000000..00774050c
--- /dev/null
+++ b/browser/themes/windows/aboutSessionRestore-window-icon-aero.png
diff --git a/browser/themes/windows/aboutSessionRestore.css b/browser/themes/windows/aboutSessionRestore.css
new file mode 100644
index 000000000..58223e905
--- /dev/null
+++ b/browser/themes/windows/aboutSessionRestore.css
@@ -0,0 +1,68 @@
+%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 {
+  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;
+  height: 70%;
+  -moz-box-orient: vertical;
+  text-align: start;
+}
+
+#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/browser/themes/windows/aboutSocialError.css b/browser/themes/windows/aboutSocialError.css
new file mode 100644
index 000000000..d1a9ad53c
--- /dev/null
+++ b/browser/themes/windows/aboutSocialError.css
@@ -0,0 +1,98 @@
+body {
+  background-color: rgb(241, 244, 248);
+  margin-top: 2em;
+  font: message-box;
+  font-size: 100%;
+}
+
+p {
+  font-size: .8em;
+}
+
+#error-box {
+  background: url('chrome://global/skin/icons/information-24.png') no-repeat left 4px;
+  -moz-padding-start: 30px;
+}
+
+#error-box:-moz-locale-dir(rtl) {
+  background-position: right 4px;
+}
+
+#main-error-msg {
+  color: #4b4b4b;
+  font-weight: bold;
+}
+
+
+#button-box {
+  text-align: center;
+  width: 75%;
+  margin: 0 auto;
+}
+
+@media all and (min-width: 300px) {
+  #error-box {
+    max-width: 50%;
+    margin: 0 auto;
+    background-image: url('chrome://global/skin/icons/information-32.png');
+    min-height: 36px;
+    -moz-padding-start: 38px;
+  }
+
+  button {
+    width: auto !important;
+    min-width: 150px;
+  }
+}
+
+@media all and (min-width: 780px) {
+  #error-box {
+    max-width: 30%;
+  }
+}
+
+button {
+  font: message-box;
+  font-size: 0.6875em;
+  -moz-appearance: none;
+  -moz-user-select: none;
+  width: 100%;
+  margin: 2px 0;
+  padding: 2px 6px;
+  line-height: 1.2;
+  background-color: hsla(210,30%,95%,.1);
+  background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
+  background-clip: padding-box;
+  border: 1px solid hsla(210,15%,25%,.4);
+  border-color: hsla(210,15%,25%,.3) hsla(210,15%,25%,.35) hsla(210,15%,25%,.4);
+  border-radius: 3px;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
+              0 0 0 1px hsla(0,0%,100%,.3) inset,
+              0 1px 0 hsla(0,0%,100%,.1);
+
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 150ms;
+  transition-timing-function: ease;
+
+}
+
+button:hover {
+  background-color: hsla(210,30%,95%,.8);
+  border-color: hsla(210,15%,25%,.45) hsla(210,15%,25%,.5) hsla(210,15%,25%,.55);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
+              0 0 0 1px hsla(0,0%,100%,.3) inset,
+              0 1px 0 hsla(0,0%,100%,.1),
+              0 0 3px hsla(210,15%,25%,.1);
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 150ms;
+  transition-timing-function: ease;
+}
+
+button:hover:active {
+  background-color: hsla(210,15%,25%,.2);
+  box-shadow: 0 1px 1px hsla(210,15%,25%,.2) inset,
+              0 0 2px hsla(210,15%,25%,.4) inset;
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 10ms;
+  transition-timing-function: linear;
+}
diff --git a/browser/themes/windows/aboutSyncTabs.css b/browser/themes/windows/aboutSyncTabs.css
new file mode 100644
index 000000000..4f21a9d40
--- /dev/null
+++ b/browser/themes/windows/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/browser/themes/windows/actionicon-tab.png b/browser/themes/windows/actionicon-tab.png
new file mode 100644
index 000000000..ced958ebb
--- /dev/null
+++ b/browser/themes/windows/actionicon-tab.png
diff --git a/browser/themes/windows/appmenu-dropmarker.png b/browser/themes/windows/appmenu-dropmarker.png
new file mode 100644
index 000000000..27deaff72
--- /dev/null
+++ b/browser/themes/windows/appmenu-dropmarker.png
diff --git a/browser/themes/windows/appmenu-icons.png b/browser/themes/windows/appmenu-icons.png
new file mode 100644
index 000000000..78f365816
--- /dev/null
+++ b/browser/themes/windows/appmenu-icons.png
diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
new file mode 100644
index 000000000..2a9016592
--- /dev/null
+++ b/browser/themes/windows/browser-aero.css
@@ -0,0 +1,457 @@
+/* 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/. */
+
+%define WINDOWS_AERO
+%include browser.css
+%undef WINDOWS_AERO
+
+%define customToolbarColor hsl(210,75%,92%)
+%define glassActiveBorderColor rgb(37, 44, 51)
+%define glassInactiveBorderColor rgb(102, 102, 102)
+
+@media not all and (-moz-windows-classic) {
+  #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container {
+    margin-top: 1px;
+  }
+
+  #appmenu-button {
+    border-width: 2px;
+    -moz-border-left-colors: @appMenuButtonBorderColor@;
+    -moz-border-bottom-colors: @appMenuButtonBorderColor@;
+    -moz-border-right-colors: @appMenuButtonBorderColor@;
+    margin-bottom: 1px; /* compensate white outer border */
+    box-shadow: 0 1px 0 rgba(255,255,255,.25) inset,
+                0 0 2px 1px rgba(255,255,255,.25) inset;
+  }
+
+  #main-window[privatebrowsingmode=temporary] #appmenu-button {
+    -moz-border-left-colors: rgba(255,255,255,.5) rgba(43,8,65,.9);
+    -moz-border-bottom-colors: rgba(255,255,255,.5) rgba(43,8,65,.9);
+    -moz-border-right-colors: rgba(255,255,255,.5) rgba(43,8,65,.9);
+  }
+
+  #appmenu-popup {
+    margin-top: -1px;
+    -moz-margin-start: 1px;
+  }
+
+  .panel-promo-message {
+    font-style: italic;
+  }
+}
+
+@media (-moz-windows-default-theme) {
+  #navigator-toolbox > toolbar:not(:-moz-lwtheme),
+  #browser-bottombox:not(:-moz-lwtheme) {
+    background-color: @customToolbarColor@;
+  }
+
+  .tabbrowser-tab:not(:-moz-lwtheme),
+  .tabs-newtab-button:not(:-moz-lwtheme) {
+    background-image: @toolbarShadowOnTab@, @bgTabTexture@,
+                      linear-gradient(@customToolbarColor@, @customToolbarColor@);
+  }
+
+  .tabbrowser-tab:not(:-moz-lwtheme):hover,
+  .tabs-newtab-button:not(:-moz-lwtheme):hover {
+    background-image: @toolbarShadowOnTab@, @bgTabTextureHover@,
+                      linear-gradient(@customToolbarColor@, @customToolbarColor@);
+  }
+
+  .tabbrowser-tab[selected="true"]:not(:-moz-lwtheme) {
+    background-image: linear-gradient(#fff, @toolbarHighlight@ 50%),
+                      linear-gradient(@customToolbarColor@, @customToolbarColor@);
+  }
+
+  #main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
+    background-image: @toolbarShadowOnTab@,
+                      linear-gradient(#fff, @toolbarHighlight@ 50%),
+                      linear-gradient(@customToolbarColor@, @customToolbarColor@);
+  }
+
+  #navigator-toolbox:not(:-moz-lwtheme)::after {
+    background-color: #aabccf;
+  }
+
+  #navigator-toolbox[tabsontop=true] #urlbar:not(:-moz-lwtheme),
+  #navigator-toolbox[tabsontop=true] .searchbar-textbox:not(:-moz-lwtheme) {
+    border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.27) hsla(210,54%,20%,.3);
+  }
+
+  #navigator-toolbox[tabsontop=true] #urlbar:not(:-moz-lwtheme):not([focused]):hover,
+  #navigator-toolbox[tabsontop=true] .searchbar-textbox:not(:-moz-lwtheme):not([focused]):hover {
+    border-color: hsla(210,54%,20%,.35) hsla(210,54%,20%,.37) hsla(210,54%,20%,.4);
+  }
+
+  #navigator-toolbox[tabsontop=true] #urlbar:not(:-moz-lwtheme)[focused],
+  #navigator-toolbox[tabsontop=true] .searchbar-textbox:not(:-moz-lwtheme)[focused] {
+    border-color: hsla(206,100%,60%,.65) hsla(206,100%,55%,.65) hsla(206,100%,50%,.65);
+  }
+
+  .sidebar-splitter {
+    border: 0;
+    -moz-border-end: 1px solid #A9B7C9;
+    min-width: 0;
+    width: 3px;
+    background-color: transparent;
+    -moz-margin-start: -3px;
+    position: relative;
+  }
+
+  #appcontent ~ .sidebar-splitter {
+    -moz-border-start: 1px solid #A9B7C9;
+    -moz-border-end: none;
+    -moz-margin-start: 0;
+    -moz-margin-end: -3px;
+  }
+
+  .menu-accel,
+  .menu-iconic-accel {
+    color: graytext;
+  }
+
+  .chatbar-button,
+  chatbar > chatbox {
+    border-color: #A9B7C9;
+  }
+  
+}
+
+@media (-moz-windows-compositor) {
+  /* These should be hidden w/ glass enabled. Windows draws its own buttons. */
+  .titlebar-button {
+    display: none;
+  }
+
+  #main-window[sizemode="maximized"] #titlebar-buttonbox {
+    -moz-margin-end: 3px;
+  }
+
+  #main-window {
+    -moz-appearance: -moz-win-borderless-glass;
+    background: transparent;
+  }
+
+  #appcontent {
+    -moz-appearance: -moz-win-exclude-glass;
+  }
+
+  #main-window[chromemargin^="0,"][sizemode=normal] #navigator-toolbox {
+    margin-top: -7px;
+  }
+
+  /* Artificially draw window borders that are covered by lwtheme, see bug 591930. */
+  #main-window[sizemode="normal"] > #titlebar > #titlebar-content:-moz-lwtheme {
+    border-top: 2px solid;
+    -moz-border-top-colors: @glassActiveBorderColor@ rgba(255,255,255,.6);
+  }
+
+  #main-window[sizemode="normal"] > #titlebar > #titlebar-content:-moz-lwtheme:-moz-window-inactive {
+    -moz-border-top-colors: @glassInactiveBorderColor@ rgba(255,255,255,.6);
+  }
+
+  #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container:-moz-lwtheme {
+    margin-top: -1px;
+  }
+
+  #main-window[sizemode="normal"] #titlebar-buttonbox:-moz-lwtheme {
+    margin-top: -2px;
+  }
+
+  #appmenu-button {
+    margin-bottom: -1px; /* compensate white outer border */
+  }
+
+  #main-window[sizemode=fullscreen]:not(:-moz-lwtheme) {
+    -moz-appearance: none;
+    background-color: #556;
+  }
+
+  #toolbar-menubar:not(:-moz-lwtheme),
+  #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme),
+  #nav-bar[tabsontop=false]:not(:-moz-lwtheme),
+  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child:not(:-moz-lwtheme) {
+    background-color: transparent !important;
+    color: black;
+    text-shadow: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255,255,255,.4);
+    border-left-style: none !important;
+    border-right-style: none !important;
+  }
+
+  :-moz-any(#toolbar-menubar, #nav-bar[tabsontop=false]) :-moz-any(@primaryToolbarButtons@):not(:-moz-any(#alltabs-button,#sync-button[status])) > .toolbarbutton-icon:not(:-moz-lwtheme),
+  :-moz-any(#toolbar-menubar, #nav-bar[tabsontop=false]) :-moz-any(@primaryToolbarButtons@) > toolbarbutton > .toolbarbutton-icon:not(:-moz-lwtheme),
+  #TabsToolbar[tabsontop=true] :-moz-any(@primaryToolbarButtons@):not(:-moz-any(#alltabs-button,#new-tab-button,#sync-button[status])) > .toolbarbutton-icon:not(:-moz-lwtheme),
+  #TabsToolbar[tabsontop=true] :-moz-any(@primaryToolbarButtons@) > toolbarbutton > .toolbarbutton-icon:not(:-moz-lwtheme),
+  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child :-moz-any(@primaryToolbarButtons@):not(:-moz-any(#alltabs-button,#new-tab-button,#sync-button[status])) > .toolbarbutton-icon:not(:-moz-lwtheme),
+  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child :-moz-any(@primaryToolbarButtons@) > toolbarbutton > .toolbarbutton-icon:not(:-moz-lwtheme) {
+    list-style-image: url("chrome://browser/skin/Toolbar-glass.png");
+  }
+
+  :-moz-any(#toolbar-menubar, #TabsToolbar[tabsontop=true], #nav-bar[tabsontop=false]) .toolbarbutton-1 > .toolbarbutton-menu-dropmarker:not(:-moz-lwtheme),
+  :-moz-any(#toolbar-menubar, #TabsToolbar[tabsontop=true], #nav-bar[tabsontop=false]) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:not(:-moz-lwtheme),
+  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child .toolbarbutton-1 > .toolbarbutton-menu-dropmarker:not(:-moz-lwtheme),
+  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:not(:-moz-lwtheme) {
+    list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
+  }
+
+  /* Vertical toolbar border */
+  #main-window[sizemode=normal] #navigator-toolbox::after,
+  #main-window[sizemode=normal] #navigator-toolbox[tabsontop=true] > toolbar:not(#toolbar-menubar):not(#TabsToolbar),
+  #main-window[sizemode=normal] #navigator-toolbox[tabsontop=false] > toolbar:not(#toolbar-menubar):not(#nav-bar) {
+    border-left: 1px solid @toolbarShadowColor@;
+    border-right: 1px solid @toolbarShadowColor@;
+    background-clip: padding-box;
+  }
+  #main-window[sizemode=normal] #navigator-toolbox > toolbar:-moz-lwtheme {
+    border-color: transparent !important;
+  }
+  #main-window[sizemode=normal] #browser-border-start,
+  #main-window[sizemode=normal] #browser-border-end {
+    display: -moz-box;
+    background-color: @toolbarShadowColor@;
+    width: 1px;
+  }
+  #main-window[sizemode=normal] #browser-bottombox {
+    border: 1px solid @toolbarShadowColor@;
+    border-top-style: none;
+    background-clip: padding-box;
+  }
+
+  #main-window[sizemode=normal][tabsontop=false] #PersonalToolbar:not(:-moz-lwtheme) {
+    border-top-left-radius: 2.5px;
+    border-top-right-radius: 2.5px;
+  }
+
+  /* Toolbar shadow behind tabs */
+  /* This code is only needed for restored windows (i.e. sizemode=normal)
+     because of the border radius on the toolbar below the tab bar. */
+  #main-window[sizemode=normal] #nav-bar[tabsontop=true]:not(:-moz-lwtheme),
+  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar:not(:-moz-lwtheme),
+  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme),
+  #main-window[sizemode=normal][disablechrome] #navigator-toolbox[tabsontop=true]:not(:-moz-lwtheme)::after {
+    border-top: 1px solid @toolbarShadowColor@;
+    border-top-left-radius: 2.5px;
+    border-top-right-radius: 2.5px;
+    background-clip: padding-box;
+  }
+  #main-window[sizemode=normal] #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) {
+    margin-bottom: -1px;
+    background-image: none !important;
+  }
+  #main-window[sizemode=normal] #tabbrowser-tabs[tabsontop=true] > .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox > .scrollbox-innerbox:not(:-moz-lwtheme) {
+    position: relative;
+  }
+
+  #navigator-toolbox[tabsontop=false] > #PersonalToolbar {
+    margin-top: 3px;
+  }
+  #navigator-toolbox[tabsontop=false] > #PersonalToolbar:not(:-moz-lwtheme) {
+    margin-top: 2px;
+    border-top: 1px solid @toolbarShadowColor@;
+    background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
+  }
+
+  #main-window[sizemode=normal] #TabsToolbar[tabsontop=true] {
+    padding-left: 4px;
+    padding-right: 4px;
+  }
+
+  #main-window[sizemode=normal] #TabsToolbar[tabsontop=false] {
+    padding-left: 2px;
+    padding-right: 2px;
+  }
+
+  /* Rounded corners for when chrome is disabled */
+  #main-window[sizemode=normal][disablechrome] #navigator-toolbox[tabsontop=true]:not(:-moz-lwtheme)::after {
+    visibility: visible;
+    background-color: @customToolbarColor@;
+    background-image: linear-gradient(@toolbarHighlight@, @toolbarHighlight@);
+    height: 4px;
+  }
+
+  /* Make the window draggable by glassed toolbars (bug 555081) */
+  #toolbar-menubar:not([autohide="true"]),
+  #TabsToolbar[tabsontop="true"],
+  #nav-bar[tabsontop=false],
+  #nav-bar + #customToolbars + #PersonalToolbar[collapsed="true"] + #TabsToolbar[tabsontop="false"]:last-child,
+  #navigator-toolbox > toolbar:not(#toolbar-menubar):-moz-lwtheme {
+    -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
+  }
+
+  #appcontent:not(:-moz-lwtheme) {
+    background-color: -moz-dialog;
+  }
+
+  #main-menubar:not(:-moz-lwtheme):not(:-moz-window-inactive) {
+    background-color: rgba(255,255,255,.5);
+    border-radius: 4px;
+  }
+
+  #navigator-toolbox[tabsontop=false] #urlbar:not(:-moz-lwtheme),
+  #navigator-toolbox[tabsontop=false] .searchbar-textbox:not(:-moz-lwtheme) {
+    background-color: rgba(255,255,255,.725);
+    @navbarTextboxCustomBorder@
+    color: black;
+  }
+
+  #navigator-toolbox[tabsontop=false] html|*.urlbar-input:not(:-moz-lwtheme)::-moz-placeholder,
+  #navigator-toolbox[tabsontop=false] .searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input:not(:-moz-lwtheme)::-moz-placeholder {
+    opacity: 1.0;
+    color: #777;
+  }
+
+  #navigator-toolbox[tabsontop=false] #urlbar:not(:-moz-lwtheme):hover,
+  #navigator-toolbox[tabsontop=false] .searchbar-textbox:not(:-moz-lwtheme):hover {
+    background-color: rgba(255,255,255,.898);
+  }
+
+  #navigator-toolbox[tabsontop=false] #urlbar:not(:-moz-lwtheme)[focused],
+  #navigator-toolbox[tabsontop=false] .searchbar-textbox:not(:-moz-lwtheme)[focused] {
+    background-color: white;
+  }
+
+  .tabbrowser-tab:not(:-moz-lwtheme) {
+    text-shadow: none;
+  }
+
+  #main-window[sizemode=normal] .statuspanel-inner {
+    /* align with the browser's side borders */
+    padding-left: 1px;
+    padding-right: 1px;
+  }
+
+  #allTabs-panel,
+  #ctrlTab-panel {
+    background: transparent;
+    -moz-appearance: -moz-win-glass;
+    border-radius: 0;
+    border: none;
+    font: normal 1.2em "Segoe UI";
+    color: black;
+    text-shadow: white -1px -1px .35em, white -1px 1px .35em, white 1px 1px .35em, white 1px -1px .35em;
+  }
+}
+
+@media not all and (-moz-windows-compositor) {
+  @media (-moz-windows-default-theme) {
+    #main-window {
+      background-color: rgb(185,209,234);
+    }
+    #main-window:-moz-window-inactive {
+      background-color: rgb(215,228,242);
+    }
+
+    #toolbar-menubar:not([autohide=true]):not(:-moz-lwtheme),
+    #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme),
+    #navigator-toolbox[tabsontop=false] > toolbar:not(#toolbar-menubar):not(:-moz-lwtheme) {
+      -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
+      background-color: transparent;
+    }
+    #toolbar-menubar[autohide=true] {
+      background-color: transparent !important;
+    }
+  }
+
+  #print-preview-toolbar:not(:-moz-lwtheme) {
+    -moz-appearance: -moz-win-browsertabbar-toolbox;
+  }
+}
+
+/* ::::: fullscreen window controls ::::: */
+
+#window-controls {
+  -moz-box-align: start;
+}
+
+#minimize-button,
+#restore-button,
+#close-button {
+  -moz-appearance: none;
+  border-style: none;
+  margin: 0;
+}
+#close-button {
+  -moz-image-region: rect(0, 49px, 16px, 32px);
+}
+#close-button:hover {
+  -moz-image-region: rect(16px, 49px, 32px, 32px);
+}
+#close-button:hover:active {
+  -moz-image-region: rect(32px, 49px, 48px, 32px);
+}
+
+#minimize-button:-moz-locale-dir(rtl),
+#restore-button:-moz-locale-dir(rtl),
+#close-button:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+/* ::::: splitmenu highlight style that imitates Windows 7 start menu ::::: */
+@media (-moz-windows-default-theme) {
+  .splitmenu-menuitem,
+  .splitmenu-menu {
+    -moz-appearance: none;
+    padding-top: 2px;
+    padding-bottom: 2px;
+    border: 1px solid transparent;
+  }
+  .splitmenu-menuitem {
+    -moz-margin-end: 0;
+  }
+  .splitmenu-menu {
+    -moz-margin-start: -1px;
+  }
+  .splitmenu-menuitem:-moz-locale-dir(ltr),
+  .splitmenu-menu:-moz-locale-dir(rtl) {
+    border-top-left-radius: 3px;
+    border-bottom-left-radius: 3px;
+  }
+  .splitmenu-menu:-moz-locale-dir(ltr),
+  .splitmenu-menuitem:-moz-locale-dir(rtl) {
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px;
+  }
+
+  .splitmenu-menuitem > .menu-text {
+    -moz-margin-start: 1px !important;
+    -moz-margin-end: 3px !important;
+  }
+  .splitmenu-menu > .menu-right {
+    -moz-margin-end: -3px;
+  }
+
+  .splitmenu-menuitem[iconic],
+  .splitmenu-menu[iconic] {
+    padding-bottom: 1px;
+  }
+  .splitmenu-menuitem[iconic] > .menu-iconic-left {
+    margin-top: -3px;
+    margin-bottom: -2px;
+    -moz-margin-start: -1px;
+  }
+  .splitmenu-menuitem[iconic] > .menu-iconic-text {
+    -moz-margin-start: 2px !important;
+    -moz-margin-end: 3px !important;
+  }
+  .splitmenu-menu[iconic] > .menu-right {
+    margin-top: -1px;
+  }
+
+  .splitmenu-menuitem[_moz-menuactive],
+  .splitmenu-menu[_moz-menuactive] {
+    background-color: transparent;
+    background-image: linear-gradient(#fafbfd, #ebf3fd);
+    border-color: #aeccf1;
+  }
+
+  .splitmenu-menuitem[disabled][_moz-menuactive],
+  .splitmenu-menu[disabled][_moz-menuactive] {
+    background-image: linear-gradient(#f8f9f9, #eaeaea);
+    border-color: #d8d7d7;
+  }
+
+  .splitmenu-menu[_moz-menuactive]:not(:hover):not([open]) {
+    background-image: none;
+  }
+}
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
new file mode 100644
index 000000000..4b0e6e293
--- /dev/null
+++ b/browser/themes/windows/browser.css
@@ -0,0 +1,3151 @@
+/* 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/browser.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
+
+%ifdef MOZ_OFFICIAL_BRANDING
+%define appMenuButtonBorderColor rgba(255,255,255,.5) rgba(83,42,6,.9)
+%else
+%if MOZ_UPDATE_CHANNEL == aurora
+%define appMenuButtonBorderColor hsla(0,0%,100%,.5) hsla(214,89%,21%,.9)
+%else
+%define appMenuButtonBorderColor hsla(0,0%,100%,.5) hsla(210,59%,13%,.9)
+%endif
+%endif
+
+#menubar-items {
+  -moz-box-orient: vertical; /* for flex hack */
+}
+
+#main-menubar {
+  -moz-box-flex: 1; /* make menu items expand to fill toolbar height */
+}
+
+#navigator-toolbox {
+  -moz-appearance: none;
+  background-color: transparent;
+  border-top: none;
+}
+
+#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;
+}
+
+%ifdef WINDOWS_AERO
+@media not all and (-moz-windows-compositor) {
+%endif
+  #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) {
+    background: linear-gradient(to top, @toolbarShadowColor@ 1px, transparent 1px),
+                linear-gradient(rgba(50%,50%,50%,0), ActiveCaption 85%);
+    color: CaptionText;
+  }
+  #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
+    background: linear-gradient(to top, @toolbarShadowColor@ 1px, transparent 1px),
+                linear-gradient(rgba(50%,50%,50%,0), InactiveCaption 85%);
+    color: InactiveCaptionText;
+  }
+
+  #main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
+    visibility: hidden;
+  }
+  #main-window[tabsintitlebar] #titlebar-content:-moz-lwtheme {
+    -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
+    visibility: visible;
+  }
+%ifdef WINDOWS_AERO
+}
+%endif
+
+#nav-bar[tabsontop=true],
+#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar,
+#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar {
+  background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
+}
+
+#personal-bookmarks {
+  min-height: 24px;
+}
+
+#print-preview-toolbar:not(:-moz-lwtheme) {
+  -moz-appearance: toolbox;
+}
+
+#browser-bottombox:not(:-moz-lwtheme) {
+  background-color: -moz-dialog;
+}
+
+/* ::::: app menu button ::::: */
+
+#appmenu-button {
+  -moz-appearance: none;
+  background-clip: padding-box;
+  border-radius: 0 0 4px 4px;
+  border: 1px solid;
+  border-top: none;
+  color: white;
+  text-shadow: 0 0 1px rgba(0,0,0,.7),
+               0 1px 1.5px rgba(0,0,0,.5);
+  font-weight: bold;
+  padding: 0 1.5em .05em;
+  margin: 0 0 2px;
+}
+
+@media (-moz-windows-classic) {
+  #appmenu-button {
+    margin-bottom: 1px;
+  }
+}
+
+%ifndef WINDOWS_AERO
+@media (-moz-windows-default-theme) {
+  #main-window[sizemode="normal"] #appmenu-button {
+    margin-bottom: 5px;
+  }
+}
+%endif
+
+#appmenu-button:hover:active,
+#appmenu-button[open] {
+  border-radius: 0;
+}
+
+%ifdef MOZ_OFFICIAL_BRANDING
+#appmenu-button {
+  background-image: linear-gradient(rgb(82,182,247), rgb(10,98,215) 95%);
+  border-color: rgba(6,42,83,.9);
+  box-shadow: 0 1px 0 rgba(255,255,255,.25) inset,
+              0 0 0 1px rgba(255,255,255,.25) inset;
+}
+#appmenu-button:hover:not(:active):not([open]) {
+  background-image: radial-gradient(farthest-side at bottom, rgba(89,240,252,.5) 10%, rgba(89,240,252,0) 70%),
+                    radial-gradient(farthest-side at bottom, rgb(60,68,236), rgba(172,229,255,0)),
+                    linear-gradient(rgb(69,170,246), rgb(30,40,209) 95%);
+  border-color: rgba(6,42,83,.9);
+  box-shadow: 0 1px 0 rgba(255,255,255,.1) inset,
+              0 0 2px 1px rgba(169,234,250,.7) inset,
+              0 -1px 0 rgba(169,234,250,.5) inset;
+}
+#appmenu-button:hover:active,
+#appmenu-button[open] {
+  background-image: linear-gradient(rgb(69,170,246), rgb(0,74,209) 95%);
+  box-shadow: 0 2px 3px rgba(0,0,0,.4) inset,
+              0 1px 1px rgba(0,0,0,.2) inset;
+}
+%else
+%if MOZ_UPDATE_CHANNEL == aurora
+#appmenu-button {
+  background-image: linear-gradient(hsl(208,99%,37%), hsl(214,90%,23%) 95%);
+  border-color: hsla(214,89%,21%,.9);
+  box-shadow: 0 1px 0 hsla(205,100%,72%,.2) inset,
+              0 0 2px 1px hsla(205,100%,72%,.25) inset;
+}
+#appmenu-button:hover:not(:active):not([open]) {
+  background-image: radial-gradient(farthest-side at bottom, hsla(202,100%,85%,.5) 10%, hsla(202,100%,85%,0) 70%),
+                    radial-gradient(farthest-side at bottom, hsla(205,100%,72%,.7), hsla(205,100%,72%,0)),
+                    linear-gradient(hsl(208,98%,34%), hsl(213,87%,20%) 95%);
+  border-color: hsla(214,89%,21%,.9);
+  box-shadow: 0 1px 0 hsla(205,100%,72%,.15) inset,
+              0 0 2px 1px hsla(205,100%,72%,.5) inset,
+              0 -1px 0 hsla(205,100%,72%,.2) inset;
+}
+#appmenu-button:hover:active,
+#appmenu-button[open] {
+  background-image: linear-gradient(hsl(208,95%,30%), hsl(214,85%,17%) 95%);
+  box-shadow: 0 2px 3px rgba(0,0,0,.4) inset,
+              0 1px 1px rgba(0,0,0,.2) inset;
+}
+%else
+#appmenu-button {
+  background-image: linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%);
+  border-color: hsla(210,59%,13%,.9);
+  box-shadow: 0 1px 0 hsla(210,48%,90%,.15) inset,
+              0 0 2px 1px hsla(211,65%,85%,.15) inset;
+}
+#appmenu-button:hover:not(:active):not([open]) {
+  background-image: radial-gradient(farthest-side at bottom, hsla(210,48%,90%,.5) 10%, hsla(210,48%,90%,0) 70%),
+                    radial-gradient(farthest-side at bottom, hsla(211,70%,83%,.5), hsla(211,70%,83%,0)),
+                    linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%);
+  border-color: hsla(210,59%,13%,.9);
+  box-shadow: 0 1px 0 hsla(210,48%,90%,.15) inset,
+              0 0 2px 1px hsla(210,48%,90%,.4) inset,
+              0 -1px 0 hsla(210,48%,90%,.2) inset;
+}
+#appmenu-button:hover:active,
+#appmenu-button[open] {
+  background-image: linear-gradient(hsl(211,33%,26%), hsl(209,53%,6%) 95%);
+  box-shadow: 0 2px 3px rgba(0,0,0,.4) inset,
+              0 1px 1px rgba(0,0,0,.2) inset;
+}
+%endif
+%endif
+
+#main-window[privatebrowsingmode=temporary] #appmenu-button {
+  background-image: linear-gradient(rgb(153,38,211), rgb(105,19,163) 95%);
+  border-color: rgba(43,8,65,.9);
+}
+
+#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:not(:active):not([open]) {
+  background-image: radial-gradient(farthest-side at bottom, rgba(240,193,255,.5) 10%, rgba(240,193,255,0) 70%),
+                    radial-gradient(farthest-side at bottom, rgb(192,81,247), rgba(236,172,255,0)),
+                    linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%);
+  border-color: rgba(43,8,65,.9);
+  box-shadow: 0 1px 0 rgba(255,255,255,.1) inset,
+              0 0 2px 1px rgba(240,193,255,.7) inset,
+              0 -1px 0 rgba(240,193,255,.5) inset;
+}
+
+#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:active,
+#main-window[privatebrowsingmode=temporary] #appmenu-button[open] {
+  background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%);
+}
+
+#appmenu-button > .button-box {
+  border-style: none;
+  padding: 0;
+}
+
+#appmenu-button > .button-box > .button-menu-dropmarker {
+  list-style-image: url(appmenu-dropmarker.png);
+  width: auto;
+  height: auto;
+  padding: 0;
+  margin: 0;
+  -moz-margin-start: .5em;
+}
+
+.splitmenu-menuitem {
+  -moz-margin-end: 1px;
+%ifdef WINDOWS_AERO
+  -moz-padding-end: 0.5em;
+%endif
+}
+
+.splitmenu-menu {
+  -moz-box-pack: end;
+}
+
+.appmenu-edit-button {
+  -moz-appearance: none;
+  border: 1px solid transparent;
+  padding: 2px;
+  background: transparent;
+  border-radius: 3px;
+}
+
+.appmenu-edit-button[disabled="true"] {
+  opacity: .3;
+}
+
+#appmenuPrimaryPane {
+  -moz-border-end: 1px solid ThreeDShadow;
+}
+
+@media (-moz-windows-default-theme) {
+  #appmenu-popup {
+    -moz-appearance: none;
+    background: white;
+    border: 1px solid ThreeDShadow;
+  }
+  #appmenuPrimaryPane {
+    background-color: rgba(255,255,255,0.5);
+    padding: 2px;
+    -moz-border-end: none;
+  }
+  #appmenuSecondaryPane {
+    background-color: #f1f5fb;
+    box-shadow: 1px 0 2px rgb(204,214,234) inset;
+    -moz-padding-start: 3px;
+    -moz-padding-end: 2px;
+    padding-top: 2px;
+    padding-bottom: 2px;
+    font-family: "Segoe UI Semibold", "Segoe UI", sans-serif;
+  }
+  #appmenuSecondaryPane:-moz-locale-dir(rtl) {
+    box-shadow: -1px 0 2px rgb(204,214,234) inset;
+  }
+
+%ifdef WINDOWS_AERO
+  #appmenuPrimaryPane menupopup {
+    -moz-appearance: none;
+    background-image: linear-gradient(to right, white 26px, ThreeDLightShadow 26px,
+                                      ThreeDLightShadow 27px, ThreeDHighlight 27px,
+                                      ThreeDHighlight 28px, white 28px);
+    border: 3px solid;
+    -moz-border-top-colors: ThreeDShadow white;
+    -moz-border-bottom-colors: ThreeDShadow white;
+    -moz-border-left-colors: ThreeDShadow white;
+    -moz-border-right-colors: ThreeDShadow white;
+  }
+%endif
+
+  #appmenuSecondaryPane menupopup {
+    -moz-appearance: none;
+%ifdef WINDOWS_AERO
+    background-image: linear-gradient(to right, #f1f5fb 26px, ThreeDLightShadow 26px,
+                                      ThreeDLightShadow 27px, ThreeDHighlight 27px,
+                                      ThreeDHighlight 28px, #f1f5fb 28px);
+    border: 3px solid;
+    -moz-border-top-colors: ThreeDShadow #f1f5fb;
+    -moz-border-bottom-colors: ThreeDShadow #f1f5fb;
+    -moz-border-left-colors: ThreeDShadow #f1f5fb;
+    -moz-border-right-colors: ThreeDShadow #f1f5fb;
+%else
+    background-color: #f1f5fb;
+    border: 1px solid ThreeDShadow;
+    padding: 2px;
+%endif
+  }
+
+%ifdef WINDOWS_AERO
+  #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
+    background-image: linear-gradient(to left, white 26px, ThreeDLightShadow 26px,
+                                      ThreeDLightShadow 27px, ThreeDHighlight 27px,
+                                      ThreeDHighlight 28px, white 28px);
+  }
+  #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
+    background-image: linear-gradient(to left, #f1f5fb 26px, ThreeDLightShadow 26px,
+                                      ThreeDLightShadow 27px, ThreeDHighlight 27px,
+                                      ThreeDHighlight 28px, #f1f5fb 28px);
+  }
+
+  /* Hi-DPI overrides of the menu backgrounds, to adjust where the gutter line falls */
+  @media (min-resolution: 1.25dppx) {
+    #appmenuPrimaryPane menupopup {
+      background-image: linear-gradient(to right, white 22.4px, ThreeDLightShadow 22.4px,
+                                        ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
+                                        ThreeDHighlight 24px, white 24px);
+    }
+    #appmenuSecondaryPane menupopup {
+      background-image: linear-gradient(to right, #f1f5fb 22.4px, ThreeDLightShadow 22.4px,
+                                        ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
+                                        ThreeDHighlight 24px, #f1f5fb 24px);
+    }
+    #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
+      background-image: linear-gradient(to left, white 22.4px, ThreeDLightShadow 22.4px,
+                                        ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
+                                        ThreeDHighlight 24px, white 24px);
+    }
+    #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
+      background-image: linear-gradient(to left, #f1f5fb 22.4px, ThreeDLightShadow 22.4px,
+                                        ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
+                                        ThreeDHighlight 24px, #f1f5fb 24px);
+    }
+  }
+
+  @media (min-resolution: 1.5dppx) {
+    #appmenuPrimaryPane menupopup {
+      background-image: linear-gradient(to right, white 20.6667px, ThreeDLightShadow 20.6667px,
+                                        ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
+                                        ThreeDHighlight 22px, white 22px);
+    }
+    #appmenuSecondaryPane menupopup {
+      background-image: linear-gradient(to right, #f1f5fb 20.6667px, ThreeDLightShadow 20.6667px,
+                                        ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
+                                        ThreeDHighlight 22px, #f1f5fb 22px);
+    }
+    #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
+      background-image: linear-gradient(to left, white 20.6667px, ThreeDLightShadow 20.6667px,
+                                        ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
+                                        ThreeDHighlight 22px, white 22px);
+    }
+    #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
+      background-image: linear-gradient(to left, #f1f5fb 20.6667px, ThreeDLightShadow 20.6667px,
+                                        ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
+                                        ThreeDHighlight 22px, #f1f5fb 22px);
+    }
+  }
+
+  @media (min-resolution: 2dppx) {
+    #appmenuPrimaryPane menupopup {
+      background-image: linear-gradient(to right, white 19.5px, ThreeDLightShadow 19.5px,
+                                        ThreeDLightShadow 20px, ThreeDHighlight 20px,
+                                        ThreeDHighlight 20.5px, white 20.5px);
+    }
+    #appmenuSecondaryPane menupopup {
+      background-image: linear-gradient(to right, #f1f5fb 19.5px, ThreeDLightShadow 19.5px,
+                                        ThreeDLightShadow 20px, ThreeDHighlight 20px,
+                                        ThreeDHighlight 20.5px, #f1f5fb 20.5px);
+    }
+    #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
+      background-image: linear-gradient(to left, white 19.5px, ThreeDLightShadow 19.5px,
+                                        ThreeDLightShadow 20px, ThreeDHighlight 20px,
+                                        ThreeDHighlight 20.5px, white 20.5px);
+    }
+    #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
+      background-image: linear-gradient(to left, #f1f5fb 19.5px, ThreeDLightShadow 19.5px,
+                                        ThreeDLightShadow 20px, ThreeDHighlight 20px,
+                                        ThreeDHighlight 20.5px, #f1f5fb 20.5px);
+    }
+  }
+%endif
+
+  .appmenu-menuseparator {
+    -moz-appearance: none;
+    margin-top: 3px;
+    margin-bottom: 3px;
+%ifdef WINDOWS_AERO
+    -moz-margin-start: 30px;
+%else
+    -moz-margin-start: calc(1.45em + 4px);
+%endif
+    padding: 0;
+    border-top: 1px solid #d6e5f5;
+    border-bottom: none;
+  }
+
+%ifdef WINDOWS_AERO
+  @media (min-resolution: 1.25dppx) {
+    .appmenu-menuseparator {
+      -moz-margin-start: 25px;
+    }
+  }
+  @media (min-resolution: 1.5dppx) {
+    .appmenu-menuseparator {
+      -moz-margin-start: 24px;
+    }
+  }
+  @media (min-resolution: 2dppx) {
+    .appmenu-menuseparator {
+      -moz-margin-start: 22px;
+    }
+  }
+%endif
+
+  .appmenu-edit-button:not([disabled]):hover {
+    border: 1px solid #b8d6fb;
+    box-shadow: inset 0 0 1px white;
+    background: linear-gradient(#fafbfd, #ebf3fd);
+    transition: .2s ease-in;
+  }
+}
+
+#appmenuSecondaryPane-spacer {
+  min-height: 1em;
+}
+
+#appmenu-editmenu {
+  -moz-box-pack: end;
+}
+
+#appmenu_print,
+#appmenu_print_popup,
+.appmenu-edit-button,
+#appmenu-editmenu-cut,
+#appmenu-editmenu-copy,
+#appmenu-editmenu-paste,
+#appmenu-quit {
+  list-style-image: url("appmenu-icons.png");
+}
+
+#appmenu-cut,
+#appmenu-editmenu-cut {
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+#appmenu-copy,
+#appmenu-editmenu-copy {
+  -moz-image-region: rect(0 32px 16px 16px);
+}
+
+#appmenu-paste,
+#appmenu-editmenu-paste {
+  -moz-image-region: rect(0 48px 16px 32px);
+}
+
+#appmenu_print,
+#appmenu_print_popup {
+  -moz-image-region: rect(0 64px 16px 48px);
+}
+
+#appmenu-quit {
+  -moz-image-region: rect(0 80px 16px 64px);
+}
+
+#appmenu-edit-label {
+  -moz-appearance: none;
+  background: transparent;
+  font-style: italic;
+}
+
+#appmenu_bookmarks {
+  list-style-image: url("chrome://browser/skin/places/bookmark.png");
+  -moz-image-region: rect(0px 48px 16px 32px);
+}
+
+#appmenu_privateBrowsing,
+#appmenu_newPrivateWindow {
+  list-style-image: url("chrome://browser/skin/Privacy-16.png");
+}
+
+@media (min-resolution: 1.25dppx) {
+  #appmenu_privateBrowsing,
+  #appmenu_newPrivateWindow {
+    list-style-image: url("chrome://browser/skin/Privacy-32.png");
+  }
+}
+
+#appmenu_addons {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+}
+
+@media (min-resolution: 1.25dppx) {
+  #appmenu_addons {
+    list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  }
+}
+
+#BMB_bookmarkThisPage,
+#appmenu_bookmarkThisPage {
+  list-style-image: url("chrome://browser/skin/places/bookmark.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+/* ::::: titlebar ::::: */
+
+#main-window[sizemode="normal"] > #titlebar {
+  -moz-appearance: -moz-window-titlebar;
+}
+
+#main-window[sizemode="maximized"] > #titlebar {
+  -moz-appearance: -moz-window-titlebar-maximized;
+}
+
+@media (-moz-windows-classic) {
+  #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container {
+    margin-top: 4px;
+  }
+}
+
+#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"] {
+%ifdef WINDOWS_AERO
+  margin-left: 22px; /* additional space for Aero Snap */
+%else
+  margin-left: 10px;
+%endif
+}
+
+/* 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;
+}
+
+@media not all and (-moz-windows-classic) {
+  #titlebar-min {
+    -moz-margin-end: 2px;
+  }
+}
+
+/* ::::: bookmark buttons ::::: */
+
+toolbarbutton.bookmark-item {
+  margin: 0;
+  padding: 2px 3px;
+}
+
+toolbarbutton.bookmark-item:hover:active:not([disabled="true"]),
+toolbarbutton.bookmark-item[open="true"] {
+  padding-top: 3px;
+  padding-bottom: 1px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 2px;
+}
+
+.bookmark-item:not(#bookmarks-menu-button) > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
+/* Prevent [mode="icons"] from hiding the label */
+.bookmark-item > .toolbarbutton-text {
+  display: -moz-box !important;
+}
+
+.bookmark-item > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+#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;
+}
+
+/* ::::: bookmark menus ::::: */
+
+menu.bookmark-item,
+menuitem.bookmark-item {
+  min-width: 0;
+  max-width: 32em;
+}
+
+.bookmark-item > .menu-iconic-left {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
+  -moz-padding-start: 0px;
+}
+
+/* ::::: bookmark items ::::: */
+
+.bookmark-item  {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+.bookmark-item[container] {
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+.bookmark-item[container][open] {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+.bookmark-item[container][livemark] {
+  list-style-image: url("chrome://browser/skin/livemark-folder.png");
+  -moz-image-region: auto;
+}
+
+.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");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[query][tagContainer] {
+  list-style-image: url("chrome://browser/skin/places/tag.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[query][dayContainer] {
+  list-style-image: url("chrome://browser/skin/places/calendar.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[query][hostContainer] {
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+.bookmark-item[query][hostContainer][open] {
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+.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;
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+.toolbarbutton-1 {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+}
+
+.toolbarbutton-1:-moz-lwtheme-brighttext {
+  list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
+}
+%ifdef WINDOWS_AERO
+.toolbarbutton-1:not(:-moz-lwtheme) {
+  list-style-image: url("chrome://browser/skin/Toolbar-glass.png");
+}
+%endif
+
+.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");
+}
+
+.toolbarbutton-1 > .toolbarbutton-menu-dropmarker:-moz-lwtheme-brighttext,
+.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-brighttext {
+  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):not(#social-provider-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-container,
+@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-container,
+@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):not(#social-provider-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@ #social-toolbar-item {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+
+@navbarLargeIcons@ #social-toolbar-item > .toolbarbutton-1 {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before,
+@navbarLargeIcons@ #social-toolbar-item > .toolbarbutton-1:not(:hover):not(:active):not([open]) + .toolbarbutton-1:not(:hover):not(:active):not([open])::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-container,
+@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-container {
+  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");
+}
+#home-button.bookmark-item:-moz-lwtheme-brighttext {
+  list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
+}
+%ifdef WINDOWS_AERO
+#home-button.bookmark-item:not(:-moz-lwtheme) {
+  list-style-image: url("chrome://browser/skin/Toolbar-glass.png");
+}
+%endif
+
+#home-button {
+  -moz-image-region: rect(0, 90px, 18px, 72px);
+}
+
+#downloads-button {
+  -moz-image-region: rect(0, 108px, 18px, 90px);
+}
+
+#history-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");
+}
+
+#bookmarks-menu-button.bookmark-item:-moz-lwtheme-brighttext {
+  list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
+}
+%ifdef WINDOWS_AERO
+#bookmarks-menu-button.bookmark-item:not(:-moz-lwtheme) {
+  list-style-image: url("chrome://browser/skin/Toolbar-glass.png");
+}
+%endif
+
+#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);
+}
+
+#webrtc-status-button {
+  -moz-image-region: rect(0, 360px, 18px, 342px);
+}
+
+
+/* ::::: fullscreen window controls ::::: */
+
+#window-controls {
+  -moz-margin-start: 4px;
+}
+
+#minimize-button,
+#restore-button,
+#close-button {
+  list-style-image: url("chrome://global/skin/icons/windowControls.png");
+  padding: 0;
+}
+
+#minimize-button {
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+#minimize-button:hover {
+  -moz-image-region: rect(16px, 16px, 32px, 0);
+}
+#minimize-button:hover:active {
+  -moz-image-region: rect(32px, 16px, 48px, 0);
+}
+#restore-button {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+#restore-button:hover {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+#restore-button:hover:active {
+  -moz-image-region: rect(32px, 32px, 48px, 16px);
+}
+#close-button {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+  -moz-appearance: none;
+  border-style: none;
+  margin: 2px;
+}
+#close-button:hover {
+  -moz-image-region: rect(16px, 48px, 32px, 32px);
+}
+#close-button:hover:active {
+  -moz-image-region: rect(32px, 48px, 48px, 32px);
+}
+
+/* ::::: 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-windows-default-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@[forwarddisabled] + #urlbar-container > #urlbar {
+/*  margin-left: -@conditionalForwardWithUrlbarWidth@px; */
+}
+
+@conditionalForwardWithUrlbar@[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar {
+  /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
+  transition-delay: 100s;
+}
+
+@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar {
+  /* when not hovered anymore, trigger a new transition to hide the forward button immediately */
+/*  margin-left: -@conditionalForwardWithUrlbarWidth@.01px; */
+}
+
+@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;
+}
+
+@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+  padding-left: 5px;
+  transition: padding-left;
+}
+
+@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+  padding-right: 5px;
+  transition: padding-right;
+}
+
+@conditionalForwardWithUrlbar@[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box {
+  /* forward button hiding is delayed when hovered */
+  transition-delay: 100s;
+}
+
+@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
+  padding-left: 5.01px;
+}
+
+@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
+  padding-right: 5.01px;
+}
+
+#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;
+}
+
+/* URL bar shading for SSL */
+
+#urlbar[https_color="y"][security_level="broken"] {
+  box-shadow: inset 0 0 2px rgb(168,0,0);
+}
+
+#urlbar[https_color="y"][security_level="high"] {
+  box-shadow: inset 0 0 2px rgb(0,79,168);
+}
+
+#urlbar[https_color="y"][security_level="ev"] {
+  box-shadow: inset 0 0 2px rgb(0,168,0);
+}
+
+#urlbar[https_color="y"][security_level="broken"]:-moz-lwtheme-brighttext,
+#urlbar[https_color="y"][security_level="broken"]:not(:-moz-lwtheme) {
+  box-shadow: inset 0 0 4px rgb(168,0,0);
+}
+
+#urlbar[https_color="y"][security_level="high"]:-moz-lwtheme-brighttext,
+#urlbar[https_color="y"][security_level="high"]:not(:-moz-lwtheme) {
+  box-shadow: inset 0 0 4px rgb(0,79,168);
+}
+
+#urlbar[https_color="y"][security_level="ev"]:-moz-lwtheme-brighttext,
+#urlbar[https_color="y"][security_level="ev"]:not(:-moz-lwtheme) {
+  box-shadow: inset 0 0 4px rgb(0,168,0);
+}
+
+
+
+/* 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;
+}
+
+.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-glass.png);
+  -moz-image-region: rect(0px 32px 16px 16px);
+  width: 16px;
+  height: 16px;
+}
+
+.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;
+}
+
+%ifndef WINDOWS_AERO
+@media (-moz-windows-default-theme) {
+  .ac-url-text:not([selected="true"]),
+  .ac-action-text:not([selected="true"]) {
+    color: #008800;
+  }
+}
+%endif
+
+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;
+}
+
+%ifdef WINDOWS_AERO
+@media not all and (-moz-windows-default-theme) {
+%endif
+  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;
+  }
+%ifdef WINDOWS_AERO
+}
+%endif
+
+.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);
+}
+
+
+/* social share panel */
+
+#social-share-panel > iframe {
+  background: linear-gradient(to bottom, #f0f4f7, #fafbfc);
+  width: 300px;
+  height: 150px;
+}
+
+#social-share-button {
+  list-style-image: url(chrome://browser/skin/social/share-button.png);
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.social-share-toolbar {
+  border-right: 1px solid #e2e5e8;
+  background: linear-gradient(to bottom, #ffffff, #f5f7fa);
+}
+
+#social-share-provider-buttons {
+  padding: 6px;
+}
+
+#social-share-provider-buttons > .share-provider-button {
+  -moz-appearance: none;
+  padding: 5px;
+  margin: 1px;
+  border: none;
+  background: none;
+  border-radius: 2px;
+}
+
+#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]),
+#social-share-provider-buttons > .share-provider-button:hover,
+#social-share-provider-buttons > .share-provider-button:active {
+  padding: 4px;
+  border: 1px solid #aeb8c1;
+  box-shadow: inset 1px 1px 1px rgba(10, 31, 51, 0.1);
+}
+
+#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]) {
+  background: linear-gradient(to bottom, rgba(230,232,234,.65), #d2d5d9);
+}
+
+#social-share-provider-buttons > .share-provider-button > .toolbarbutton-text {
+  display: none;
+}
+#social-share-provider-buttons > .share-provider-button > .toolbarbutton-icon {
+  width: 16px;
+  min-height: 16px;
+  max-height: 16px;
+}
+
+/* fixup corners for share panel */
+.social-panel > .social-panel-frame {
+  border-radius: inherit;
+}
+
+#social-share-panel {
+  max-height: 600px;
+  min-height: 100px;
+  max-width: 800px;
+  min-width: 300px;
+}
+
+.social-share-frame {
+  background: linear-gradient(to bottom, #f0f4f7, #fafbfc);
+  width: 330px;
+  height: 150px;
+  /* we resize our panels dynamically, make it look nice */
+  transition: height 100ms ease-out, width 100ms ease-out;
+}
+
+.social-share-frame:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-top-right-radius: inherit;
+  border-bottom-right-radius: inherit;
+}
+
+.social-share-frame:-moz-locale-dir(rtl) {
+  border-top-left-radius: inherit;
+  border-bottom-left-radius: inherit;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#social-share-panel > .social-share-toolbar:-moz-locale-dir(ltr) {
+  border-top-left-radius: inherit;
+  border-bottom-left-radius: inherit;
+}
+
+#social-share-panel > .social-share-toolbar:-moz-locale-dir(rtl) {
+  border-top-right-radius: inherit;
+  border-bottom-right-radius: inherit;
+}
+
+#social-share-provider-buttons:-moz-locale-dir(ltr) {
+  border-top-left-radius: inherit;
+  border-bottom-left-radius: inherit;
+}
+
+#social-share-provider-buttons:-moz-locale-dir(rtl) {
+  border-top-right-radius: inherit;
+  border-bottom-right-radius: inherit;
+}
+
+/* social recommending panel */
+
+#social-mark-button {
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+/* 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;
+}
+
+.panel-promo-box {
+  margin: 10px -10px -10px;
+  padding: 8px 10px;
+  border-top: 1px solid ThreeDShadow;
+  background-image: linear-gradient(hsla(0,0%,0%,.15), hsla(0,0%,0%,.08) 6px);
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+
+@media (-moz-windows-default-theme) {
+  .panel-promo-box {
+    border-top-style: none;
+    background: #f1f5fb;
+    color: GrayText;
+    box-shadow: 0px 1px 2px rgb(204,214,234) inset;
+  }
+}
+
+.panel-promo-icon {
+  list-style-image: url("chrome://browser/skin/sync-notification-24.png");
+  -moz-margin-end: 10px;
+  vertical-align: middle;
+}
+
+.panel-promo-closebutton {
+  -moz-appearance: none;
+  list-style-image: url("chrome://global/skin/icons/close.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+  border: none;
+  -moz-margin-end: -10px;
+  margin-top: -5px;
+}
+
+.panel-promo-closebutton:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.panel-promo-closebutton:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+.panel-promo-closebutton > .toolbarbutton-text {
+  padding: 0;
+  margin: 0;
+}
+
+/* ::::: 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%);
+}
+
+%ifndef WINDOWS_AERO
+@media (-moz-windows-default-theme) {
+  #main-window[sizemode=normal] #TabsToolbar {
+    padding-left: 2px;
+    padding-right: 2px;
+  }
+}
+%endif
+
+.tabbrowser-tab,
+.tabs-newtab-button {
+  -moz-appearance: none;
+  background: @toolbarShadowOnTab@, @bgTabTexture@,
+              linear-gradient(-moz-dialog, -moz-dialog);
+  background-origin: border-box;
+  background-position: 1px 2px;
+  background-size: calc(100% - 2px) calc(100% - 2px);
+  background-repeat: no-repeat;
+  margin: 0;
+  padding: 2px 0 4px;
+  border-width: 4px 3px 0;
+  border-style: solid;
+  border-image: url(tabbrowser/tab.png) 4 3 0 fill repeat stretch;
+  border-radius: 0;
+}
+
+.tabbrowser-tab:hover,
+.tabs-newtab-button:hover {
+  background-image: @toolbarShadowOnTab@, @bgTabTextureHover@,
+                    linear-gradient(-moz-dialog, -moz-dialog);
+}
+
+%ifndef WINDOWS_AERO
+@media (-moz-windows-theme: luna-blue) {
+  .tabbrowser-tab,
+  .tabs-newtab-button {
+    background-image: @toolbarShadowOnTab@,
+                      linear-gradient(hsla(51,34%,89%,.9), hsla(51,15%,79%,.9) 1px, hsla(51,9%,68%,.9));
+  }
+
+  .tabbrowser-tab:hover,
+  .tabs-newtab-button:hover {
+    background-image: @toolbarShadowOnTab@,
+                      linear-gradient(hsla(51,34%,100%,.9), hsla(51,15%,94%,.9) 1px, hsla(51,9%,83%,.9));
+  }
+}
+%endif
+
+.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:-moz-lwtheme {
+  color: inherit;
+}
+
+.tabbrowser-tab[selected="true"]:-moz-lwtheme {
+  background-image: linear-gradient(@selectedTabHighlight@, @toolbarHighlight@ 50%);
+}
+
+.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]),
+.tabs-newtab-button:-moz-lwtheme-brighttext {
+  background-image: linear-gradient(hsla(0,0%,40%,.6), hsla(0,0%,30%,.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%,.6), hsla(0,0%,45%,.6) 80%);
+}
+
+.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]),
+.tabs-newtab-button:-moz-lwtheme-darktext {
+  background-image: linear-gradient(hsla(0,0%,60%,.5), hsla(0,0%,45%,.5) 80%);
+}
+
+.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]):hover,
+.tabs-newtab-button:-moz-lwtheme-darktext:hover {
+  background-image: linear-gradient(hsla(0,0%,80%,.5), hsla(0,0%,60%,.5) 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;
+  -moz-image-region: rect(0, 64px, 16px, 48px);
+  border: none;
+  padding: 0px;
+  list-style-image: url("chrome://global/skin/icons/close.png");
+}
+
+.tab-close-button:hover,
+.tab-close-button:hover[selected="true"] {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.tab-close-button:hover:active,
+.tab-close-button:hover:active[selected="true"] {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+.tab-close-button[selected="true"] {
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+/* 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;
+}
+
+%ifdef WINDOWS_AERO
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-system-metric(windows-compositor):not(:-moz-lwtheme),
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-system-metric(windows-compositor):not(:-moz-lwtheme) {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-glass.png);
+}
+%endif
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-lwtheme-brighttext,
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-lwtheme-brighttext {
+  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;
+}
+
+%ifdef WINDOWS_AERO
+#TabsToolbar > #new-tab-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme),
+#TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme) {
+  list-style-image: url(chrome://browser/skin/tabbrowser/newtab-glass.png);
+}
+%endif
+
+.tabs-newtab-button:-moz-lwtheme-brighttext,
+#TabsToolbar > #new-tab-button:-moz-lwtheme-brighttext,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-lwtheme-brighttext {
+  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;
+}
+
+%ifdef WINDOWS_AERO
+:-moz-any(#TabsToolbar, #nav-bar[tabsontop=false], #toolbar-menubar) > #alltabs-button[type=menu]:-moz-system-metric(windows-compositor):not(:-moz-lwtheme),
+:-moz-any(#TabsToolbar, #nav-bar[tabsontop=false], #toolbar-menubar) > toolbarpaletteitem > #alltabs-button[type=menu]:-moz-system-metric(windows-compositor):not(:-moz-lwtheme),
+%endif
+#alltabs-button[type="menu"]:-moz-lwtheme-brighttext {
+  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;
+  list-style-image: url("chrome://global/skin/icons/close.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+  padding: 4px 2px;
+  margin: 0px;
+  border: none;
+}
+
+.tabs-closebutton > .toolbarbutton-icon {
+  -moz-margin-end: 0px !important;
+  -moz-padding-end: 2px !important;
+  -moz-padding-start: 2px !important;
+}
+
+.tabs-closebutton:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.tabs-closebutton:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
+}
+
+toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
+}
+
+toolbarbutton.chevron > .toolbarbutton-text,
+toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+toolbarbutton.chevron > .toolbarbutton-icon {
+  margin: 0;
+}
+
+toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
+  display: -moz-box; /* display chevron icon in text mode */
+}
+
+#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-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="plugins-not-found"] {
+  list-style-image: url(chrome://browser/skin/pluginInstall-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;
+  margin: 0;
+  min-height: 0;
+  min-width: 0;
+  list-style-image: url(chrome://mozapps/skin/downloads/downloadButtons.png);
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+.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-save"],
+.popup-notification-icon[popupid="password-change"] {
+  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png);
+}
+
+.popup-notification-icon[popupid="webapps-install"] {
+  list-style-image: url(chrome://browser/skin/webapps-64.png);
+}
+
+.popup-notification-icon[popupid="mixed-content-blocked"] {
+  list-style-image: url(chrome://browser/skin/mixed-content-blocked-64.png);
+}
+
+.popup-notification-icon[popupid="webRTC-sharingDevices"],
+.popup-notification-icon[popupid="webRTC-shareDevices"] {
+  list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png);
+}
+
+.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);
+}
+
+.identity-notification-icon,
+#identity-notification-icon {
+  list-style-image: url(chrome://mozapps/skin/profile/profileicon.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);
+}
+
+#webapps-notification-icon {
+  list-style-image: url(chrome://browser/skin/webapps-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);
+}
+
+#plugin-install-notification-icon {
+  list-style-image: url(chrome://browser/skin/pluginInstall-16.png);
+}
+
+#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);
+}
+
+.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);
+}
+
+.web-notifications-notification-icon,
+#web-notifications-notification-icon {
+  list-style-image: url(chrome://browser/skin/notification-16.png);
+}
+
+#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");
+}
+
+#bookmarksToolbarFolderMenu,
+#appmenu_bookmarksToolbar,
+#BMB_bookmarksToolbar {
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.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;
+}
+
+.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;
+  list-style-image: url("chrome://global/skin/icons/close.png");
+  -moz-appearance: none;
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+#addonbar-closebutton:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+#addonbar-closebutton:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+/* 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-warning-container[obscure-browser] {
+  background-color: rgba(0,0,0,0.3);
+}
+
+.full-screen-description {
+  font-size: 150%;
+}
+
+#full-screen-domain-text {
+  font-size: 300%;
+}
+
+.full-screen-approval-button,
+#full-screen-remember-decision {
+  font-size: 120%;
+}
+
+%include ../shared/devtools/responsivedesign.inc.css
+%include ../shared/devtools/highlighter.inc.css
+%include ../shared/devtools/commandline.inc.css
+%include ../shared/plugin-doorhanger.inc.css
+
+/* 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;
+}
+
+/* Social toolbar item */
+
+#social-provider-button {
+  -moz-image-region: rect(0, 16px, 16px, 0);
+  list-style-image: url(chrome://browser/skin/social/services-16.png);
+}
+
+#social-provider-button > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+.toolbarbutton-badge-container {
+  margin: 0;
+  padding: 0;
+  position: relative;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-badge-container {
+  padding: 2px 5px;
+}
+
+.toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon {
+  position: absolute;
+  top: 2px;
+  right: 2px;
+}
+
+.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) {
+  -moz-margin-end: 0;
+}
+
+.toolbarbutton-badge[badge=""] {
+  display: none;
+}
+.toolbarbutton-badge[badge]:not([badge=""])::after {
+  /* The |content| property is set in the content stylesheet. */
+  font-size: 9px;
+  font-weight: bold;
+  padding: 0 1px;
+  color: #fff;
+  background-color: rgb(240,61,37);
+  border: 1px solid rgb(216,55,34);
+  border-radius: 2px;
+  box-shadow: 0 1px 0 rgba(0,39,121,0.77);
+  position: absolute;
+  top: 0;
+  right: 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;
+}
+
+.popup-notification-icon[popupid="servicesInstall"] {
+  list-style-image: url(chrome://browser/skin/social/services-64.png);
+}
+#servicesInstall-notification-icon {
+  list-style-image: url(chrome://browser/skin/social/services-16.png);
+}
+#social-undoactivation-button,
+#servicesInstall-learnmore-link {
+  -moz-margin-start: 0; /* override default label margin to match description margin */
+}
+
+#socialActivatedNotification .popup-notification-button-container {
+  margin-left: 6px;
+}
+
+.social-activation-icon {
+  width: auto;
+  height: auto;
+  max-height: 64px;
+  max-width: 64px;
+}
+
+#social-activation-message {
+  max-width: 250px;
+}
+
+#social-activation-message > label {
+  margin: 0;
+}
+
+/* social toolbar provider menu */
+.social-statusarea-popup {
+  margin-top: 0;
+  margin-left: -12px;
+  margin-right: -12px;
+}
+
+.social-statusarea-user {
+  -moz-appearance: none;
+  border-bottom: 1px solid rgb(221,221,221);
+  background-color: -moz-Dialog;
+  position: relative;
+  cursor: pointer;
+  list-style-image:url("chrome://global/skin/icons/information-32.png");
+}
+
+.social-statusarea-user-portrait {
+  width: 32px;
+  height: 32px;
+  border-radius: 2px;
+  margin: 10px;
+}
+
+.social-statusarea-loggedInStatus {
+  -moz-appearance: none;
+  background: transparent;
+  border: none;
+  color: -moz-nativehyperlinktext;
+  min-width: 0;
+  margin: 0 6px;
+  list-style-image: none;
+}
+
+.social-statusarea-user[_moz-menuactive] > vbox > .social-statusarea-loggedInStatus {
+  text-decoration: underline;
+}
+
+.social-panel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+}
+
+.social-panel-frame {
+  border-radius: inherit;
+}
+
+%include ../shared/social/chat.inc.css
+
+.chat-titlebar {
+  background-color: #c4cfde;
+  background-image: linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,0));
+}
+
+.chat-titlebar[selected] {
+  background-color: #dae3f0;
+}
+
+.chatbar-button {
+  -moz-appearance: none;
+  background-color: #c4cfde;
+  background-image: linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,0));
+}
+
+.chatbar-button > .toolbarbutton-icon {
+  -moz-margin-end: 0;
+}
+
+.chatbar-button:hover,
+.chatbar-button[open="true"] {
+  background-color: #dae3f0;
+}
+
+.chatbar-button[activity]:not([open="true"]) {
+  background-image: radial-gradient(circle farthest-corner at center 3px, rgb(255,255,255) 3%, rgba(186,221,251,0.75) 40%, rgba(127,179,255,0.5) 80%, rgba(127,179,255,0.25));
+}
+
+chatbox {
+  border-top-left-radius: 2.5px;
+  border-top-right-radius: 2.5px;
+}
+
+#main-window[privatebrowsingmode=temporary] #toolbar-menubar {
+  background-image: url("chrome://browser/skin/privatebrowsing-dark.png");
+  background-position: top right;
+  background-repeat: no-repeat;
+}
+
+#main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) {
+  background-position: top left;
+}
+
+#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .box-inherit > .button-icon {
+  list-style-image: url("chrome://browser/skin/privatebrowsing-light.png");
+  width: 20px;
+  height: 16px;
+}
diff --git a/browser/themes/windows/click-to-play-warning-stripes.png b/browser/themes/windows/click-to-play-warning-stripes.png
new file mode 100644
index 000000000..29f15f7b8
--- /dev/null
+++ b/browser/themes/windows/click-to-play-warning-stripes.png
diff --git a/browser/themes/windows/communicator/communicator.css b/browser/themes/windows/communicator/communicator.css
new file mode 100644
index 000000000..0b57574fd
--- /dev/null
+++ b/browser/themes/windows/communicator/communicator.css
@@ -0,0 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url("chrome://global/skin/");
+
diff --git a/browser/themes/windows/communicator/jar.mn b/browser/themes/windows/communicator/jar.mn
new file mode 100644
index 000000000..dfd20c523
--- /dev/null
+++ b/browser/themes/windows/communicator/jar.mn
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+browser.jar:
+% skin communicator classic/1.0 %skin/classic/communicator/
+        skin/classic/communicator/communicator.css
diff --git a/browser/themes/windows/communicator/moz.build b/browser/themes/windows/communicator/moz.build
new file mode 100644
index 000000000..895d11993
--- /dev/null
+++ b/browser/themes/windows/communicator/moz.build
@@ -0,0 +1,6 @@
+# -*- 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/.
+
diff --git a/browser/themes/windows/devtools/alerticon-warning.png b/browser/themes/windows/devtools/alerticon-warning.png
new file mode 100644
index 000000000..5c5d0aec5
--- /dev/null
+++ b/browser/themes/windows/devtools/alerticon-warning.png
diff --git a/browser/themes/windows/devtools/arrow-e.png b/browser/themes/windows/devtools/arrow-e.png
new file mode 100644
index 000000000..09691bc5e
--- /dev/null
+++ b/browser/themes/windows/devtools/arrow-e.png
diff --git a/browser/themes/windows/devtools/background-noise-toolbar.png b/browser/themes/windows/devtools/background-noise-toolbar.png
new file mode 100644
index 000000000..d09ba9daf
--- /dev/null
+++ b/browser/themes/windows/devtools/background-noise-toolbar.png
diff --git a/browser/themes/windows/devtools/breadcrumbs-scrollbutton.png b/browser/themes/windows/devtools/breadcrumbs-scrollbutton.png
new file mode 100644
index 000000000..722438060
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs-scrollbutton.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-end-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-end-pressed.png
new file mode 100644
index 000000000..80c1f3a26
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/ltr-end-pressed.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected-pressed.png
new file mode 100644
index 000000000..87808778c
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected-pressed.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected.png b/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected.png
new file mode 100644
index 000000000..dbb728411
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-end.png b/browser/themes/windows/devtools/breadcrumbs/ltr-end.png
new file mode 100644
index 000000000..ee96024f1
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/ltr-end.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-middle-pressed.png
new file mode 100644
index 000000000..57abb3ffb
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/ltr-middle-pressed.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected-pressed.png
new file mode 100644
index 000000000..3898ba3ac
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected-pressed.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected.png b/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected.png
new file mode 100644
index 000000000..c0d13e3ef
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-middle.png b/browser/themes/windows/devtools/breadcrumbs/ltr-middle.png
new file mode 100644
index 000000000..eb65fffd5
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/ltr-middle.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-start-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-start-pressed.png
new file mode 100644
index 000000000..c1a946525
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/ltr-start-pressed.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected-pressed.png
new file mode 100644
index 000000000..77d63d1b1
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected-pressed.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected.png b/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected.png
new file mode 100644
index 000000000..6529b71ab
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-start.png b/browser/themes/windows/devtools/breadcrumbs/ltr-start.png
new file mode 100644
index 000000000..a4ca85860
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/ltr-start.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-end-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-end-pressed.png
new file mode 100644
index 000000000..1077cfb7b
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/rtl-end-pressed.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected-pressed.png
new file mode 100644
index 000000000..ab1040ba8
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected-pressed.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected.png b/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected.png
new file mode 100644
index 000000000..8b0905d0f
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-end.png b/browser/themes/windows/devtools/breadcrumbs/rtl-end.png
new file mode 100644
index 000000000..88cc61b0b
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/rtl-end.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-middle-pressed.png
new file mode 100644
index 000000000..f4a3a5bee
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/rtl-middle-pressed.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected-pressed.png
new file mode 100644
index 000000000..d66acb42e
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected-pressed.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected.png b/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected.png
new file mode 100644
index 000000000..9b77579e9
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-middle.png b/browser/themes/windows/devtools/breadcrumbs/rtl-middle.png
new file mode 100644
index 000000000..63b620154
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/rtl-middle.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-start-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-start-pressed.png
new file mode 100644
index 000000000..bfff8e95d
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/rtl-start-pressed.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected-pressed.png
new file mode 100644
index 000000000..2ce094819
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected-pressed.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected.png b/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected.png
new file mode 100644
index 000000000..e7c848ac3
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected.png
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-start.png b/browser/themes/windows/devtools/breadcrumbs/rtl-start.png
new file mode 100644
index 000000000..b8f67974c
--- /dev/null
+++ b/browser/themes/windows/devtools/breadcrumbs/rtl-start.png
diff --git a/browser/themes/windows/devtools/checkbox-dark.png b/browser/themes/windows/devtools/checkbox-dark.png
new file mode 100644
index 000000000..e937b600b
--- /dev/null
+++ b/browser/themes/windows/devtools/checkbox-dark.png
diff --git a/browser/themes/windows/devtools/checkbox-light.png b/browser/themes/windows/devtools/checkbox-light.png
new file mode 100644
index 000000000..00d6d450c
--- /dev/null
+++ b/browser/themes/windows/devtools/checkbox-light.png
diff --git a/browser/themes/windows/devtools/close.png b/browser/themes/windows/devtools/close.png
new file mode 100644
index 000000000..b53941253
--- /dev/null
+++ b/browser/themes/windows/devtools/close.png
diff --git a/browser/themes/windows/devtools/command-paintflashing.png b/browser/themes/windows/devtools/command-paintflashing.png
new file mode 100644
index 000000000..b785131a2
--- /dev/null
+++ b/browser/themes/windows/devtools/command-paintflashing.png
diff --git a/browser/themes/windows/devtools/command-responsivemode.png b/browser/themes/windows/devtools/command-responsivemode.png
new file mode 100644
index 000000000..cbfa59904
--- /dev/null
+++ b/browser/themes/windows/devtools/command-responsivemode.png
diff --git a/browser/themes/windows/devtools/command-scratchpad.png b/browser/themes/windows/devtools/command-scratchpad.png
new file mode 100644
index 000000000..5131ca5cb
--- /dev/null
+++ b/browser/themes/windows/devtools/command-scratchpad.png
diff --git a/browser/themes/windows/devtools/command-tilt.png b/browser/themes/windows/devtools/command-tilt.png
new file mode 100644
index 000000000..f816bba59
--- /dev/null
+++ b/browser/themes/windows/devtools/command-tilt.png
diff --git a/browser/themes/windows/devtools/commandline-icon.png b/browser/themes/windows/devtools/commandline-icon.png
new file mode 100644
index 000000000..e120a3926
--- /dev/null
+++ b/browser/themes/windows/devtools/commandline-icon.png
diff --git a/browser/themes/windows/devtools/commandline.css b/browser/themes/windows/devtools/commandline.css
new file mode 100644
index 000000000..7eee7eb5c
--- /dev/null
+++ b/browser/themes/windows/devtools/commandline.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/. */
+
+.gcli-body {
+  margin: 0;
+  font: message-box;
+  color: hsl(210,30%,85%);
+}
+
+#gcli-output-root,
+#gcli-tooltip-root {
+  border: 1px solid hsl(206,37%,4%);
+  box-shadow: 0 1px 0 hsla(209,29%,72%,.25) inset;
+  background-image: linear-gradient(hsla(209,18%,18%,0.9), hsl(209,23%,18%));
+  border-radius: 3px;
+}
+
+#gcli-output-root {
+  padding: 5px 10px;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom: 0;
+}
+
+#gcli-tooltip-root {
+  padding: 5px 0px;
+}
+
+#gcli-tooltip-connector {
+  margin-top: -1px;
+  margin-left: 8px;
+  width: 20px;
+  height: 10px;
+  border-left: 1px solid hsl(206,37%,4%);
+  border-right: 1px solid hsl(206,37%,4%);
+  background-color: hsl(209,23%,18%);
+}
+
+.gcli-tt-description,
+.gcli-tt-error {
+  padding: 0 10px;
+}
+
+.gcli-row-out {
+  padding: 0 5px;
+  line-height: 1.2em;
+  border-top: none;
+  border-bottom: none;
+  color: hsl(210,30%,85%);
+}
+
+.gcli-row-out p,
+.gcli-row-out h1,
+.gcli-row-out h2,
+.gcli-row-out h3 {
+  margin: 5px 0;
+}
+
+.gcli-row-out h1,
+.gcli-row-out h2,
+.gcli-row-out h3,
+.gcli-row-out h4,
+.gcli-row-out h5,
+.gcli-row-out th,
+.gcli-row-out strong,
+.gcli-row-out pre {
+  color: hsl(210,30%,95%);
+}
+
+.gcli-row-out pre {
+  font-size: 80%;
+}
+
+.gcli-row-out td {
+  white-space: nowrap;
+}
+
+.gcli-out-shortcut,
+.gcli-help-synopsis {
+  padding: 0 3px;
+  margin: 0 4px;
+  font-weight: normal;
+  font-size: 90%;
+  border-radius: 3px;
+  background-color: hsl(209,23%,18%);
+  border: 1px solid hsl(206,37%,4%);
+}
+
+.gcli-out-shortcut:before,
+.gcli-help-synopsis:before {
+  color: hsl(210,30%,85%);
+  -moz-padding-end: 2px;
+}
+
+.gcli-help-arrow {
+  color: #666;
+}
+
+.gcli-help-description {
+  margin: 0 20px;
+  padding: 0;
+}
+
+.gcli-help-parameter {
+  margin: 0 30px;
+  padding: 0;
+}
+
+.gcli-help-header {
+  margin: 10px 0 6px;
+}
+
+.gcli-menu-name {
+  -moz-padding-start: 8px;
+}
+
+.gcli-menu-desc {
+  -moz-padding-end: 8px;
+  color: hsl(210,30%,75%);
+}
+
+.gcli-menu-option:hover {
+  background-color: hsla(0,0%,0%,.3);
+}
+
+.gcli-menu-highlight,
+.gcli-menu-highlight.gcli-menu-option:hover {
+  background-color: hsla(0,100%,100%,.1);
+}
+
+.gcli-menu-typed {
+  color: hsl(25,78%,50%);
+}
+
+.gcli-menu-more {
+  font-size: 80%;
+  text-align: right;
+  -moz-padding-end: 8px;
+}
+
+.gcli-addon-disabled {
+  opacity: 0.6;
+  text-decoration: line-through;
+}
+
+.gcli-breakpoint-label {
+  font-weight: bold;
+}
+
+.gcli-breakpoint-lineText {
+  font-family: monospace;
+}
diff --git a/browser/themes/windows/devtools/commandline.png b/browser/themes/windows/devtools/commandline.png
new file mode 100644
index 000000000..6726f2820
--- /dev/null
+++ b/browser/themes/windows/devtools/commandline.png
diff --git a/browser/themes/windows/devtools/common.css b/browser/themes/windows/devtools/common.css
new file mode 100644
index 000000000..2e13f4eae
--- /dev/null
+++ b/browser/themes/windows/devtools/common.css
@@ -0,0 +1,369 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* 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/. */
+
+/* Font for code */
+
+:root {
+  font: message-box;
+}
+
+.devtools-monospace {
+  font-family: monospace;
+}
+
+/* Toolbar and Toolbar items */
+
+.devtools-toolbar {
+  -moz-appearance: none;
+  padding: 4px 3px;
+  color: hsl(210,30%,85%);
+  background-image: url(background-noise-toolbar.png), linear-gradient(#3e4750, #3e4750);
+  border-bottom: 1px solid #060a0d;
+  box-shadow: 0 1px 0 hsla(204,45%,98%,.05) inset, -1px 0 0 hsla(204,45%,98%,.05) inset, 0 -1px 0 hsla(204,45%,98%,.05) inset;
+}
+
+.devtools-menulist,
+.devtools-toolbarbutton {
+  -moz-appearance: none;
+  -moz-box-align: center;
+  min-width: 78px;
+  min-height: 22px;
+  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+  border: 1px solid hsla(211,68%,6%,.5);
+  border-radius: 3px;
+  background: linear-gradient(hsla(209,13%,54%,.35), hsla(209,13%,54%,.1) 85%, hsla(209,13%,54%,.2)) padding-box;
+  box-shadow: 0 1px 0 hsla(209,29%,72%,.15) inset, 0 0 0 1px hsla(209,29%,72%,.1) inset, 0 0 0 1px hsla(209,29%,72%,.1), 0 1px 0 hsla(210,16%,76%,.1);
+  margin: 0;
+  -moz-margin-end: 3px;
+  color: inherit;
+}
+
+.devtools-toolbarbutton > .toolbarbutton-menubutton-button {
+  -moz-box-orient: horizontal;
+}
+
+.devtools-menulist:-moz-focusring,
+.devtools-toolbarbutton:-moz-focusring {
+  outline: 1px dotted hsla(210,30%,85%,0.7);
+  outline-offset: -4px;
+}
+
+.devtools-toolbarbutton > .toolbarbutton-icon {
+  margin: 0;
+}
+
+.devtools-toolbarbutton:not([label]) {
+  min-width: 32px;
+}
+
+.devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
+  display: none;
+}
+
+.devtools-toolbarbutton:not([checked=true]):hover:active {
+  background-color: hsla(210,18%,9%,.1);
+  background-image: linear-gradient(hsla(209,13%,54%,.35), hsla(209,13%,54%,.1) 85%, hsla(209,13%,54%,.2));
+  box-shadow: 0 1px 3px hsla(211,68%,6%,.5) inset, 0 0 0 1px hsla(209,29%,72%,.1), 0 1px 0 hsla(210,16%,76%,.1);
+}
+
+.devtools-menulist[open=true],
+.devtools-toolbarbutton[open=true],
+.devtools-toolbarbutton[checked=true] {
+  border-color: hsla(211,68%,6%,.6);
+  background: linear-gradient(hsla(211,68%,6%,.1), hsla(211,68%,6%,.2));
+  box-shadow: 0 1px 3px hsla(211,68%,6%,.5) inset, 0 0 0 1px hsla(209,29%,72%,.1), 0 1px 0 hsla(210,16%,76%,.1);
+}
+
+.devtools-toolbarbutton[checked=true] {
+  color: hsl(200,100%,60%) !important;
+}
+
+.devtools-toolbarbutton[checked=true]:hover:active {
+  background-color: hsla(211,68%,6%,.2);
+}
+
+.devtools-option-toolbarbutton {
+  -moz-appearance: none;
+  list-style-image: url("chrome://browser/skin/devtools/option-icon.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+  background: none;
+  border: none;
+}
+
+.devtools-option-toolbarbutton[open=true] {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+.devtools-menulist > .menulist-label-box {
+  text-align: center;
+}
+
+.devtools-menulist > .menulist-dropmarker {
+  -moz-appearance: none;
+  list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
+  border-width: 0;
+  background-color: transparent;
+}
+
+.devtools-menulist:focus:not([open="true"]):not(.menulist-compact) > .menulist-label-box {
+  color: hsl(210,30%,85%) !important;
+  background-color: transparent;
+}
+
+.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
+  -moz-appearance: none;
+  color: inherit;
+  border-width: 0;
+  -moz-border-end: 1px solid hsla(210,8%,5%,.45);
+  box-shadow: -1px 0 0 hsla(210,16%,76%,.15) inset, 1px 0 0 hsla(210,16%,76%,.15);
+}
+
+.devtools-toolbarbutton[type=menu-button]:-moz-locale-dir(rtl) > .toolbarbutton-menubutton-button {
+  box-shadow: 1px 0 0 hsla(210,16%,76%,.15) inset, -1px 0 0 hsla(210,16%,76%,.15);
+}
+
+.devtools-toolbarbutton[type=menu-button] {
+  padding: 0 1px;
+  -moz-box-align: stretch;
+}
+
+.devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
+.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
+  -moz-appearance: none !important;
+  list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
+  -moz-box-align: center;
+}
+
+/* Text input */
+
+.devtools-textinput,
+.devtools-searchinput {
+  -moz-appearance: none;
+  margin: 0 3px;
+  min-height: 22px;
+  border: 1px solid hsla(211,68%,6%,.6);
+  box-shadow: inset 0 1px 0 hsla(211,68%,6%,.05), 0 0 0 1px hsla(210,40%,83%,.1);
+  border-radius: 2px;
+  background-color: transparent;
+  background-image: linear-gradient(hsla(210,16%,76%,.15), hsla(210,16%,76%,.35));
+  padding: 3px;
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 150ms;
+  transition-timing-function: ease;
+  color: inherit;
+}
+
+.devtools-searchinput {
+  background-image: url(magnifying-glass.png), linear-gradient(hsla(210,16%,76%,.15), hsla(210,16%,76%,.35));
+  background-repeat: no-repeat;
+  background-position: 4px center, top left, top left;
+  padding-top: 0;
+  padding-bottom: 0;
+  -moz-padding-start: 18px;
+  -moz-padding-end: 12px;
+  font-size: inherit;
+}
+
+.devtools-searchinput[focused] {
+  border-color: hsl(200,70%,40%) hsl(200,75%,37%) hsl(200,80%,35%);
+  background-origin: padding-box;
+  background-clip: padding-box;
+  box-shadow: inset 0 0 0 1px hsla(211,68%,6%,.1);
+}
+
+.devtools-searchinput:-moz-locale-dir(rtl) {
+  background-position: calc(100% - 4px) center, top left, top left;
+}
+
+.devtools-searchinput > .textbox-input-box > .textbox-search-icons {
+  display: none;
+}
+
+.devtools-searchinput > .textbox-input-box > .textbox-input::-moz-placeholder {
+  opacity: 1.0;
+  color: hsl(208,10%,66%);
+}
+
+.devtools-no-search-result {
+  box-shadow: inset 0 0 0 1px hsla(0,68%,6%,.35);
+  border-color: hsl(10,70%,40%) hsl(10,75%,37%) hsl(10,80%,35%) !important;
+  background-image: url(magnifying-glass.png), linear-gradient(hsla(1,16%,76%,.45), hsla(1,16%,76%,.75));
+}
+
+/* Close button */
+
+.devtools-closebutton {
+  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  -moz-appearance: none;
+  border: none;
+  margin: 0 4px;
+  min-width: 16px;
+  width: 16px;
+  opacity: 0.6;
+}
+
+.devtools-closebutton > .toolbarbutton-text {
+  display: none;
+}
+
+.devtools-closebutton:hover {
+  opacity: 0.8;
+}
+
+.devtools-closebutton:hover:active {
+  opacity: 1;
+}
+
+/* Splitters */
+
+.devtools-horizontal-splitter {
+  -moz-appearance: none;
+  border-width: 1px 0 0 0;
+  -moz-border-top-colors: black;
+  background-color: transparent;
+  min-height: 3px;
+  height: 3px;
+  margin-bottom: -3px;
+  position: relative;
+}
+
+.devtools-side-splitter {
+  border: 0;
+  -moz-border-start: 1px solid #242b33;
+  min-width: 0;
+  width: 3px;
+  background-color: transparent;
+  -moz-margin-end: -3px;
+  position: relative;
+  cursor: e-resize;
+}
+
+/* In-tools sidebar */
+
+.devtools-toolbox-side-iframe {
+  min-width: 465px;
+}
+
+.devtools-sidebar-tabs {
+  -moz-appearance: none;
+  margin: 0;
+}
+
+.devtools-sidebar-tabs > tabpanels {
+  -moz-appearance: none;
+  padding: 0;
+  border: 0;
+}
+
+.devtools-sidebar-tabs > tabs {
+  -moz-appearance: none;
+  position: static;
+  color: hsl(210,30%,85%);
+  margin-bottom: 0;
+  padding: 0;
+  background-image: url(background-noise-toolbar.png), linear-gradient(#3e4750, #3e4750);
+  box-shadow: 0 1px 0 hsla(204,45%,98%,.05) inset, -1px 0 0 hsla(204,45%,98%,.05) inset, 0 -1px 0 hsla(204,45%,98%,.05) inset;
+  border-width: 0 0 1px 0;
+  border-color: hsla(210,8%,5%,.6);
+  border-style: solid;
+  overflow: hidden;
+}
+
+.devtools-sidebar-tabs > tabs > .tabs-right,
+.devtools-sidebar-tabs > tabs > .tabs-left {
+  display: none;
+}
+
+.devtools-sidebar-tabs > tabs > tab {
+  -moz-appearance: none;
+  /* We want to match the height of a toolbar with a toolbarbutton
+   * First, we need to replicated the padding of toolbar (4px),
+   * then, the padding of the button itself from toolbarbutton.css (3px),
+   * Also, we need to take the border of the buttons into accout (1px).
+   * Padding-bottom is one pixel shorter because we need to include the
+   * black border.
+   */
+  padding: 8px 3px 7px;
+  -moz-padding-start: 6px;
+  margin: 0;
+  min-width: 78px;
+  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+  text-align: center;
+  color: inherit;
+  -moz-box-flex: 1;
+  border-width: 0;
+  background: transparent;
+  border-radius: 0;
+  position: static;
+  -moz-margin-start: -1px;
+}
+
+.devtools-sidebar-tabs > tabs > tab:-moz-focusring {
+  position: static;
+}
+
+.devtools-sidebar-tabs > tabs > tab:last-of-type {
+  -moz-border-end-width: 0;
+}
+
+.devtools-sidebar-tabs > tabs > tab:first-of-type {
+  -moz-margin-start: -3px;
+}
+
+.devtools-sidebar-tabs > tabs > tab {
+  background-size: 100% 100%, 1px 100%, 1px 100%, 1px 100%;
+  background-repeat: no-repeat;
+  background-position: 2px, 0, 1px, 2px;
+}
+
+.devtools-sidebar-tabs:-moz-locale-dir(rtl) > tabs > tab {
+  background-position: calc(100% - 3px), 100%, calc(100% - 1px), calc(100% - 2px);
+}
+
+%filter substitution
+%define smallSeparator linear-gradient(hsla(204,45%,98%,0), hsla(204,45%,98%,.1), hsla(204,45%,98%,0)), linear-gradient(hsla(206,37%,4%,0), hsla(206,37%,4%,.6), hsla(206,37%,4%,0)), linear-gradient(hsla(204,45%,98%,0), hsla(204,45%,98%,.1), hsla(204,45%,98%,0))
+%define solidSeparator linear-gradient(transparent, transparent), linear-gradient(hsla(206,37%,4%,.6), hsla(206,37%,4%,.7)), linear-gradient(hsla(204,45%,98%,.1), hsla(204,45%,98%,.1))
+
+.devtools-sidebar-tabs > tabs > tab {
+  background-image: linear-gradient(transparent, transparent), @smallSeparator@;
+}
+
+.devtools-sidebar-tabs > tabs > tab:hover {
+  background-image: linear-gradient(hsla(206,37%,4%,.2), hsla(206,37%,4%,.2)), @smallSeparator@;
+}
+
+.devtools-sidebar-tabs > tabs > tab:hover:active {
+  background-image: linear-gradient(hsla(206,37%,4%,.4), hsla(206,37%,4%,.4)), @smallSeparator@;
+}
+
+.devtools-sidebar-tabs > tabs > tab[selected=true] + tab {
+  background-image: linear-gradient(transparent, transparent), @solidSeparator@;
+}
+
+.devtools-sidebar-tabs > tabs > tab[selected=true] + tab:hover {
+  background-image: linear-gradient(hsla(206,37%,4%,.2), hsla(206,37%,4%,.2)), @solidSeparator@;
+}
+
+.devtools-sidebar-tabs > tabs > tab[selected=true] + tab:hover:active {
+  background-image: linear-gradient(hsla(206,37%,4%,.4), hsla(206,37%,4%,.4)), @solidSeparator@;
+}
+
+.devtools-sidebar-tabs > tabs > tab[selected=true] {
+  color: #f5f7fa;
+  background-image: linear-gradient(#2f607b, #294d68), @solidSeparator@;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.1) inset, 0 -2px 0 hsla(206,37%,4%,.05) inset, 0 -1px 1px hsla(206,37%,4%,.1) inset;
+}
+
+.devtools-sidebar-tabs > tabs > tab[selected=true]:hover {
+  background-image: linear-gradient(#274f64, #224056), @solidSeparator@;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset, 0 -2px 0 hsla(206,37%,4%,.05) inset, 0 -1px 1px hsla(206,37%,4%,.1) inset;
+}
+
+.devtools-sidebar-tabs > tabs > tab[selected=true]:hover:active {
+  background-image: linear-gradient(#1f3e4f, #1b3243), @solidSeparator@;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset, 0 -2px 0 hsla(206,37%,4%,.05) inset, 0 -1px 1px hsla(206,37%,4%,.1) inset;
+}
+
+%include ../../shared/devtools/common.inc.css
diff --git a/browser/themes/windows/devtools/computedview.css b/browser/themes/windows/devtools/computedview.css
new file mode 100644
index 000000000..4f6c05b67
--- /dev/null
+++ b/browser/themes/windows/devtools/computedview.css
@@ -0,0 +1,169 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* 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/. */
+
+/* Take away these two :visited rules to get a core dumper     */
+/* See https://bugzilla.mozilla.org/show_bug.cgi?id=575675#c30 */
+.link,
+.link:visited {
+  color: #0091ff;
+}
+.link,
+.helplink,
+.link:visited,
+.helplink:visited {
+  text-decoration: none;
+}
+.link:hover {
+  text-decoration: underline;
+}
+
+/* From content */
+
+* {
+  -moz-box-sizing: border-box;
+}
+
+:root {
+  height: 100%;
+}
+
+body {
+  margin: 0;
+  display : flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+#propertyContainer {
+  -moz-user-select: text;
+  overflow: auto;
+  min-height: 0;
+  flex: 1;
+}
+
+.property-view-hidden,
+.property-content-hidden {
+  display: none;
+}
+
+.property-view {
+  clear: both;
+  padding: 2px 0 2px 17px;
+}
+
+.property-view > * {
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.property-name {
+  width: 50%;
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.property-value {
+  width: 50%;
+  max-width: 100%;
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  background-image: url(arrow-e.png);
+  background-repeat: no-repeat;
+  background-size: 5px 8px;
+  background-position: 2px center;
+  padding-left: 10px;
+}
+
+.other-property-value {
+  background-image: url(arrow-e.png);
+  background-repeat: no-repeat;
+  background-size: 5px 8px;
+  background-position: left center;
+  padding-left: 8px;
+}
+
+@media (min-width: 400px) {
+  .property-name {
+    width: 200px;
+  }
+  .property-value {
+    width: auto;
+  }
+}
+
+.property-content {
+  padding-left: 17px;
+}
+
+/* From skin */
+.expander {
+  visibility: hidden;
+  margin-left: -12px!important;
+}
+
+.expander[open] {
+  margin-left: -17px!important;
+}
+
+.expandable {
+  visibility: visible;
+}
+
+.match {
+  visibility: hidden;
+}
+
+.matchedselectors > p {
+  clear: both;
+  margin: 0 2px 0 0;
+  padding: 2px;
+  overflow-x: hidden;
+  border-style: dotted;
+  border-color: rgba(128,128,128,0.4);
+  border-width: 1px 1px 0 1px;
+}
+
+.matchedselectors > p:last-of-type {
+  border-bottom-width: 1px;
+}
+
+/* This rule is necessary because Templater.jsm breaks LTR TDs in RTL docs */
+.rule-text {
+  direction: ltr;
+}
+
+.matched {
+  text-decoration: line-through;
+}
+
+.parentmatch {
+  opacity: 0.5;
+}
+
+#noResults {
+  font-size: 110%;
+  margin: 5px;
+  text-align: center;
+}
+
+.onlyuserstyles {
+  cursor: pointer;
+}
+
+.legendKey {
+  margin: 0 5px;
+}
+
+.devtools-toolbar {
+  width: 100%;
+}
+
+.link {
+  padding: 0 3px;
+  cursor: pointer;
+  float: right;
+}
diff --git a/browser/themes/windows/devtools/dark-theme.css b/browser/themes/windows/devtools/dark-theme.css
new file mode 100644
index 000000000..97189572d
--- /dev/null
+++ b/browser/themes/windows/devtools/dark-theme.css
@@ -0,0 +1,104 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* 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/. */
+
+/* According to:
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
+ */
+.theme-body {
+  background: #131c26;
+  color: #8fa1b2
+}
+
+.theme-twisty {
+  cursor: pointer;
+  margin-right: 5px;
+}
+
+.theme-twisty:-moz-focusring {
+  outline-style: none;
+}
+
+.theme-twisty:not([open]) {
+  width: 0;
+  height: 0;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid rgba(255,255,255,0.5);
+  margin-left: 5px;
+}
+
+.theme-twisty[open] {
+  width: 10px;
+  height: 10px;
+  background-image: linear-gradient(to bottom right, transparent 68%,  rgba(255,255,255,0.5) 68%);
+}
+
+.theme-checkbox {
+  display: inline-block;
+  border: 0;
+  width: 14px;
+  height: 14px;
+  padding: 0;
+  outline: none;
+  background: url("chrome://browser/skin/devtools/checkbox-dark.png") no-repeat;
+}
+
+.theme-checkbox[checked] {
+  background: url("chrome://browser/skin/devtools/checkbox-dark.png") 14px 0;
+}
+
+.theme-selected {
+  background: #26384E;
+}
+
+.theme-bg-darker {
+  background-color: rgba(0,0,0,0.1);
+}
+
+.theme-link { /* blue */
+  color: #3689b2;
+}
+
+.theme-comment { /* grey */
+  color: #5c6773;
+}
+
+.theme-gutter {
+  background-color: #0f171f;
+  color: #667380;
+  border-color: #303b47;
+}
+
+.theme-separator { /* grey */
+  border-color: #303b47;
+}
+
+.theme-fg-color1 { /* green */
+  color: #5c9966;
+}
+
+.theme-fg-color2 { /* blue */
+  color: #3689b2;
+}
+
+.theme-fg-color3 { /* pink/lavender */
+  color: #a673bf;
+}
+
+.theme-fg-color4 { /* purple/violet */
+  color: #6270b2;
+}
+
+.theme-fg-color5 { /* Yellow */
+  color: #a18650;
+}
+
+.theme-fg-color6 { /* Orange */
+  color: #b26b47;
+}
+
+.theme-fg-color7 { /* Red */
+  color: #bf5656;
+}
diff --git a/browser/themes/windows/devtools/debugger-collapse.png b/browser/themes/windows/devtools/debugger-collapse.png
new file mode 100644
index 000000000..242e19c56
--- /dev/null
+++ b/browser/themes/windows/devtools/debugger-collapse.png
diff --git a/browser/themes/windows/devtools/debugger-expand.png b/browser/themes/windows/devtools/debugger-expand.png
new file mode 100644
index 000000000..af453e316
--- /dev/null
+++ b/browser/themes/windows/devtools/debugger-expand.png
diff --git a/browser/themes/windows/devtools/debugger-pause.png b/browser/themes/windows/devtools/debugger-pause.png
new file mode 100644
index 000000000..7f908bf8b
--- /dev/null
+++ b/browser/themes/windows/devtools/debugger-pause.png
diff --git a/browser/themes/windows/devtools/debugger-play.png b/browser/themes/windows/devtools/debugger-play.png
new file mode 100644
index 000000000..91719826a
--- /dev/null
+++ b/browser/themes/windows/devtools/debugger-play.png
diff --git a/browser/themes/windows/devtools/debugger-step-in.png b/browser/themes/windows/devtools/debugger-step-in.png
new file mode 100644
index 000000000..c80ee72a2
--- /dev/null
+++ b/browser/themes/windows/devtools/debugger-step-in.png
diff --git a/browser/themes/windows/devtools/debugger-step-out.png b/browser/themes/windows/devtools/debugger-step-out.png
new file mode 100644
index 000000000..1a7145a98
--- /dev/null
+++ b/browser/themes/windows/devtools/debugger-step-out.png
diff --git a/browser/themes/windows/devtools/debugger-step-over.png b/browser/themes/windows/devtools/debugger-step-over.png
new file mode 100644
index 000000000..7c9b82ad4
--- /dev/null
+++ b/browser/themes/windows/devtools/debugger-step-over.png
diff --git a/browser/themes/windows/devtools/debugger.css b/browser/themes/windows/devtools/debugger.css
new file mode 100644
index 000000000..9eeaf2eba
--- /dev/null
+++ b/browser/themes/windows/devtools/debugger.css
@@ -0,0 +1,321 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* 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/. */
+
+#body {
+  background: #fff;
+}
+
+/* Sources and breakpoints pane */
+
+#sources-pane {
+  min-width: 50px;
+}
+
+#sources-pane + .devtools-side-splitter {
+  -moz-border-start-color: transparent;
+}
+
+/* ListWidget items */
+
+.list-widget-item {
+  padding: 2px;
+}
+
+.list-widget-item:not(.selected):not(.empty):hover {
+  background: linear-gradient(rgba(255,255,255,0.9), rgba(255,255,255,0.85)), Highlight;
+}
+
+.list-widget-item.selected.light {
+  background: linear-gradient(rgba(255,255,255,0.85), rgba(255,255,255,0.8)), Highlight;
+  color: #000;
+}
+
+.list-widget-item.selected {
+  background: Highlight;
+  color: HighlightText;
+}
+
+.list-widget-item.empty {
+  color: GrayText;
+  padding: 2px;
+}
+
+/* Stack frames view */
+
+.dbg-stackframe-details {
+  -moz-padding-start: 4px;
+}
+
+.dbg-stackframe-menuitem[checked] {
+  margin-top: 3px;
+  margin-bottom: 3px;
+  outline: 1px solid #eee;
+  font-weight: 600;
+}
+
+.dbg-stackframe-menuitem-details {
+  -moz-padding-start: 16px;
+}
+
+/* Sources and breakpoints view */
+
+.dbg-breakpoint {
+  font-family: monospace;
+}
+
+.dbg-breakpoint-line {
+  font-weight: 600;
+}
+
+.dbg-breakpoint-text {
+  -moz-margin-start: 10px !important;
+  font-style: italic;
+}
+
+/* Watch expressions view */
+
+#expressions {
+  min-height: 10px;
+  max-height: 125px;
+}
+
+.dbg-expression {
+  height: 20px;
+}
+
+.dbg-expression-arrow {
+  width: 16px;
+  height: auto;
+  background: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
+}
+
+.dbg-expression-input {
+  -moz-padding-start: 2px !important;
+  font-family: Menlo, Monaco, monospace;
+}
+
+/* Searchbox and the search operations help panel */
+
+.devtools-searchinput {
+  min-width: 220px;
+  -moz-margin-start: 1px;
+}
+
+#searchbox-panel-description {
+  margin-top: 0;
+  margin-bottom: 8px;
+  -moz-margin-start: 2px;
+}
+
+.searchbox-panel-operator-button {
+  min-width: 26px;
+  margin-top: 0;
+  margin-bottom: 0;
+  -moz-margin-start: 2px;
+  -moz-margin-end: 6px;
+  text-align: center;
+  font-family: Menlo, Monaco, monospace;
+}
+
+.searchbox-panel-operator-label {
+  padding-bottom: 2px;
+}
+
+/* Searchbox results panel */
+
+.results-panel {
+  padding: 4px;
+  opacity: 0.9;
+}
+
+.results-panel-item {
+  background: #f4f4f4;
+  border: 1px solid #ddd;
+  border-top-color: #fff;
+  padding: 5px;
+  cursor: pointer;
+}
+
+.results-panel-item:first-of-type {
+  border-top-color: #ddd;
+  border-radius: 4px 4px 0 0;
+}
+
+.results-panel-item:last-of-type {
+  border-radius: 0 0 4px 4px;
+}
+
+.results-panel-item:only-of-type {
+  border-radius: 4px;
+}
+
+.results-panel-item:not(.selected):not(:hover) {
+  text-shadow: 0 1px #fff;
+}
+
+.results-panel-item-pre {
+  -moz-margin-end: 5px !important;
+  color: #444;
+  cursor: inherit;
+}
+
+.results-panel-item-name {
+  color: #111;
+  font-weight: 600;
+  cursor: inherit;
+}
+
+.results-panel-item-details {
+  color: #7f7f7f;
+  cursor: inherit;
+}
+
+/* Sources search view */
+
+#globalsearch {
+  min-height: 10px;
+  box-shadow: inset 0 -4px 8px #eee;
+  background: url(background-noise-toolbar.png);
+}
+
+#globalsearch > vbox:not(:empty) {
+  min-height: 10px;
+  max-height: 125px;
+}
+
+#globalsearch + .devtools-horizontal-splitter {
+  -moz-border-top-colors: #bfbfbf;
+}
+
+.dbg-source-results {
+  padding: 0;
+  background: none !important;
+}
+
+.dbg-results-header {
+  -moz-padding-start: 6px;
+}
+
+.dbg-results-header-location {
+  font-weight: 600;
+}
+
+.dbg-results-header-match-count {
+  -moz-padding-start: 6px;
+  color: GrayText;
+}
+
+.dbg-results-line-number {
+  background: #e2e2e2;
+  min-width: 40px;
+  -moz-border-end: 1px solid #b4c4d3;
+  -moz-padding-end: 4px;
+  padding-top: 2px;
+  text-align: end;
+  font-family: monospace;
+  color: #8c8c8c;
+}
+
+.dbg-results-line-contents {
+  -moz-padding-start: 4px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  font-family: monospace;
+}
+
+.dbg-results-line-contents-string {
+  padding: 1px;
+}
+
+.dbg-results-line-contents-string[match=true] {
+  background: rgba(255,255,0,0.5);
+  padding: 0;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.dbg-results-line-contents-string[match=true][focusing] {
+  transition: transform 0.3s ease-in-out;
+}
+
+.dbg-results-line-contents-string[match=true][focused] {
+  transition-duration: 0.1s;
+  transform: scale(1.75, 1.75);
+}
+
+/* Toolbar Controls */
+
+#resumption-panel-desc {
+  width: 200px;
+}
+
+#resumption-order-panel {
+  -moz-margin-start: -8px;
+}
+
+#resume {
+  list-style-image: url("chrome://browser/skin/devtools/debugger-play.png");
+  -moz-image-region: rect(0px,16px,16px,0px);
+}
+
+#resume[checked] {
+  -moz-image-region: rect(0px,32px,16px,16px);
+}
+
+#step-over {
+  list-style-image: url("chrome://browser/skin/devtools/debugger-step-over.png");
+}
+
+#step-in {
+  list-style-image: url("chrome://browser/skin/devtools/debugger-step-in.png");
+}
+
+#step-out {
+  list-style-image: url("chrome://browser/skin/devtools/debugger-step-out.png");
+}
+
+#debugger-controls > toolbarbutton {
+  margin: 0;
+  box-shadow: none;
+  border-radius: 0;
+  border-width: 0;
+  -moz-border-end-width: 1px;
+  outline-offset: -3px;
+}
+
+#debugger-controls > toolbarbutton:last-of-type {
+  -moz-border-end-width: 0;
+}
+
+#debugger-controls {
+  box-shadow: 0 1px 0 hsla(209,29%,72%,.15) inset,
+              0 0 0 1px hsla(209,29%,72%,.1) inset,
+              0 0 0 1px hsla(209,29%,72%,.1),
+              0 1px 0 hsla(210,16%,76%,.1);
+  border: 1px solid hsla(210,8%,5%,.45);
+  border-radius: 3px;
+  margin: 0 3px;
+}
+
+#instruments-pane-toggle {
+  background: none;
+  box-shadow: none;
+  border: none;
+  list-style-image: url("chrome://browser/skin/devtools/debugger-collapse.png");
+  -moz-image-region: rect(0px,16px,16px,0px);
+}
+
+#instruments-pane-toggle[pane-collapsed] {
+  list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png");
+}
+
+#instruments-pane-toggle:hover {
+  -moz-image-region: rect(0px,32px,16px,16px);
+}
+
+#instruments-pane-toggle:hover:active {
+  -moz-image-region: rect(0px,48px,16px,32px);
+}
diff --git a/browser/themes/windows/devtools/dock-bottom.png b/browser/themes/windows/devtools/dock-bottom.png
new file mode 100644
index 000000000..8fa9c932b
--- /dev/null
+++ b/browser/themes/windows/devtools/dock-bottom.png
diff --git a/browser/themes/windows/devtools/dock-side.png b/browser/themes/windows/devtools/dock-side.png
new file mode 100644
index 000000000..1c1235513
--- /dev/null
+++ b/browser/themes/windows/devtools/dock-side.png
diff --git a/browser/themes/windows/devtools/dropmarker.png b/browser/themes/windows/devtools/dropmarker.png
new file mode 100644
index 000000000..7e91860fb
--- /dev/null
+++ b/browser/themes/windows/devtools/dropmarker.png
diff --git a/browser/themes/windows/devtools/floating-scrollbars-light.css b/browser/themes/windows/devtools/floating-scrollbars-light.css
new file mode 100644
index 000000000..7e38611f6
--- /dev/null
+++ b/browser/themes/windows/devtools/floating-scrollbars-light.css
@@ -0,0 +1,10 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* 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("floating-scrollbars.css");
+
+scrollbar thumb {
+  background-color: rgba(170,170,170,0.2) !important;
+}
diff --git a/browser/themes/windows/devtools/floating-scrollbars.css b/browser/themes/windows/devtools/floating-scrollbars.css
new file mode 100644
index 000000000..ff70d646f
--- /dev/null
+++ b/browser/themes/windows/devtools/floating-scrollbars.css
@@ -0,0 +1,33 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+scrollbar {
+  -moz-appearance: none !important;
+  position: relative;
+  background-color: transparent;
+  background-image: none;
+  z-index: 2147483647;
+  padding: 2px;
+}
+
+scrollbar[orient="vertical"] {
+  -moz-margin-start: -10px;
+  min-width: 10px;
+  max-width: 10px;
+}
+
+scrollbar[orient="horizontal"] {
+  margin-top: -10px;
+  min-height: 10px;
+  max-height: 10px;
+}
+
+scrollbar thumb {
+  -moz-appearance: none !important;
+  border-width: 0px !important;
+  background-color: rgba(170,170,170,0.2) !important;
+  border-radius: 3px !important;
+}
+
+scrollbar scrollbarbutton, scrollbar gripper {
+  display: none;
+}
diff --git a/browser/themes/windows/devtools/font-inspector.css b/browser/themes/windows/devtools/font-inspector.css
new file mode 100644
index 000000000..df8fb3ef6
--- /dev/null
+++ b/browser/themes/windows/devtools/font-inspector.css
@@ -0,0 +1,80 @@
+* {
+  -moz-box-sizing: border-box;
+}
+
+body {
+  margin: 0;
+  padding-bottom: 20px;
+}
+
+#all-fonts {
+  padding: 0 5px;
+  margin: 0;
+}
+
+#showall {
+  border-radius: 0;
+  border: 1px solid black;
+  margin: 3px;
+  cursor: pointer;
+  position: fixed;
+  bottom: 0;
+  right: 0;
+}
+
+.font {
+  padding: 10px 5px;
+  font-size: 0;
+}
+
+.theme-dark .font {
+  border-bottom: 1px solid #444;
+}
+
+.theme-light .font {
+  border-bottom: 1px solid #DDD;
+}
+
+.font:last-of-type {
+  border-bottom: 0;
+}
+
+.theme-light .font:nth-child(even) {
+  background: #F4F4F4;
+}
+
+.font-preview {
+  height: 60px;
+  width: 100%;
+  border: 0;
+  display: block;
+}
+
+.font-info {
+  font-size: 1rem;
+  display: block;
+}
+
+.font-name {
+  display: inline;
+}
+
+.font-css-code {
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding: 5px;
+}
+
+.theme-light .font-css-code,
+.theme-light .font-url {
+  border: 1px solid #CCC;
+  background: white;
+}
+
+.theme-dark .font-css-code,
+.theme-dark .font-url {
+  border: 1px solid #333;
+  background: black;
+  color: white;
+}
diff --git a/browser/themes/windows/devtools/inspect-button.png b/browser/themes/windows/devtools/inspect-button.png
new file mode 100644
index 000000000..ebfd9586d
--- /dev/null
+++ b/browser/themes/windows/devtools/inspect-button.png
diff --git a/browser/themes/windows/devtools/inspector.css b/browser/themes/windows/devtools/inspector.css
new file mode 100644
index 000000000..62e70b798
--- /dev/null
+++ b/browser/themes/windows/devtools/inspector.css
@@ -0,0 +1,35 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* 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/. */
+
+#inspector-inspect-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#inspector-inspect-toolbutton[checked=true] {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#inspector-searchbox {
+  transition-property: max-width, -moz-padding-end, -moz-padding-start;
+  transition-duration: 250ms;
+  transition-timing-function: ease;
+}
+
+#inspector-searchbox:not([focused]):not([filled]) > .textbox-input-box {
+  overflow: hidden;
+}
+
+#inspector-searchbox:not([focused]):not([filled]) {
+  max-width: 20px !important;
+  -moz-padding-end: 6px;
+  -moz-padding-start: 22px;
+  background-position: 8px center, top left, top left;
+}
+
+#inspector-searchbox[focused],
+#inspector-searchbox[filled] {
+  max-width: 200px !important;
+}
diff --git a/browser/themes/windows/devtools/itemArrow-ltr.png b/browser/themes/windows/devtools/itemArrow-ltr.png
new file mode 100644
index 000000000..6cc3e984b
--- /dev/null
+++ b/browser/themes/windows/devtools/itemArrow-ltr.png
diff --git a/browser/themes/windows/devtools/itemArrow-rtl.png b/browser/themes/windows/devtools/itemArrow-rtl.png
new file mode 100644
index 000000000..0f8f4b1b0
--- /dev/null
+++ b/browser/themes/windows/devtools/itemArrow-rtl.png
diff --git a/browser/themes/windows/devtools/itemToggle.png b/browser/themes/windows/devtools/itemToggle.png
new file mode 100644
index 000000000..cf70394e6
--- /dev/null
+++ b/browser/themes/windows/devtools/itemToggle.png
diff --git a/browser/themes/windows/devtools/layout-background-grid.png b/browser/themes/windows/devtools/layout-background-grid.png
new file mode 100644
index 000000000..87b0b855d
--- /dev/null
+++ b/browser/themes/windows/devtools/layout-background-grid.png
diff --git a/browser/themes/windows/devtools/layoutview.css b/browser/themes/windows/devtools/layoutview.css
new file mode 100644
index 000000000..49420db11
--- /dev/null
+++ b/browser/themes/windows/devtools/layoutview.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/. */
+
+.theme-dark .theme-body {
+  background-image: url(layout-background-grid.png);
+}
+
+.theme-light .theme-body {
+  background-image: url(layout-background-grid.png), radial-gradient(circle at 50% 70%, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
+}
+
+.theme-body {
+  color: hsl(210,100%,85%);
+  -moz-box-sizing: border-box;
+}
+
+#main {
+  border-color: hsla(210,100%,85%,0.7);
+  border-style: dotted;
+}
+
+#main > .border {
+  color: hsl(210,53%,45%);
+}
+
+.border > span {
+  background-color: hsl(210,100%,85%);
+  border-radius: 2px;
+  padding: 0 4px;
+}
+
+#content {
+  border-color: hsla(210,100%,85%,0.7);
+  border-style: dotted 
+}
+
+#padding {
+  border-color: hsla(210,100%,85%,0.2);
+  border-style: solid;
+}
+
+#borders {
+  border-style: solid;
+  border-color: hsl(210,100%,85%);
+}
diff --git a/browser/themes/windows/devtools/light-theme.css b/browser/themes/windows/devtools/light-theme.css
new file mode 100644
index 000000000..a867df614
--- /dev/null
+++ b/browser/themes/windows/devtools/light-theme.css
@@ -0,0 +1,104 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* 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/. */
+
+/* According to:
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
+ */
+.theme-body {
+  background: white;
+  color: black;
+}
+
+.theme-twisty {
+  cursor: pointer;
+  margin-right: 5px;
+}
+
+.theme-twisty:-moz-focusring {
+  outline-style: none;
+}
+
+.theme-twisty:not([open]) {
+  width: 0;
+  height: 0;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid rgba(0,0,0,0.5);
+  margin-left: 5px;
+}
+
+.theme-twisty[open] {
+  width: 10px;
+  height: 10px;
+  background-image: linear-gradient(to bottom right, transparent 68%,  rgba(0,0,0,0.5) 68%);
+}
+
+.theme-checkbox {
+  display: inline-block;
+  border: 0;
+  width: 14px;
+  height: 14px;
+  padding: 0;
+  outline: none;
+  background: url("chrome://browser/skin/devtools/checkbox-light.png") no-repeat;
+}
+
+.theme-checkbox[checked] {
+  background: url("chrome://browser/skin/devtools/checkbox-light.png") 14px 0;
+}
+
+.theme-selected {
+  background-color: hsl(0,0%,90%);
+}
+
+.theme-bg-darker {
+  background: #F9F9F9;
+}
+
+.theme-link { /* blue */
+  color: hsl(208,56%,40%);
+}
+
+.theme-comment { /* grey */
+  color: hsl(90,2%,46%);
+}
+
+.theme-gutter {
+  background-color: hsl(0,0%,90%);
+  color: #667380;
+  border-color: hsl(0,0%,65%);
+}
+
+.theme-separator { /* grey */
+  border-color: #cddae5;
+}
+
+.theme-fg-color1 { /* green */
+  color: hsl(72,100%,27%);
+}
+
+.theme-fg-color2 { /* blue */
+  color: hsl(208,56%,40%);
+}
+
+.theme-fg-color3 { /* dark blue */
+  color: hsl(208,81%,21%)
+}
+
+.theme-fg-color4 { /* Orange */
+  color: hsl(24,85%,39%);
+}
+
+.theme-fg-color5 { /* Yellow */
+  color: #a18650;
+}
+
+.theme-fg-color6 { /* Orange */
+  color: hsl(24,85%,39%);
+}
+
+.theme-fg-color7 { /* Red */
+  color: #bf5656;
+}
diff --git a/browser/themes/windows/devtools/magnifying-glass.png b/browser/themes/windows/devtools/magnifying-glass.png
new file mode 100644
index 000000000..236d93d49
--- /dev/null
+++ b/browser/themes/windows/devtools/magnifying-glass.png
diff --git a/browser/themes/windows/devtools/markup-view.css b/browser/themes/windows/devtools/markup-view.css
new file mode 100644
index 000000000..4651a4314
--- /dev/null
+++ b/browser/themes/windows/devtools/markup-view.css
@@ -0,0 +1,44 @@
+/* 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/. */
+
+* {
+  padding: 0;
+  margin: 0;
+}
+
+.newattr {
+  cursor: pointer;
+}
+
+.selected {
+  background-color: hsl(0,0%,90%);
+}
+
+/* Give some padding to focusable elements to match the editor input
+ * that will replace them. */
+span[tabindex] {
+  display: inline-block;
+  padding: 1px 0;
+}
+
+li.container {
+  position: relative;
+  padding: 2px 0 0 2px;
+}
+
+.codebox {
+  padding-left: 14px;
+}
+
+.expander {
+  position: absolute;
+}
+
+.more-nodes {
+  padding-left: 16px;
+}
+
+.styleinspector-propertyeditor {
+  border: 1px solid #CCC;
+}
diff --git a/browser/themes/windows/devtools/netmonitor.css b/browser/themes/windows/devtools/netmonitor.css
new file mode 100644
index 000000000..ee72aa607
--- /dev/null
+++ b/browser/themes/windows/devtools/netmonitor.css
@@ -0,0 +1,531 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* 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/. */
+
+#body {
+  background: url(background-noise-toolbar.png), hsl(208,11%,27%);
+}
+
+/* Network requests table */
+
+#requests-menu-empty-notice {
+  background: url(background-noise-toolbar.png), hsl(208,11%,27%);
+  padding: 12px;
+  font-size: 110%;
+  color: #fff;
+}
+
+#requests-menu-toolbar {
+  height: 33px;
+  padding: 0;
+}
+
+.requests-menu-header:first-child {
+  -moz-padding-start: 4px;
+}
+
+.requests-menu-subitem {
+  padding: 4px;
+}
+
+.requests-menu-header:not(:last-child):-moz-locale-dir(ltr),
+.requests-menu-subitem:not(:last-child):-moz-locale-dir(ltr) {
+  -moz-border-end: 1px solid hsla(210,8%,5%,.25);
+  box-shadow: 1px 0 0 hsla(210,16%,76%,.1);
+}
+
+.requests-menu-header:not(:last-child):-moz-locale-dir(rtl),
+.requests-menu-subitem:not(:last-child):-moz-locale-dir(rtl) {
+  -moz-border-end: 1px solid hsla(210,8%,5%,.25);
+  box-shadow: -1px 0 0 hsla(210,16%,76%,.1);
+}
+
+.requests-menu-header-button {
+  -moz-appearance: none;
+  background: none;
+  min-width: 20px;
+  min-height: 32px; /* Remaining 1px comes from border of the toolbar. */
+  margin: 0;
+  border: none;
+  padding: 0;
+  color: inherit;
+  font-weight: inherit !important;
+  transition: background-color 0.1s ease-in-out;
+}
+
+.requests-menu-header-button:hover {
+  background: rgba(0,0,0,0.10);
+}
+
+.requests-menu-header-button:hover:active {
+  background: rgba(0,0,0,0.25);
+}
+
+.requests-menu-header-button:not(:active)[sorted] {
+  background: rgba(0,0,0,0.15);
+}
+
+.requests-menu-header-button:not(:active)[sorted=ascending] {
+  background-image: radial-gradient(farthest-side at center top, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3));
+  background-size: 100% 1px;
+  background-repeat: no-repeat;
+}
+
+.requests-menu-header-button:not(:active)[sorted=descending] {
+  background-image: radial-gradient(farthest-side at center bottom, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3));
+  background-size: 100% 1px;
+  background-repeat: no-repeat;
+  background-position: bottom;
+}
+
+/* Network requests table: specific column dimensions */
+
+.requests-menu-status-and-method {
+  width: 8em;
+}
+
+.requests-menu-status {
+  width: 10px;
+  height: 10px;
+}
+
+.requests-menu-method {
+  text-align: center;
+  font-weight: 600;
+}
+
+.requests-menu-file {
+  width: 20vw;
+  min-width: 4em;
+}
+
+.requests-menu-domain {
+  width: 14vw;
+  min-width: 10em;
+}
+
+.requests-menu-type {
+  text-align: center;
+  width: 4em;
+}
+
+.requests-menu-size {
+  text-align: center;
+  width: 8em;
+}
+
+/* Network requests table: status codes */
+
+box.requests-menu-status {
+  background: #fff;
+  -moz-margin-start: 5px;
+  -moz-margin-end: 5px;
+  border-radius: 20px;
+  box-shadow:
+    0 0 0 1px rgba(255,255,255,0.4) inset,
+    0 -6px 4px 0 rgba(32,32,32,1.0) inset,
+    0 0 8px 0 rgba(32,0,0,0.4);
+  transition: box-shadow 0.5s ease-in-out;
+}
+
+box.requests-menu-status[code^="1"] {
+  box-shadow:
+    0 0 2px 1px rgba(255,255,255,0.8) inset,
+    0 -6px 4px 0 rgba(0,0,64,1.0) inset,
+    0 0 8px 0 rgba(0,0,128,1.0);
+}
+
+box.requests-menu-status[code^="2"] {
+  box-shadow:
+    0 0 2px 1px rgba(255,255,255,0.8) inset,
+    0 -6px 4px 0 rgba(0,64,0,1.0) inset,
+    0 0 8px 0 rgba(0,128,0,1.0);
+}
+
+box.requests-menu-status[code^="3"] {
+  box-shadow:
+    0 0 2px 1px rgba(255,255,255,0.8) inset,
+    0 -6px 4px 0 rgba(64,32,0,1.0) inset,
+    0 0 8px 0 rgba(128,128,0,1.0);
+}
+
+box.requests-menu-status[code^="4"] {
+  box-shadow:
+    0 0 2px 1px rgba(255,255,255,0.8) inset,
+    0 -6px 4px 0 rgba(64,0,0,1.0) inset,
+    0 0 8px 0 rgba(128,0,0,1.0);
+}
+
+box.requests-menu-status[code^="5"] {
+  box-shadow:
+    0 0 2px 1px rgba(255,255,255,0.8) inset,
+    0 -6px 4px 0 rgba(64,0,64,1.0) inset,
+    0 0 8px 0 rgba(128,0,128,1.0);
+}
+
+/* Network requests table: waterfall header */
+
+#requests-menu-waterfall-label {
+  -moz-padding-start: 8px;
+  -moz-padding-end: 8px;
+}
+
+.requests-menu-timings-division {
+  width: 100px;
+  padding-top: 1px;
+  -moz-padding-start: 4px;
+  -moz-border-start: 1px dotted #999;
+  font-size: 90%;
+  pointer-events: none;
+}
+
+.requests-menu-timings-division:not(:first-child) {
+  -moz-margin-start: -100px !important; /* Don't affect layout. */
+}
+
+.requests-menu-timings-division:-moz-locale-dir(ltr) {
+  transform-origin: left center;
+}
+
+.requests-menu-timings-division:-moz-locale-dir(rtl) {
+  transform-origin: right center;
+}
+
+/* Network requests table: waterfall items */
+
+.requests-menu-subitem.requests-menu-waterfall {
+  -moz-padding-start: 4px;
+  -moz-padding-end: 4px;
+  background-repeat: repeat-y; /* Background created on a <canvas> in js. */
+  margin-top: -1px; /* Compensate borders. */
+  margin-bottom: -1px;
+}
+
+.requests-menu-subitem.requests-menu-waterfall:-moz-locale-dir(rtl) {
+  background-position: right center;
+}
+
+.requests-menu-timings:-moz-locale-dir(ltr) {
+  transform-origin: left center;
+}
+
+.requests-menu-timings:-moz-locale-dir(rtl) {
+  transform-origin: right center;
+}
+
+.requests-menu-timings-total:-moz-locale-dir(ltr) {
+  transform-origin: left center;
+}
+
+.requests-menu-timings-total:-moz-locale-dir(rtl) {
+  transform-origin: right center;
+}
+
+.requests-menu-timings-total {
+  -moz-padding-start: 8px;
+  font-size: 85%;
+  font-weight: 600;
+}
+
+.requests-menu-timings-cap {
+  width: 4px;
+  height: 10px;
+  border: 1px solid #fff;
+}
+
+.requests-menu-timings-cap.start {
+  -moz-border-end: none;
+}
+
+.requests-menu-timings-cap.end {
+  -moz-border-start: none;
+}
+
+.requests-menu-timings-cap.start:-moz-locale-dir(ltr) {
+  border-radius: 4px 0 0 4px;
+  transform-origin: right center;
+}
+
+.requests-menu-timings-cap.start:-moz-locale-dir(rtl) {
+  border-radius: 0 4px 4px 0;
+  transform-origin: left center;
+}
+
+.requests-menu-timings-cap.end:-moz-locale-dir(ltr) {
+  border-radius: 0 4px 4px 0;
+  transform-origin: left center;
+}
+
+.requests-menu-timings-cap.end:-moz-locale-dir(rtl) {
+  border-radius: 4px 0 0 4px;
+  transform-origin: right center;
+}
+
+.requests-menu-timings-box {
+  height: 10px;
+  border-top: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+}
+
+.requests-menu-timings-box.blocked,
+.requests-menu-timings-cap.blocked {
+  background-color: rgba(255,32,32,0.8);
+  box-shadow: 0 0 8px 0 rgba(128,32,32,0.8),
+              0 0 4px 0 rgba(255,255,255,1.0) inset;
+}
+
+.requests-menu-timings-box.dns,
+.requests-menu-timings-cap.dns {
+  background-color: rgba(255,128,255,0.6);
+  box-shadow: 0 0 8px 0 rgba(128,128,255,1.0),
+              0 0 4px 0 rgba(255,255,255,1.0) inset;
+}
+
+.requests-menu-timings-box.connect,
+.requests-menu-timings-cap.connect {
+  background-color: rgba(255,128,16,0.4);
+  box-shadow: 0 0 8px 0 rgba(128,128,16,0.8),
+              0 0 4px 0 rgba(255,255,255,1.0) inset;
+}
+
+.requests-menu-timings-box.send,
+.requests-menu-timings-cap.send {
+  background-color: rgba(255,255,128,0.4);
+  box-shadow: 0 0 8px 0 rgba(128,255,128,0.8),
+              0 0 4px 0 rgba(255,255,255,1.0) inset;
+}
+
+.requests-menu-timings-box.wait,
+.requests-menu-timings-cap.wait {
+  background-color: rgba(255,255,255,0.2);
+  box-shadow: 0 0 8px 0 rgba(128,255,255,0.4),
+              0 0 4px 0 rgba(255,255,255,1.0) inset;
+}
+
+.requests-menu-timings-box.receive,
+.requests-menu-timings-cap.receive {
+  background-color: rgba(255,255,255,1.0);
+  box-shadow: 0 0 8px 0 rgba(128,255,255,1.0),
+              0 0 4px 0 rgba(255,255,255,1.0) inset;
+}
+
+/* SideMenuWidget */
+
+.side-menu-widget-item[odd] {
+  background: rgba(255,255,255,0.05);
+}
+
+.side-menu-widget-item-contents {
+  padding: 0;
+}
+
+/* Network request details */
+
+#details-pane {
+  background: hsl(208,11%,27%);
+  max-width: 500px;
+}
+
+#details-pane-toggle {
+  background: none;
+  box-shadow: none;
+  border-color: transparent;
+  list-style-image: url("chrome://browser/skin/devtools/debugger-collapse.png");
+  -moz-image-region: rect(0px,16px,16px,0px);
+}
+
+#details-pane-toggle[pane-collapsed] {
+  list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png");
+}
+
+#details-pane-toggle:active {
+  -moz-image-region: rect(0px,32px,16px,16px);
+}
+
+/* Network request details tabpanels */
+
+.tabpanel-content {
+  background: url(background-noise-toolbar.png), #3e4750;
+  box-shadow: 0 1px 0 hsla(204,45%,98%,.05) inset;
+  color: #fff;
+}
+
+.tabpanel-summary-container {
+  padding: 1px;
+}
+
+.tabpanel-summary-label {
+  -moz-padding-start: 4px;
+  -moz-padding-end: 3px;
+  font-weight: 600;
+  text-shadow: 0 1px 0 #000;
+  color: hsl(210,30%,85%);
+}
+
+.tabpanel-summary-value {
+  -moz-padding-start: 3px;
+  font-family: Menlo, Monaco, monospace;
+}
+
+.variable-or-property:not(:focus) > .title > .token-string {
+  color: #10c !important;
+}
+
+/* Headers tabpanel */
+
+#headers-summary-status,
+#headers-summary-version {
+  padding-bottom: 2px;
+}
+
+#headers-summary-size {
+  padding-top: 2px;
+}
+
+/* Response tabpanel */
+
+#response-content-info-header {
+  background:
+    url(background-noise-toolbar.png),
+    linear-gradient(hsl(0,61%,40%), hsl(0,61%,31%)) repeat-x top left;
+  box-shadow:
+    inset 0 1px 0 hsla(210,40%,83%,.15),
+    inset 0 -1px 0 hsla(210,40%,83%,.05);
+  margin: 0;
+  padding: 5px 8px;
+}
+
+#response-content-image-box {
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
+
+#response-content-image {
+  background: #fff;
+  border: 1px dashed GrayText;
+  margin-bottom: 10px;
+}
+
+/* Timings tabpanel */
+
+#timings-tabpanel .tabpanel-summary-label {
+  width: 10em;
+}
+
+#timings-tabpanel .requests-menu-timings-box {
+  transition: transform 0.2s ease-out;
+  min-width: 1px;
+}
+
+#timings-tabpanel .requests-menu-timings-total {
+  transition: transform 0.2s ease-out;
+}
+
+/* Footer */
+
+#requests-menu-footer {
+  box-shadow: inset 0 1px 16px hsla(210,8%,5%,.3);
+}
+
+.requests-menu-footer-button,
+.requests-menu-footer-label {
+  min-width: 1em;
+  margin: 0;
+  border: none;
+  padding: 0px 1.5vw;
+  color: #fff;
+}
+
+.requests-menu-footer-spacer {
+  min-width: 2px;
+}
+
+.requests-menu-footer-spacer,
+.requests-menu-footer-button {
+  -moz-border-end: 1px solid hsla(210,8%,5%,.25);
+  box-shadow: 1px 0 0 hsla(210,16%,76%,.1);
+}
+
+.requests-menu-footer-button {
+  -moz-appearance: none;
+  background: rgba(0,0,0,0.025);
+}
+
+.requests-menu-footer-button:hover {
+  background: rgba(0,0,0,0.20);
+}
+
+.requests-menu-footer-button:hover:active {
+  background: rgba(0,0,0,0.35);
+}
+
+.requests-menu-footer-button:not(:active)[checked] {
+  background-color: rgba(0,0,0,0.25);
+  background-image: radial-gradient(farthest-side at center top, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3));
+  background-size: 100% 1px;
+  background-repeat: no-repeat;
+}
+
+.requests-menu-footer-label {
+  font-weight: 600;
+}
+
+/* Responsive sidebar */
+@media (max-width: 700px) {
+  #requests-menu-toolbar {
+    height: 24px;
+  }
+
+  .requests-menu-header-button {
+    min-height: 23px; /* Remaining 1px comes from border of the toolbar. */
+  }
+
+  .requests-menu-footer-button,
+  .requests-menu-footer-label {
+    padding: 0px 2vw;
+  }
+
+  #details-pane {
+    max-width: none;
+    margin: 0 !important;
+    /* To prevent all the margin hacks to hide the sidebar. */
+  }
+
+  .requests-menu-status-and-method {
+    width: 16vw;
+  }
+
+  .requests-menu-file,
+  .requests-menu-domain {
+    width: 30vw;
+  }
+
+  .requests-menu-type {
+    width: 8vw;
+  }
+
+  .requests-menu-size {
+    width: 16vw;
+    border-width: 0 !important;
+    box-shadow: none !important;
+    /* The "Timeline" header is not visible anymore, and thus the
+       right border and box-shadow of "Size" column should be hidden. */
+  }
+}
+
+@media (min-width: 701px) {
+  #network-table[type-overflows] .requests-menu-domain {
+    border-width: 0 !important;
+    box-shadow: none !important;
+    /* The "Type" header is not visible anymore, and thus the
+       right border and box-shadow of "Domain" column should be hidden. */
+  }
+
+  #network-table[domain-overflows] .requests-menu-file {
+    border-width: 0 !important;
+    box-shadow: none !important;
+    /* The "Domain" header is not visible anymore, and thus the
+       right border and box-shadow of "File" column should be hidden. */
+  }
+}
diff --git a/browser/themes/windows/devtools/option-icon.png b/browser/themes/windows/devtools/option-icon.png
new file mode 100644
index 000000000..9fd78175d
--- /dev/null
+++ b/browser/themes/windows/devtools/option-icon.png
diff --git a/browser/themes/windows/devtools/orion-breakpoint.png b/browser/themes/windows/devtools/orion-breakpoint.png
new file mode 100644
index 000000000..ddd344eee
--- /dev/null
+++ b/browser/themes/windows/devtools/orion-breakpoint.png
diff --git a/browser/themes/windows/devtools/orion-container.css b/browser/themes/windows/devtools/orion-container.css
new file mode 100644
index 000000000..cf3568a94
--- /dev/null
+++ b/browser/themes/windows/devtools/orion-container.css
@@ -0,0 +1,39 @@
+/* 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/. */
+
+.viewTooltip {
+  display: none; /* TODO: add tooltips support, see bug 721752 */
+  font-family: monospace;
+  font-size: 13px;
+  background-color: InfoBackground;
+  color: InfoText;
+  padding: 2px;
+  border-radius: 4px;
+  border: 1px solid black;
+  z-index: 100;
+  position: fixed;
+  overflow: hidden;
+  white-space: pre;
+}
+
+.viewTooltip em {
+  font-style: normal;
+  font-weight: bold;
+}
+
+.annotationHTML {
+  cursor: pointer;
+  width: 16px;
+  height: 16px;
+  display: inline-block;
+  vertical-align: middle;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+.annotationHTML.task {
+  background-image: url("chrome://browser/skin/devtools/orion-task.png");
+}
+.annotationHTML.breakpoint {
+  background-image: url("chrome://browser/skin/devtools/orion-breakpoint.png");
+}
diff --git a/browser/themes/windows/devtools/orion-debug-location.png b/browser/themes/windows/devtools/orion-debug-location.png
new file mode 100644
index 000000000..a00649b77
--- /dev/null
+++ b/browser/themes/windows/devtools/orion-debug-location.png
diff --git a/browser/themes/windows/devtools/orion-task.png b/browser/themes/windows/devtools/orion-task.png
new file mode 100644
index 000000000..42dbc00b6
--- /dev/null
+++ b/browser/themes/windows/devtools/orion-task.png
diff --git a/browser/themes/windows/devtools/orion.css b/browser/themes/windows/devtools/orion.css
new file mode 100644
index 000000000..f51ecceeb
--- /dev/null
+++ b/browser/themes/windows/devtools/orion.css
@@ -0,0 +1,199 @@
+/* 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/. */
+
+.viewContainer {
+  background: hsl(0,0%,89%); /* This will be seen as the continuation of the ruler */
+  font-family: monospace;
+  font-size: inherit; /* inherit browser's default monospace font size */
+}
+
+.view {
+  color: black; /* Default text color */
+  background: white; /* Background of the editor */
+  padding-left: 4px;
+}
+
+.readonly > .view {
+  background: #fdfefd; /* super light green */
+}
+
+.ruler {
+  background: hsl(0,0%,89%);
+  color: hsl(0,0%,55%);
+}
+.ruler.annotations {
+  width: 16px;
+  padding-left: 4px;
+}
+.ruler.lines {
+  border-right: 1px solid #b4c4d3;
+  min-width: 1.4em;
+  padding-left: 4px;
+  padding-right: 4px;
+  text-align: end;
+}
+
+.ruler.linesWithAnnotations {
+  min-width: 0;
+  padding-left: 0;
+}
+
+.ruler.overview {
+  border-left: 1px solid #b4c4d3;
+  width: 14px;
+  text-align: start;
+}
+
+/* Styles for the annotation ruler (first line) */
+.annotationHTML {
+  cursor: pointer;
+  width: 16px;
+  height: 16px;
+  display: inline-block;
+  vertical-align: middle;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+.annotation.task .annotationHTML {
+  background-image: url("chrome://browser/skin/devtools/orion-task.png");
+}
+.annotation.breakpoint .annotationHTML {
+  background-image: url("chrome://browser/skin/devtools/orion-breakpoint.png");
+}
+.annotation.debugLocation .annotationHTML {
+  background-image: url("chrome://browser/skin/devtools/orion-debug-location.png");
+}
+.annotation.breakpoint.debugLocation .annotationHTML,
+.annotation.task.debugLocation .annotationHTML {
+  background-position: center, center;
+  background-repeat: no-repeat, no-repeat;
+  background-size: 75%, 100%;
+}
+.annotation.breakpoint.debugLocation .annotationHTML {
+  background-image: url("chrome://browser/skin/devtools/orion-debug-location.png"),
+                    url("chrome://browser/skin/devtools/orion-breakpoint.png");
+}
+
+.annotation.task.debugLocation .annotationHTML {
+  background-image: url("chrome://browser/skin/devtools/orion-debug-location.png"),
+                    url("chrome://browser/skin/devtools/orion-task.png");
+}
+
+/* Styles for the overview ruler  */
+.annotationOverview {
+  cursor: pointer;
+  border-radius: 2px;
+  left: 2px;
+  width: 8px;
+}
+.annotationOverview.task {
+  background-color: lightgreen;
+  border: 1px solid green;
+}
+.annotationOverview.breakpoint {
+  background-color: lightblue;
+  border: 1px solid blue;
+}
+.annotationOverview.debugLocation {
+  background-color: white;
+  border: 1px solid green;
+}
+.annotationOverview.currentBracket {
+  background-color: lightgray;
+  border: 1px solid red;
+}
+.annotationOverview.matchingBracket {
+  background-color: lightgray;
+  border: 1px solid red;
+}
+
+/* Styles for text range */
+.annotationRange {
+  background-repeat: repeat-x;
+  background-position: left bottom;
+}
+.annotationRange.task {
+  outline: 1px dashed rgba(0, 255, 0, 0.5);
+}
+.annotationRange.matchingBracket {
+  outline: 1px solid grey;
+}
+
+.token_singleline_comment,
+.token_multiline_comment,
+.token_doc_comment  {
+  color: hsl(90,2%,50%); /* grey */
+}
+
+.token_doc_html_markup {
+  color: #dd0058; /* purple */
+}
+
+.token_doc_tag {
+  color: #dd0058; /* purple */
+}
+
+.token_task_tag { /* "TODO" */
+  color: black;
+  background: yellow;
+}
+
+.token_string {
+  color: hsl(72,100%,27%); /* green */
+  font-style: italic;
+}
+
+.token_keyword {
+  color: hsl(276,44%,45%); /* purple */
+}
+
+.token_space {
+  /* images/white_space.png */
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAIAAABv85FHAAAABnRSTlMA/wAAAACkwsAdAAAAIUlEQVR4nGP4z8CAC+GUIEXuABhgkTuABEiRw2cmae4EAH05X7xDolNRAAAAAElFTkSuQmCC");
+  background-repeat: no-repeat;
+  background-position: center center;
+}
+
+.token_tab {
+  /* images/white_tab.png */
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAJCAIAAACJ2loDAAAABnRSTlMA/wD/AP83WBt9AAAAMklEQVR4nGP4TwRgoK6i52c3bz5w6zMSA6tJn28d2Lx589nnCAYu63AaSLxJRLoJPwAAeNk0aG4opfMAAAAASUVORK5CYII=");
+  background-repeat: no-repeat;
+  background-position: left center;
+}
+
+.line_caret,
+.annotationLine.currentLine { /* Current line */
+  background: hsl(208, 93%, 94%);
+}
+
+.readonly .line_caret,
+.readonly .annotationLine.currentLine {
+  background: hsl(208, 80%, 90%);
+}
+
+/* Styling for html syntax highlighting */
+.entity-name-tag {
+  color: hsl(208,48%,40%); /* blue */
+}
+
+.entity-other-attribute-name {
+  color: hsl(208,48%,40%); /* blue */
+}
+
+.punctuation-definition-comment {
+  color: hsl(90,2%,50%); /* grey */
+}
+
+.comment {
+  color: hsl(90,2%,50%); /* grey */
+}
+
+.string-quoted {
+  color: hsl(24,85%,39%); /* orange */
+}
+
+.invalid {
+  color: red;
+  font-weight: bold;
+}
diff --git a/browser/themes/windows/devtools/profiler.css b/browser/themes/windows/devtools/profiler.css
new file mode 100644
index 000000000..152678396
--- /dev/null
+++ b/browser/themes/windows/devtools/profiler.css
@@ -0,0 +1,5 @@
+/* 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/devtools/profiler.inc.css
\ No newline at end of file
diff --git a/browser/themes/windows/devtools/responsive-background.png b/browser/themes/windows/devtools/responsive-background.png
new file mode 100644
index 000000000..271dd5ebc
--- /dev/null
+++ b/browser/themes/windows/devtools/responsive-background.png
diff --git a/browser/themes/windows/devtools/responsive-se-resizer.png b/browser/themes/windows/devtools/responsive-se-resizer.png
new file mode 100644
index 000000000..bdc03ee24
--- /dev/null
+++ b/browser/themes/windows/devtools/responsive-se-resizer.png
diff --git a/browser/themes/windows/devtools/responsive-vertical-resizer.png b/browser/themes/windows/devtools/responsive-vertical-resizer.png
new file mode 100644
index 000000000..1bb622dd3
--- /dev/null
+++ b/browser/themes/windows/devtools/responsive-vertical-resizer.png
diff --git a/browser/themes/windows/devtools/ruleview.css b/browser/themes/windows/devtools/ruleview.css
new file mode 100644
index 000000000..b0ddd80e6
--- /dev/null
+++ b/browser/themes/windows/devtools/ruleview.css
@@ -0,0 +1,131 @@
+/* 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/. */
+
+.ruleview {
+  height: 100%;
+}
+
+.ruleview-rule-source {
+  -moz-padding-start: 5px;
+  cursor: pointer;
+  text-align: right;
+  float: right;
+  -moz-user-select: none;
+}
+
+.ruleview-rule-inheritance {
+  border-top-width: 1px;
+  border-bottom-width: 1px;
+  border-top-style: solid;
+  border-bottom-style: solid;
+  padding: 1px 4px;
+  margin-top: 4px;
+  -moz-user-select: none;
+}
+
+.ruleview-rule-source:hover {
+  text-decoration: underline;
+}
+
+.ruleview-rule,
+#noResults {
+  padding: 2px 4px;
+}
+
+#noResults {
+  font: message-box;
+  color: GrayText;
+}
+
+.ruleview-rule + .ruleview-rule {
+  border-top-width: 1px;
+  border-top-style: dotted;
+}
+
+.ruleview-warning {
+  background: url("chrome://browser/skin/devtools/alerticon-warning.png");
+  -moz-margin-start: 5px;
+  vertical-align: middle;
+  width: 13px;
+  height: 12px;
+}
+
+.ruleview-ruleopen {
+  -moz-padding-end: 5px;
+}
+
+.ruleview-ruleclose {
+  cursor: text;
+  padding-right: 20px;
+}
+
+.ruleview-propertylist {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.ruleview-rule:not(:hover) .ruleview-enableproperty {
+  visibility: hidden;
+}
+
+.ruleview-expander {
+  display: inline-block;
+}
+
+.ruleview-newproperty {
+  /* (enable checkbox width: 12px) + (expander width: 15px) */
+  -moz-margin-start: 27px;
+}
+
+.ruleview-namecontainer,
+.ruleview-propertycontainer,
+.ruleview-propertyname,
+.ruleview-propertyvalue {
+  text-decoration: inherit;
+}
+
+.ruleview-computedlist {
+  list-style: none;
+  padding: 0;
+}
+
+.ruleview-computed {
+  -moz-margin-start: 35px;
+}
+
+.ruleview-overridden {
+  text-decoration: line-through;
+}
+
+.styleinspector-propertyeditor {
+  border: 1px solid #CCC;
+  padding: 0;
+}
+
+.ruleview-property {
+  border-left: 2px solid transparent;
+}
+
+.ruleview-property  > * {
+  vertical-align: middle;
+}
+
+.ruleview-property[dirty] {
+  border-left-color: #68E268;
+}
+
+.ruleview-namecontainer > .ruleview-propertyname,
+.ruleview-propertycontainer > .ruleview-propertyvalue {
+  border-bottom: 1px dashed transparent;
+}
+
+.ruleview-namecontainer:hover > .ruleview-propertyname,
+.ruleview-propertycontainer:hover > .ruleview-propertyvalue {
+  border-bottom-color: hsl(0,0%,50%);
+}
+
+.ruleview-selector-separator, .ruleview-selector-unmatched {
+  color: #888;
+}
diff --git a/browser/themes/windows/devtools/scratchpad.css b/browser/themes/windows/devtools/scratchpad.css
new file mode 100644
index 000000000..86b4b167b
--- /dev/null
+++ b/browser/themes/windows/devtools/scratchpad.css
@@ -0,0 +1,5 @@
+/* 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/devtools/scratchpad.inc.css
\ No newline at end of file
diff --git a/browser/themes/windows/devtools/splitview.css b/browser/themes/windows/devtools/splitview.css
new file mode 100644
index 000000000..549f4cdaa
--- /dev/null
+++ b/browser/themes/windows/devtools/splitview.css
@@ -0,0 +1,115 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* 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/. */
+
+.splitview-nav-container {
+  background-color: hsl(211,21%,26%);
+  color: white;
+}
+
+.loading .splitview-nav-container {
+  background-image: url(chrome://global/skin/icons/loading_16.png);
+  background-repeat: no-repeat;
+  background-position: center center;
+}
+
+.splitview-nav {
+  -moz-appearance: none;
+  margin: 0;
+  box-shadow: inset -1px 0 0 #222426;
+}
+
+.splitview-nav > li {
+  color: white;
+  background-clip: padding-box;
+  border-bottom: 1px solid hsla(210,40%,83%,.1);
+  box-shadow: inset 0 -1px 0 hsla(211,68%,6%,.3);
+  -moz-padding-end: 8px;
+  -moz-box-align: center;
+}
+
+.splitview-nav {
+  list-style-image: none;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.splitview-nav > li {
+  outline: 0;
+  vertical-align: bottom;
+}
+
+.placeholder {
+  -moz-box-flex: 1;
+  text-align: center;
+}
+
+.splitview-nav > li.splitview-active {
+  background-image: url(itemArrow-ltr.png),
+                    linear-gradient(to right, black, black),
+                    linear-gradient(hsl(200,100%,33%), hsl(200,100%,25%));
+  background-repeat: no-repeat, no-repeat, repeat-x;
+  background-position: center right, top right, top left;
+  background-size: auto, 1px 100%, auto;
+  border-bottom: 1px solid hsla(210,8%,5%,.25);
+  box-shadow: inset 0 1px 0 hsla(210,40%,83%,.15),
+              inset 0 -1px 0 hsla(210,40%,83%,.05);
+}
+
+.splitview-nav > li.splitview-active:-moz-locale-dir(rtl) {
+  background-image: url(itemArrow-rtl.png),
+                    linear-gradient(to right, black, black),
+                    linear-gradient(hsl(200,100%,33%), hsl(200,100%,25%));
+  background-repeat: no-repeat, no-repeat, repeat-x;
+  background-position: center left, top left, top right;
+}
+
+/* Toolbars */
+
+.devtools-toolbar {
+  height: 26px;
+  background-origin: border-box;
+  background-clip: border-box;
+  border-top-width: 0;
+  border-bottom: 1px solid hsla(210,8%,5%,.65);
+  padding: 3px;
+}
+
+.splitview-main > toolbar:-moz-locale-dir(ltr) {
+  border-right: 1px solid hsla(210,8%,5%,.5);
+}
+
+.splitview-main > toolbar:-moz-locale-dir(rtl) {
+  border-left: 1px solid hsla(210,8%,5%,.5);
+}
+
+.devtools-toolbarbutton {
+  font-size: 11px;
+  padding: 0 8px;
+  width: auto;
+  min-width: 48px;
+  min-height: 0;
+}
+
+
+/* Resizers */
+
+.splitview-landscape-splitter {
+  -moz-border-start-color: transparent;
+}
+
+.splitview-portrait-resizer {
+  -moz-appearance: none;
+  background: linear-gradient(black 1px, rgba(255,255,255,0.2) 1px),
+              linear-gradient(hsl(209,18%,34%), hsl(210,24%,16%));
+  height: 12px;
+  background-size: 10px 2px, 100% 12px;
+  background-clip: content-box, border-box;
+  background-repeat: repeat-y, no-repeat;
+  background-position: center center;
+  padding: 2px 0;
+  border-top: 1px solid hsla(210,8%,5%,.5);
+  border-bottom: 1px solid hsla(210,8%,5%,.5);
+}
diff --git a/browser/themes/windows/devtools/styleeditor.css b/browser/themes/windows/devtools/styleeditor.css
new file mode 100644
index 000000000..8b10c25f9
--- /dev/null
+++ b/browser/themes/windows/devtools/styleeditor.css
@@ -0,0 +1,131 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* 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/. */
+
+#style-editor-chrome {
+  background-color: hsl(211,21%,26%);
+}
+
+.stylesheet-title,
+.stylesheet-name {
+  text-decoration: none;
+  color: hsl(210,30%,85%);
+}
+
+.stylesheet-name {
+  font-size: 13px;
+}
+
+.stylesheet-rule-count,
+.stylesheet-saveButton {
+  color: hsl(210,16%,53%);
+}
+
+.stylesheet-saveButton {
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.splitview-active .stylesheet-title,
+.splitview-active .stylesheet-name {
+  color: hsl(0,0%,100%);
+}
+
+.splitview-active .stylesheet-rule-count,
+.splitview-active .stylesheet-saveButton {
+  color: hsl(205,50%,70%);
+}
+
+.splitview-nav:focus {
+  outline: 0; /* focus ring is on the stylesheet name */
+}
+
+.splitview-nav > li.unsaved > hgroup .stylesheet-name {
+  font-style: italic;
+}
+
+.splitview-nav:-moz-locale-dir(ltr) > li.unsaved > hgroup .stylesheet-name:before,
+.splitview-nav:-moz-locale-dir(rtl) > li.unsaved > hgroup .stylesheet-name:after {
+  font-style: italic;
+}
+
+.splitview-nav.empty > p {
+  padding: 0 10px;
+}
+
+.stylesheet-enabled {
+  padding: 8px 0;
+  margin: 0 8px;
+  background-image: url(itemToggle.png);
+  background-repeat: no-repeat;
+  background-clip: content-box;
+  background-position: 0 8px;
+  width: 24px;
+  height: 40px;
+}
+
+.disabled > .stylesheet-enabled {
+  background-position: -24px 8px;
+}
+
+.splitview-nav > li > .stylesheet-enabled:focus,
+.splitview-nav > li:hover > .stylesheet-enabled {
+  outline: 0;
+}
+
+.stylesheet-error-message {
+  color: red;
+}
+
+.stylesheet-more > h3 {
+  font-size: 11px;
+  -moz-margin-end: 2px;
+}
+
+.devtools-searchinput {
+  max-width: 25ex;
+  font-size: 11px;
+}
+
+.placeholder {
+  color: white;
+}
+
+.placeholder a {
+  text-decoration: underline;
+}
+
+h1,
+h2,
+h3 {
+  font-size: inherit;
+  font-weight: normal;
+  margin: 0;
+  padding: 0;
+}
+
+/* portrait mode */
+@media (max-width: 550px) {
+  .splitview-nav {
+    box-shadow: none;
+  }
+
+  .splitview-nav > li.splitview-active {
+    background-size: 0 0, 0 0, auto;
+  }
+
+  .stylesheet-enabled {
+    padding: 0;
+    background-position: 0 0;
+    height: 24px;
+  }
+
+  .disabled > .stylesheet-enabled {
+    background-position: -24px 0;
+  }
+
+  .splitview-nav > li > hgroup.stylesheet-info {
+    -moz-box-align: baseline;
+  }
+}
diff --git a/browser/themes/windows/devtools/toggle-tools.png b/browser/themes/windows/devtools/toggle-tools.png
new file mode 100644
index 000000000..8a40d0d11
--- /dev/null
+++ b/browser/themes/windows/devtools/toggle-tools.png
diff --git a/browser/themes/windows/devtools/tool-debugger-paused.png b/browser/themes/windows/devtools/tool-debugger-paused.png
new file mode 100644
index 000000000..4c968f542
--- /dev/null
+++ b/browser/themes/windows/devtools/tool-debugger-paused.png
diff --git a/browser/themes/windows/devtools/tool-debugger.png b/browser/themes/windows/devtools/tool-debugger.png
new file mode 100644
index 000000000..af4dbc0e0
--- /dev/null
+++ b/browser/themes/windows/devtools/tool-debugger.png
diff --git a/browser/themes/windows/devtools/tool-inspector.png b/browser/themes/windows/devtools/tool-inspector.png
new file mode 100644
index 000000000..8c1e7f308
--- /dev/null
+++ b/browser/themes/windows/devtools/tool-inspector.png
diff --git a/browser/themes/windows/devtools/tool-network.png b/browser/themes/windows/devtools/tool-network.png
new file mode 100644
index 000000000..01f23203f
--- /dev/null
+++ b/browser/themes/windows/devtools/tool-network.png
diff --git a/browser/themes/windows/devtools/tool-options.png b/browser/themes/windows/devtools/tool-options.png
new file mode 100644
index 000000000..7079a1752
--- /dev/null
+++ b/browser/themes/windows/devtools/tool-options.png
diff --git a/browser/themes/windows/devtools/tool-profiler.png b/browser/themes/windows/devtools/tool-profiler.png
new file mode 100644
index 000000000..8f30f12a9
--- /dev/null
+++ b/browser/themes/windows/devtools/tool-profiler.png
diff --git a/browser/themes/windows/devtools/tool-styleeditor.png b/browser/themes/windows/devtools/tool-styleeditor.png
new file mode 100644
index 000000000..83765d9f6
--- /dev/null
+++ b/browser/themes/windows/devtools/tool-styleeditor.png
diff --git a/browser/themes/windows/devtools/tool-webconsole.png b/browser/themes/windows/devtools/tool-webconsole.png
new file mode 100644
index 000000000..86633249a
--- /dev/null
+++ b/browser/themes/windows/devtools/tool-webconsole.png
diff --git a/browser/themes/windows/devtools/toolbox.css b/browser/themes/windows/devtools/toolbox.css
new file mode 100644
index 000000000..ef71b811a
--- /dev/null
+++ b/browser/themes/windows/devtools/toolbox.css
@@ -0,0 +1,282 @@
+/* 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/. */
+
+#toolbox-controls {
+  margin: 0 4px;
+}
+
+#toolbox-controls > toolbarbutton,
+#toolbox-dock-buttons > toolbarbutton {
+  -moz-appearance: none;
+  border: none;
+  margin: 0 4px;
+  min-width: 16px;
+  width: 16px;
+}
+
+#toolbox-dock-bottom {
+  list-style-image: url("chrome://browser/skin/devtools/dock-bottom.png");
+}
+
+#toolbox-dock-side {
+  list-style-image: url("chrome://browser/skin/devtools/dock-side.png");
+}
+
+#toolbox-dock-window {
+  list-style-image: url("chrome://browser/skin/devtools/undock.png");
+}
+
+#toolbox-dock-window,
+#toolbox-dock-bottom,
+#toolbox-dock-side {
+  opacity: 0.6;
+}
+
+#toolbox-dock-window:hover,
+#toolbox-dock-bottom:hover,
+#toolbox-dock-side:hover {
+  opacity: 1;
+}
+
+#toolbox-controls-separator {
+  width: 3px;
+  background-image: linear-gradient(hsla(204,45%,98%,0), hsla(204,45%,98%,.1), hsla(204,45%,98%,0)),
+                    linear-gradient(hsla(206,37%,4%,0), hsla(206,37%,4%,.6), hsla(206,37%,4%,0)),
+                    linear-gradient(hsla(204,45%,98%,0), hsla(204,45%,98%,.1), hsla(204,45%,98%,0));
+  background-size: 1px 100%;
+  background-repeat: no-repeat;
+  background-position: 0, 1px, 2px;
+  -moz-margin-start: 8px;
+}
+
+
+/* Command buttons */
+
+.command-button {
+  -moz-appearance: none;
+  border: none;
+  margin: 0;
+  padding: 0 8px;
+  width: 16px;
+}
+
+.command-button:hover {
+  background-color: hsla(206,37%,4%,.2);
+}
+.command-button:hover:active, .command-button[checked=true]:not(:hover) {
+  background-color: hsla(206,37%,4%,.4);
+}
+
+#command-button-paintflashing {
+  list-style-image: url("chrome://browser/skin/devtools/command-paintflashing.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+#command-button-paintflashing:hover {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+#command-button-paintflashing:hover:active {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+#command-button-paintflashing[checked=true] {
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#command-button-responsive {
+  list-style-image: url("chrome://browser/skin/devtools/command-responsivemode.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+#command-button-responsive:hover {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+#command-button-responsive:hover:active {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+#command-button-responsive[checked=true] {
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#command-button-tilt {
+  list-style-image: url("chrome://browser/skin/devtools/command-tilt.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+#command-button-tilt:hover {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+#command-button-tilt:hover:active {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+#command-button-tilt[checked=true] {
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#command-button-scratchpad {
+  list-style-image: url("chrome://browser/skin/devtools/command-scratchpad.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+#command-button-scratchpad:hover {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+#command-button-scratchpad:hover:active {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+/* Tabs */
+
+.devtools-tabbar {
+  -moz-appearance: none;
+  background-image: url("background-noise-toolbar.png"),
+                    linear-gradient(#303840, #2d3640);
+  border-bottom: 1px solid #060a0d;
+  box-shadow: 0 1px 0 hsla(204,45%,98%,.05) inset,
+              0 -1px 0 hsla(206,37%,4%,.1) inset;
+  min-height: 32px;
+  padding: 0;
+}
+
+#toolbox-tabs {
+  margin: 0;
+}
+
+.devtools-tab {
+  -moz-appearance: none;
+  min-width: 32px;
+  min-height: 32px;
+  max-width: 110px;
+  color: #b6babf;
+  margin: 0;
+  padding: 0;
+  background-image: linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1)),
+                    linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1));
+  background-size: 1px 100%;
+  background-repeat: no-repeat;
+  background-position: left, right;
+  border-top: 1px solid #060a0d;
+  border-right: 1px solid hsla(206,37%,4%,.45);
+}
+
+.devtools-tab > image {
+  -moz-margin-end: 0;
+  -moz-margin-start: 4px;
+  opacity: 0.6;
+}
+
+#toolbox-tab-options > image {
+  margin: 0 8px;
+}
+
+.devtools-tab:hover > image {
+  opacity: 0.8;
+}
+
+.devtools-tab:active > image,
+.devtools-tab[selected=true] > image {
+  opacity: 1;
+}
+
+.devtools-tab:hover {
+  background-image: linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1)),
+                    linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1)),
+                    linear-gradient(hsla(206,37%,4%,.1), hsla(206,37%,4%,.2));
+  background-size: 1px 100%,
+                   1px 100%,
+                   100%;
+  background-repeat: no-repeat,
+                     no-repeat,
+                     repeat-x;
+  background-position: left, right;
+  color: #ced3d9;
+}
+.devtools-tab:hover:active {
+  background-color: hsla(206,37%,4%,.2);
+  color: #f5f7fa;
+}
+
+.devtools-tab[selected=true] {
+  color: #f5f7fa;
+  background-image: radial-gradient(farthest-corner at center top, #9fdfff, hsla(200,100%,70%,.3)),
+                    radial-gradient(farthest-side at center top, hsla(200,100%,70%,.4), hsla(200,100%,70%,0)),
+                    linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1)),
+                    linear-gradient(hsla(204,45%,98%,.02), hsla(204,45%,98%,.04)),
+                    linear-gradient(hsla(206,37%,4%,.2), hsla(206,37%,4%,.3));
+  background-size: 100% 1px,
+                   100% 5px,
+                   1px 100%,
+                   1px 100%,
+                   100%;
+  background-repeat: no-repeat,
+                     no-repeat,
+                     no-repeat,
+                     no-repeat,
+                     repeat-x;
+  background-position: top right, top left, left, right;
+  box-shadow: 1px -1px 0 hsla(206,37%,4%,.2) inset;
+}
+
+.devtools-tab:not([selected=true]).highlighted {
+  color: #f5f7fa;
+  background-image: radial-gradient(farthest-corner at center top, #c0ff40, hsla(80,100%,63%,.5) 70%, hsla(80,100%,63%,.3) 97%),
+                    radial-gradient(farthest-side at center top, hsla(80,100%,35%,.5), hsla(80,100%,35%,0)),
+                    linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1)),
+                    linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1)),
+                    linear-gradient(hsla(99,100%,14%,.2), hsla(99,100%,14%,.2));
+  background-size: 100% 1px,
+                   100% 5px,
+                   1px 100%,
+                   1px 100%,
+                   100%;
+  background-repeat: no-repeat,
+                     no-repeat,
+                     no-repeat,
+                     no-repeat,
+                     repeat-x;
+  background-position: top right, top left, left, right;
+}
+
+.devtools-tab:not(.highlighted) > .highlighted-icon,
+.devtools-tab[selected=true] > .highlighted-icon,
+.devtools-tab:not([selected=true]).highlighted > .default-icon {
+  visibility: collapse;
+}
+
+#options-panel {
+  background-image: url("chrome://browser/skin/newtab/noise.png");
+}
+
+.options-vertical-pane {
+  margin: 15px;
+  width: calc(50% - 30px);
+  min-width: 400px;
+  -moz-padding-start: 5px;
+}
+
+.options-vertical-pane > label {
+  padding: 5px 0;
+  font-size: 1.4rem;
+}
+
+.options-groupbox {
+  -moz-margin-start: 15px;
+  padding: 4px;
+}
+
+.options-groupbox > * {
+  padding: 2px;
+}
+
+.options-citation-label {
+  font-size: 1rem !important;
+  /* !important is required otherwise font-size will still be 1.4rem */
+  font-style: italic;
+  padding: 4px 0 0; /* To align it with the checkbox */
+  color: #444;
+}
+
+.options-citation-label + label {
+  padding: 3px 0 0 !important; /* To align it with the checkbox */
+  font-style: italic;
+}
diff --git a/browser/themes/windows/devtools/undock.png b/browser/themes/windows/devtools/undock.png
new file mode 100644
index 000000000..4e62b2cee
--- /dev/null
+++ b/browser/themes/windows/devtools/undock.png
diff --git a/browser/themes/windows/devtools/vview-delete.png b/browser/themes/windows/devtools/vview-delete.png
new file mode 100644
index 000000000..9604653c0
--- /dev/null
+++ b/browser/themes/windows/devtools/vview-delete.png
diff --git a/browser/themes/windows/devtools/vview-edit.png b/browser/themes/windows/devtools/vview-edit.png
new file mode 100644
index 000000000..af42a28df
--- /dev/null
+++ b/browser/themes/windows/devtools/vview-edit.png
diff --git a/browser/themes/windows/devtools/webconsole.css b/browser/themes/windows/devtools/webconsole.css
new file mode 100644
index 000000000..3daf77ca7
--- /dev/null
+++ b/browser/themes/windows/devtools/webconsole.css
@@ -0,0 +1,21 @@
+/* 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/devtools/webconsole.inc.css
+
+.webconsole-timestamp,
+.webconsole-msg-body,
+.jsterm-input-node,
+.jsterm-complete-node {
+  font-family: Consolas, Lucida Console, monospace;
+}
+
+/*
+ * This hardcoded width likely due to a toolkit Windows specific bug.
+ * See http://hg.mozilla.org/mozilla-central/annotate/f38d6df93cad/toolkit/themes/winstripe/global/textbox-aero.css#l7
+ */
+
+.hud-filter-box {
+  width: 200px;
+}
diff --git a/browser/themes/windows/devtools/webconsole.png b/browser/themes/windows/devtools/webconsole.png
new file mode 100644
index 000000000..8aee79015
--- /dev/null
+++ b/browser/themes/windows/devtools/webconsole.png
diff --git a/browser/themes/windows/devtools/webconsole_networkpanel.css b/browser/themes/windows/devtools/webconsole_networkpanel.css
new file mode 100644
index 000000000..d66232fe9
--- /dev/null
+++ b/browser/themes/windows/devtools/webconsole_networkpanel.css
@@ -0,0 +1,100 @@
+/* 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/. */
+
+body {
+  font-family: sans-serif;
+  font-size: 11px;
+  background: #EEE;
+  color: #000;
+}
+
+#header {
+  padding: 5px;
+  overflow-x: auto;
+  display: block;
+}
+
+h1 {
+  font-size: 13px;
+  line-height: 15px;
+  padding: 3px 10px;
+  vertical-align: bottom;
+  margin: 0px;
+  background: linear-gradient(#BBB, #999);
+  border-radius: 2px;
+  text-shadow: #FFF 0px 1px 0px;
+}
+
+h1 .info {
+  font-size: 11px;
+  line-height: 15px;
+  vertical-align: bottom;
+  float: right;
+  color: #333;
+  padding-right: 3px;
+}
+
+.property-table {
+  padding: 2px 5px;
+  background: linear-gradient(#FFF, #F8F8F8);
+  color: #333;
+  width: 100%;
+  max-height: 330px;
+  overflow: auto;
+  display: block;
+}
+
+.property-table-header {
+  font-size: 11px;
+  font-weight: bold;
+  padding-right: 4px;
+  color: #000;
+  white-space: nowrap;
+  text-align: right;
+  vertical-align: top;
+  width: 10%;
+}
+
+.property-table-value {
+  padding-right: 5px;
+  font-size: 11px;
+  word-wrap: break-word;
+  width: 90%;
+}
+
+div.group {
+  margin-top: 10px;
+}
+
+div.group,
+#header {
+  background: #FFF;
+  border-color: #E1E1E1;
+  border-style: solid;
+  border-width: 1px;
+  box-shadow: 0 1px 1.5px rgba(0, 0, 0, 0.2);
+  border-radius: 4px 4px 4px 4px;
+}
+
+img#responseImageNode {
+  box-shadow: rgba(0,0,0,0.2) 0px 3px 3.5px;
+  max-width: 100%;
+}
+
+#responseImageNodeDiv {
+  padding: 5px;
+}
+
+#responseBodyFetchLink, #requestBodyFetchLink {
+  padding: 5px;
+  margin: 0;
+  cursor: pointer;
+  font-weight: bold;
+  font-size: 1.1em;
+  text-decoration: underline;
+}
+
+.longStringEllipsis {
+  margin-left: 0.6em;
+}
diff --git a/browser/themes/windows/devtools/widgets.css b/browser/themes/windows/devtools/widgets.css
new file mode 100644
index 000000000..0422b68d1
--- /dev/null
+++ b/browser/themes/windows/devtools/widgets.css
@@ -0,0 +1,655 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* 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/. */
+
+/* Generic pane helpers */
+
+.generic-toggled-side-pane {
+  min-width: 50px;
+  -moz-margin-start: 0px !important;
+  /* Unfortunately, transitions don't work properly with locale-aware properties,
+     so both the left and right margins are set via js, while the start margin
+     is always overridden here. */
+}
+
+.generic-toggled-side-pane[animated] {
+  transition: margin 0.25s ease-in-out;
+}
+
+/* BreacrumbsWidget */
+
+.breadcrumbs-widget-container {
+  -moz-margin-end: 3px;
+  /* A fake 1px-shadow is included in the border-images of the
+     breadcrumbs-widget-items, to match toolbar-buttons style.
+     This negative margin compensates the extra row of pixels created
+     by the shadow.*/
+  margin: -1px 0;
+}
+
+/* Preloading hack, LTR */
+
+.breadcrumbs-widget-container:-moz-locale-dir(ltr)::after {
+  content: '';
+  display: block;
+  background-image:
+    url(breadcrumbs/ltr-start.png),
+    url(breadcrumbs/ltr-start-selected.png),
+    url(breadcrumbs/ltr-start-pressed.png),
+    url(breadcrumbs/ltr-start-selected-pressed.png),
+    url(breadcrumbs/ltr-middle.png),
+    url(breadcrumbs/ltr-middle-selected.png),
+    url(breadcrumbs/ltr-middle-pressed.png),
+    url(breadcrumbs/ltr-middle-selected-pressed.png),
+    url(breadcrumbs/ltr-end.png),
+    url(breadcrumbs/ltr-end-selected.png),
+    url(breadcrumbs/ltr-end-pressed.png),
+    url(breadcrumbs/ltr-end-selected-pressed.png);
+}
+
+/* Preloading hack, RTL */
+
+.breadcrumbs-widget-container:-moz-locale-dir(rtl)::after {
+  content: '';
+  display: block;
+  background-image:
+    url(breadcrumbs/rtl-start.png),
+    url(breadcrumbs/rtl-start-selected.png),
+    url(breadcrumbs/rtl-start-pressed.png),
+    url(breadcrumbs/rtl-start-selected-pressed.png),
+    url(breadcrumbs/rtl-middle.png),
+    url(breadcrumbs/rtl-middle-selected.png),
+    url(breadcrumbs/rtl-middle-pressed.png),
+    url(breadcrumbs/rtl-middle-selected-pressed.png),
+    url(breadcrumbs/rtl-end.png),
+    url(breadcrumbs/rtl-end-selected.png),
+    url(breadcrumbs/rtl-end-pressed.png),
+    url(breadcrumbs/rtl-end-selected-pressed.png);
+}
+
+.scrollbutton-up,
+.scrollbutton-down {
+  -moz-appearance: none;
+  background: linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
+  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset,
+              0 0 0 1px hsla(210,16%,76%,.15) inset,
+              0 1px 0 hsla(210,16%,76%,.15);
+  border: 1px solid hsla(210,8%,5%,.45);
+  margin: 1px 0 1px;
+}
+
+.scrollbutton-up:not([disabled]):active:hover,
+.scrollbutton-down:not([disabled]):active:hover {
+  background: linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
+  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset,
+              0 1px 3px hsla(210,8%,5%,.25) inset,
+              0 1px 0 hsla(210,16%,76%,.15);
+  border-color: hsla(210,8%,5%,.6);
+}
+
+.scrollbutton-up > .toolbarbutton-icon,
+.scrollbutton-down > .toolbarbutton-icon {
+  -moz-appearance: none;
+  list-style-image: url("breadcrumbs-scrollbutton.png");
+  -moz-image-region: rect(0px,7px,16px,0px);
+  margin: 0 5px;
+}
+
+.scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
+.scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
+  -moz-image-region: rect(0px,14px,16px,7px);
+}
+
+.scrollbutton-up[disabled] > .toolbarbutton-icon,
+.scrollbutton-down[disabled] > .toolbarbutton-icon {
+  opacity: 0.5;
+}
+
+.scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
+.scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
+  transform: scaleX(-1);
+}
+
+.breadcrumbs-widget-item {
+  background-color: transparent;
+  -moz-appearance: none;
+  overflow: hidden;
+  min-width: 85px;
+  max-width: 250px;
+  min-height: 25px;
+  border-style: solid;
+  border-width: 2px 13px;
+  margin: 0 -11px 0 0;
+  padding: 0 9px;
+  outline: none;
+  color: hsl(210,30%,85%);
+}
+
+.breadcrumbs-widget-item:-moz-focusring > label {
+  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
+}
+
+.breadcrumbs-widget-item:-moz-focusring > .button-box {
+  border-width: 0;
+}
+
+.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-tag {
+  color: hsl(208,100%,60%);
+}
+
+.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-id {
+  color: hsl(205,100%,70%);
+}
+
+.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-pseudo-classes {
+  color: hsl(20,100%,70%);
+}
+
+.breadcrumbs-widget-item-id,
+.breadcrumbs-widget-item-classes {
+  color: #8d99a6;
+}
+
+.breadcrumbs-widget-item-pseudo-classes {
+  color: hsl(20,100%,85%);
+}
+
+/* Breadcrumbs LTR */
+
+.breadcrumbs-widget-item:-moz-locale-dir(ltr) {
+  border-image: url("breadcrumbs/ltr-middle.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:not([checked]):hover:active:-moz-locale-dir(ltr) {
+  border-image: url("breadcrumbs/ltr-middle-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item[checked]:-moz-locale-dir(ltr) {
+  border-image: url("breadcrumbs/ltr-middle-selected.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item[checked]:hover:active:-moz-locale-dir(ltr) {
+  border-image: url("breadcrumbs/ltr-middle-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:first-of-type:-moz-locale-dir(ltr) {
+  border-image: url("breadcrumbs/ltr-start.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:first-of-type:not([checked]):hover:active:-moz-locale-dir(ltr) {
+  border-image: url("breadcrumbs/ltr-start-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:first-of-type[checked]:-moz-locale-dir(ltr) {
+  border-image: url("breadcrumbs/ltr-start-selected.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:first-of-type[checked]:hover:active:-moz-locale-dir(ltr) {
+  border-image: url("breadcrumbs/ltr-start-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:last-of-type:-moz-locale-dir(ltr) {
+  border-image: url("breadcrumbs/ltr-end.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:last-of-type:not([checked]):hover:active:-moz-locale-dir(ltr) {
+  border-image: url("breadcrumbs/ltr-end-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:last-of-type[checked]:-moz-locale-dir(ltr) {
+  border-image: url("breadcrumbs/ltr-end-selected.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:last-of-type[checked]:hover:active:-moz-locale-dir(ltr) {
+  border-image: url("breadcrumbs/ltr-end-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:first-of-type:-moz-locale-dir(ltr) {
+  border-left-width: 0;
+}
+
+.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:last-of-type:-moz-locale-dir(ltr) {
+  border-right-width: 0;
+}
+
+/* Breadcrumbs RTL */
+
+.breadcrumbs-widget-item:-moz-locale-dir(rtl) {
+  border-image: url("breadcrumbs/rtl-middle.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  border-image: url("breadcrumbs/rtl-middle-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item[checked]:-moz-locale-dir(rtl) {
+  border-image: url("breadcrumbs/rtl-middle-selected.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item[checked]:hover:active:-moz-locale-dir(rtl) {
+  border-image: url("breadcrumbs/rtl-middle-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:first-of-type:-moz-locale-dir(rtl) {
+  border-image: url("breadcrumbs/rtl-start.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  border-image: url("breadcrumbs/rtl-start-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:first-of-type[checked]:-moz-locale-dir(rtl) {
+  border-image: url("breadcrumbs/rtl-start-selected.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  border-image: url("breadcrumbs/rtl-start-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:last-of-type:-moz-locale-dir(rtl) {
+  border-image: url("breadcrumbs/rtl-end.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  border-image: url("breadcrumbs/rtl-end-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:last-of-type[checked]:-moz-locale-dir(rtl) {
+  border-image: url("breadcrumbs/rtl-end-selected.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-item:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  border-image: url("breadcrumbs/rtl-end-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:first-of-type:-moz-locale-dir(rtl) {
+  border-right-width: 0;
+}
+
+.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:last-of-type:-moz-locale-dir(rtl) {
+  border-left-width: 0;
+}
+
+/* SideMenuWidget */
+
+.side-menu-widget-container {
+  background: url(background-noise-toolbar.png), hsl(208,11%,27%);
+  color: #fff;
+}
+
+.side-menu-widget-container[with-arrow=true]:-moz-locale-dir(ltr),
+.side-menu-widget-group[with-arrow=true]:-moz-locale-dir(ltr),
+.side-menu-widget-item[with-arrow=true]:-moz-locale-dir(ltr) {
+  box-shadow: inset -1px 0 0 #222426;
+}
+
+.side-menu-widget-container[with-arrow=true]:-moz-locale-dir(rtl),
+.side-menu-widget-group[with-arrow=true]:-moz-locale-dir(rtl),
+.side-menu-widget-item[with-arrow=true]:-moz-locale-dir(rtl) {
+  box-shadow: inset 1px 0 0 #222426;
+}
+
+.side-menu-widget-group-title {
+  background-image: linear-gradient(#1f3e4f, #1b3243);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 -2px 0 hsla(206,37%,4%,.05) inset,
+              0 -1px 1px hsla(206,37%,4%,.1) inset;
+  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+  padding: 4px;
+  color: #f5f7fa;
+  transition-property: color, text-shadow;
+  transition-duration: 0.3s;
+}
+
+.side-menu-widget-group:hover > .side-menu-widget-group-title {
+  text-shadow: 0 0 1px #cfcfcf;
+  color: #fff;
+}
+
+.side-menu-widget-item {
+  border-top: 1px solid hsla(210,16%,76%,.1);
+  border-bottom: 1px solid hsla(210,8%,5%,.25);
+  cursor: pointer;
+}
+
+.side-menu-widget-item:last-of-type {
+  box-shadow: 0 1px 0 hsla(210,16%,76%,.1);
+}
+
+.side-menu-widget-item.selected {
+  background: linear-gradient(hsl(206,61%,40%), hsl(206,61%,31%)) repeat-x top left !important;
+  box-shadow: inset 0 1px 0 hsla(210,40%,83%,.15),
+              inset 0 -1px 0 hsla(210,40%,83%,.05);
+}
+
+.side-menu-widget-item.selected > .side-menu-widget-item-arrow {
+  background-size: auto, 1px 100%;
+  background-repeat: no-repeat;
+}
+
+.side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(ltr) {
+  background-image: url(itemArrow-ltr.png), linear-gradient(to right, black, black);
+  background-position: center right, top right;
+}
+
+.side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(rtl) {
+  background-image: url(itemArrow-rtl.png), linear-gradient(to right, black, black);
+  background-position: center left, top left;
+}
+
+.side-menu-widget-item-arrow {
+  -moz-margin-start: -8px;
+  width: 8px;
+}
+
+.side-menu-widget-item-contents {
+  padding: 4px;
+}
+
+.side-menu-widget-item label {
+  cursor: inherit;
+}
+
+.side-menu-widget-item-other {
+  background: url(background-noise-toolbar.png), hsla(208,11%,27%, 0.65);
+  margin: 0 -4px;
+  -moz-padding-start: 5px;
+}
+
+.side-menu-widget-item-other.selected {
+  background: url(background-noise-toolbar.png), hsla(208,11%,27%, 0.15);
+  box-shadow: inset 0 1px 0 hsla(210,40%,83%,.07),
+              inset 0 -1px 0 hsla(210,40%,83%,.07);
+}
+
+.side-menu-widget-item.selected .side-menu-widget-item-other:first-of-type {
+  border-top: 1px dotted #333;
+  margin-top: 3px;
+}
+
+.side-menu-widget-item-other:first-of-type {
+  margin-top: 4px;
+}
+
+.side-menu-widget-item-other:last-of-type {
+  margin-bottom: -4px;
+}
+
+.side-menu-widget-item-other > label {
+  color: #f5f7fa;
+}
+
+.side-menu-widget-empty-notice-container {
+  background: url(background-noise-toolbar.png), hsl(208,11%,27%);
+  padding: 12px;
+  color: #fff;
+  font-weight: 600;
+}
+
+/* VariablesView */
+
+.variables-view-container {
+  background: #fff;
+}
+
+.variables-view-empty-notice {
+  color: GrayText;
+  padding: 2px;
+}
+
+.variables-view-scope > .title {
+  color: #fff;
+}
+
+.variables-view-scope:focus > .title {
+  background: Highlight;
+  color: HighlightText;
+}
+
+.variables-view-scope > .variables-view-element-details:not(:empty) {
+  margin-top: 1px;
+  -moz-margin-start: 2px;
+  -moz-margin-end: 1px;
+}
+
+.variables-view-scope > .variables-view-element-details.enum:not(:empty) {
+  border-bottom: 1px solid #ddd;
+}
+
+/* Generic traits applied to both variables and properties */
+
+.variable-or-property {
+  transition: background 1s ease-in-out;
+  color: #000;
+}
+
+.variable-or-property[changed] {
+  background: rgba(255,255,0,0.65);
+  transition-duration: 0.4s;
+}
+
+.variable-or-property > .title > .value {
+  -moz-padding-start: 6px;
+  -moz-padding-end: 4px;
+}
+
+.variable-or-property:focus > .title {
+  background: Highlight;
+  color: HighlightText;
+  border-radius: 4px;
+}
+
+.variable-or-property[editable] > .title > .value {
+  cursor: text;
+}
+
+.variable-or-property:not([non-header]) > .variables-view-element-details {
+  -moz-margin-start: 10px;
+}
+
+/* Custom variables and properties traits */
+
+.variables-view-variable {
+  -moz-margin-start: 1px;
+  -moz-margin-end: 1px;
+  border-bottom: 1px solid #eee;
+}
+
+.variables-view-variable > .title > .name {
+  font-weight: 600;
+}
+
+.variables-view-variable:not(:focus) > .title > .name {
+  color: #048;
+}
+
+.variables-view-property:not(:focus) > .title > .name {
+  color: #881090;
+}
+
+/* Token value colors */
+
+.variable-or-property:not(:focus) > .title > .token-undefined {
+  color: #bbb;
+}
+
+.variable-or-property:not(:focus) > .title > .token-null {
+  color: #999;
+}
+
+.variable-or-property:not(:focus) > .title > .token-boolean {
+  color: #10c;
+}
+
+.variable-or-property:not(:focus) > .title > .token-number {
+  color: #c00;
+}
+
+.variable-or-property:not(:focus) > .title > .token-string {
+  color: #282;
+}
+
+.variable-or-property:not(:focus) > .title > .token-other {
+  color: #333;
+}
+
+/* Custom configurable/enumerable/writable or frozen/sealed/extensible
+ * variables and properties */
+
+.variable-or-property[non-enumerable]:not([self]):not([exception]):not([return]) > .title > .name {
+  opacity: 0.5;
+}
+
+.variable-or-property[non-configurable] > .title > .name {
+  border-bottom: 1px dashed #99f;
+}
+
+.variable-or-property[non-writable] > .title > .name {
+  border-bottom: 1px dashed #f99;
+}
+
+.variable-or-property-non-writable-icon {
+  background: url("chrome://browser/skin/identity-icons-https.png") no-repeat;
+  width: 16px;
+  height: 16px;
+  opacity: 0.5;
+}
+
+@media (min-resolution: 2dppx) {
+  .variable-or-property-non-writable-icon {
+    background-image: url("chrome://browser/skin/identity-icons-https@2x.png");
+    background-size: 32px;
+  }
+}
+
+.variable-or-property-frozen-label,
+.variable-or-property-sealed-label,
+.variable-or-property-non-extensible-label {
+  -moz-padding-end: 4px;
+}
+
+.variable-or-property:not(:focus) > .title > .variable-or-property-frozen-label,
+.variable-or-property:not(:focus) > .title > .variable-or-property-sealed-label,
+.variable-or-property:not(:focus) > .title > .variable-or-property-non-extensible-label {
+  color: #666;
+}
+
+/* Special variables and properties */
+
+.variable-or-property[safe-getter] > .title > .name {
+  border-bottom: 1px dashed #8b0;
+}
+
+.variable-or-property[exception]:not(:focus) > .title > .name {
+  color: #a00;
+  text-shadow: 0 0 8px #fcc;
+}
+
+.variable-or-property[return]:not(:focus) > .title > .name {
+  color: #0a0;
+  text-shadow: 0 0 8px #cfc;
+}
+
+/* Variables and properties tooltips */
+
+.variable-or-property > tooltip > label {
+  margin: 0 2px 0 2px;
+}
+
+.variable-or-property[non-enumerable] > tooltip > label[value=enumerable],
+.variable-or-property[non-configurable] > tooltip > label[value=configurable],
+.variable-or-property[non-writable] > tooltip > label[value=writable],
+.variable-or-property[non-extensible] > tooltip > label[value=extensible] {
+  color: #800;
+  text-decoration: line-through;
+}
+
+.variable-or-property[safe-getter] > tooltip > label[value=WebIDL] {
+  -moz-padding-start: 4px;
+  -moz-border-start: 1px dotted #000;
+  color: #080;
+}
+
+/* Variables and properties editing */
+
+.variables-view-delete {
+  list-style-image: url("chrome://browser/skin/devtools/vview-delete.png");
+  -moz-image-region: rect(0,16px,16px,0);
+}
+
+.variables-view-delete:hover {
+  -moz-image-region: rect(0,32px,16px,16px);
+}
+
+.variables-view-delete:active {
+  -moz-image-region: rect(0,48px,16px,32px);
+}
+
+*:not(:hover) .variables-view-delete {
+  display: none;
+}
+
+.variables-view-delete > .toolbarbutton-text {
+  display: none;
+}
+
+.variables-view-edit {
+  background: url("chrome://browser/skin/devtools/vview-edit.png") center no-repeat;
+  width: 20px;
+  height: 16px;
+  cursor: pointer;
+}
+
+.variables-view-throbber {
+  background: url("chrome://global/skin/icons/loading_16.png") center no-repeat;
+  width: 16px;
+  height: 16px;
+}
+
+.element-value-input {
+  -moz-margin-start: 4px !important;
+  -moz-margin-end: 2px !important;
+}
+
+.element-name-input {
+  -moz-margin-start: -2px !important;
+  -moz-margin-end: 2px !important;
+  color: #048;
+  font-weight: 600;
+}
+
+.element-value-input,
+.element-name-input {
+  border: 1px solid #999 !important;
+  box-shadow: 1px 2px 4px #aaa;
+}
+
+/* Variables and properties searching */
+
+.variables-view-searchinput {
+  min-height: 24px;
+}
+
+.variable-or-property[non-match] {
+  border: none;
+  margin: 0;
+}
+
+/* Expand/collapse arrow */
+
+.arrow {
+  background: url("chrome://global/skin/tree/twisty-clsd.png") center center no-repeat;
+  width: 9px;
+  height: 20px;
+  -moz-margin-start: 5px;
+  -moz-margin-end: 5px;
+}
+
+.arrow[open] {
+  background-image: url("chrome://global/skin/tree/twisty-open.png");
+}
+
+.arrow[invisible] {
+  visibility: hidden;
+}
diff --git a/browser/themes/windows/downloads/allDownloadsViewOverlay-aero.css b/browser/themes/windows/downloads/allDownloadsViewOverlay-aero.css
new file mode 100644
index 000000000..1907fc152
--- /dev/null
+++ b/browser/themes/windows/downloads/allDownloadsViewOverlay-aero.css
@@ -0,0 +1,35 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%define WINDOWS_AERO
+%include allDownloadsViewOverlay.css
+%undef WINDOWS_AERO
+
+@media (-moz-windows-default-theme) {
+  /*
+  -moz-appearance: menuitem is almost right, but the hover effect is not
+  transparent and is lighter than desired.
+
+  Copied from the autocomplete richlistbox styling in
+  toolkit/themes/windows/global/autocomplete.css
+
+  This styling should be kept in sync with the style from the above file.
+  */
+  #downloadsRichListBox > richlistitem.download[selected] {
+    color: inherit;
+    background-color: transparent;
+    /* four gradients for the bevel highlights on each edge, one for blue background */
+    background-image:
+      linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, rgba(255,255,255,0) 3px),
+      linear-gradient(to right, rgba(255,255,255,0.5) 3px, rgba(255,255,255,0) 3px),
+      linear-gradient(to left, rgba(255,255,255,0.5) 3px, rgba(255,255,255,0) 3px),
+      linear-gradient(to top, rgba(255,255,255,0.4) 3px, rgba(255,255,255,0) 3px),
+      linear-gradient(to bottom, rgba(163,196,247,0.3), rgba(122,180,246,0.3));
+    background-clip: content-box;
+    border-radius: 6px;
+    outline: 1px solid rgb(124,163,206);
+    -moz-outline-radius: 3px;
+    outline-offset: -2px;
+  }
+}
diff --git a/browser/themes/windows/downloads/allDownloadsViewOverlay.css b/browser/themes/windows/downloads/allDownloadsViewOverlay.css
new file mode 100644
index 000000000..62457d4b9
--- /dev/null
+++ b/browser/themes/windows/downloads/allDownloadsViewOverlay.css
@@ -0,0 +1,152 @@
+/* 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;
+%ifndef WINDOWS_AERO
+  padding: 5px 8px;
+%endif
+}
+
+.downloadTypeIcon {
+  -moz-margin-end: 8px;
+%ifdef WINDOWS_AERO
+  -moz-margin-start: 8px;
+%endif
+  /* 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);
+}
+
+%ifndef WINDOWS_AERO
+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);
+}
+%endif
diff --git a/browser/themes/windows/downloads/buttons-aero.png b/browser/themes/windows/downloads/buttons-aero.png
new file mode 100644
index 000000000..c1057c434
--- /dev/null
+++ b/browser/themes/windows/downloads/buttons-aero.png
diff --git a/browser/themes/windows/downloads/buttons.png b/browser/themes/windows/downloads/buttons.png
new file mode 100644
index 000000000..ca87b401b
--- /dev/null
+++ b/browser/themes/windows/downloads/buttons.png
diff --git a/browser/themes/windows/downloads/contentAreaDownloadsView.css b/browser/themes/windows/downloads/contentAreaDownloadsView.css
new file mode 100644
index 000000000..ece99eacd
--- /dev/null
+++ b/browser/themes/windows/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/browser/themes/windows/downloads/download-glow.png b/browser/themes/windows/downloads/download-glow.png
new file mode 100644
index 000000000..53182d7a4
--- /dev/null
+++ b/browser/themes/windows/downloads/download-glow.png
diff --git a/browser/themes/windows/downloads/download-notification-finish.png b/browser/themes/windows/downloads/download-notification-finish.png
new file mode 100644
index 000000000..5194f5d59
--- /dev/null
+++ b/browser/themes/windows/downloads/download-notification-finish.png
diff --git a/browser/themes/windows/downloads/download-notification-start.png b/browser/themes/windows/downloads/download-notification-start.png
new file mode 100644
index 000000000..bd548b183
--- /dev/null
+++ b/browser/themes/windows/downloads/download-notification-start.png
diff --git a/browser/themes/windows/downloads/download-summary.png b/browser/themes/windows/downloads/download-summary.png
new file mode 100644
index 000000000..67003c7d7
--- /dev/null
+++ b/browser/themes/windows/downloads/download-summary.png
diff --git a/browser/themes/windows/downloads/downloads-aero.css b/browser/themes/windows/downloads/downloads-aero.css
new file mode 100644
index 000000000..68dbfc111
--- /dev/null
+++ b/browser/themes/windows/downloads/downloads-aero.css
@@ -0,0 +1,60 @@
+/* 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/. */
+
+%define WINDOWS_AERO
+%include downloads.css
+%undef WINDOWS_AERO
+
+@media (-moz-windows-default-theme) {
+  richlistitem[type="download"] {
+    border: 1px solid transparent;
+    border-bottom: 1px solid hsl(213,40%,90%);
+  }
+
+  #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover {
+    border: 1px solid hsl(213,45%,65%);
+    box-shadow: 0 0 0 1px hsla(0,0%,100%,.5) inset,
+                0 1px 0 hsla(0,0%,100%,.3) inset;
+    background-image: linear-gradient(hsl(212,86%,92%), hsl(212,91%,86%));
+    color: black;
+  }
+}
+
+@media (-moz-windows-compositor) {
+  /* The following rules are for the downloads indicator when in its normal,
+     non-downloading, non-paused state (ie, it's just showing the downloads
+     button icon). */
+  #toolbar-menubar #downloads-indicator:not([attention]) > #downloads-indicator-anchor > #downloads-indicator-icon:not(:-moz-lwtheme),
+  #TabsToolbar[tabsontop=true] #downloads-indicator:not([attention]) > #downloads-indicator-anchor > #downloads-indicator-icon:not(:-moz-lwtheme),
+  #navigator-toolbox[tabsontop=false] > #nav-bar #downloads-indicator:not([attention]) > #downloads-indicator-anchor > #downloads-indicator-icon:not(:-moz-lwtheme),
+  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child #downloads-indicator:not([attention]) > #downloads-indicator-anchor > #downloads-indicator-icon:not(:-moz-lwtheme),
+
+  /* The following rules are for the downloads indicator when in its paused
+     or undetermined progress state. We use :not([counter]) as a shortcut for
+     :-moz-any([progress], [paused]). */
+
+  /* This is the case where the downloads indicator has been moved next to the menubar */
+  #toolbar-menubar #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter,
+  /* This is the case where the downloads indicator is in the tabstrip toolbar with tabs on top. */
+  #TabsToolbar[tabsontop=true] #downloads-indicator:not(:-moz-lwtheme):not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter,
+  /* This is the case where the downloads indicator is anywhere in the nav-bar with tabs on bottom. */
+  #navigator-toolbox[tabsontop=false] > #nav-bar #downloads-indicator:not(:-moz-lwtheme):not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter,
+  /* This is the case where the downloads indicator is in the tabstrip when the tabstrip is the last item in the toolbox (and is therefore over glass) */
+  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child #downloads-indicator:not(:-moz-lwtheme):not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
+    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 0, 108, 18, 90);
+  }
+
+  #toolbar-menubar #downloads-indicator-counter:not(:-moz-lwtheme),
+  #TabsToolbar[tabsontop=true] #downloads-indicator-counter:not(:-moz-lwtheme),
+  #navigator-toolbox[tabsontop=false] > #nav-bar #downloads-indicator-counter:not(:-moz-lwtheme),
+  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child #downloads-indicator-counter:not(:-moz-lwtheme) {
+    color: white;
+    text-shadow: 0 0 1px rgba(0,0,0,.7),
+                 0 1px 1.5px rgba(0,0,0,.5);
+  }
+}
+
+#downloads-indicator-counter {
+  margin-bottom: -1px;
+}
diff --git a/browser/themes/windows/downloads/downloads.css b/browser/themes/windows/downloads/downloads.css
new file mode 100644
index 000000000..071420c4d
--- /dev/null
+++ b/browser/themes/windows/downloads/downloads.css
@@ -0,0 +1,386 @@
+/* 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;
+}
+
+#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-windows-default-theme) {
+  #downloadsPanel[hasdownloads] > #downloadsFooter {
+%ifdef WINDOWS_AERO
+    background-color: #f1f5fb;
+%else
+    background-color: hsla(216,45%,88%,.98);
+%endif
+    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-windows-default-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 .downloadTarget, .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
+      .downloadTarget and .downloadProgress.
+
+   Finally, since we want .downloadTarget'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,
+.downloadTarget {
+  margin-bottom: 6px;
+  cursor: inherit;
+}
+
+.downloadTarget {
+  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);
+}
+%ifndef WINDOWS_AERO
+#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);
+}
+%endif
+
+.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;
+}
+
+#downloads-indicator-icon:-moz-lwtheme-brighttext {
+  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;
+}
+
+#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;
+}
+
+#downloads-indicator-counter:-moz-lwtheme-brighttext {
+  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/browser/themes/windows/engineManager.css b/browser/themes/windows/engineManager.css
new file mode 100644
index 000000000..18817cd4f
--- /dev/null
+++ b/browser/themes/windows/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/browser/themes/windows/feeds/feed-icons-16-aero.png b/browser/themes/windows/feeds/feed-icons-16-aero.png
new file mode 100644
index 000000000..b822aa44f
--- /dev/null
+++ b/browser/themes/windows/feeds/feed-icons-16-aero.png
diff --git a/browser/themes/windows/feeds/feed-icons-16.png b/browser/themes/windows/feeds/feed-icons-16.png
new file mode 100644
index 000000000..bcca08638
--- /dev/null
+++ b/browser/themes/windows/feeds/feed-icons-16.png
diff --git a/browser/themes/windows/feeds/feedIcon-aero.png b/browser/themes/windows/feeds/feedIcon-aero.png
new file mode 100644
index 000000000..b4d599499
--- /dev/null
+++ b/browser/themes/windows/feeds/feedIcon-aero.png
diff --git a/browser/themes/windows/feeds/feedIcon.png b/browser/themes/windows/feeds/feedIcon.png
new file mode 100644
index 000000000..e69bc4496
--- /dev/null
+++ b/browser/themes/windows/feeds/feedIcon.png
diff --git a/browser/themes/windows/feeds/feedIcon16-aero.png b/browser/themes/windows/feeds/feedIcon16-aero.png
new file mode 100644
index 000000000..7c3aceb66
--- /dev/null
+++ b/browser/themes/windows/feeds/feedIcon16-aero.png
diff --git a/browser/themes/windows/feeds/feedIcon16.png b/browser/themes/windows/feeds/feedIcon16.png
new file mode 100644
index 000000000..d77880753
--- /dev/null
+++ b/browser/themes/windows/feeds/feedIcon16.png
diff --git a/browser/themes/windows/feeds/subscribe-ui.css b/browser/themes/windows/feeds/subscribe-ui.css
new file mode 100644
index 000000000..8ca53283b
--- /dev/null
+++ b/browser/themes/windows/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/browser/themes/windows/feeds/subscribe.css b/browser/themes/windows/feeds/subscribe.css
new file mode 100644
index 000000000..780a7f8b2
--- /dev/null
+++ b/browser/themes/windows/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/browser/themes/windows/icon.png b/browser/themes/windows/icon.png
new file mode 100644
index 000000000..ff4f21f9a
--- /dev/null
+++ b/browser/themes/windows/icon.png
diff --git a/browser/themes/windows/identity-aero.png b/browser/themes/windows/identity-aero.png
new file mode 100644
index 000000000..0dcccd493
--- /dev/null
+++ b/browser/themes/windows/identity-aero.png
diff --git a/browser/themes/windows/identity-icons-generic.png b/browser/themes/windows/identity-icons-generic.png
new file mode 100644
index 000000000..a39e493c1
--- /dev/null
+++ b/browser/themes/windows/identity-icons-generic.png
diff --git a/browser/themes/windows/identity-icons-https-ev.png b/browser/themes/windows/identity-icons-https-ev.png
new file mode 100644
index 000000000..d49be13cb
--- /dev/null
+++ b/browser/themes/windows/identity-icons-https-ev.png
diff --git a/browser/themes/windows/identity-icons-https-mixed-active.png b/browser/themes/windows/identity-icons-https-mixed-active.png
new file mode 100644
index 000000000..3c77bc84d
--- /dev/null
+++ b/browser/themes/windows/identity-icons-https-mixed-active.png
diff --git a/browser/themes/windows/identity-icons-https.png b/browser/themes/windows/identity-icons-https.png
new file mode 100644
index 000000000..ffd669426
--- /dev/null
+++ b/browser/themes/windows/identity-icons-https.png
diff --git a/browser/themes/windows/identity.png b/browser/themes/windows/identity.png
new file mode 100644
index 000000000..60d5261ff
--- /dev/null
+++ b/browser/themes/windows/identity.png
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
new file mode 100644
index 000000000..decbbae8e
--- /dev/null
+++ b/browser/themes/windows/jar.mn
@@ -0,0 +1,511 @@
+# 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/ os=WINNT osversion<6
+% skin browser classic/1.0 %skin/classic/browser/ os!=WINNT
+# NOTE: If you add a new file here, you'll need to add it to the aero
+# section at the bottom of this file
+        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
+        skin/classic/browser/aboutSocialError.css
+#ifdef MOZ_SERVICES_SYNC
+        skin/classic/browser/aboutSyncTabs.css
+#endif
+        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/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/notification-16.png
+        skin/classic/browser/notification-64.png
+        skin/classic/browser/pageInfo.css
+        skin/classic/browser/pageInfo.png
+        skin/classic/browser/page-livemarks.png                      (feeds/feedIcon16.png)
+        skin/classic/browser/pluginInstall-16.png
+        skin/classic/browser/pluginInstall-64.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-light.png
+        skin/classic/browser/privatebrowsing-dark.png
+        skin/classic/browser/reload-stop-go.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/webapps-16.png
+        skin/classic/browser/webapps-64.png
+        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)
+        skin/classic/browser/webRTC-shareDevice-16.png
+        skin/classic/browser/webRTC-shareDevice-64.png
+        skin/classic/browser/webRTC-sharingDevice-16.png
+        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                     (newtab/controls.png)
+        skin/classic/browser/newtab/noise.png                        (newtab/noise.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/bookmarksMenu.png                (places/bookmarksMenu.png)
+        skin/classic/browser/places/bookmarksToolbar.png             (places/bookmarksToolbar.png)
+        skin/classic/browser/places/calendar.png                     (places/calendar.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/tag.png                          (places/tag.png)
+        skin/classic/browser/places/history.png                      (places/history.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/livemark-item.png                (places/livemark-item.png)
+        skin/classic/browser/preferences/alwaysAsk.png               (preferences/alwaysAsk.png)
+        skin/classic/browser/preferences/application.png             (preferences/application.png)
+        skin/classic/browser/preferences/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/in-content/preferences.css  (preferences/in-content/preferences.css)
+        skin/classic/browser/preferences/applications.css            (preferences/applications.css)
+        skin/classic/browser/preferences/aboutPermissions.css        (preferences/aboutPermissions.css)
+        skin/classic/browser/social/services-16.png                  (social/services-16.png)
+        skin/classic/browser/social/services-64.png                  (social/services-64.png)
+        skin/classic/browser/social/share-button.png                 (social/share-button.png)
+        skin/classic/browser/social/share-button-active.png          (social/share-button-active.png)
+        skin/classic/browser/social/chat-icons.png                   (social/chat-icons.png)
+        skin/classic/browser/tabbrowser/alltabs.png                  (tabbrowser/alltabs.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.png                      (tabbrowser/tab.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/devtools/common.css                    (devtools/common.css)
+        skin/classic/browser/devtools/dark-theme.css                (devtools/dark-theme.css)
+        skin/classic/browser/devtools/light-theme.css               (devtools/light-theme.css)
+        skin/classic/browser/devtools/widgets.css                   (devtools/widgets.css)
+        skin/classic/browser/devtools/commandline-icon.png          (devtools/commandline-icon.png)
+        skin/classic/browser/devtools/alerticon-warning.png         (devtools/alerticon-warning.png)
+        skin/classic/browser/devtools/ruleview.css                  (devtools/ruleview.css)
+        skin/classic/browser/devtools/commandline.css               (devtools/commandline.css)
+        skin/classic/browser/devtools/command-paintflashing.png     (devtools/command-paintflashing.png)
+        skin/classic/browser/devtools/command-responsivemode.png    (devtools/command-responsivemode.png)
+        skin/classic/browser/devtools/command-scratchpad.png        (devtools/command-scratchpad.png)
+        skin/classic/browser/devtools/command-tilt.png              (devtools/command-tilt.png)
+        skin/classic/browser/devtools/checkbox-dark.png             (devtools/checkbox-dark.png)
+        skin/classic/browser/devtools/checkbox-light.png            (devtools/checkbox-light.png)
+        skin/classic/browser/devtools/markup-view.css               (devtools/markup-view.css)
+        skin/classic/browser/devtools/orion.css                     (devtools/orion.css)
+        skin/classic/browser/devtools/orion-container.css           (devtools/orion-container.css)
+        skin/classic/browser/devtools/orion-task.png                (devtools/orion-task.png)
+        skin/classic/browser/devtools/orion-breakpoint.png          (devtools/orion-breakpoint.png)
+        skin/classic/browser/devtools/orion-debug-location.png      (devtools/orion-debug-location.png)
+*       skin/classic/browser/devtools/webconsole.css                  (devtools/webconsole.css)
+        skin/classic/browser/devtools/webconsole_networkpanel.css     (devtools/webconsole_networkpanel.css)
+        skin/classic/browser/devtools/webconsole.png                  (devtools/webconsole.png)
+        skin/classic/browser/devtools/breadcrumbs-scrollbutton.png                 (devtools/breadcrumbs-scrollbutton.png)
+        skin/classic/browser/devtools/breadcrumbs/ltr-end-pressed.png              (devtools/breadcrumbs/ltr-end-pressed.png)
+        skin/classic/browser/devtools/breadcrumbs/ltr-end-selected-pressed.png     (devtools/breadcrumbs/ltr-end-selected-pressed.png)
+        skin/classic/browser/devtools/breadcrumbs/ltr-end-selected.png             (devtools/breadcrumbs/ltr-end-selected.png)
+        skin/classic/browser/devtools/breadcrumbs/ltr-end.png                      (devtools/breadcrumbs/ltr-end.png)
+        skin/classic/browser/devtools/breadcrumbs/ltr-middle-pressed.png           (devtools/breadcrumbs/ltr-middle-pressed.png)
+        skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected-pressed.png  (devtools/breadcrumbs/ltr-middle-selected-pressed.png)
+        skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected.png          (devtools/breadcrumbs/ltr-middle-selected.png)
+        skin/classic/browser/devtools/breadcrumbs/ltr-middle.png                   (devtools/breadcrumbs/ltr-middle.png)
+        skin/classic/browser/devtools/breadcrumbs/ltr-start-pressed.png            (devtools/breadcrumbs/ltr-start-pressed.png)
+        skin/classic/browser/devtools/breadcrumbs/ltr-start-selected-pressed.png   (devtools/breadcrumbs/ltr-start-selected-pressed.png)
+        skin/classic/browser/devtools/breadcrumbs/ltr-start.png                    (devtools/breadcrumbs/ltr-start.png)
+        skin/classic/browser/devtools/breadcrumbs/ltr-start-selected.png           (devtools/breadcrumbs/ltr-start-selected.png)
+        skin/classic/browser/devtools/breadcrumbs/rtl-end-pressed.png              (devtools/breadcrumbs/rtl-end-pressed.png)
+        skin/classic/browser/devtools/breadcrumbs/rtl-end-selected-pressed.png     (devtools/breadcrumbs/rtl-end-selected-pressed.png)
+        skin/classic/browser/devtools/breadcrumbs/rtl-end-selected.png             (devtools/breadcrumbs/rtl-end-selected.png)
+        skin/classic/browser/devtools/breadcrumbs/rtl-end.png                      (devtools/breadcrumbs/rtl-end.png)
+        skin/classic/browser/devtools/breadcrumbs/rtl-middle-pressed.png           (devtools/breadcrumbs/rtl-middle-pressed.png)
+        skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected-pressed.png  (devtools/breadcrumbs/rtl-middle-selected-pressed.png)
+        skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected.png          (devtools/breadcrumbs/rtl-middle-selected.png)
+        skin/classic/browser/devtools/breadcrumbs/rtl-middle.png                   (devtools/breadcrumbs/rtl-middle.png)
+        skin/classic/browser/devtools/breadcrumbs/rtl-start-pressed.png            (devtools/breadcrumbs/rtl-start-pressed.png)
+        skin/classic/browser/devtools/breadcrumbs/rtl-start-selected-pressed.png   (devtools/breadcrumbs/rtl-start-selected-pressed.png)
+        skin/classic/browser/devtools/breadcrumbs/rtl-start.png                    (devtools/breadcrumbs/rtl-start.png)
+        skin/classic/browser/devtools/breadcrumbs/rtl-start-selected.png           (devtools/breadcrumbs/rtl-start-selected.png)
+        skin/classic/browser/devtools/splitview.css                 (devtools/splitview.css)
+        skin/classic/browser/devtools/styleeditor.css               (devtools/styleeditor.css)
+        skin/classic/browser/devtools/debugger.css                  (devtools/debugger.css)
+*       skin/classic/browser/devtools/profiler.css                  (devtools/profiler.css)
+        skin/classic/browser/devtools/netmonitor.css                (devtools/netmonitor.css)
+*       skin/classic/browser/devtools/scratchpad.css                (devtools/scratchpad.css)
+        skin/classic/browser/devtools/magnifying-glass.png          (devtools/magnifying-glass.png)
+        skin/classic/browser/devtools/option-icon.png               (devtools/option-icon.png)
+        skin/classic/browser/devtools/itemToggle.png                (devtools/itemToggle.png)
+        skin/classic/browser/devtools/itemArrow-rtl.png             (devtools/itemArrow-rtl.png)
+        skin/classic/browser/devtools/itemArrow-ltr.png             (devtools/itemArrow-ltr.png)
+        skin/classic/browser/devtools/background-noise-toolbar.png  (devtools/background-noise-toolbar.png)
+        skin/classic/browser/devtools/inspect-button.png            (devtools/inspect-button.png)
+        skin/classic/browser/devtools/dropmarker.png                (devtools/dropmarker.png)
+        skin/classic/browser/devtools/layout-background-grid.png    (devtools/layout-background-grid.png)
+        skin/classic/browser/devtools/layoutview.css                (devtools/layoutview.css)
+        skin/classic/browser/devtools/debugger-collapse.png         (devtools/debugger-collapse.png)
+        skin/classic/browser/devtools/debugger-expand.png           (devtools/debugger-expand.png)
+        skin/classic/browser/devtools/debugger-pause.png            (devtools/debugger-pause.png)
+        skin/classic/browser/devtools/debugger-play.png             (devtools/debugger-play.png)
+        skin/classic/browser/devtools/debugger-step-in.png          (devtools/debugger-step-in.png)
+        skin/classic/browser/devtools/debugger-step-out.png         (devtools/debugger-step-out.png)
+        skin/classic/browser/devtools/debugger-step-over.png        (devtools/debugger-step-over.png)
+        skin/classic/browser/devtools/responsive-se-resizer.png     (devtools/responsive-se-resizer.png)
+        skin/classic/browser/devtools/responsive-vertical-resizer.png (devtools/responsive-vertical-resizer.png)
+        skin/classic/browser/devtools/responsive-background.png     (devtools/responsive-background.png)
+        skin/classic/browser/devtools/toggle-tools.png              (devtools/toggle-tools.png)
+        skin/classic/browser/devtools/dock-bottom.png               (devtools/dock-bottom.png)
+        skin/classic/browser/devtools/dock-side.png                 (devtools/dock-side.png)
+        skin/classic/browser/devtools/floating-scrollbars.css       (devtools/floating-scrollbars.css)
+        skin/classic/browser/devtools/floating-scrollbars-light.css (devtools/floating-scrollbars-light.css)
+        skin/classic/browser/devtools/inspector.css                 (devtools/inspector.css)
+        skin/classic/browser/devtools/toolbox.css                   (devtools/toolbox.css)
+        skin/classic/browser/devtools/tool-options.png              (devtools/tool-options.png)
+        skin/classic/browser/devtools/tool-webconsole.png           (devtools/tool-webconsole.png)
+        skin/classic/browser/devtools/tool-debugger.png             (devtools/tool-debugger.png)
+        skin/classic/browser/devtools/tool-debugger-paused.png      (devtools/tool-debugger-paused.png)
+        skin/classic/browser/devtools/tool-inspector.png            (devtools/tool-inspector.png)
+        skin/classic/browser/devtools/tool-styleeditor.png          (devtools/tool-styleeditor.png)
+        skin/classic/browser/devtools/tool-profiler.png             (devtools/tool-profiler.png)
+        skin/classic/browser/devtools/tool-network.png              (devtools/tool-network.png)
+        skin/classic/browser/devtools/close.png                     (devtools/close.png)
+        skin/classic/browser/devtools/vview-delete.png              (devtools/vview-delete.png)
+        skin/classic/browser/devtools/vview-edit.png                (devtools/vview-edit.png)
+        skin/classic/browser/devtools/undock.png                    (devtools/undock.png)
+        skin/classic/browser/devtools/font-inspector.css            (devtools/font-inspector.css)
+        skin/classic/browser/devtools/computedview.css              (devtools/computedview.css)
+        skin/classic/browser/devtools/arrow-e.png                   (devtools/arrow-e.png)
+#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/sync-notification-24.png
+        skin/classic/browser/syncSetup.css
+        skin/classic/browser/syncCommon.css
+        skin/classic/browser/syncQuota.css
+        skin/classic/browser/syncProgress.css
+#endif
+
+#ifdef XP_WIN
+browser.jar:
+% skin browser classic/1.0 %skin/classic/aero/browser/ os=WINNT osversion>=6
+        skin/classic/aero/browser/sanitizeDialog.css                       (sanitizeDialog.css)
+*       skin/classic/aero/browser/aboutPrivateBrowsing.css           (aboutPrivateBrowsing.css)
+*       skin/classic/aero/browser/aboutSessionRestore.css            (aboutSessionRestore.css)
+        skin/classic/aero/browser/aboutSessionRestore-window-icon.png (aboutSessionRestore-window-icon-aero.png)
+        skin/classic/aero/browser/aboutCertError.css
+        skin/classic/aero/browser/aboutCertError_sectionCollapsed.png
+        skin/classic/aero/browser/aboutCertError_sectionCollapsed-rtl.png
+        skin/classic/aero/browser/aboutCertError_sectionExpanded.png
+        skin/classic/aero/browser/aboutSocialError.css
+#ifdef MOZ_SERVICES_SYNC
+        skin/classic/aero/browser/aboutSyncTabs.css
+#endif
+        skin/classic/aero/browser/actionicon-tab.png
+        skin/classic/aero/browser/appmenu-dropmarker.png
+        skin/classic/aero/browser/appmenu-icons.png
+*       skin/classic/aero/browser/browser.css                        (browser-aero.css)
+        skin/classic/aero/browser/click-to-play-warning-stripes.png
+*       skin/classic/aero/browser/engineManager.css
+        skin/classic/aero/browser/Geolocation-16.png
+        skin/classic/aero/browser/Geolocation-64.png
+        skin/classic/aero/browser/Info.png                           (Info-aero.png)
+        skin/classic/aero/browser/identity.png                       (identity-aero.png)
+        skin/classic/aero/browser/identity-icons-generic.png
+        skin/classic/aero/browser/identity-icons-https.png
+        skin/classic/aero/browser/identity-icons-https-ev.png
+        skin/classic/aero/browser/identity-icons-https-mixed-active.png
+        skin/classic/aero/browser/keyhole-forward-mask.svg
+        skin/classic/aero/browser/KUI-background.png
+        skin/classic/aero/browser/KUI-close.png
+        skin/classic/aero/browser/livemark-folder.png                (livemark-folder-aero.png)
+        skin/classic/aero/browser/menu-back.png                      (menu-back-aero.png)
+        skin/classic/aero/browser/menu-forward.png                   (menu-forward-aero.png)
+        skin/classic/aero/browser/mixed-content-blocked-16.png
+        skin/classic/aero/browser/mixed-content-blocked-64.png
+        skin/classic/aero/browser/monitor.png
+        skin/classic/aero/browser/monitor_16-10.png
+        skin/classic/aero/browser/notification-16.png
+        skin/classic/aero/browser/notification-64.png
+        skin/classic/aero/browser/pageInfo.css
+        skin/classic/aero/browser/pageInfo.png                       (pageInfo-aero.png)
+        skin/classic/aero/browser/page-livemarks.png                 (feeds/feedIcon16-aero.png)
+        skin/classic/aero/browser/pluginInstall-16.png
+        skin/classic/aero/browser/pluginInstall-64.png
+        skin/classic/aero/browser/pointerLock-16.png
+        skin/classic/aero/browser/pointerLock-64.png
+        skin/classic/aero/browser/Privacy-16.png                     (Privacy-16-aero.png)
+        skin/classic/aero/browser/Privacy-32.png                     (Privacy-32-aero.png)
+        skin/classic/aero/browser/Privacy-48.png                     (Privacy-48-aero.png)
+        skin/classic/aero/browser/privatebrowsing-light.png
+        skin/classic/aero/browser/privatebrowsing-dark.png
+        skin/classic/aero/browser/reload-stop-go.png
+        skin/classic/aero/browser/searchbar.css
+        skin/classic/aero/browser/searchbar-dropdown-arrow.png       (searchbar-dropdown-arrow-aero.png)
+        skin/classic/aero/browser/Secure24.png                       (Secure24-aero.png)
+        skin/classic/aero/browser/setDesktopBackground.css
+        skin/classic/aero/browser/slowStartup-16.png
+        skin/classic/aero/browser/Toolbar.png
+        skin/classic/aero/browser/Toolbar-glass.png
+        skin/classic/aero/browser/Toolbar-inverted.png
+        skin/classic/aero/browser/toolbarbutton-dropdown-arrow.png
+        skin/classic/aero/browser/toolbarbutton-dropdown-arrow-inverted.png
+        skin/classic/aero/browser/urlbar-arrow.png
+        skin/classic/aero/browser/urlbar-popup-blocked.png
+        skin/classic/aero/browser/urlbar-history-dropmarker.png
+        skin/classic/aero/browser/webapps-16.png
+        skin/classic/aero/browser/webapps-64.png
+        skin/classic/aero/browser/notification-pluginNormal.png     (../shared/plugins/notification-pluginNormal.png)
+        skin/classic/aero/browser/notification-pluginAlert.png      (../shared/plugins/notification-pluginAlert.png)
+        skin/classic/aero/browser/notification-pluginBlocked.png    (../shared/plugins/notification-pluginBlocked.png)
+        skin/classic/aero/browser/webRTC-shareDevice-16.png
+        skin/classic/aero/browser/webRTC-shareDevice-64.png
+        skin/classic/aero/browser/webRTC-sharingDevice-16.png
+        skin/classic/aero/browser/downloads/buttons.png              (downloads/buttons-aero.png)
+        skin/classic/aero/browser/downloads/download-glow.png        (downloads/download-glow.png)
+        skin/classic/aero/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
+        skin/classic/aero/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
+        skin/classic/aero/browser/downloads/download-summary.png     (downloads/download-summary.png)
+*       skin/classic/aero/browser/downloads/downloads.css            (downloads/downloads-aero.css)
+*       skin/classic/aero/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay-aero.css)
+        skin/classic/aero/browser/downloads/contentAreaDownloadsView.css (downloads/contentAreaDownloadsView.css)
+        skin/classic/aero/browser/feeds/feedIcon.png                 (feeds/feedIcon-aero.png)
+        skin/classic/aero/browser/feeds/feedIcon16.png               (feeds/feedIcon16-aero.png)
+        skin/classic/aero/browser/feeds/feed-icons-16.png            (feeds/feed-icons-16-aero.png)
+        skin/classic/aero/browser/feeds/audioFeedIcon.png            (feeds/feedIcon-aero.png)
+        skin/classic/aero/browser/feeds/audioFeedIcon16.png          (feeds/feedIcon16-aero.png)
+        skin/classic/aero/browser/feeds/videoFeedIcon.png            (feeds/feedIcon-aero.png)
+        skin/classic/aero/browser/feeds/videoFeedIcon16.png          (feeds/feedIcon16-aero.png)
+        skin/classic/aero/browser/feeds/subscribe.css                (feeds/subscribe.css)
+        skin/classic/aero/browser/feeds/subscribe-ui.css             (feeds/subscribe-ui.css)
+        skin/classic/aero/browser/newtab/newTab.css                  (newtab/newTab.css)
+        skin/classic/aero/browser/newtab/controls.png                (newtab/controls.png)
+        skin/classic/aero/browser/newtab/noise.png                   (newtab/noise.png)
+*       skin/classic/aero/browser/places/places.css                  (places/places-aero.css)
+*       skin/classic/aero/browser/places/organizer.css               (places/organizer-aero.css)
+        skin/classic/aero/browser/places/bookmark.png                (places/bookmark.png)
+        skin/classic/aero/browser/places/editBookmark.png            (places/editBookmark.png)
+        skin/classic/aero/browser/places/query.png                   (places/query-aero.png)
+        skin/classic/aero/browser/places/bookmarksMenu.png           (places/bookmarksMenu-aero.png)
+        skin/classic/aero/browser/places/bookmarksToolbar.png        (places/bookmarksToolbar-aero.png)
+        skin/classic/aero/browser/places/calendar.png                (places/calendar-aero.png)
+        skin/classic/aero/browser/places/toolbarDropMarker.png       (places/toolbarDropMarker-aero.png)
+        skin/classic/aero/browser/places/editBookmarkOverlay.css     (places/editBookmarkOverlay.css)
+        skin/classic/aero/browser/places/libraryToolbar.png          (places/libraryToolbar-aero.png)
+        skin/classic/aero/browser/places/starred48.png               (places/starred48-aero.png)
+        skin/classic/aero/browser/places/unstarred48.png             (places/unstarred48.png)
+        skin/classic/aero/browser/places/tag.png                     (places/tag-aero.png)
+        skin/classic/aero/browser/places/history.png                 (places/history-aero.png)
+        skin/classic/aero/browser/places/allBookmarks.png            (places/allBookmarks-aero.png)
+        skin/classic/aero/browser/places/unsortedBookmarks.png       (places/unsortedBookmarks-aero.png)
+        skin/classic/aero/browser/places/downloads.png               (places/downloads.png)
+        skin/classic/aero/browser/places/livemark-item.png           (places/livemark-item.png)
+        skin/classic/aero/browser/preferences/alwaysAsk.png          (preferences/alwaysAsk-aero.png)
+        skin/classic/aero/browser/preferences/application.png        (preferences/application-aero.png)
+        skin/classic/aero/browser/preferences/mail.png               (preferences/mail-aero.png)
+        skin/classic/aero/browser/preferences/Options.png            (preferences/Options-aero.png)
+#ifdef MOZ_SERVICES_SYNC
+        skin/classic/aero/browser/preferences/Options-sync.png       (preferences/Options-sync.png)
+#endif
+        skin/classic/aero/browser/preferences/saveFile.png           (preferences/saveFile-aero.png)
+*       skin/classic/aero/browser/preferences/preferences.css        (preferences/preferences.css)
+        skin/classic/aero/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
+        skin/classic/aero/browser/preferences/applications.css       (preferences/applications.css)
+        skin/classic/aero/browser/preferences/aboutPermissions.css   (preferences/aboutPermissions.css)
+        skin/classic/aero/browser/social/services-16.png             (social/services-16.png)
+        skin/classic/aero/browser/social/services-64.png             (social/services-64.png)
+        skin/classic/aero/browser/social/share-button.png            (social/share-button.png)
+        skin/classic/aero/browser/social/share-button-active.png     (social/share-button-active.png)
+        skin/classic/aero/browser/social/chat-icons.png              (social/chat-icons.png)
+        skin/classic/aero/browser/tabbrowser/alltabs.png             (tabbrowser/alltabs.png)
+        skin/classic/aero/browser/tabbrowser/newtab.png              (tabbrowser/newtab.png)
+        skin/classic/aero/browser/tabbrowser/newtab-glass.png        (tabbrowser/newtab-glass.png)
+        skin/classic/aero/browser/tabbrowser/newtab-inverted.png     (tabbrowser/newtab-inverted.png)
+        skin/classic/aero/browser/tabbrowser/connecting.png          (tabbrowser/connecting.png)
+        skin/classic/aero/browser/tabbrowser/loading.png             (tabbrowser/loading.png)
+        skin/classic/aero/browser/tabbrowser/tab.png                 (tabbrowser/tab.png)
+        skin/classic/aero/browser/tabbrowser/tab-arrow-left.png      (tabbrowser/tab-arrow-left.png)
+        skin/classic/aero/browser/tabbrowser/tab-arrow-left-glass.png    (tabbrowser/tab-arrow-left-glass.png)
+        skin/classic/aero/browser/tabbrowser/tab-arrow-left-inverted.png (tabbrowser/tab-arrow-left-inverted.png)
+        skin/classic/aero/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png)
+        skin/classic/aero/browser/tabbrowser/tabDragIndicator.png    (tabbrowser/tabDragIndicator.png)
+*       skin/classic/aero/browser/devtools/common.css                (devtools/common.css)
+        skin/classic/aero/browser/devtools/dark-theme.css            (devtools/dark-theme.css)
+        skin/classic/aero/browser/devtools/light-theme.css           (devtools/light-theme.css)
+        skin/classic/aero/browser/devtools/widgets.css               (devtools/widgets.css)
+        skin/classic/aero/browser/devtools/commandline-icon.png      (devtools/commandline-icon.png)
+        skin/classic/aero/browser/devtools/command-paintflashing.png  (devtools/command-paintflashing.png)
+        skin/classic/aero/browser/devtools/command-responsivemode.png (devtools/command-responsivemode.png)
+        skin/classic/aero/browser/devtools/command-scratchpad.png    (devtools/command-scratchpad.png)
+        skin/classic/aero/browser/devtools/command-tilt.png          (devtools/command-tilt.png)
+        skin/classic/aero/browser/devtools/checkbox-dark.png         (devtools/checkbox-dark.png)
+        skin/classic/aero/browser/devtools/checkbox-light.png        (devtools/checkbox-light.png)
+        skin/classic/aero/browser/devtools/alerticon-warning.png     (devtools/alerticon-warning.png)
+        skin/classic/aero/browser/devtools/ruleview.css              (devtools/ruleview.css)
+        skin/classic/aero/browser/devtools/commandline.css           (devtools/commandline.css)
+        skin/classic/aero/browser/devtools/markup-view.css           (devtools/markup-view.css)
+        skin/classic/aero/browser/devtools/orion.css                 (devtools/orion.css)
+        skin/classic/aero/browser/devtools/orion-container.css       (devtools/orion-container.css)
+        skin/classic/aero/browser/devtools/orion-task.png            (devtools/orion-task.png)
+        skin/classic/aero/browser/devtools/orion-breakpoint.png      (devtools/orion-breakpoint.png)
+        skin/classic/aero/browser/devtools/orion-debug-location.png  (devtools/orion-debug-location.png)
+*       skin/classic/aero/browser/devtools/webconsole.css                  (devtools/webconsole.css)
+        skin/classic/aero/browser/devtools/webconsole_networkpanel.css     (devtools/webconsole_networkpanel.css)
+        skin/classic/aero/browser/devtools/webconsole.png                  (devtools/webconsole.png)
+        skin/classic/aero/browser/devtools/breadcrumbs-scrollbutton.png                 (devtools/breadcrumbs-scrollbutton.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/ltr-end-pressed.png              (devtools/breadcrumbs/ltr-end-pressed.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/ltr-end-selected-pressed.png     (devtools/breadcrumbs/ltr-end-selected-pressed.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/ltr-end-selected.png             (devtools/breadcrumbs/ltr-end-selected.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/ltr-end.png                      (devtools/breadcrumbs/ltr-end.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/ltr-middle-pressed.png           (devtools/breadcrumbs/ltr-middle-pressed.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/ltr-middle-selected-pressed.png  (devtools/breadcrumbs/ltr-middle-selected-pressed.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/ltr-middle-selected.png          (devtools/breadcrumbs/ltr-middle-selected.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/ltr-middle.png                   (devtools/breadcrumbs/ltr-middle.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/ltr-start-pressed.png            (devtools/breadcrumbs/ltr-start-pressed.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/ltr-start-selected-pressed.png   (devtools/breadcrumbs/ltr-start-selected-pressed.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/ltr-start.png                    (devtools/breadcrumbs/ltr-start.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/ltr-start-selected.png           (devtools/breadcrumbs/ltr-start-selected.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/rtl-end-pressed.png              (devtools/breadcrumbs/rtl-end-pressed.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/rtl-end-selected-pressed.png     (devtools/breadcrumbs/rtl-end-selected-pressed.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/rtl-end-selected.png             (devtools/breadcrumbs/rtl-end-selected.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/rtl-end.png                      (devtools/breadcrumbs/rtl-end.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/rtl-middle-pressed.png           (devtools/breadcrumbs/rtl-middle-pressed.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/rtl-middle-selected-pressed.png  (devtools/breadcrumbs/rtl-middle-selected-pressed.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/rtl-middle-selected.png          (devtools/breadcrumbs/rtl-middle-selected.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/rtl-middle.png                   (devtools/breadcrumbs/rtl-middle.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/rtl-start-pressed.png            (devtools/breadcrumbs/rtl-start-pressed.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/rtl-start-selected-pressed.png   (devtools/breadcrumbs/rtl-start-selected-pressed.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/rtl-start.png                    (devtools/breadcrumbs/rtl-start.png)
+        skin/classic/aero/browser/devtools/breadcrumbs/rtl-start-selected.png           (devtools/breadcrumbs/rtl-start-selected.png)
+        skin/classic/aero/browser/devtools/splitview.css             (devtools/splitview.css)
+        skin/classic/aero/browser/devtools/styleeditor.css           (devtools/styleeditor.css)
+        skin/classic/aero/browser/devtools/debugger.css              (devtools/debugger.css)
+*       skin/classic/aero/browser/devtools/profiler.css              (devtools/profiler.css)
+        skin/classic/aero/browser/devtools/netmonitor.css            (devtools/netmonitor.css)
+*       skin/classic/aero/browser/devtools/scratchpad.css            (devtools/scratchpad.css)
+        skin/classic/aero/browser/devtools/magnifying-glass.png      (devtools/magnifying-glass.png)
+        skin/classic/aero/browser/devtools/option-icon.png           (devtools/option-icon.png)
+        skin/classic/aero/browser/devtools/itemToggle.png            (devtools/itemToggle.png)
+        skin/classic/aero/browser/devtools/itemArrow-rtl.png         (devtools/itemArrow-rtl.png)
+        skin/classic/aero/browser/devtools/background-noise-toolbar.png (devtools/background-noise-toolbar.png)
+        skin/classic/aero/browser/devtools/itemArrow-ltr.png         (devtools/itemArrow-ltr.png)
+        skin/classic/aero/browser/devtools/inspect-button.png        (devtools/inspect-button.png)
+        skin/classic/aero/browser/devtools/dropmarker.png            (devtools/dropmarker.png)
+        skin/classic/aero/browser/devtools/layout-background-grid.png (devtools/layout-background-grid.png)
+        skin/classic/aero/browser/devtools/layoutview.css            (devtools/layoutview.css)
+        skin/classic/aero/browser/devtools/debugger-collapse.png     (devtools/debugger-collapse.png)
+        skin/classic/aero/browser/devtools/debugger-expand.png       (devtools/debugger-expand.png)
+        skin/classic/aero/browser/devtools/debugger-pause.png        (devtools/debugger-pause.png)
+        skin/classic/aero/browser/devtools/debugger-play.png         (devtools/debugger-play.png)
+        skin/classic/aero/browser/devtools/debugger-step-in.png      (devtools/debugger-step-in.png)
+        skin/classic/aero/browser/devtools/debugger-step-out.png     (devtools/debugger-step-out.png)
+        skin/classic/aero/browser/devtools/debugger-step-over.png    (devtools/debugger-step-over.png)
+        skin/classic/aero/browser/devtools/responsive-se-resizer.png (devtools/responsive-se-resizer.png)
+        skin/classic/aero/browser/devtools/responsive-vertical-resizer.png (devtools/responsive-vertical-resizer.png)
+        skin/classic/aero/browser/devtools/responsive-background.png (devtools/responsive-background.png)
+        skin/classic/aero/browser/devtools/toggle-tools.png          (devtools/toggle-tools.png)
+        skin/classic/aero/browser/devtools/dock-bottom.png           (devtools/dock-bottom.png)
+        skin/classic/aero/browser/devtools/dock-side.png             (devtools/dock-side.png)
+        skin/classic/aero/browser/devtools/floating-scrollbars.css   (devtools/floating-scrollbars.css)
+        skin/classic/aero/browser/devtools/floating-scrollbars-light.css (devtools/floating-scrollbars-light.css)
+        skin/classic/aero/browser/devtools/inspector.css             (devtools/inspector.css)
+        skin/classic/aero/browser/devtools/toolbox.css               (devtools/toolbox.css)
+        skin/classic/aero/browser/devtools/tool-options.png          (devtools/tool-options.png)
+        skin/classic/aero/browser/devtools/tool-webconsole.png       (devtools/tool-webconsole.png)
+        skin/classic/aero/browser/devtools/tool-debugger.png         (devtools/tool-debugger.png)
+        skin/classic/aero/browser/devtools/tool-debugger-paused.png  (devtools/tool-debugger-paused.png)
+        skin/classic/aero/browser/devtools/tool-inspector.png        (devtools/tool-inspector.png)
+        skin/classic/aero/browser/devtools/tool-styleeditor.png      (devtools/tool-styleeditor.png)
+        skin/classic/aero/browser/devtools/tool-profiler.png         (devtools/tool-profiler.png)
+        skin/classic/aero/browser/devtools/tool-network.png          (devtools/tool-network.png)
+        skin/classic/aero/browser/devtools/close.png                 (devtools/close.png)
+        skin/classic/aero/browser/devtools/vview-delete.png          (devtools/vview-delete.png)
+        skin/classic/aero/browser/devtools/vview-edit.png            (devtools/vview-edit.png)
+        skin/classic/aero/browser/devtools/undock.png                (devtools/undock.png)
+        skin/classic/aero/browser/devtools/font-inspector.css        (devtools/font-inspector.css)
+        skin/classic/aero/browser/devtools/computedview.css          (devtools/computedview.css)
+        skin/classic/aero/browser/devtools/arrow-e.png               (devtools/arrow-e.png)
+#ifdef MOZ_SERVICES_SYNC
+        skin/classic/aero/browser/sync-throbber.png
+        skin/classic/aero/browser/sync-16.png
+        skin/classic/aero/browser/sync-32.png
+        skin/classic/aero/browser/sync-128.png
+        skin/classic/aero/browser/sync-bg.png
+        skin/classic/aero/browser/sync-desktopIcon.png
+        skin/classic/aero/browser/sync-mobileIcon.png
+        skin/classic/aero/browser/sync-notification-24.png
+        skin/classic/aero/browser/syncSetup.css
+        skin/classic/aero/browser/syncCommon.css
+        skin/classic/aero/browser/syncQuota.css
+        skin/classic/aero/browser/syncProgress.css
+#endif
+#endif
diff --git a/browser/themes/windows/keyhole-forward-mask.svg b/browser/themes/windows/keyhole-forward-mask.svg
new file mode 100644
index 000000000..83554471c
--- /dev/null
+++ b/browser/themes/windows/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/browser/themes/windows/livemark-folder-aero.png b/browser/themes/windows/livemark-folder-aero.png
new file mode 100644
index 000000000..79e332945
--- /dev/null
+++ b/browser/themes/windows/livemark-folder-aero.png
diff --git a/browser/themes/windows/livemark-folder.png b/browser/themes/windows/livemark-folder.png
new file mode 100644
index 000000000..38a4f1055
--- /dev/null
+++ b/browser/themes/windows/livemark-folder.png
diff --git a/browser/themes/windows/menu-back-aero.png b/browser/themes/windows/menu-back-aero.png
new file mode 100644
index 000000000..2f99ea7a5
--- /dev/null
+++ b/browser/themes/windows/menu-back-aero.png
diff --git a/browser/themes/windows/menu-back.png b/browser/themes/windows/menu-back.png
new file mode 100644
index 000000000..ecb8ccd1a
--- /dev/null
+++ b/browser/themes/windows/menu-back.png
diff --git a/browser/themes/windows/menu-forward-aero.png b/browser/themes/windows/menu-forward-aero.png
new file mode 100644
index 000000000..82cd87483
--- /dev/null
+++ b/browser/themes/windows/menu-forward-aero.png
diff --git a/browser/themes/windows/menu-forward.png b/browser/themes/windows/menu-forward.png
new file mode 100644
index 000000000..20834927a
--- /dev/null
+++ b/browser/themes/windows/menu-forward.png
diff --git a/browser/themes/windows/mixed-content-blocked-16.png b/browser/themes/windows/mixed-content-blocked-16.png
new file mode 100644
index 000000000..7cf33ec4c
--- /dev/null
+++ b/browser/themes/windows/mixed-content-blocked-16.png
diff --git a/browser/themes/windows/mixed-content-blocked-64.png b/browser/themes/windows/mixed-content-blocked-64.png
new file mode 100644
index 000000000..cac441514
--- /dev/null
+++ b/browser/themes/windows/mixed-content-blocked-64.png
diff --git a/browser/themes/windows/monitor.png b/browser/themes/windows/monitor.png
new file mode 100644
index 000000000..35e7b2056
--- /dev/null
+++ b/browser/themes/windows/monitor.png
diff --git a/browser/themes/windows/monitor_16-10.png b/browser/themes/windows/monitor_16-10.png
new file mode 100644
index 000000000..41950340e
--- /dev/null
+++ b/browser/themes/windows/monitor_16-10.png
diff --git a/browser/themes/windows/moz.build b/browser/themes/windows/moz.build
new file mode 100644
index 000000000..4c7366cd5
--- /dev/null
+++ b/browser/themes/windows/moz.build
@@ -0,0 +1,8 @@
+# -*- 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']
+
diff --git a/browser/themes/windows/newtab/controls.png b/browser/themes/windows/newtab/controls.png
new file mode 100644
index 000000000..14f382fbd
--- /dev/null
+++ b/browser/themes/windows/newtab/controls.png
diff --git a/browser/themes/windows/newtab/newTab.css b/browser/themes/windows/newtab/newTab.css
new file mode 100644
index 000000000..5605a983d
--- /dev/null
+++ b/browser/themes/windows/newtab/newTab.css
@@ -0,0 +1,199 @@
+/* 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/. */
+
+:root {
+  -moz-appearance: none;
+  font-size: 75%;
+  background-color: transparent;
+}
+
+/* SCROLLBOX */
+#newtab-scrollbox:not([page-disabled]) {
+  background-color: rgb(229,229,229);
+  background-image: url(chrome://browser/skin/newtab/noise.png),
+                    linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,.2));
+  background-attachment: fixed;
+}
+
+/* UNDO */
+#newtab-undo-container {
+  padding: 4px 3px;
+  border: 1px solid;
+  border-color: rgba(8,22,37,.12) rgba(8,22,37,.14) rgba(8,22,37,.16);
+  background-color: rgba(255,255,255,.4);
+  color: #525e69;
+}
+
+#newtab-undo-label {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.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:hover {
+  text-decoration: underline;
+}
+
+.newtab-undo-button:-moz-focusring {
+  outline: 1px dotted;
+}
+
+.newtab-undo-button > .button-box {
+  padding: 0;
+}
+
+#newtab-undo-close-button {
+  -moz-appearance: none;
+  padding: 0;
+  border: none;
+  list-style-image: url("chrome://global/skin/icons/close.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+  -moz-user-focus: normal;
+}
+
+#newtab-undo-close-button:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+#newtab-undo-close-button:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+#newtab-undo-close-button > .toolbarbutton-text {
+  display: none;
+}
+
+#newtab-undo-close-button:-moz-focusring {
+  outline: 1px dotted;
+}
+
+/* TOGGLE */
+#newtab-toggle {
+  width: 16px;
+  height: 16px;
+  padding: 0;
+  border: none;
+  background: -216px 0 transparent url(chrome://browser/skin/newtab/controls.png);
+}
+
+#newtab-toggle[page-disabled] {
+  background-position: -232px 0;
+}
+
+/* ROWS */
+.newtab-row {
+  margin-bottom: 20px;
+}
+
+.newtab-row:last-child {
+  margin-bottom: 0;
+}
+
+/* CELLS */
+.newtab-cell {
+  -moz-margin-end: 20px;
+  background-color: rgba(255,255,255,.2);
+  border: 1px solid;
+  border-color: rgba(8,22,37,.12) rgba(8,22,37,.14) rgba(8,22,37,.16);
+  border-radius: 1px;
+  transition: border-color 100ms ease-out;
+}
+
+.newtab-cell:empty {
+  border: 1px dashed;
+  border-color: rgba(8,22,37,.15) rgba(8,22,37,.17) rgba(8,22,37,.19);
+}
+
+.newtab-cell:last-child {
+  -moz-margin-end: 0;
+}
+
+.newtab-cell:hover:not(:empty):not([dragged]) {
+  border-color: rgba(8,22,37,.25) rgba(8,22,37,.27) rgba(8,22,37,.3);
+}
+
+/* SITES */
+.newtab-site {
+  text-decoration: none;
+  transition-property: top, left, opacity, box-shadow, background-color;
+}
+
+.newtab-site:hover,
+.newtab-site[dragged] {
+  box-shadow: 0 0 10px rgba(8,22,37,.3);
+}
+
+.newtab-site[dragged] {
+  transition-property: box-shadow, background-color;
+  background-color: rgb(242,242,242);
+}
+
+/* THUMBNAILS */
+.newtab-thumbnail {
+  background-origin: padding-box;
+  background-clip: padding-box;
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+
+/* TITLES */
+.newtab-title {
+  padding: 0 8px;
+  background-color: rgba(248,249,251,.95);
+  color: #1f364c;
+  line-height: 24px;
+}
+
+/* CONTROLS */
+.newtab-control {
+  width: 24px;
+  height: 24px;
+  padding: 1px 2px 3px;
+  border: none;
+  background: transparent url(chrome://browser/skin/newtab/controls.png);
+}
+
+.newtab-control-pin:hover {
+  background-position: -24px 0;
+}
+
+.newtab-control-pin:active {
+  background-position: -48px 0;
+}
+
+.newtab-control-pin[pinned] {
+  background-position: -72px 0;
+}
+
+.newtab-control-pin[pinned]:hover {
+  background-position: -96px 0;
+}
+
+.newtab-control-pin[pinned]:active {
+  background-position: -120px 0;
+}
+
+.newtab-control-block {
+  background-position: -144px 0;
+}
+
+.newtab-control-block:hover {
+  background-position: -168px 0;
+}
+
+.newtab-control-block:active {
+  background-position: -192px 0;
+}
diff --git a/browser/themes/windows/newtab/noise.png b/browser/themes/windows/newtab/noise.png
new file mode 100644
index 000000000..01d340aaa
--- /dev/null
+++ b/browser/themes/windows/newtab/noise.png
diff --git a/browser/themes/windows/notification-16.png b/browser/themes/windows/notification-16.png
new file mode 100644
index 000000000..6b2df7341
--- /dev/null
+++ b/browser/themes/windows/notification-16.png
diff --git a/browser/themes/windows/notification-64.png b/browser/themes/windows/notification-64.png
new file mode 100644
index 000000000..a01d0ab77
--- /dev/null
+++ b/browser/themes/windows/notification-64.png
diff --git a/browser/themes/windows/pageInfo-aero.png b/browser/themes/windows/pageInfo-aero.png
new file mode 100644
index 000000000..fcc713b8f
--- /dev/null
+++ b/browser/themes/windows/pageInfo-aero.png
diff --git a/browser/themes/windows/pageInfo.css b/browser/themes/windows/pageInfo.css
new file mode 100644
index 000000000..f205b57bb
--- /dev/null
+++ b/browser/themes/windows/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/browser/themes/windows/pageInfo.png b/browser/themes/windows/pageInfo.png
new file mode 100644
index 000000000..237381b4a
--- /dev/null
+++ b/browser/themes/windows/pageInfo.png
diff --git a/browser/themes/windows/places/allBookmarks-aero.png b/browser/themes/windows/places/allBookmarks-aero.png
new file mode 100644
index 000000000..177c31c3c
--- /dev/null
+++ b/browser/themes/windows/places/allBookmarks-aero.png
diff --git a/browser/themes/windows/places/allBookmarks.png b/browser/themes/windows/places/allBookmarks.png
new file mode 100644
index 000000000..74af71c81
--- /dev/null
+++ b/browser/themes/windows/places/allBookmarks.png
diff --git a/browser/themes/windows/places/bookmark.png b/browser/themes/windows/places/bookmark.png
new file mode 100644
index 000000000..2e9a20634
--- /dev/null
+++ b/browser/themes/windows/places/bookmark.png
diff --git a/browser/themes/windows/places/bookmarksMenu-aero.png b/browser/themes/windows/places/bookmarksMenu-aero.png
new file mode 100644
index 000000000..14c9601bb
--- /dev/null
+++ b/browser/themes/windows/places/bookmarksMenu-aero.png
diff --git a/browser/themes/windows/places/bookmarksMenu.png b/browser/themes/windows/places/bookmarksMenu.png
new file mode 100644
index 000000000..b76d849b9
--- /dev/null
+++ b/browser/themes/windows/places/bookmarksMenu.png
diff --git a/browser/themes/windows/places/bookmarksToolbar-aero.png b/browser/themes/windows/places/bookmarksToolbar-aero.png
new file mode 100644
index 000000000..5a4a6935d
--- /dev/null
+++ b/browser/themes/windows/places/bookmarksToolbar-aero.png
diff --git a/browser/themes/windows/places/bookmarksToolbar.png b/browser/themes/windows/places/bookmarksToolbar.png
new file mode 100644
index 000000000..1e36e1177
--- /dev/null
+++ b/browser/themes/windows/places/bookmarksToolbar.png
diff --git a/browser/themes/windows/places/calendar-aero.png b/browser/themes/windows/places/calendar-aero.png
new file mode 100644
index 000000000..c0d107159
--- /dev/null
+++ b/browser/themes/windows/places/calendar-aero.png
diff --git a/browser/themes/windows/places/calendar.png b/browser/themes/windows/places/calendar.png
new file mode 100644
index 000000000..1855c9f50
--- /dev/null
+++ b/browser/themes/windows/places/calendar.png
diff --git a/browser/themes/windows/places/downloads.png b/browser/themes/windows/places/downloads.png
new file mode 100644
index 000000000..d37bc40b6
--- /dev/null
+++ b/browser/themes/windows/places/downloads.png
diff --git a/browser/themes/windows/places/editBookmark.png b/browser/themes/windows/places/editBookmark.png
new file mode 100644
index 000000000..fbca0523d
--- /dev/null
+++ b/browser/themes/windows/places/editBookmark.png
diff --git a/browser/themes/windows/places/editBookmarkOverlay.css b/browser/themes/windows/places/editBookmarkOverlay.css
new file mode 100644
index 000000000..be3ea83f4
--- /dev/null
+++ b/browser/themes/windows/places/editBookmarkOverlay.css
@@ -0,0 +1,80 @@
+/* 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/. */
+
+/**** folder menulist ****/
+.folder-icon > .menulist-label-box > .menulist-icon {
+  width: 16px;
+  height: 16px;
+}
+
+.folder-icon > .menu-iconic-left {
+  display: -moz-box;
+}
+
+.folder-icon {
+  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
+  -moz-image-region: rect(0px, 32px, 16px, 16px) !important;
+}
+
+
+/**** expanders ****/
+
+.expander-up,
+.expander-down {
+  min-width: 0;
+  margin: 0;
+  -moz-margin-end: 4px;
+}
+
+.expander-up > .button-box,
+.expander-down > .button-box {
+  padding: 0;
+}
+
+.expander-up {
+  list-style-image: url("chrome://global/skin/icons/collapse.png");
+}
+
+.expander-down {
+  list-style-image: url("chrome://global/skin/icons/expand.png");
+}
+
+#editBookmarkPanelContent {
+  min-width: 23em;
+}
+
+#editBMPanel_folderTree {
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+/* 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 icons ::::: */
+
+#editBMPanel_folderMenuList[selectedIndex="0"],
+#editBMPanel_toolbarFolderItem {
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;
+  -moz-image-region: auto !important;
+}
+
+#editBMPanel_folderMenuList[selectedIndex="1"],
+#editBMPanel_bmRootItem {
+  list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png") !important;
+  -moz-image-region: auto !important;
+}
+
+#editBMPanel_folderMenuList[selectedIndex="2"],
+#editBMPanel_unfiledRootItem {
+  list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png") !important;
+  -moz-image-region: auto !important;
+}
diff --git a/browser/themes/windows/places/history-aero.png b/browser/themes/windows/places/history-aero.png
new file mode 100644
index 000000000..4917c109c
--- /dev/null
+++ b/browser/themes/windows/places/history-aero.png
diff --git a/browser/themes/windows/places/history.png b/browser/themes/windows/places/history.png
new file mode 100644
index 000000000..cc3b067c0
--- /dev/null
+++ b/browser/themes/windows/places/history.png
diff --git a/browser/themes/windows/places/libraryToolbar-aero.png b/browser/themes/windows/places/libraryToolbar-aero.png
new file mode 100644
index 000000000..f5f3654ae
--- /dev/null
+++ b/browser/themes/windows/places/libraryToolbar-aero.png
diff --git a/browser/themes/windows/places/libraryToolbar.png b/browser/themes/windows/places/libraryToolbar.png
new file mode 100644
index 000000000..2ed627acb
--- /dev/null
+++ b/browser/themes/windows/places/libraryToolbar.png
diff --git a/browser/themes/windows/places/livemark-item.png b/browser/themes/windows/places/livemark-item.png
new file mode 100644
index 000000000..9184b9518
--- /dev/null
+++ b/browser/themes/windows/places/livemark-item.png
diff --git a/browser/themes/windows/places/organizer-aero.css b/browser/themes/windows/places/organizer-aero.css
new file mode 100644
index 000000000..645aff64b
--- /dev/null
+++ b/browser/themes/windows/places/organizer-aero.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/. */
+
+%include organizer.css
+
+%filter substitution
+%define toolbarHighlight rgba(255,255,255,.5)
+%define customToolbarColor hsl(210,75%,92%)
+
+#placesView {
+  border-top: none;
+}
+
+@media not all and (-moz-windows-classic) {
+  #placesToolbox {
+    -moz-appearance: none;
+    background-color: transparent;
+  }
+
+  #placesToolbar {
+    -moz-appearance: none;
+    background-color: -moz-Dialog;
+    color: -moz-dialogText;
+  }
+}
+
+@media (-moz-windows-compositor) {
+  #placesToolbox {
+    border-top: none;
+  }
+
+  #placesToolbar {
+    background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
+  }
+}
+
+@media (-moz-windows-default-theme) {
+  #placesView,
+  #infoPane,
+  #placesList,
+  #placeContent {
+    background-color: #EEF3FA;
+  }
+
+  #placesToolbar {
+    background-color: @customToolbarColor@;
+    color: black;
+  }
+
+  #placesView > splitter {
+    border: 0;
+    -moz-border-end: 1px solid #A9B7C9;
+    min-width: 0;
+    width: 3px;
+    background-color: transparent;
+    -moz-margin-start: -3px;
+    position: relative;
+  }
+
+  #detailsDeck {
+    border-top-color: #A9B7C9;
+  }
+
+  #searchFilter {
+    -moz-appearance: none;
+    padding: 2px;
+    -moz-padding-start: 4px;
+    background-clip: padding-box;
+    border: 1px solid rgba(0,0,0,.32);
+    border-radius: 2px;
+  }
+}
diff --git a/browser/themes/windows/places/organizer.css b/browser/themes/windows/places/organizer.css
new file mode 100644
index 000000000..4ccdc1b5c
--- /dev/null
+++ b/browser/themes/windows/places/organizer.css
@@ -0,0 +1,142 @@
+/* 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);
+}
+
+/* Menu */
+#placesMenu {
+  -moz-margin-start: 6px;
+  -moz-appearance: none;
+  border: none;
+}
+
+#placesMenu > menu {
+  -moz-padding-start: 4px;
+  -moz-padding-end: 1px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  -moz-appearance: toolbarbutton;
+%ifdef XP_WIN
+% use standard menu colors on OS/2
+  color: -moz-DialogText;
+%endif
+  border: 1px solid transparent;
+}
+
+#placesMenu > menu[_moz-menuactive="true"] {
+  background-color: transparent;
+}
+
+#placesMenu > menu:hover {
+  border-color: ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight;
+}
+
+#placesMenu > menu[open="true"] {
+  border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow;
+  -moz-padding-start: 5px;
+  -moz-padding-end: 0px;
+  padding-top: 3px;
+  padding-bottom: 1px;
+}
+
+#placesMenu > menu > .menubar-text {
+  -moz-padding-end: 8px;
+  background: url(chrome://global/skin/arrow/arrow-dn.gif) right center no-repeat;
+}
+
+#placesMenu > menu > .menubar-text:-moz-locale-dir(rtl) {
+  background-position: left center;
+}
+
+/* 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;
+}
diff --git a/browser/themes/windows/places/places-aero.css b/browser/themes/windows/places/places-aero.css
new file mode 100644
index 000000000..2efd906c6
--- /dev/null
+++ b/browser/themes/windows/places/places-aero.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/. */
+
+%include places.css
+
+/* Style Places sidebars as Vista media collection */
+@media (-moz-windows-default-theme) {
+  #bookmarksPanel,
+  #history-panel {
+    background-color: #EEF3FA;
+  }
+
+  .sidebar-placesTree {
+    background-color: transparent;
+    border-top: none;
+  }
+}
diff --git a/browser/themes/windows/places/places.css b/browser/themes/windows/places/places.css
new file mode 100644
index 000000000..bc18b3645
--- /dev/null
+++ b/browser/themes/windows/places/places.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/. */
+
+/* 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) {
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+treechildren::-moz-tree-image(title, open) {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+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/icons/folder-item.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+treechildren::-moz-tree-image(title, query, hostContainer, open) {
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+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) {
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+treechildren::-moz-tree-image(title, query, folder, open) {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+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/browser/themes/windows/places/query-aero.png b/browser/themes/windows/places/query-aero.png
new file mode 100644
index 000000000..fff0fb014
--- /dev/null
+++ b/browser/themes/windows/places/query-aero.png
diff --git a/browser/themes/windows/places/query.png b/browser/themes/windows/places/query.png
new file mode 100644
index 000000000..c06025e62
--- /dev/null
+++ b/browser/themes/windows/places/query.png
diff --git a/browser/themes/windows/places/starred48-aero.png b/browser/themes/windows/places/starred48-aero.png
new file mode 100644
index 000000000..2f7e878a7
--- /dev/null
+++ b/browser/themes/windows/places/starred48-aero.png
diff --git a/browser/themes/windows/places/starred48.png b/browser/themes/windows/places/starred48.png
new file mode 100644
index 000000000..bfa14599a
--- /dev/null
+++ b/browser/themes/windows/places/starred48.png
diff --git a/browser/themes/windows/places/tag-aero.png b/browser/themes/windows/places/tag-aero.png
new file mode 100644
index 000000000..da906245d
--- /dev/null
+++ b/browser/themes/windows/places/tag-aero.png
diff --git a/browser/themes/windows/places/tag.png b/browser/themes/windows/places/tag.png
new file mode 100644
index 000000000..4c876b92b
--- /dev/null
+++ b/browser/themes/windows/places/tag.png
diff --git a/browser/themes/windows/places/toolbarDropMarker-aero.png b/browser/themes/windows/places/toolbarDropMarker-aero.png
new file mode 100644
index 000000000..3abb7c281
--- /dev/null
+++ b/browser/themes/windows/places/toolbarDropMarker-aero.png
diff --git a/browser/themes/windows/places/toolbarDropMarker.png b/browser/themes/windows/places/toolbarDropMarker.png
new file mode 100644
index 000000000..38e9f9ae5
--- /dev/null
+++ b/browser/themes/windows/places/toolbarDropMarker.png
diff --git a/browser/themes/windows/places/unsortedBookmarks-aero.png b/browser/themes/windows/places/unsortedBookmarks-aero.png
new file mode 100644
index 000000000..d18a5016c
--- /dev/null
+++ b/browser/themes/windows/places/unsortedBookmarks-aero.png
diff --git a/browser/themes/windows/places/unsortedBookmarks.png b/browser/themes/windows/places/unsortedBookmarks.png
new file mode 100644
index 000000000..893e75a79
--- /dev/null
+++ b/browser/themes/windows/places/unsortedBookmarks.png
diff --git a/browser/themes/windows/places/unstarred48.png b/browser/themes/windows/places/unstarred48.png
new file mode 100644
index 000000000..8b82aab4b
--- /dev/null
+++ b/browser/themes/windows/places/unstarred48.png
diff --git a/browser/themes/windows/pluginInstall-16.png b/browser/themes/windows/pluginInstall-16.png
new file mode 100644
index 000000000..a72a2839c
--- /dev/null
+++ b/browser/themes/windows/pluginInstall-16.png
diff --git a/browser/themes/windows/pluginInstall-64.png b/browser/themes/windows/pluginInstall-64.png
new file mode 100644
index 000000000..6a41aa059
--- /dev/null
+++ b/browser/themes/windows/pluginInstall-64.png
diff --git a/browser/themes/windows/pointerLock-16.png b/browser/themes/windows/pointerLock-16.png
new file mode 100644
index 000000000..862cd11c6
--- /dev/null
+++ b/browser/themes/windows/pointerLock-16.png
diff --git a/browser/themes/windows/pointerLock-64.png b/browser/themes/windows/pointerLock-64.png
new file mode 100644
index 000000000..a35ce040c
--- /dev/null
+++ b/browser/themes/windows/pointerLock-64.png
diff --git a/browser/themes/windows/preferences/Options-aero.png b/browser/themes/windows/preferences/Options-aero.png
new file mode 100644
index 000000000..2cb1f5088
--- /dev/null
+++ b/browser/themes/windows/preferences/Options-aero.png
diff --git a/browser/themes/windows/preferences/Options-sync.png b/browser/themes/windows/preferences/Options-sync.png
new file mode 100644
index 000000000..89901fb69
--- /dev/null
+++ b/browser/themes/windows/preferences/Options-sync.png
diff --git a/browser/themes/windows/preferences/Options.png b/browser/themes/windows/preferences/Options.png
new file mode 100644
index 000000000..448eca6e1
--- /dev/null
+++ b/browser/themes/windows/preferences/Options.png
diff --git a/browser/themes/windows/preferences/aboutPermissions.css b/browser/themes/windows/preferences/aboutPermissions.css
new file mode 100644
index 000000000..7a64c1f9b
--- /dev/null
+++ b/browser/themes/windows/preferences/aboutPermissions.css
@@ -0,0 +1,114 @@
+/* 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");
+
+
+/* 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="cookie"] {
+  list-style-image: url(chrome://global/skin/icons/question-64.png);
+}
+.pref-icon[type="geo"] {
+  list-style-image: url(chrome://browser/skin/Geolocation-64.png);
+}
+.pref-icon[type="indexedDB"] {
+  list-style-image: url(chrome://global/skin/icons/question-64.png);
+}
+.pref-icon[type="install"] {
+  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
+}
+.pref-icon[type="popup"] {
+  list-style-image: url(chrome://global/skin/icons/question-64.png);
+}
+.pref-icon[type="image"] {
+  list-style-image: url(chrome://global/skin/icons/question-64.png);
+}
+.pref-icon[type="plugins"] {
+  list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
+}
+.pref-icon[type="fullscreen"] {
+  list-style-image: url(chrome://global/skin/icons/question-64.png);
+}
+
+.pref-title {
+  font-size: 125%;
+  margin-bottom: 0;
+  font-weight: bold;
+}
+
+.pref-menulist {
+  margin-left: 6px;
+  margin-right: 6px;
+  min-width: 10em; /* native menulists ellipsize their longest entries by default on many themes */
+}
diff --git a/browser/themes/windows/preferences/alwaysAsk-aero.png b/browser/themes/windows/preferences/alwaysAsk-aero.png
new file mode 100644
index 000000000..d12805ef0
--- /dev/null
+++ b/browser/themes/windows/preferences/alwaysAsk-aero.png
diff --git a/browser/themes/windows/preferences/alwaysAsk.png b/browser/themes/windows/preferences/alwaysAsk.png
new file mode 100644
index 000000000..ddd4cb213
--- /dev/null
+++ b/browser/themes/windows/preferences/alwaysAsk.png
diff --git a/browser/themes/windows/preferences/application-aero.png b/browser/themes/windows/preferences/application-aero.png
new file mode 100644
index 000000000..d67993d59
--- /dev/null
+++ b/browser/themes/windows/preferences/application-aero.png
diff --git a/browser/themes/windows/preferences/application.png b/browser/themes/windows/preferences/application.png
new file mode 100644
index 000000000..ff2ecc2f3
--- /dev/null
+++ b/browser/themes/windows/preferences/application.png
diff --git a/browser/themes/windows/preferences/applications.css b/browser/themes/windows/preferences/applications.css
new file mode 100644
index 000000000..80699b463
--- /dev/null
+++ b/browser/themes/windows/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/browser/themes/windows/preferences/in-content/preferences.css b/browser/themes/windows/preferences/in-content/preferences.css
new file mode 100644
index 000000000..38034a9f2
--- /dev/null
+++ b/browser/themes/windows/preferences/in-content/preferences.css
@@ -0,0 +1,182 @@
+/* - 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");

+

+@namespace html "http://www.w3.org/1999/xhtml";

+

+#preferences-home {

+  display: block;

+}

+

+#header {

+  margin-bottom: 18px;

+}

+

+.landingButton {

+  -moz-box-align: center;

+  -moz-box-orient: vertical;

+  border: none;

+  background: none;

+  box-shadow: none;

+}

+

+.landingButton:hover {

+  cursor: pointer;

+}

+

+.landingButton-label {

+  margin-top: 4px;

+}

+

+.landingButton-icon {

+  display: block;

+  width: 32px;

+  height: 32px;

+  background-image: url("chrome://browser/skin/preferences/Options.png");

+  background-repeat: no-repeat;

+}

+

+.preference-icon {

+  display: block;

+  width: 32px;

+  height: 32px;

+  background-image: url("chrome://browser/skin/preferences/Options.png");

+  background-repeat: no-repeat;

+  margin: 0 20px;

+}

+

+.preference-icon[type="general"],

+.landingButton-icon[type="general"] {

+  background-position: 0 0;

+}

+

+.preference-icon[type="tabs"],

+.landingButton-icon[type="tabs"] {

+  background-position: -32px 0;

+}

+

+.preference-icon[type="content"],

+.landingButton-icon[type="content"] {

+  background-position: -64px 0;

+}

+

+.preference-icon[type="applications"],

+.landingButton-icon[type="applications"] {

+  background-position: -96px 0;

+}

+

+.preference-icon[type="privacy"],

+.landingButton-icon[type="privacy"] {

+  background-position: -128px 0;

+}

+

+.preference-icon[type="security"],

+.landingButton-icon[type="security"] {

+  background-position: -160px 0;

+}

+

+.preference-icon[type="advanced"],

+.landingButton-icon[type="advanced"] {

+  background-position: -192px 0;

+}

+

+.preference-icon[type="sync"],

+.landingButton-icon[type="sync"] {

+  background-image: url("chrome://browser/skin/preferences/Options-sync.png");

+}

+

+caption {

+  font-size: 20px;

+}

+

+.heading {

+  height: 50px;

+  background-color: rgba(192,199,210,0.7);

+  border-radius: 5px 5px 0 0;

+  margin-bottom: 15px;

+  -moz-box-align: center;

+}

+

+prefpane > .content-box {

+  overflow: auto;

+}

+

+/* Applications Pane Styles */

+

+#applications-content {

+  padding: 15px;

+}

+

+#handlersView {

+  -moz-appearance: none;

+  border: 1px solid rgba(31,64,100,0.4);

+  overflow-y: auto;

+}

+

+/* XXX This style is for bug 740213 and should be removed once that

+   bug has a solution. */

+description > html|a {

+  cursor: pointer;

+}

+

+/* XXX Styles Below can be removed once bug 660726 lands */

+.nav-button {

+  list-style-image: url(chrome://mozapps/skin/extensions/navigation.png);

+}

+

+#forward-btn {

+  -moz-border-start: none;

+}

+

+#back-btn:-moz-locale-dir(ltr),

+#forward-btn:-moz-locale-dir(rtl) {

+  -moz-image-region: rect(0, 18px, 18px, 0);

+  border-top-right-radius: 0;

+  border-bottom-right-radius: 0;

+}

+

+#back-btn:-moz-locale-dir(rtl),

+#forward-btn:-moz-locale-dir(ltr) {

+  -moz-image-region: rect(0, 36px, 18px, 18px);

+  border-top-left-radius: 0;

+  border-bottom-left-radius: 0;

+}

+

+.header-button[disabled="true"] {

+  opacity: 0.8;

+}

+

+.header-button {

+  -moz-appearance: none;

+  padding: 1px 3px;

+  color: #444;

+  text-shadow: 0 0 3px white;

+  background: linear-gradient(

+                rgba(251,252,253,0.95),

+                rgba(246,247,248,0) 49%,

+                rgba(211,212,213,0.45) 51%,

+                rgba(225,226,229, 0.3));

+  background-clip: padding-box;

+  border-radius: 2.5px;

+  border: 1px solid rgba(31,64,100,0.4);

+  border-top-color: rgba(31,64,100,0.3);

+  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.25) inset,

+              0 0 2px 1px rgba(255, 255, 255, 0.25) inset;

+}

+

+.header-button[disabled="true"] > .toolbarbutton-icon {

+  opacity: 0.4;

+}

+

+.header-button:not([disabled="true"]):active:hover,

+.header-button[open="true"] {

+  background-color: rgba(61, 76, 92, 0.2);

+  border-color: rgba(39, 53, 68, 0.5);

+  box-shadow: 0 0 3px 1px rgba(39, 53, 68, 0.2) inset;

+}

+

+.header-button > .toolbarbutton-text {

+  display: none;

+}

diff --git a/browser/themes/windows/preferences/mail-aero.png b/browser/themes/windows/preferences/mail-aero.png
new file mode 100644
index 000000000..be1ed4d38
--- /dev/null
+++ b/browser/themes/windows/preferences/mail-aero.png
diff --git a/browser/themes/windows/preferences/mail.png b/browser/themes/windows/preferences/mail.png
new file mode 100644
index 000000000..c40d15991
--- /dev/null
+++ b/browser/themes/windows/preferences/mail.png
diff --git a/browser/themes/windows/preferences/preferences.css b/browser/themes/windows/preferences/preferences.css
new file mode 100644
index 000000000..5067fe635
--- /dev/null
+++ b/browser/themes/windows/preferences/preferences.css
@@ -0,0 +1,141 @@
+/*
+# -*- 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;
+}
+
+.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) {
+  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+#cookiesChildren::-moz-tree-image(domainCol, container, open) {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+#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/browser/themes/windows/preferences/saveFile-aero.png b/browser/themes/windows/preferences/saveFile-aero.png
new file mode 100644
index 000000000..1248dd30c
--- /dev/null
+++ b/browser/themes/windows/preferences/saveFile-aero.png
diff --git a/browser/themes/windows/preferences/saveFile.png b/browser/themes/windows/preferences/saveFile.png
new file mode 100644
index 000000000..c210e8473
--- /dev/null
+++ b/browser/themes/windows/preferences/saveFile.png
diff --git a/browser/themes/windows/privatebrowsing-dark.png b/browser/themes/windows/privatebrowsing-dark.png
new file mode 100644
index 000000000..9eaf3aec7
--- /dev/null
+++ b/browser/themes/windows/privatebrowsing-dark.png
diff --git a/browser/themes/windows/privatebrowsing-light.png b/browser/themes/windows/privatebrowsing-light.png
new file mode 100644
index 000000000..c12f50779
--- /dev/null
+++ b/browser/themes/windows/privatebrowsing-light.png
diff --git a/browser/themes/windows/reload-stop-go.png b/browser/themes/windows/reload-stop-go.png
new file mode 100644
index 000000000..1017be903
--- /dev/null
+++ b/browser/themes/windows/reload-stop-go.png
diff --git a/browser/themes/windows/sanitizeDialog.css b/browser/themes/windows/sanitizeDialog.css
new file mode 100644
index 000000000..4312eb8fb
--- /dev/null
+++ b/browser/themes/windows/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://global/skin/icons/collapse.png");
+}
+
+.expander-down {
+  list-style-image: url("chrome://global/skin/icons/expand.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/browser/themes/windows/searchbar-dropdown-arrow-aero.png b/browser/themes/windows/searchbar-dropdown-arrow-aero.png
new file mode 100644
index 000000000..79d8d61b4
--- /dev/null
+++ b/browser/themes/windows/searchbar-dropdown-arrow-aero.png
diff --git a/browser/themes/windows/searchbar-dropdown-arrow.png b/browser/themes/windows/searchbar-dropdown-arrow.png
new file mode 100644
index 000000000..7f5f55ef2
--- /dev/null
+++ b/browser/themes/windows/searchbar-dropdown-arrow.png
diff --git a/browser/themes/windows/searchbar.css b/browser/themes/windows/searchbar.css
new file mode 100644
index 000000000..86a485530
--- /dev/null
+++ b/browser/themes/windows/searchbar.css
@@ -0,0 +1,81 @@
+/* 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://global/skin/icons/folder-item.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+  -moz-margin-start: 2px;
+}
+
+.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://global/skin/icons/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/browser/themes/windows/setDesktopBackground.css b/browser/themes/windows/setDesktopBackground.css
new file mode 100644
index 000000000..585284c7b
--- /dev/null
+++ b/browser/themes/windows/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/browser/themes/windows/slowStartup-16.png b/browser/themes/windows/slowStartup-16.png
new file mode 100644
index 000000000..5551ef054
--- /dev/null
+++ b/browser/themes/windows/slowStartup-16.png
diff --git a/browser/themes/windows/social/chat-icons.png b/browser/themes/windows/social/chat-icons.png
new file mode 100644
index 000000000..cc895f93c
--- /dev/null
+++ b/browser/themes/windows/social/chat-icons.png
diff --git a/browser/themes/windows/social/services-16.png b/browser/themes/windows/social/services-16.png
new file mode 100644
index 000000000..7001ea1f0
--- /dev/null
+++ b/browser/themes/windows/social/services-16.png
diff --git a/browser/themes/windows/social/services-64.png b/browser/themes/windows/social/services-64.png
new file mode 100644
index 000000000..e787bddc3
--- /dev/null
+++ b/browser/themes/windows/social/services-64.png
diff --git a/browser/themes/windows/social/share-button-active.png b/browser/themes/windows/social/share-button-active.png
new file mode 100644
index 000000000..e819a740b
--- /dev/null
+++ b/browser/themes/windows/social/share-button-active.png
diff --git a/browser/themes/windows/social/share-button.png b/browser/themes/windows/social/share-button.png
new file mode 100644
index 000000000..931874dc3
--- /dev/null
+++ b/browser/themes/windows/social/share-button.png
diff --git a/browser/themes/windows/sync-128.png b/browser/themes/windows/sync-128.png
new file mode 100644
index 000000000..1ea34818c
--- /dev/null
+++ b/browser/themes/windows/sync-128.png
diff --git a/browser/themes/windows/sync-16.png b/browser/themes/windows/sync-16.png
new file mode 100644
index 000000000..0afb1c719
--- /dev/null
+++ b/browser/themes/windows/sync-16.png
diff --git a/browser/themes/windows/sync-32.png b/browser/themes/windows/sync-32.png
new file mode 100644
index 000000000..7a762cb98
--- /dev/null
+++ b/browser/themes/windows/sync-32.png
diff --git a/browser/themes/windows/sync-bg.png b/browser/themes/windows/sync-bg.png
new file mode 100644
index 000000000..893a27d76
--- /dev/null
+++ b/browser/themes/windows/sync-bg.png
diff --git a/browser/themes/windows/sync-desktopIcon.png b/browser/themes/windows/sync-desktopIcon.png
new file mode 100644
index 000000000..d3d1e27c3
--- /dev/null
+++ b/browser/themes/windows/sync-desktopIcon.png
diff --git a/browser/themes/windows/sync-mobileIcon.png b/browser/themes/windows/sync-mobileIcon.png
new file mode 100644
index 000000000..a3bda5751
--- /dev/null
+++ b/browser/themes/windows/sync-mobileIcon.png
diff --git a/browser/themes/windows/sync-notification-24.png b/browser/themes/windows/sync-notification-24.png
new file mode 100644
index 000000000..fc9a4e63d
--- /dev/null
+++ b/browser/themes/windows/sync-notification-24.png
diff --git a/browser/themes/windows/sync-throbber.png b/browser/themes/windows/sync-throbber.png
new file mode 100644
index 000000000..d25490b4f
--- /dev/null
+++ b/browser/themes/windows/sync-throbber.png
diff --git a/browser/themes/windows/syncCommon.css b/browser/themes/windows/syncCommon.css
new file mode 100644
index 000000000..f0beae0d5
--- /dev/null
+++ b/browser/themes/windows/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/browser/themes/windows/syncProgress.css b/browser/themes/windows/syncProgress.css
new file mode 100644
index 000000000..d7aa59976
--- /dev/null
+++ b/browser/themes/windows/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/browser/themes/windows/syncQuota.css b/browser/themes/windows/syncQuota.css
new file mode 100644
index 000000000..1577de8a3
--- /dev/null
+++ b/browser/themes/windows/syncQuota.css
@@ -0,0 +1,26 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#quotaDialog {
+  width: 33em;
+  height: 25em;
+}
+
+treechildren::-moz-tree-checkbox {
+  list-style-image: none;
+}
+treechildren::-moz-tree-checkbox(checked) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
+}
+treechildren::-moz-tree-checkbox(disabled) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
+}
+
+#treeCaption {
+  height: 4em;
+}
+
+.captionWarning {
+  font-weight: bold;
+}
diff --git a/browser/themes/windows/syncSetup.css b/browser/themes/windows/syncSetup.css
new file mode 100644
index 000000000..fff65e963
--- /dev/null
+++ b/browser/themes/windows/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/browser/themes/windows/tabbrowser/alltabs.png b/browser/themes/windows/tabbrowser/alltabs.png
new file mode 100644
index 000000000..172d425f8
--- /dev/null
+++ b/browser/themes/windows/tabbrowser/alltabs.png
diff --git a/browser/themes/windows/tabbrowser/connecting.png b/browser/themes/windows/tabbrowser/connecting.png
new file mode 100644
index 000000000..e564fb570
--- /dev/null
+++ b/browser/themes/windows/tabbrowser/connecting.png
diff --git a/browser/themes/windows/tabbrowser/loading.png b/browser/themes/windows/tabbrowser/loading.png
new file mode 100644
index 000000000..ba54836e9
--- /dev/null
+++ b/browser/themes/windows/tabbrowser/loading.png
diff --git a/browser/themes/windows/tabbrowser/newtab-glass.png b/browser/themes/windows/tabbrowser/newtab-glass.png
new file mode 100644
index 000000000..15185beb6
--- /dev/null
+++ b/browser/themes/windows/tabbrowser/newtab-glass.png
diff --git a/browser/themes/windows/tabbrowser/newtab-inverted.png b/browser/themes/windows/tabbrowser/newtab-inverted.png
new file mode 100644
index 000000000..4ac1ebaaf
--- /dev/null
+++ b/browser/themes/windows/tabbrowser/newtab-inverted.png
diff --git a/browser/themes/windows/tabbrowser/newtab.png b/browser/themes/windows/tabbrowser/newtab.png
new file mode 100644
index 000000000..7cea7bdd8
--- /dev/null
+++ b/browser/themes/windows/tabbrowser/newtab.png
diff --git a/browser/themes/windows/tabbrowser/tab-arrow-left-glass.png b/browser/themes/windows/tabbrowser/tab-arrow-left-glass.png
new file mode 100644
index 000000000..aac93a727
--- /dev/null
+++ b/browser/themes/windows/tabbrowser/tab-arrow-left-glass.png
diff --git a/browser/themes/windows/tabbrowser/tab-arrow-left-inverted.png b/browser/themes/windows/tabbrowser/tab-arrow-left-inverted.png
new file mode 100644
index 000000000..16cd7a277
--- /dev/null
+++ b/browser/themes/windows/tabbrowser/tab-arrow-left-inverted.png
diff --git a/browser/themes/windows/tabbrowser/tab-arrow-left.png b/browser/themes/windows/tabbrowser/tab-arrow-left.png
new file mode 100644
index 000000000..e0fb348d6
--- /dev/null
+++ b/browser/themes/windows/tabbrowser/tab-arrow-left.png
diff --git a/browser/themes/windows/tabbrowser/tab-overflow-border.png b/browser/themes/windows/tabbrowser/tab-overflow-border.png
new file mode 100644
index 000000000..77f2462e5
--- /dev/null
+++ b/browser/themes/windows/tabbrowser/tab-overflow-border.png
diff --git a/browser/themes/windows/tabbrowser/tab.png b/browser/themes/windows/tabbrowser/tab.png
new file mode 100644
index 000000000..fb0fc676f
--- /dev/null
+++ b/browser/themes/windows/tabbrowser/tab.png
diff --git a/browser/themes/windows/tabbrowser/tabDragIndicator.png b/browser/themes/windows/tabbrowser/tabDragIndicator.png
new file mode 100644
index 000000000..c67c2337d
--- /dev/null
+++ b/browser/themes/windows/tabbrowser/tabDragIndicator.png
diff --git a/browser/themes/windows/toolbarbutton-dropdown-arrow-inverted.png b/browser/themes/windows/toolbarbutton-dropdown-arrow-inverted.png
new file mode 100644
index 000000000..f3261f1da
--- /dev/null
+++ b/browser/themes/windows/toolbarbutton-dropdown-arrow-inverted.png
diff --git a/browser/themes/windows/toolbarbutton-dropdown-arrow.png b/browser/themes/windows/toolbarbutton-dropdown-arrow.png
new file mode 100644
index 000000000..a7abe7396
--- /dev/null
+++ b/browser/themes/windows/toolbarbutton-dropdown-arrow.png
diff --git a/browser/themes/windows/urlbar-arrow.png b/browser/themes/windows/urlbar-arrow.png
new file mode 100644
index 000000000..fcab253bb
--- /dev/null
+++ b/browser/themes/windows/urlbar-arrow.png
diff --git a/browser/themes/windows/urlbar-history-dropmarker.png b/browser/themes/windows/urlbar-history-dropmarker.png
new file mode 100644
index 000000000..fc8b0be98
--- /dev/null
+++ b/browser/themes/windows/urlbar-history-dropmarker.png
diff --git a/browser/themes/windows/urlbar-popup-blocked.png b/browser/themes/windows/urlbar-popup-blocked.png
new file mode 100644
index 000000000..e6fd29f7d
--- /dev/null
+++ b/browser/themes/windows/urlbar-popup-blocked.png
diff --git a/browser/themes/windows/webRTC-shareDevice-16.png b/browser/themes/windows/webRTC-shareDevice-16.png
new file mode 100644
index 000000000..df01b3351
--- /dev/null
+++ b/browser/themes/windows/webRTC-shareDevice-16.png
diff --git a/browser/themes/windows/webRTC-shareDevice-64.png b/browser/themes/windows/webRTC-shareDevice-64.png
new file mode 100644
index 000000000..d125789fb
--- /dev/null
+++ b/browser/themes/windows/webRTC-shareDevice-64.png
diff --git a/browser/themes/windows/webRTC-sharingDevice-16.png b/browser/themes/windows/webRTC-sharingDevice-16.png
new file mode 100644
index 000000000..a670676a0
--- /dev/null
+++ b/browser/themes/windows/webRTC-sharingDevice-16.png
diff --git a/browser/themes/windows/webapps-16.png b/browser/themes/windows/webapps-16.png
new file mode 100644
index 000000000..7112ab4e4
--- /dev/null
+++ b/browser/themes/windows/webapps-16.png
diff --git a/browser/themes/windows/webapps-64.png b/browser/themes/windows/webapps-64.png
new file mode 100644
index 000000000..7c5e48cb8
--- /dev/null
+++ b/browser/themes/windows/webapps-64.png