more Australis update work

[themes.git] / LCARStrek / browser / browser.css

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index e123cdc2b86bf4ad9a3c1fd5d7be8ec44b54f9b6..761dab91ddacb2f1513686d0422c386cda781a4f 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url("chrome://global/skin/");
+@import url("downloads/indicator.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
@@ -11,10 +12,20 @@ toolbar {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar");
 }
 
+/* Remove selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */
+#navigator-toolbox:not([iconsize]) > toolbar[customizable="true"] {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-browsercustom");
+}
+
 toolbar[type="menubar"][autohide="true"] {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-menubar-autohide");
 }
 
+/* Remove selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */
+#navigator-toolbox:not([iconsize]) > #toolbar-menubar[autohide="true"] {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-menubar-autohide-browsercustom");
+}
+
 menubar {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#menubar");
 }
@@ -38,6 +49,28 @@ menubar {
   background-color: #9C9CFF;
 }
 
+/* We want a 4px gap between the TabsToolbar and the toolbar-menubar when the
+   toolbar-menu is displayed, and a 16px gap when it is not. 1px is taken care
+   of by the (light) outer shadow of the tab, the remaining 3/15 are these margins. */
+#toolbar-menubar:not([autohide="true"]) ~ #TabsToolbar,
+#toolbar-menubar[autohide="true"]:not([inactive]) ~ #TabsToolbar {
+/*  margin-top: 3px;*/
+}
+
+#main-window[tabsintitlebar][sizemode="normal"][chromehidden~="menubar"] #toolbar-menubar ~ #TabsToolbar,
+#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] ~ #TabsToolbar {
+/*  margin-top: 15px;*/
+}
+
+/* Remove selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */
+#navigator-toolbox:not([iconsize]) > #toolbar-menubar:not([autohide="true"]) {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
+}
+
+#main-window[tabsintitlebar] #toolbar-menubar .toolbar-endcap {
+  /* the titlebar buttons are shown right over the endcap but we have no power over the buttonbox position just for this case, so hide the endcap */
+  display: none;
+}
 
 #navigator-toolbox {
 }
@@ -56,16 +89,16 @@ menubar {
 #navigator-toolbox > toolbar:not(:-moz-lwtheme) {
 }
 
-#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) {
+#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) {
   /* like menubar */
   background-color: #6000CF;
   color: #FF9F00;
 }
-#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
+#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
   background-color: #8050B0;
   color: #FF9F00;
 }
-#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar > .tabbrowser-tabs > .tabbrowser-tab {
+#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar > .tabbrowser-tabs > .tabbrowser-tab {
   padding-top: 3px;
 }
 
@@ -81,6 +114,9 @@ menubar {
 #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)); */
+  /* Position the toolbar above the bottom of background tabs */
+  position: relative;
+  z-index: 1;
 }
 
 #personal-bookmarks {
@@ -93,6 +129,16 @@ menubar {
 
 /* ::::: app menu button ::::: */
 
+/* The app menu button must appear on top of the navigator-toolbox in order
+ * for click and hover mouse events to work properly for the button in the
+ * restored window state. Otherwise, elements in the navigator-toolbox, like the
+ * menubar can swallow these events. It will also place the button above the
+ * fog on themes with Aero Glass.
+ */
+#main-window[tabsintitlebar] #appmenu-button-container {
+  z-index: 1;
+}
+
 #appmenu-button {
   background-color: #FF9F00;
   background-clip: padding-box;
@@ -337,9 +383,16 @@ menubar {
   margin-top: 4px;
 }
 
+/* The button box must appear on top of the navigator-toolbox in order for
+ * click and hover mouse events to work properly for the button in the restored
+ * window state. Otherwise, elements in the navigator-toolbox, like the menubar,
+ * can swallow those events. It will also place the buttons above the fog on
+ * themes with Aero Glass.
+ */
 #titlebar-buttonbox {
   margin-top: 5px;
   -moz-margin-end: 3px;
+  z-index: 1;
 }
 
 #main-window[sizemode="maximized"] #titlebar-buttonbox {
@@ -389,14 +442,15 @@ menubar {
 
 /* ::::: bookmark buttons ::::: */
 
-/*.bookmark-item:not(#bookmarks-menu-button) > .toolbarbutton-icon */
-.bookmark-item > .toolbarbutton-icon {
+.bookmark-item > .toolbarbutton-icon,
+#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
 }
 
-/* Prevent [mode="icons"] from hiding the label */
-.bookmark-item > .toolbarbutton-text {
+/* Force the display of the label for bookmarks */
+.bookmark-item > .toolbarbutton-text,
+#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-text {
   display: -moz-box !important;
 }
 
@@ -408,7 +462,8 @@ menubar {
   background: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") no-repeat center;
 }
 
-.bookmarks-toolbar-customize {
+.bookmarks-toolbar-customize,
+#bookmarks-toolbar-placeholder {
   max-width: 15em !important;
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") !important;
 }
@@ -498,364 +553,1076 @@ menuitem.bookmark-item {
 
 /* ::::: primary toolbar buttons ::::: */
 
-.toolbarbutton-1 {
-  list-style-image: url("chrome://browser/skin/FxToolbar.png");
+/* === BEGIN toolbarbuttons.inc.css === */
+
+/* Whole section of this included file: */
+/* Remove |#navigator-toolbox:not([iconsize])| selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */
+#navigator-toolbox:not([iconsize]) :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button,
+          #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button,
+          #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button,
+          #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button,
+          #PanelUI-menu-button, #characterencoding-button, #email-link-button),
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  list-style-image: url("chrome://browser/skin/ToolbarFx.png");
 }
 
-.toolbarbutton-1:not([type="menu-button"]) {
-  -moz-box-orient: vertical;
+#navigator-toolbox:not([iconsize]) #back-button {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
 }
 
-.toolbarbutton-1,
-.toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  min-width: 36px;
-  min-height: 36px;
+#navigator-toolbox:not([iconsize]) #back-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(18px, 36px, 36px, 18px);
 }
 
-.toolbarbutton-1:not([type="menu-button"]) {
-  -moz-box-orient: vertical;
+#navigator-toolbox:not([iconsize]) #back-button[disabled="true"] {
+  -moz-image-region: rect(36px, 36px, 54px, 18px);
 }
 
-.toolbarbutton-1,
-.toolbarbutton-1 > .toolbarbutton-menubutton-button,
-.toolbarbutton-1[disabled="true"]:hover:active,
-.toolbarbutton-1[disabled="true"]:hover:active > .toolbarbutton-menubutton-button {
-  padding: 1px 2px;
+#navigator-toolbox:not([iconsize]) #forward-button {
+  -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
-.toolbarbutton-1:hover:active,
-.toolbarbutton-1[open="true"],
-.toolbarbutton-1:hover:active > .toolbarbutton-menubutton-button {
-  padding-top: 2px;
-  padding-bottom: 0px;
-  -moz-padding-start: 3px;
-  -moz-padding-end: 1px;
+#navigator-toolbox:not([iconsize]) #forward-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(18px, 72px, 36px, 54px);
 }
 
-/* ::::: small primary toolbar buttons ::::: */
+#navigator-toolbox:not([iconsize]) #forward-button[disabled="true"] {
+  -moz-image-region: rect(36px, 72px, 54px, 54px);
+}
 
-#nav-bar {
-  /* force iconsize="small" on this toolbar */
-  counter-reset: smallicons;
+#navigator-toolbox:not([iconsize]) #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+#navigator-toolbox:not([iconsize]) #forward-button:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
 }
 
-toolbar[mode="text"] .toolbarbutton-1,
-toolbar[mode="icons"] .toolbarbutton-1,
-toolbar[iconsize="small"] .toolbarbutton-1,
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1,
-toolbar[mode="text"] .toolbarbutton-menubutton-button,
-toolbar[mode="icons"] .toolbarbutton-menubutton-button,
-toolbar[iconsize="small"] .toolbarbutton-menubutton-button,
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  min-width: 0px;
-  min-height: 0px;
+#navigator-toolbox:not([iconsize]) #home-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
-toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker {
-  padding-top: 4px;
-  padding-bottom: 8px;
-  -moz-padding-start: 1px;
-  -moz-padding-end: 1px;
+#navigator-toolbox:not([iconsize]) #home-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 126px, 36px, 108px);
 }
 
-toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker,
-toolbar[iconsize="small"] .toolbarbutton-menubutton-dropmarker,
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  padding-top: 0px;
-  padding-bottom: 13px;
-  -moz-padding-start: 1px;
-  -moz-padding-end: 1px;
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 144px, 18px, 126px);
 }
 
-toolbar[mode="text"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
-toolbar[mode="text"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
-  padding-top: 5px;
-  padding-bottom: 7px;
-  -moz-padding-start: 0px;
-  -moz-padding-end: 2px;
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"]:hover,
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][open="true"] {
+  -moz-image-region: rect(18px, 144px, 36px, 126px);
 }
 
-toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
-toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
-toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
-toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
-  padding-top: 1px;
-  padding-bottom: 12px;
-  -moz-padding-start: 0px;
-  -moz-padding-end: 2px;
+/* When "new tab" page shows up, the menubutton-button (star button) is disabled */
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button[disabled="true"] {
+  -moz-image-region: rect(36px, 144px, 54px, 126px) !important;
+  background-color: transparent !important;
 }
 
-toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  padding-top: 4px !important;
-  padding-bottom: 8px !important;
-  -moz-padding-start: 1px !important;
-  -moz-padding-end: 1px !important;
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][starred] {
+  -moz-image-region: rect(0, 162px, 18px, 144px);
 }
 
-toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker[disabled="true"],
-toolbar[iconsize="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  padding-top: 0px !important;
-  padding-bottom: 13px !important;
-  -moz-padding-start: 1px !important;
-  -moz-padding-end: 1px !important;
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][starred]:hover,
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][starred][open="true"] {
+  -moz-image-region: rect(18px, 162px, 36px, 144px);
 }
 
-toolbar[mode="icons"] .toolbarbutton-text,
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  -moz-image-region: rect(0, 630px, 18px, 612px);
 }
 
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 4px 0;
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker {
+  padding: 1px;
+  -moz-box-align: center;
 }
 
-toolbar[mode="text"] .toolbarbutton-1,
-toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  -moz-box-orient: horizontal;
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"]:hover > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][open="true"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  -moz-image-region: rect(18px, 630px, 36px, 612px);
 }
 
-toolbar[mode="full"] .toolbarbutton-1,
-toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  min-width: 30px;
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+  padding-top: 2px;
+  padding-bottom: 0px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
 }
 
-#navigator-toolbox[iconsize=small] > #nav-bar {
+#navigator-toolbox:not([iconsize]) #history-panelmenu[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 180px, 18px, 162px);
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar {
+#navigator-toolbox:not([iconsize]) #history-panelmenu[cui-areatype="toolbar"]:hover,
+#navigator-toolbox:not([iconsize]) #history-panelmenu[cui-areatype="toolbar"][open="true"] {
+  -moz-image-region: rect(18px, 180px, 36px, 162px);
 }
 
+#navigator-toolbox:not([iconsize]) #downloads-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 198px, 18px, 180px);
+}
 
-/* unified back/forward button */
+#navigator-toolbox:not([iconsize]) #downloads-button[cui-areatype="toolbar"]:hover,
+#navigator-toolbox:not([iconsize]) #downloads-button[cui-areatype="toolbar"][open="true"] {
+  -moz-image-region: rect(18px, 198px, 36px, 180px);
+}
 
-#back-button {
-  -moz-image-region: rect(0, 18px, 18px, 0);
-  -moz-margin-end: 0;
+#navigator-toolbox:not([iconsize]) #add-ons-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 216px, 18px, 198px);
 }
 
-#back-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(18px, 18px, 36px, 0);
+#navigator-toolbox:not([iconsize]) #add-ons-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 216px, 36px, 198px);
 }
 
-#back-button[disabled="true"] {
-  -moz-image-region: rect(36px, 18px, 54px, 0);
+#navigator-toolbox:not([iconsize]) #switch-to-metro-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 648px, 18px, 630px);
 }
 
-#forward-button {
-  -moz-image-region: rect(0, 36px, 18px, 18px);
-  border-left: none;
-  -moz-margin-start: 0;
+#navigator-toolbox:not([iconsize]) #switch-to-metro-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 648px, 36px, 630px);
 }
 
-#forward-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(18px, 36px, 36px, 18px);
+#navigator-toolbox:not([iconsize]) #open-file-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 234px, 18px, 216px);
 }
 
-#forward-button[disabled="true"] {
-  -moz-image-region: rect(36px, 36px, 54px, 18px);
+#navigator-toolbox:not([iconsize]) #open-file-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 234px, 36px, 216px);
 }
 
-#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);
+#navigator-toolbox:not([iconsize]) #save-page-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 252px, 18px, 234px);
 }
 
-#nav-bar #back-button {
-  -moz-margin-end: 0 !important;
+#navigator-toolbox:not([iconsize]) #save-page-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 252px, 36px, 234px);
 }
 
-#nav-bar #forward-button {
-  border-left-style: none;
-  -moz-margin-start: 0 !important;
+#navigator-toolbox:not([iconsize]) #sync-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 270px, 18px, 252px);
 }
 
-#nav-bar #back-button:-moz-locale-dir(ltr) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
+#navigator-toolbox:not([iconsize]) #sync-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 270px, 36px, 252px);
 }
 
-#nav-bar #back-button:-moz-locale-dir(rtl),
-#nav-bar #forward-button {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
+#navigator-toolbox:not([iconsize]) #feed-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 288px, 18px, 270px);
 }
 
-window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
-    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button > #back-button {
-  border-radius: 10000px;
-  width: 30px;
-  height: 30px;
-  position: relative;
-  z-index: 1;
-  margin-top: -2px;
-  margin-bottom: -2px;
-  border: none;
-  -moz-image-region: rect(54px, 20px, 74px, 0);
+#navigator-toolbox:not([iconsize]) #feed-button[cui-areatype="toolbar"]:hover:not([disabled="true"]) {
+  -moz-image-region: rect(18px, 288px, 36px, 270px);
 }
 
-window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
-    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button > #back-button:not([disabled="true"]):hover,
-window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
-    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button > #back-button[open="true"] {
-  -moz-image-region: rect(54px, 40px, 74px, 20px);
+#navigator-toolbox:not([iconsize]) #feed-button[cui-areatype="toolbar"][disabled="true"] {
+  -moz-image-region: rect(36px, 288px, 54px, 270px);
 }
 
-window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
-    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button > #back-button[disabled="true"] {
-  -moz-image-region: rect(54px, 60px, 74px, 40px);
+#navigator-toolbox:not([iconsize]) #social-share-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0px, 306px, 18px, 288px);
 }
 
-window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
-    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button > #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover {
+#navigator-toolbox:not([iconsize]) #social-share-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 306px, 36px, 288px);
 }
 
-window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
-    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button > #back-button:not([disabled="true"]):hover:active,
-window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
-    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button > #back-button[open="true"] {
+#navigator-toolbox:not([iconsize]) #email-link-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 306px, 18px, 288px);
+  /* This is temporary until we have an email-link icon (Bug 932235) */
+  transform: scale(-1, -1);
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar[currentset*="unified-back-forward-button"],
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar:not([currentset]) {
-/*  padding-top: 3px;
-  padding-bottom: 5px; */
+#navigator-toolbox:not([iconsize]) #email-link-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 306px, 36px, 288px);
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"][tabsontop="true"] > #nav-bar[currentset*="unified-back-forward-button"],
-#navigator-toolbox[iconsize="large"][mode="icons"][tabsontop="true"] > #nav-bar:not([currentset]) {
-/*  padding-top: 5px; */
+#navigator-toolbox:not([iconsize]) #characterencoding-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 324px, 18px, 306px);
 }
 
-window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
-    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button > #forward-button {
-  /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
-  /*clip-path: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-clip-path"); */
-  -moz-margin-start: -6px !important;
-  padding-left: 7px;
-  padding-right: 3px;
-  margin-top: 2px;
-  margin-bottom: 2px;
+#navigator-toolbox:not([iconsize]) #characterencoding-button[cui-areatype="toolbar"]:hover:not([disabled="true"]),
+#navigator-toolbox:not([iconsize]) #characterencoding-button[cui-areatype="toolbar"][open="true"] {
+  -moz-image-region: rect(18px, 324px, 36px, 306px);
 }
 
-window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
-    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button > #forward-button:-moz-locale-dir(ltr) {
-  border-top-right-radius: 11px;
-  border-bottom-right-radius: 11px;
+#navigator-toolbox:not([iconsize]) #characterencoding-button[cui-areatype="toolbar"][disabled="true"] {
+  -moz-image-region: rect(36px, 324px, 54px, 306px);
 }
 
-window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
-    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button > #forward-button:-moz-locale-dir(rtl) {
-  border-top-left-radius: 11px;
-  border-bottom-left-radius: 11px;
+#navigator-toolbox:not([iconsize]) #new-window-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 342px, 18px, 324px);
 }
 
-.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr),
-.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://global/skin/arrow/arrow-left.gif") !important;
+#navigator-toolbox:not([iconsize]) #new-window-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 342px, 36px, 324px);
 }
 
-.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr):hover,
-.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl):hover {
-  list-style-image: url("chrome://global/skin/arrow/arrow-left-hover.gif") !important;
+#navigator-toolbox:not([iconsize]) #new-tab-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 360px, 18px, 342px);
 }
 
-.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr),
-.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://global/skin/arrow/arrow-right.gif") !important;
+#navigator-toolbox:not([iconsize]) #new-tab-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 360px, 36px, 342px);
 }
 
-.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr):hover,
-.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl):hover {
-  list-style-image: url("chrome://global/skin/arrow/arrow-right.gif") !important;
+#navigator-toolbox:not([iconsize]) #privatebrowsing-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 378px, 18px, 360px);
 }
 
-window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
-    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button > #forward-button {
-/*  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  -moz-margin-end: 0; */
+#navigator-toolbox:not([iconsize]) #privatebrowsing-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 378px, 36px, 360px);
 }
 
-window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
-    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button:not([switchingtabs]) > #forward-button {
-  transition: opacity 150ms ease-out;
+#navigator-toolbox:not([iconsize]) #find-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 396px, 18px, 378px);
 }
 
-window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
-    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button:not(:hover) > #forward-button[disabled] {
+#navigator-toolbox:not([iconsize]) #find-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 396px, 36px, 378px);
+}
+
+#navigator-toolbox:not([iconsize]) #print-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 414px, 18px, 396px);
+}
+
+#navigator-toolbox:not([iconsize]) #print-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 414px, 36px, 396px);
+}
+
+#navigator-toolbox:not([iconsize]) #fullscreen-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 432px, 18px, 414px);
+}
+
+#navigator-toolbox:not([iconsize]) #fullscreen-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 432px, 36px, 414px);
+}
+
+#navigator-toolbox:not([iconsize]) #developer-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 450px, 18px, 432px);
+}
+
+#navigator-toolbox:not([iconsize]) #developer-button[cui-areatype="toolbar"]:hover,
+#navigator-toolbox:not([iconsize]) #developer-button[cui-areatype="toolbar"][open="true"] {
+  -moz-image-region: rect(18px, 450px, 36px, 432px);
+}
+
+#navigator-toolbox:not([iconsize]) #preferences-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 468px, 18px, 450px);
+}
+
+#navigator-toolbox:not([iconsize]) #preferences-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 468px, 36px, 450px);
+}
+
+#navigator-toolbox:not([iconsize]) #PanelUI-menu-button {
+  -moz-image-region: rect(0, 486px, 18px, 468px);
+}
+
+#navigator-toolbox:not([iconsize]) #PanelUI-menu-button:hover,
+#navigator-toolbox:not([iconsize]) #PanelUI-menu-button[open="true"] {
+  -moz-image-region: rect(18px, 486px, 36px, 468px);
+}
+
+#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button {
+  -moz-image-region: rect(0, 504px, 18px, 486px);
+}
+
+#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(18px, 504px, 36px, 486px);
+}
+
+#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button[disabled="true"] {
+  -moz-image-region: rect(36px, 504px, 54px, 486px);
+}
+
+#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button {
+  -moz-image-region: rect(0, 522px, 18px, 504px);
+}
+
+#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(18px, 522px, 36px, 504px);
+}
+
+#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button[disabled="true"] {
+  -moz-image-region: rect(36px, 522px, 54px, 504px);
+}
+
+#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button {
+  -moz-image-region: rect(0, 540px, 18px, 522px);
+}
+
+#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(18px, 540px, 36px, 522px);
+}
+
+#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button[disabled="true"] {
+  -moz-image-region: rect(36px, 540px, 54px, 522px);
+}
+
+#navigator-toolbox:not([iconsize]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button {
+  -moz-image-region: rect(0, 558px, 18px, 540px);
+}
+
+#navigator-toolbox:not([iconsize]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(18px, 558px, 36px, 540px);
+}
+
+#navigator-toolbox:not([iconsize]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button[disabled="true"] {
+  -moz-image-region: rect(36px, 558px, 54px, 540px);
+}
+
+#navigator-toolbox:not([iconsize]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button {
+  -moz-image-region: rect(0, 576px, 18px, 558px);
+}
+
+#navigator-toolbox:not([iconsize]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(18px, 576px, 36px, 558px);
+}
+
+#navigator-toolbox:not([iconsize]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button[disabled="true"] {
+  -moz-image-region: rect(36px, 576px, 54px, 558px);
+}
+
+#navigator-toolbox:not([iconsize]) #webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) {
+  -moz-image-region: rect(0, 594px, 18px, 576px);
+}
+
+#navigator-toolbox:not([iconsize]) #webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)):hover,
+#navigator-toolbox:not([iconsize]) #webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem))[open="true"] {
+  -moz-image-region: rect(18px, 594px, 36px, 576px);
+}
+
+#navigator-toolbox:not([iconsize]) #nav-bar-overflow-button {
+  -moz-image-region: rect(0, 612px, 18px, 594px);
+}
+
+#navigator-toolbox:not([iconsize]) #nav-bar-overflow-button:hover,
+#navigator-toolbox:not([iconsize]) #nav-bar-overflow-button[open="true"] {
+  -moz-image-region: rect(18px, 612px, 36px, 594px);
+}
+
+/* === END toolbarbuttons.inc.css === */
+
+/* === BEGIN menupanel.inc.css === */
+
+/* Menu panel and palette styles */
+
+/* Remove |:-moz-any(#customization-palette, #panelUI-contents)| selector when Australis lands - this makes it only apply post-Australis as those elements only exist there */
+:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button,
+          #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button,
+          #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button,
+          #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button,
+          #PanelUI-menu-button, #characterencoding-button, #email-link-button)[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button,
+          #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button,
+          #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button,
+          #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button,
+          #PanelUI-menu-button, #characterencoding-button, #email-link-button) {
+  list-style-image: url("chrome://browser/skin/menuPanel.png");
+}
+
+#home-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #home-button {
+  -moz-image-region: rect(0px, 128px, 32px, 96px);
+}
+
+#home-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #home-button:hover {
+  -moz-image-region: rect(32px, 128px, 64px, 96px);
+}
+
+#bookmarks-menu-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #bookmarks-menu-button {
+  -moz-image-region: rect(0px, 160px, 32px, 128px);
+}
+
+#bookmarks-menu-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #bookmarks-menu-button:hover {
+  -moz-image-region: rect(32px, 160px, 64px, 128px);
+}
+
+#bookmarks-menu-button[starred][cui-areatype="menu-panel"] {
+  -moz-image-region: rect(0px, 192px, 32px, 160px);
+}
+
+#bookmarks-menu-button[starred][cui-areatype="menu-panel"]:hover {
+  -moz-image-region: rect(32px, 192px, 64px, 160px);
+}
+
+#history-panelmenu[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #history-panelmenu {
+  -moz-image-region: rect(0px, 224px, 32px, 192px);
+}
+
+#history-panelmenu[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #history-panelmenu:hover {
+  -moz-image-region: rect(32px, 224px, 64px, 192px);
+}
+
+#downloads-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #downloads-button {
+  -moz-image-region: rect(0px, 256px, 32px, 224px);
+}
+
+#downloads-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #downloads-button:hover {
+  -moz-image-region: rect(32px, 256px, 64px, 224px);
+}
+
+#switch-to-metro-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #switch-to-metro-button {
+  -moz-image-region: rect(0px, 800px, 32px, 768px);
+}
+
+#switch-to-metro-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #switch-to-metro-button:hover {
+  -moz-image-region: rect(32px, 800px, 64px, 768px);
+}
+
+#add-ons-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #add-ons-button {
+  -moz-image-region: rect(0px, 288px, 32px, 256px);
+}
+
+#add-ons-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #add-ons-button:hover {
+  -moz-image-region: rect(32px, 288px, 64px, 256px);
+}
+
+#open-file-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #open-file-button {
+  -moz-image-region: rect(0px, 320px, 32px, 288px);
+}
+
+#open-file-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #open-file-button:hover {
+  -moz-image-region: rect(32px, 320px, 64px, 288px);
+}
+
+#save-page-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #save-page-button {
+  -moz-image-region: rect(0px, 352px, 32px, 320px);
+}
+
+#save-page-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #save-page-button:hover {
+  -moz-image-region: rect(32px, 352px, 64px, 320px);
+}
+
+#sync-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #sync-button {
+  -moz-image-region: rect(0px, 384px, 32px, 352px);
+}
+
+#sync-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #sync-button:hover {
+  -moz-image-region: rect(32px, 384px, 64px, 352px);
+}
+
+#feed-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #feed-button {
+  -moz-image-region: rect(0px, 416px, 32px, 384px);
+}
+
+#feed-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]),
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #feed-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(32px, 416px, 64px, 384px);
+}
+
+#feed-button[cui-areatype="menu-panel"][disabled="true"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #feed-button[disabled="true"] {
+  -moz-image-region: rect(64px, 416px, 96px, 384px);
+}
+
+#social-share-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #social-share-button {
+  -moz-image-region: rect(0px, 448px, 32px, 416px);
+}
+
+#social-share-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #social-share-button:hover {
+  -moz-image-region: rect(32px, 448px, 64px, 416px);
+}
+
+#email-link-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #email-link-button {
+  -moz-image-region: rect(0, 448px, 32px, 416px);
+}
+
+#email-link-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #email-link-button:hover {
+  -moz-image-region: rect(32px, 448px, 64px, 416px);
+}
+
+/* This is temporary until we have an email-link icon (Bug 932235) */
+#email-link-button[cui-areatype="menu-panel"] > image,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #email-link-button > image {
+  transform: scale(-1, -1);
+}
+
+#characterencoding-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #characterencoding-button {
+  -moz-image-region: rect(0px, 480px, 32px, 448px);
+}
+
+#characterencoding-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]),
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #characterencoding-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(32px, 480px, 64px, 448px);
+}
+
+#characterencoding-button[cui-areatype="menu-panel"][disabled="true"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #characterencoding-button[disabled="true"] {
+  -moz-image-region: rect(64px, 480px, 96px, 448px);
+}
+
+#new-window-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #new-window-button {
+  -moz-image-region: rect(0px, 512px, 32px, 480px);
+}
+
+#new-window-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #new-window-button:hover {
+  -moz-image-region: rect(32px, 512px, 64px, 480px);
+}
+
+#new-tab-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #new-tab-button {
+  -moz-image-region: rect(0px, 544px, 32px, 512px);
+}
+
+#new-tab-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #new-tab-button:hover {
+  -moz-image-region: rect(32px, 544px, 64px, 512px);
+}
+
+#privatebrowsing-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #privatebrowsing-button {
+  -moz-image-region: rect(0px, 576px, 32px, 544px);
+}
+
+#privatebrowsing-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #privatebrowsing-button:hover {
+  -moz-image-region: rect(32px, 576px, 64px, 544px);
+}
+
+#find-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #find-button {
+  -moz-image-region: rect(0px, 640px, 32px, 608px);
+}
+
+#find-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #find-button:hover {
+  -moz-image-region: rect(32px, 640px, 64px, 608px);
+}
+
+#print-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #print-button {
+  -moz-image-region: rect(0px, 672px, 32px, 640px);
+}
+
+#print-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #print-button:hover {
+  -moz-image-region: rect(32px, 672px, 64px, 640px);
+}
+
+#fullscreen-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #fullscreen-button {
+  -moz-image-region: rect(0px, 704px, 32px, 672px);
+}
+
+#fullscreen-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #fullscreen-button:hover {
+  -moz-image-region: rect(32px, 704px, 64px, 672px);
+}
+
+#developer-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #developer-button {
+  -moz-image-region: rect(0px, 736px, 32px, 704px);
+}
+
+#developer-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #developer-button:hover {
+  -moz-image-region: rect(32px, 736px, 64px, 704px);
+}
+
+#preferences-button[cui-areatype="menu-panel"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #preferences-button {
+  -moz-image-region: rect(0px, 768px, 32px, 736px);
+}
+
+#preferences-button[cui-areatype="menu-panel"]:hover,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #preferences-button:hover {
+  -moz-image-region: rect(32px, 768px, 64px, 736px);
+}
+
+/* Wide panel control icons */
+
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton,
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > toolbarbutton,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > toolbarbutton {
+  list-style-image: url("chrome://browser/skin/menuPanel-small.png");
+}
+
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #cut-button,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #cut-button:hover:not([disabled="true"]),
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #cut-button[disabled="true"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button[disabled="true"] {
+  -moz-image-region: rect(32px, 32px, 48px, 16px);
+}
+
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button:hover:not([disabled="true"]),
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(16px, 48px, 32px, 32px);
+}
+
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button[disabled="true"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button[disabled="true"] {
+  -moz-image-region: rect(32px, 48px, 48px, 32px);
+}
+
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #paste-button,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button {
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #paste-button:hover:not([disabled="true"]),
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(16px, 64px, 32px, 48px);
+}
+
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #paste-button[disabled="true"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button[disabled="true"] {
+  -moz-image-region: rect(32px, 64px, 48px, 48px);
+}
+
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-out-button,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button {
+  -moz-image-region: rect(0px, 80px, 16px, 64px);
+}
+
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-out-button:hover:not([disabled="true"]),
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(16px, 80px, 32px, 64px);
+}
+
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-out-button[disabled="true"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button[disabled="true"] {
+  -moz-image-region: rect(32px, 80px, 48px, 64px);
+}
+
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-in-button,
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
+  -moz-image-region: rect(0px, 96px, 16px, 80px);
+}
+
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-in-button:hover:not([disabled="true"]),
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(16px, 96px, 32px, 80px);
+}
+
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-in-button[disabled="true"],
+:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button[disabled="true"] {
+  -moz-image-region: rect(32px, 96px, 48px, 80px);
+}
+
+/* === END menupanel.inc.css === */
+
+.toolbarbutton-1 {
+  list-style-image: url("chrome://browser/skin/FxToolbar.png");
+}
+
+.toolbarbutton-1:not([type="menu-button"]) {
+  -moz-box-orient: vertical;
+}
+
+.toolbarbutton-1,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  min-width: 36px;
+  min-height: 36px;
+}
+
+.toolbarbutton-1:not([type="menu-button"]) {
+  -moz-box-orient: vertical;
+}
+
+.toolbarbutton-1,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button,
+.toolbarbutton-1[disabled="true"]:hover:active,
+.toolbarbutton-1[disabled="true"]:hover:active > .toolbarbutton-menubutton-button {
+  padding: 1px 2px;
+}
+
+.toolbarbutton-1:hover:active,
+.toolbarbutton-1[open="true"],
+.toolbarbutton-1:hover:active > .toolbarbutton-menubutton-button {
+  padding-top: 2px;
+  padding-bottom: 0px;
+  -moz-padding-start: 3px;
+  -moz-padding-end: 1px;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+#nav-bar {
+  /* force iconsize="small" on this toolbar */
+  counter-reset: smallicons;
+}
+
+toolbar[mode="text"] .toolbarbutton-1,
+toolbar[mode="icons"] .toolbarbutton-1,
+toolbar[iconsize="small"] .toolbarbutton-1,
+:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1,
+toolbar[mode="text"] .toolbarbutton-menubutton-button,
+toolbar[mode="icons"] .toolbarbutton-menubutton-button,
+toolbar[iconsize="small"] .toolbarbutton-menubutton-button,
+:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  min-width: 0px;
+  min-height: 0px;
+}
+
+toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker {
+  padding-top: 4px;
+  padding-bottom: 8px;
+  -moz-padding-start: 1px;
+  -moz-padding-end: 1px;
+}
+
+toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] .toolbarbutton-menubutton-dropmarker,
+:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+  padding-top: 0px;
+  padding-bottom: 13px;
+  -moz-padding-start: 1px;
+  -moz-padding-end: 1px;
+}
+
+toolbar[mode="text"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbar[mode="text"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+  padding-top: 5px;
+  padding-bottom: 7px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
+}
+
+toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
+:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+  padding-top: 1px;
+  padding-bottom: 12px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
+}
+
+toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  padding-top: 4px !important;
+  padding-bottom: 8px !important;
+  -moz-padding-start: 1px !important;
+  -moz-padding-end: 1px !important;
+}
+
+toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker[disabled="true"],
+toolbar[iconsize="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  padding-top: 0px !important;
+  padding-bottom: 13px !important;
+  -moz-padding-start: 1px !important;
+  -moz-padding-end: 1px !important;
+}
+
+toolbar[mode="icons"] .toolbarbutton-text,
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-text {
+  padding: 4px 0;
+}
+
+toolbar[mode="text"] .toolbarbutton-1,
+toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  -moz-box-orient: horizontal;
+}
+
+toolbar[mode="full"] .toolbarbutton-1,
+toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  min-width: 30px;
+}
+
+#navigator-toolbox[iconsize=small] > #nav-bar {
+}
+
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar {
+}
+
+
+/* unified back/forward button */
+
+/* Australis?
+#forward-button {
+  padding: 0 !important;
+}
+
+#forward-button > menupopup {
+  margin-top: 1px !important;
+}
+*/
+
+#back-button {
+  -moz-margin-end: 0;
+}
+
+/* A number of styles use :-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) - this makes it only apply pre-Australis as iconsize and palette-box or addon-bar don't exist afterwards */
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #back-button {
+  -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #back-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 18px, 36px, 0);
+}
+
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #back-button[disabled="true"] {
+  -moz-image-region: rect(36px, 18px, 54px, 0);
+}
+
+#forward-button {
+  -moz-margin-start: 0;
+}
+
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #forward-button {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #forward-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 36px, 36px, 18px);
+}
+
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #forward-button[disabled="true"] {
+  -moz-image-region: rect(36px, 36px, 54px, 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);
+}
+/*
+#nav-bar #back-button:-moz-locale-dir(ltr) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#nav-bar #back-button:-moz-locale-dir(rtl),
+#nav-bar #forward-button {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+*/
+/* Remove selector when Australis lands - this makes it only apply post-Australis as back/forward buttons are in the urlbar-container there */
+#urlbar-container > #back-button,
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button {
+  border-radius: 10000px;
+  width: 30px;
+  height: 30px;
+  position: relative;
+  z-index: 1;
+  margin-top: -2px;
+  margin-bottom: -2px;
+  border: none;
+  -moz-image-region: rect(54px, 20px, 74px, 0);
+}
+
+/* Remove selector when Australis lands - this makes it only apply post-Australis as back/forward buttons are in the urlbar-container there */
+#urlbar-container > #back-button[open="true"],
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button:not([disabled="true"]):hover,
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button[open="true"] {
+  -moz-image-region: rect(54px, 40px, 74px, 20px);
+}
+
+/* Remove selector when Australis lands - this makes it only apply post-Australis as back/forward buttons are in the urlbar-container there */
+#urlbar-container > #back-button[disabled="true"],
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button[disabled="true"] {
+  -moz-image-region: rect(54px, 60px, 74px, 40px);
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover {
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button:not([disabled="true"]):hover:active,
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button[open="true"] {
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar[currentset*="unified-back-forward-button"],
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar:not([currentset]) {
+/*  padding-top: 3px;
+  padding-bottom: 5px; */
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"][tabsontop="true"] > #nav-bar[currentset*="unified-back-forward-button"],
+#navigator-toolbox[iconsize="large"][mode="icons"][tabsontop="true"] > #nav-bar:not([currentset]) {
+/*  padding-top: 5px; */
+}
+
+/* Remove selector when Australis lands - this makes it only apply post-Australis as back/forward buttons are in the urlbar-container there */
+#urlbar-container > #forward-button,
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button {
+  /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
+  /*clip-path: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-clip-path"); */
+  -moz-margin-start: -6px !important;
+  padding-left: 7px;
+  padding-right: 3px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+/* Remove selector when Australis lands - this makes it only apply post-Australis as back/forward buttons are in the urlbar-container there */
+#urlbar-container > #forward-button:-moz-locale-dir(ltr),
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button:-moz-locale-dir(ltr) {
+  border-top-right-radius: 11px;
+  border-bottom-right-radius: 11px;
+}
+
+/* Remove selector when Australis lands - this makes it only apply post-Australis as back/forward buttons are in the urlbar-container there */
+#urlbar-container > #forward-button:-moz-locale-dir(rtl),
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button:-moz-locale-dir(rtl) {
+  border-top-left-radius: 11px;
+  border-bottom-left-radius: 11px;
+}
+
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr),
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-left.gif") !important;
+}
+
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr):hover,
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl):hover {
+  list-style-image: url("chrome://global/skin/arrow/arrow-left-hover.gif") !important;
+}
+
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr),
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-right.gif") !important;
+}
+
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr):hover,
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl):hover {
+  list-style-image: url("chrome://global/skin/arrow/arrow-right.gif") !important;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button {
+/*  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-margin-end: 0; */
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button:not([switchingtabs]) > #forward-button,
+window:not([chromehidden~="toolbar"]) #urlbar-container:not([switchingtabs]) > #forward-button {
+  transition: opacity 150ms ease-out;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button:not(:hover) > #forward-button[disabled],
+window:not([chromehidden~="toolbar"]) #urlbar-container:not(:hover) > #forward-button[disabled] {
   opacity: 0;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button:hover > #forward-button[disabled] {
+    #unified-back-forward-button:hover > #forward-button[disabled],
+window:not([chromehidden~="toolbar"]) #urlbar-container:hover > #forward-button[disabled] {
   background-color: transparent;
 }
 
-#stop-button {
+/* A number of buttons use :-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) - this makes it only apply pre-Australis as iconsize and the palette-box don't exist afterwards */
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #stop-button {
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
 
-#stop-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #stop-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 54px, 36px, 36px);
 }
 
-#stop-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #stop-button[disabled="true"] {
   -moz-image-region: rect(36px, 54px, 54px, 36px);
 }
 
-#reload-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #reload-button {
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
-#reload-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #reload-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 72px, 36px, 54px);
 }
 
-#reload-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #reload-button[disabled="true"] {
   -moz-image-region: rect(36px, 72px, 54px, 54px);
 }
 
-#home-button.bookmark-item {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #home-button.bookmark-item {
   list-style-image: url("chrome://browser/skin/FxToolbar.png");
 }
-#home-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #home-button {
   -moz-image-region: rect(0, 90px, 18px, 72px);
 }
 
-#home-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #home-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 90px, 36px, 72px);
 }
 
-#home-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #home-button[disabled="true"] {
   -moz-image-region: rect(36px, 90px, 54px, 72px);
 }
 
-#downloads-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #downloads-button {
   -moz-image-region: rect(0, 108px, 18px, 90px);
 }
 
-#downloads-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #downloads-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 108px, 36px, 90px);
 }
 
-#downloads-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #downloads-button[disabled="true"] {
   -moz-image-region: rect(36px, 108px, 54px, 90px);
 }
 
@@ -863,20 +1630,20 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   margin: 0;
 }
 
-#history-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #history-button {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
-#history-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #history-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 126px, 36px, 108px);
 }
 
-#history-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #history-button[disabled="true"] {
   -moz-image-region: rect(36px, 126px, 54px, 108px);
 }
 
-#bookmarks-button,
-#bookmarks-menu-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-button,
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-menu-button {
   list-style-image: url("chrome://browser/skin/FxToolbar.png") !important; /* for making the palette work */
   -moz-image-region: rect(0, 144px, 18px, 126px);
 }
@@ -885,54 +1652,54 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   /* list-style-image: url("chrome://browser/skin/FxToolbar.png"); */
 }
 
-#bookmarks-menu-button.toolbarbutton-1 {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-menu-button.toolbarbutton-1 {
   -moz-box-orient: horizontal;
 }
 
-#bookmarks-button:not([disabled="true"]):hover,
-#bookmarks-menu-button[open="true"],
-#bookmarks-menu-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-button:not([disabled="true"]):hover,
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-menu-button[open="true"],
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-menu-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 144px, 36px, 126px);
 }
 
-#bookmarks-button[disabled="true"],
-#bookmarks-menu-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-button[disabled="true"],
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #bookmarks-menu-button[disabled="true"] {
   -moz-image-region: rect(36px, 144px, 54px, 126px);
 }
 
-#print-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #print-button {
   -moz-image-region: rect(0, 162px, 18px, 144px);
 }
 
-#print-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #print-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 162px, 36px, 144px);
 }
 
-#print-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #print-button[disabled="true"] {
   -moz-image-region: rect(36px, 162px, 54px, 144px);
 }
 
-#new-tab-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #new-tab-button {
   -moz-image-region: rect(0, 180px, 18px, 162px);
 }
 
-#new-tab-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #new-tab-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 180px, 36px, 162px);
 }
 
-#new-tab-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #new-tab-button[disabled="true"] {
   -moz-image-region: rect(36px, 180px, 54px, 162px);
 }
 
-#new-window-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #new-window-button {
   -moz-image-region: rect(0, 198px, 18px, 180px);
 }
 
-#new-window-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #new-window-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 198px, 36px, 180px);
 }
 
-#new-window-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #new-window-button[disabled="true"] {
   -moz-image-region: rect(36px, 198px, 54px, 180px);
 }
 
@@ -972,15 +1739,15 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 252px, 54px, 234px);
 }
 
-#fullscreen-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #fullscreen-button {
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }
 
-#fullscreen-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #fullscreen-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 270px, 36px, 252px);
 }
 
-#fullscreen-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #fullscreen-button[disabled="true"] {
   -moz-image-region: rect(36px, 270px, 54px, 252px);
 }
 
@@ -1009,38 +1776,38 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 306px, 54px, 288px);
 }
 
-#sync-button:not([status]) {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #sync-button:not([status]) {
   list-style-image: url("chrome://browser/skin/FxToolbar.png") !important; /* for making the palette work */
   -moz-image-region: rect(0, 324px, 18px, 306px);
 }
 
-#sync-button[status="active"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #sync-button[status="active"] {
   list-style-image: url("chrome://browser/skin/sync-throbber.png");
   -moz-image-region: rect(0, 18px, 18px, 0);
 }
 
-#sync-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #sync-button[disabled="true"] {
   -moz-image-region: rect(36px, 324px, 54px, 306px);
 }
 
-#feed-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #feed-button {
   -moz-image-region: rect(0, 342px, 18px, 324px);
 }
 
-#feed-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #feed-button[disabled="true"] {
   -moz-image-region: rect(36px, 342px, 54px, 324px);
 }
 
-#webrtc-status-button {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #webrtc-status-button {
   -moz-image-region: rect(0, 360px, 18px, 342px);
 }
 
-#webrtc-status-button:not([disabled="true"]):hover,
-#webrtc-status-button[open="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #webrtc-status-button:not([disabled="true"]):hover,
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #webrtc-status-button[open="true"] {
   -moz-image-region: rect(18px, 360px, 36px, 342px);
 }
 
-#webrtc-status-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) #webrtc-status-button[disabled="true"] {
   -moz-image-region: rect(36px, 360px, 54px, 342px);
 }
 
@@ -1048,7 +1815,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 #tabview-button,
 #menu_tabview {
-  list-style-image: url("chrome://browser/skin/tabview/tabview.png");
+  list-style-image: url("chrome://browser/skin/tabview/tabview.png") !important;
 }
 
 #tabview-button {
@@ -1151,7 +1918,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button + #urlbar-container {
+    #unified-back-forward-button + #urlbar-container,
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper {
   padding-left: 22px;
   -moz-margin-start: -22px;
   position: relative;
@@ -1160,7 +1928,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button + #urlbar-container > #urlbar {
+    #unified-back-forward-button + #urlbar-container > #urlbar,
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar {
 /*  -moz-border-start: none;
   margin-left: 0; */
   pointer-events: all;
@@ -1168,40 +1937,46 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button:not([switchingtabs]) + #urlbar-container > #urlbar {
+    #unified-back-forward-button:not([switchingtabs]) + #urlbar-container > #urlbar,
+window:not([chromehidden~="toolbar"]) #urlbar-container:not([switchingtabs]) > #urlbar-wrapper > #urlbar {
   transition: margin-left 150ms ease-out;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(ltr) {
+    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(ltr),
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar:-moz-locale-dir(ltr) {
 /*  border-top-left-radius: 0;
   border-bottom-left-radius: 0; */
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
+    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl),
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
 /*  border-top-right-radius: 0;
   border-bottom-right-radius: 0; */
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar {
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar,
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar {
   margin-left: -22px;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar {
+    #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar,
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:hover:not([switchingtabs]) > #urlbar-wrapper > #urlbar {
   /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
   transition-delay: 100s;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar {
+    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar,
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar {
   /* when not hovered anymore, trigger a new transition to hide the forward button immediately */
   margin-left: -22.01px;
 }
@@ -1211,7 +1986,9 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
     #unified-back-forward-button + #urlbar-container:-moz-locale-dir(rtl),
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
+    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl),
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper:-moz-locale-dir(rtl),
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
   /* let winstripe-urlbar-back-button-clip-path clip the urlbar's right side for RTL */
   transform: scaleX(-1);
 }
@@ -1285,6 +2062,10 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   color: #8050B0;
 }
 
+#search-container {
+  min-width: calc(54px + 11ch);
+}
+
 /* identity box */
 
 #identity-box {
@@ -1299,7 +2080,8 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button + #urlbar-container > #urlbar > #identity-box {
+    #unified-back-forward-button + #urlbar-container > #urlbar > #identity-box,
+window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar > #identity-box {
 /*   border-radius: 0; */
   -moz-padding-start: 2px;
   -moz-padding-end: 2px;
@@ -1308,50 +2090,66 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar >
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr),
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar >
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
   padding-left: 2px;
   transition: padding-left;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > 
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl),
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar > 
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
   padding-right: 2px;
   transition: padding-right;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box {
+    #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar > 
+    #notification-popup-box[hidden] + #identity-box,
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:hover:not([switchingtabs]) > #urlbar-wrapper > #urlbar > 
+    #notification-popup-box[hidden] + #identity-box {
   /* forward button hiding is delayed when hovered */
   transition-delay: 100s;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar >
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr),
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:hover) > #urlbar-wrapper > #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: 2.01px;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > 
+    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl),
+window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:hover) > #urlbar-wrapper > #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: 2.01px;
 }
 
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI,
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
-  color: #008484;
-  -moz-border-end: 1px solid #008484;
   -moz-margin-end: 3px;
 }
 
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:-moz-locale-dir(ltr),
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:-moz-locale-dir(ltr) {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
 
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:-moz-locale-dir(rtl),
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
@@ -1382,7 +2180,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   background-color: transparent;
 }
 
-#urlbar-container[combined="true"] > #urlbar > .urlbar-history-dropmarker {
+#urlbar-container[combined="true"] > #urlbar > .urlbar-history-dropmarker,
+#urlbar-wrapper > #urlbar > .urlbar-history-dropmarker {
   border: none;
   border-radius: 0px;
 }
@@ -1396,11 +2195,37 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 /* page proxy icon */
 
+/* === BEGIN identity-block.inc.css === */
+
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI {
+  /* Default theme does different color per channel, we can't as they do it build-time. */
+  color: #9C9CFF;
+  -moz-border-end: 1px solid #9C9CFF;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
+  color: #008484;
+  -moz-border-end: 1px solid #008484;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI,
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
+  background-position: right;
+  background-size: 1px;
+  background-repeat: no-repeat;
+}
+
+/* page proxy icon */
+
 #page-proxy-favicon {
   width: 16px;
   height: 16px;
   list-style-image: url("chrome://browser/skin/identity-icons-generic.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
+  margin: 2px;
+}
+
+.chromeUI > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://branding/content/identity-icons-brand.png");
 }
 
 .verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] {
@@ -1415,6 +2240,39 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-active.png");
 }
 
+.mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-display.png");
+}
+
+.mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-display.png");
+}
+
+#page-proxy-favicon[pageproxystate="invalid"] {
+  opacity: 0.3;
+}
+
+#identity-popup.chromeUI > #identity-popup-container > #identity-popup-icon {
+  list-style-image: url("chrome://branding/content/icon64.png");
+}
+
+#identity-popup-brandName {
+  font-weight: bold;
+  font-size: 1.25em;
+  margin-top: .5em;
+  margin-bottom: .5em;
+}
+
+#identity-popup-content-box {
+  max-width: 50ch;
+}
+
+/* === END identity-block.inc.css === */
+
+#page-proxy-favicon {
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
 #identity-box:hover > #page-proxy-favicon {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
@@ -1426,11 +2284,20 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 #identity-box:hover {
   background-color: #FFCF00;
+  color: #000000;
 }
 
 #identity-box:hover:active,
 #identity-box[open=true] {
   background-color: #FF9F00;
+  color: #000000;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:hover,
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:hover:active,
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI[open=true] {
+  background-color: #9C9CFF;
+  color: #000000;
 }
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:hover,
@@ -1440,10 +2307,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   color: #000000;
 }
 
-#page-proxy-favicon[pageproxystate="invalid"] {
-  opacity: 0.3;
-}
-
 /* autocomplete */
 
 #treecolAutoCompleteImage {
@@ -1600,6 +2463,116 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
+/* 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 #9C9CFF;
+/*  background-color: #000000; */
+}
+
+#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;
+}
+
+#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]) {
+}
+
+#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;
+}
+
+toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
+  width: auto;
+  height: auto;
+  max-width: 32px;
+  max-height: 24px;
+}
+
+/* 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 {
@@ -1608,28 +2581,29 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 /* star button */
 
-#star-button {
+/* #urlbar-container only directly contains the urlbar pre-Australis, don't assign an icon in Australis */
+#urlbar-container > #urlbar > #urlbar-icons > #star-button {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark.png");
   -moz-image-region: rect(16px 16px 32px 0px);
 }
 
-#star-button:hover {
+#urlbar-container > #urlbar > #urlbar-icons > #star-button:hover {
   -moz-image-region: rect(16px 32px 32px 16px);
 }
 
-#star-button:hover:active {
+#urlbar-container > #urlbar > #urlbar-icons > #star-button:hover:active {
   -moz-image-region: rect(16px 48px 32px 32px);
 }
 
-#star-button[starred="true"] {
+#urlbar-container > #urlbar > #urlbar-icons > #star-button[starred="true"] {
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-#star-button[starred="true"]:hover {
+#urlbar-container > #urlbar > #urlbar-icons > #star-button[starred="true"]:hover {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-#star-button[starred="true"]:hover:active {
+#urlbar-container > #urlbar > #urlbar-icons > #star-button[starred="true"]:hover:active {
   -moz-image-region: rect(0px 48px 16px 32px);
 }
 
@@ -1701,6 +2675,13 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-padding-start: 0px;
 }
 
+.browserContainer > findbar {
+/*
+  background-color: -moz-dialog;
+  color: -moz-DialogText;
+*/
+}
+
 /* ::::: throbber ::::: */
 
 #navigator-throbber {
@@ -1720,6 +2701,8 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 /* Tabstrip */
 
+/* Remove selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */
+#navigator-toolbox:not([iconsize]) > #TabsToolbar,
 #TabsToolbar {
   min-height: 0;
   padding: 0;
@@ -1735,12 +2718,15 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   border-bottom: 1px solid #008484;
 }
 
+/* === BEGIN tabs.inc.css === */
+
 .tabbrowser-tab,
-.tabs-newtab-button {
+.tabs-newtab-button,
+#TabsToolbar > #new-tab-button {
   margin-top: 0px;
 }
 
-.tabbrowser-tab{
+.tabbrowser-tab {
   padding: 1px 4px 2px;
 }
 
@@ -1748,54 +2734,49 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-margin-start: 2px;
 }
 
-.tabs-newtab-button {
+.tabs-newtab-button,
+#TabsToolbar > #new-tab-button {
   border-radius: 8px 8px 0px 0px;
   -moz-margin-start: 0;
 }
 
-.tabs-newtab-button:not(:hover) {
+.tabs-newtab-button:not(:hover),
+#TabsToolbar > #new-tab-button:not(:hover) {
   background-color: #C09070;
 }
 
-.tabbrowser-tab:hover,
-.tabs-newtab-button:hover {
+.tabbrowser-tab[remote] {
+  text-decoration: underline;
 }
 
+/* Selected tab */
+
 .tabbrowser-tab[selected="true"] {
 }
 
-#main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
-}
+/* End selected tab */
 
-.tabbrowser-tab:-moz-lwtheme {
-}
+/* Pinned tabs */
 
-.tabbrowser-tab[selected="true"]:-moz-lwtheme {
+.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
+  background-color: #E7ADE7;
 }
-
-.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]),
-.tabs-newtab-button:-moz-lwtheme-brighttext {
+.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
+  background-color: #3333FF;
+  color: #000000;
 }
 
-.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]):hover,
-.tabs-newtab-button:-moz-lwtheme-brighttext:hover {
-}
+/* New tab button */
 
-.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]),
-.tabs-newtab-button:-moz-lwtheme-darktext {
+.tabs-newtab-button {
+  width: 28px;
 }
 
-.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]):hover,
-.tabs-newtab-button:-moz-lwtheme-darktext:hover {
+#TabsToolbar > #new-tab-button {
+  width: 26px;
 }
 
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
-  background-color: #E7ADE7;
-}
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
-  background-color: #3333FF;
-  color: #000000;
-}
+/* === END tabs.inc.css === */
 
 .tab-throbber,
 .tab-icon-image {
@@ -1874,16 +2855,11 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-image-region: rect(0, 16px, 18px, 0);
 }
 
-.tabs-newtab-button {
-  width: 28px;
-}
-
-#TabsToolbar > #new-tab-button {
-  width: 26px;
-}
-
+/* Remove |#navigator-toolbox:not([iconsize])| selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */
 .tabs-newtab-button,
 .tabs-newtab-button:hover,
+#navigator-toolbox:not([iconsize]) #TabsToolbar > #new-tab-button,
+#navigator-toolbox:not([iconsize]) #TabsToolbar > #new-tab-button:hover,
 #TabsToolbar > #new-tab-button:hover {
   -moz-image-region: rect(0, 32px, 18px, 16px);
 }
@@ -2066,12 +3042,45 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://browser/skin/Secure24.png");
 }
 
+#identity-popup-help-icon {
+  border: none;
+  margin: 7px 0 0 -3px;
+  background: none;
+  min-width: 0;
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
+  cursor: pointer;
+}
+
+#identity-popup-help-icon > .button-box > .button-text {
+  display: none;
+}
+
+#identity-popup-help-icon > .button-box > .button-icon {
+  height: 16px;
+  width: 16px;
+}
+
 #identity-popup-more-info-button {
   margin-top: 6px;
   margin-bottom: 0;
   -moz-margin-end: 0;
 }
 
+#identity-popup > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+}
+
+#identity-popup-container {
+  min-width: 280px;
+  padding: 10px;
+}
+
+#identity-popup-button-container {
+/*  background: linear-gradient(to bottom, rgba(0,0,0,0.04) 60%, transparent);*/
+  padding: 10px;
+  margin-top: 5px;
+}
+
 .popup-notification-icon {
   width: 64px;
   height: 64px;
@@ -2138,7 +3147,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 
 .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-requested"],
+.popup-notification-icon[popupid="offline-app-usage"] {
   list-style-image: url("chrome://global/skin/icons/alert-question.gif");
 }
 
@@ -2147,8 +3157,9 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png");
 }
 
+.popup-notification-icon[popupid="webapps-install-progress"],
 .popup-notification-icon[popupid="webapps-install"] {
-  list-style-image: url("chrome://browser/skin/webapps-64.png");
+  list-style-image: url("chrome://global/skin/icons/webapps-64.png");
 }
 
 .popup-notification-icon[popupid="mixed-content-blocked"] {
@@ -2199,14 +3210,17 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 /*  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");
 }
@@ -2215,6 +3229,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=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");
 }
@@ -2224,15 +3239,27 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 }
 
 #webapps-notification-icon {
-  list-style-image: url("chrome://browser/skin/webapps-16.png");
+  list-style-image: url("chrome://gobal/skin/icons/webapps-16.png");
+}
+
+#plugins-notification-icon {
+  list-style-image: url("chrome://browser/skin/notification-pluginNormal.png");
+}
+
+#plugins-notification-icon.plugin-hidden {
+  list-style-image: url("chrome://browser/skin/notification-pluginAlert.png");
+}
+
+#plugins-notification-icon.plugin-blocked {
+  list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png");
 }
 
 #plugins-notification-icon {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+/*  -moz-image-region: rect(0, 16px, 16px, 0);*/
 }
 
-#blocked-plugins-notification-icon {
-  list-style-image: url("chrome://mozapps/skin/plugins/notifyPluginBlocked.png");
+#plugins-notification-icon:hover {
+/*  -moz-image-region: rect(0, 32px, 16px, 16px);*/
 }
 
 #plugin-install-notification-icon {
@@ -2246,7 +3273,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   visibility: collapse;
 }
 
-#blocked-plugins-notification-icon[showing] {
+#plugins-notification-icon.plugin-blocked[showing] {
   animation: pluginBlockedNotification 500ms ease 0s 5 alternate both;
 }
 
@@ -2259,18 +3286,22 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   }
 }
 
+.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");
 }
@@ -2282,10 +3313,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   margin: 0px;
 }
 
-#identity-popup-container {
-  min-width: 280px;
-}
-
 #download-monitor {
   list-style-image: url("chrome://browser/skin/FxToolbar.png");
   -moz-image-region: rect(0, 108px, 18px, 90px);
@@ -2459,11 +3486,13 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   background-color: transparent !important;
 }
 
+/* === BEGIN highlighter.inc.css === */
+
 /* Highlighter */
 
 .highlighter-outline {
   box-shadow: 0 0 0 1px black;
-  outline: 1px dashed white;
+  outline: 1px dashed #A09090;
 }
 
 .highlighter-outline[locked]  {
@@ -2471,36 +3500,18 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   outline-color: rgba(255,255,255,0.7);
 }
 
-/* Developer toolbar */
-
-#developer-toolbar {
-  border-top: 3px solid #000000;
-  border-bottom: none;
-}
-
-#developer-toolbar .toolbar-holder {
-  background-color: #8050B0;
-  color: #FFCF00;
-}
-
-#developer-toolbar .toolbar-holder {
-  background-color: #8050B0;
-  color: #FFCF00;
-}
-
-#developer-toolbar .toolbar-startcap,
-#developer-toolbar .toolbar-endcap{
-  background-color: #6000CF;
-}
-
 /* Highlighter - Node Infobar */
 
 .highlighter-nodeinfobar {
   color: #FF9F00;
-  border: 1px solid rgba(156, 156, 255, .5);
   border-radius: 3px;
   background-color: #000000;
   background-clip: padding-box;
+  border: 1px solid #008484;
+  padding: 5px;
+  /* Avoid cases where the infobar is smaller than the arrow, when the text is
+  short */
+  min-width: 75px;
 }
 
 /* Highlighter - Node Infobar - text */
@@ -2538,9 +3549,6 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   -moz-margin-end: 2px;
 }
 
-.highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
-}
-
 .highlighter-nodeinfobar-inspectbutton:hover,
 .highlighter-nodeinfobar-inspectbutton:hover:active/*,
 .highlighter-nodeinfobar-container:not([locked]) >  .highlighter-nodeinfobar >  .highlighter-nodeinfobar-inspectbutton*/ {
@@ -2550,9 +3558,6 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
 .highlighter-nodeinfobar-menu {
 }
 
-.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
-}
-
 .highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
   -moz-box-align: center;
   -moz-margin-start: -1px;
@@ -2565,7 +3570,6 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   height: 14px;
   -moz-margin-start: calc(50% - 7px);
   transform: rotate(-45deg);
-  border: 1px solid transparent;
   background-clip: padding-box;
   background-repeat: no-repeat;
 }
@@ -2573,28 +3577,21 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
 .highlighter-nodeinfobar-arrow-top {
   margin-bottom: -8px;
   margin-top: 8px;
-  border-right-color: rgba(0, 132, 132, .5);
-  border-top-color: rgba(0, 132, 132, .5);
-  background-image: linear-gradient(bottom left, transparent 50%, rgb(0, 132, 132) 50%);
+  background-image: linear-gradient(to bottom left, transparent 50%, rgb(0, 132, 132) 50%);
 }
 
 .highlighter-nodeinfobar-arrow-bottom {
   margin-top: -8px;
   margin-bottom: 8px;
-  border-left-color: rgba(0, 132, 132, .5);
-  border-bottom-color: rgba(0, 132, 132, .5);
-  background-image: linear-gradient(top right, transparent 50%, rgb(0, 132, 132) 50%);
-}
-
-.highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar,
-.highlighter-nodeinfobar-container[position="overlap"] > .highlighter-nodeinfobar {
-  box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
+  background-image: linear-gradient(to top right, transparent 50%, rgb(0, 132, 132) 50%);
 }
 
 .highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
   margin: 7px 0;
 }
 
+/* === END highlighter.inc.css === */
+
 #full-screen-warning-message {
   background-color: #000000;
   color: #FF9F00;
@@ -2621,6 +3618,85 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   font-size: 120%;
 }
 
+/* === BEGIN commandline.inc.css === */
+
+/* Developer toolbar */
+
+#developer-toolbar {
+  border-top: 3px solid #000000;
+  border-bottom: none;
+}
+
+#developer-toolbar .toolbar-holder {
+  background-color: #8050B0;
+  color: #FFCF00;
+}
+
+#developer-toolbar .toolbar-holder {
+  background-color: #8050B0;
+  color: #FFCF00;
+}
+
+#developer-toolbar .toolbar-startcap,
+#developer-toolbar .toolbar-endcap{
+  background-color: #6000CF;
+}
+
+#developer-toolbar {
+/*  padding: 0;
+  min-height: 32px; */
+}
+
+#developer-toolbar > toolbarbutton {
+/*  margin: 0;
+  padding: 0 10px;
+  width: 32px; */
+}
+
+.developer-toolbar-button > image {
+/*  margin: auto 10px; */
+}
+
+#developer-toolbar-toolbox-button > label {
+  display: none;
+}
+
+#developer-toolbar-toolbox-button {
+  list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+#developer-toolbar-toolbox-button > label {
+  display: none;
+}
+
+#developer-toolbar-toolbox-button:hover,
+#developer-toolbar-toolbox-button:hover:active,
+#developer-toolbar-toolbox-button[checked=true] {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+#developer-toolbar-closebutton {
+  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+  min-width: 16px;
+  width: 16px;
+}
+
+#developer-toolbar-closebutton > .toolbarbutton-icon {
+}
+
+#developer-toolbar-closebutton > .toolbarbutton-text {
+  display: none;
+}
+
+#developer-toolbar-closebutton:hover,
+#developer-toolbar-closebutton:hover:active {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+/* GCLI */
+
 html|*#gcli-tooltip-frame,
 html|*#gcli-output-frame {
   padding: 0;
@@ -2632,24 +3708,30 @@ html|*#gcli-output-frame {
 #gcli-tooltip {
   border-width: 0;
   background-color: transparent;
-  margin-bottom: -2px;
 }
 
 .gclitoolbar-input-node,
-.gclitoolbar-complete-node,
-.gclitoolbar-prompt {
+.gclitoolbar-complete-node {
   margin: 1px 3px;
   -moz-box-align: center;
   padding-top: 0;
   padding-bottom: 0;
-  padding-right: 4px;
+  padding-right: 8px;
   background-color: transparent;
-  border-radius: 3px;
-  text-shadow: none;
 }
 
 .gclitoolbar-input-node {
   padding-left: 20px;
+/*  line-height: 32px;
+  outline-style: none; */
+  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 16, 16, 0);
+  background-repeat: no-repeat;
+  background-color: rgba(0, 0, 0, .75);
+}
+
+.gclitoolbar-input-node[focused="true"] {
+  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
+  background-color: #000000;
 }
 
 .gclitoolbar-input-node:not([focused="true"]) {
@@ -2666,18 +3748,10 @@ html|*#gcli-output-frame {
   padding-left: 21px;
   background-color: transparent;
   color: transparent;
+  z-index: 100;
+  pointer-events: none;
 }
 
-.gclitoolbar-prompt {
-  padding-left: 4px;
-  padding-bottom: 2px;
-  font-size: 150%;
-  font-weight: bold;
-  color: #E7ADE7;
-  background-color: #000000;
-}
-
-.gclitoolbar-prompt-label,
 .gcli-in-incomplete,
 .gcli-in-error,
 .gcli-in-ontab,
@@ -2709,6 +3783,10 @@ html|*#gcli-output-frame {
   color: #8050B0;
 }
 
+/* === END commandline.inc.css === */
+
+/* === BEGIN responsivedesign.inc.css === */
+
 /* Responsive Mode */
 
 .browserContainer[responsivemode] {
@@ -2722,82 +3800,171 @@ html|*#gcli-output-frame {
 
 .devtools-responsiveui-toolbar {
   background: transparent;
+  /* text color is textColor from dark theme, since no theme is applied to
+   * the responsive toolbar.
+   */
+  color: #FF9F00;
   margin: 10px 0;
   padding: 0;
   box-shadow: none;
   border-bottom-width: 0;
 }
 
-.devtools-responsiveui-toolbar > menulist,
-.devtools-responsiveui-toolbar > toolbarbutton {
-  min-width: 22px;
-  border-radius: 0;
+.devtools-responsiveui-menulist,
+.devtools-responsiveui-toolbarbutton {
+  -moz-box-align: center;
+  min-width: 32px;
+/*  min-height: 22px;*/
+/*  margin: 0 3px; */
 }
 
-.devtools-responsiveui-toolbar:-moz-locale-dir(ltr) > *:first-child,
-.devtools-responsiveui-toolbar:-moz-locale-dir(rtl) > *:last-child {
-  margin-left: 0;
+.devtools-responsiveui-toolbarbutton > .toolbarbutton-menubutton-button {
+  -moz-box-orient: horizontal;
 }
 
-.devtools-responsiveui-resizebar {
-  width: 7px;
-  height: 24px;
-  cursor: ew-resize;
-  transform: translate(12px, -12px);
-  background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png");
+.devtools-responsiveui-menulist:-moz-focusring,
+.devtools-responsiveui-toolbarbutton:-moz-focusring {
+/*  outline: 1px dotted hsla(210,30%,85%,0.7);
+  outline-offset: -4px;*/
 }
 
-.devtools-responsiveui-resizehandle {
-  width: 16px;
-  height: 16px;
-  cursor: se-resize;
-  transform: translate(12px, 12px);
-  background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png");
+.devtools-responsiveui-toolbarbutton:not([label]) > .toolbarbutton-text {
+  display: none;
+}
+
+.devtools-responsiveui-toolbarbutton:not([checked=true]):hover:active {
+/*  border-color: hsla(210,8%,5%,.6);
+  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); */
 }
 
-/* Web Console */
+.devtools-responsiveui-menulist[open=true],
+.devtools-responsiveui-toolbarbutton[open=true],
+.devtools-responsiveui-toolbarbutton[checked=true] {
+/*  border-color: hsla(210,8%,5%,.6) !important;
+  background: linear-gradient(hsla(220,6%,10%,.6), hsla(210,11%,18%,.45) 75%, hsla(210,11%,30%,.4));
+  box-shadow: 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15); */
+}
 
-.web-console-frame {
-  /* border-bottom: 3px solid #000000; */
+.devtools-responsiveui-toolbarbutton[checked=true] {
+/*  color: hsl(208,100%,60%); */
 }
 
-.web-console-frame[animated] {
-  transition: height 100ms;
+.devtools-responsiveui-toolbarbutton[checked=true]:hover {
+/*  background-color: transparent !important;*/
 }
 
-/* Developer Toolbar */
+.devtools-responsiveui-toolbarbutton[checked=true]:hover:active {
+/*  background-color: hsla(210,8%,5%,.2) !important;*/
+}
 
-#developer-toolbar-toolbox-button {
-  min-width: 18px;
+.devtools-responsiveui-menulist > .menulist-label-box {
+  text-align: center;
 }
 
-#developer-toolbar-toolbox-button > .toolbarbutton-text {
-  display: none;
+.devtools-responsiveui-menulist > .menulist-dropmarker {
+/*  display: -moz-box;
+  background-color: transparent;
+  list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
+  -moz-box-align: center;
+  border-width: 0;
+  min-width: 16px;*/
 }
 
-#developer-toolbar-toolbox-button > .toolbarbutton-icon {
-  -moz-margin-end: 0;
+.devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
+/*  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);*/
 }
 
-.developer-toolbar-button {
-  min-width: 78px;
-  min-height: 21px;
-  margin: 0 1px;
-  list-style-image: url("chrome://browser/skin/devtools/tools-icons-small.png");
+.devtools-responsiveui-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);*/
 }
 
-.developer-toolbar-button[open=true],
-.developer-toolbar-button:active:hover,
-.developer-toolbar-button[checked=true] {
+.devtools-responsiveui-toolbarbutton[type=menu-button] {
+/*  padding: 0 1px;*/
+  -moz-box-align: stretch;
 }
 
-.developer-toolbar-button[checked=true] {
+.devtools-responsiveui-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
+.devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
+/*  list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
+  -moz-box-align: center;
+  padding: 0 3px;*/
 }
 
-#developer-toolbar-toolbox-button {
-  -moz-image-region: rect(64px, 16px, 80px, 0);
+.devtools-responsiveui-toolbar:-moz-locale-dir(ltr) > *:first-child,
+.devtools-responsiveui-toolbar:-moz-locale-dir(rtl) > *:last-child {
+  margin-left: 3px;
+}
+
+.devtools-responsiveui-close {
+  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  -moz-image-region: rect(0px,16px,16px,0px);
 }
 
+.devtools-responsiveui-close:hover {
+  -moz-image-region: rect(0px,32px,16px,16px);
+}
+
+.devtools-responsiveui-rotate {
+  list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png");
+  -moz-image-region: rect(0px,16px,16px,0px);
+}
+
+.devtools-responsiveui-rotate:hover {
+  -moz-image-region: rect(0px,32px,16px,16px);
+}
+
+.devtools-responsiveui-touch {
+  list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png");
+  -moz-image-region: rect(0px,16px,16px,0px);
+}
+
+.devtools-responsiveui-touch:hover,
+.devtools-responsiveui-touch[checked],
+.devtools-responsiveui-touch[checked]:hover {
+  -moz-image-region: rect(0px,32px,16px,16px);
+}
+
+.devtools-responsiveui-screenshot {
+  list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png");
+  -moz-image-region: rect(0px,16px,16px,0px);
+}
+
+.devtools-responsiveui-screenshot:hover {
+  -moz-image-region: rect(0px,32px,16px,16px);
+}
+
+.devtools-responsiveui-resizebarV {
+  width: 7px;
+  height: 24px;
+  cursor: ew-resize;
+  transform: translate(12px, -12px);
+  background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png");
+}
+
+.devtools-responsiveui-resizebarH {
+  width: 24px;
+  height: 7px;
+  cursor: ns-resize;
+  transform: translate(-12px, 12px);
+  background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer.png");
+}
+
+.devtools-responsiveui-resizehandle {
+  width: 16px;
+  height: 16px;
+  cursor: se-resize;
+  transform: translate(12px, 12px);
+  background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png");
+}
+
+/* === END responsivedesign.inc.css === */
+
+/* === including indicator.css is done at the start of the file === */
+
 /* Error counter */
 
 #developer-toolbar-toolbox-button[error-count]:before {
@@ -2963,6 +4130,8 @@ html|*#gcli-output-frame {
   border-radius: inherit;
 }
 
+/* === BEGIN chat.inc.css === */
+
 .chat-status-icon {
   max-height: 16px;
   max-width: 16px;
@@ -2975,20 +4144,60 @@ html|*#gcli-output-frame {
   padding: 0;
   margin: 0;
   background: none;
+  width: 16px;
 }
 
 .chat-toolbarbutton > .toolbarbutton-text {
   display: none;
 }
 
+.chat-toolbarbutton > .toolbarbutton-icon {
+  width: inherit;
+}
+
+.chat-toolbarbutton.notification-anchor-icon > .toolbarbutton-icon {
+  width: inherit;
+  margin-top: -2px;
+}
+
 .chat-close-button {
-  list-style-image: url('chrome://browser/skin/social/chat-close.png');
-  -moz-image-region: rect(0, 14px, 14px, 0);
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .chat-close-button:hover,
 .chat-close-button:hover:active {
-  -moz-image-region: rect(14px, 14px, 28px, 0);
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.chat-minimize-button {
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(16px, 16px, 32px, 0);
+}
+
+.chat-minimize-button:hover:active,
+.chat-minimize-button:hover {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+.chat-swap-button {
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(48px, 16px, 64px, 0);
+}
+
+.chat-swap-button:hover:active,
+.chat-swap-button:hover {
+  -moz-image-region: rect(48px, 32px, 64px, 16px);
+}
+
+chatbar > chatbox > .chat-titlebar > .chat-swap-button {
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(32px, 16px, 48px, 0);
+}
+
+chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active,
+chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover {
+  -moz-image-region: rect(32px, 32px, 48px, 16px);
 }
 
 .chat-title {
@@ -3012,6 +4221,11 @@ html|*#gcli-output-frame {
   cursor: pointer;
 }
 
+.chat-titlebar > .notification-anchor-icon {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+
 .chat-titlebar[minimized="true"] {
   border-bottom: none;
 }
@@ -3048,6 +4262,10 @@ html|*#gcli-output-frame {
   }
 }
 
+.chatbar-button > .toolbarbutton-icon {
+  width: 16px;
+}
+
 .chatbar-button > menupopup > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
   width: auto;
   height: auto;
@@ -3107,131 +4325,478 @@ chatbox[minimized="true"] {
   height: 20px;
 }
 
-.click-to-play-plugins-notification-content {
-  margin: -10px;
-  border-radius: 4px;
+window > chatbox {
+  -moz-margin-start: 0px;
+  margin: 0px;
+  border: none;
+  padding: 0px;
+}
+
+/* === END chat.inc.css === */
+
+/* === BEGIN plugin-doorhanger.inc.css === */
+
+/**
+ * Plugin Doorhanger Styles
+ */
+
+#notification-popup[popupid="click-to-play-plugins"] > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 6px 1px 2px;
+}
+
+.click-to-play-plugins-notification-center-box {
 }
 
-.click-to-play-plugins-notification-icon-box {
-  background: #000000;
-  -moz-border-end: 1px solid #FF9F00;
-  padding-top: 16px;
-  -moz-padding-end: 16px;
-  -moz-padding-start: 24px;
-  -moz-margin-start: 4px;
-  margin-top: 4px;
-  margin-bottom: 4px;
+.plugin-popupnotification-centeritem:nth-child(odd) {
+/*  background-color: rgba(0,0,0,0.1);*/
+}
+
+.center-item-label {
+  margin-bottom: 0;
+  text-overflow: ellipsis;
 }
 
-.click-to-play-plugins-notification-icon-box:-moz-locale-dir(ltr) {
-  border-bottom-left-radius: 4px;
-  border-top-left-radius: 4px;
+.center-item-warning-icon {
+  background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
+  background-repeat: no-repeat;
+  width: 16px;
+  height: 15px;
+  -moz-margin-start: 6px;
 }
 
-.click-to-play-plugins-notification-icon-box:-moz-locale-dir(rtl) {
-  border-bottom-right-radius: 4px;
-  border-top-right-radius: 4px;
+.click-to-play-plugins-notification-button-container {
 }
 
-.click-to-play-plugins-notification-separator {
-  /*-moz-border-start: 1px solid #9C9CFF;
-  border-top: 1px solid #9C9CFF;*/
+.click-to-play-popup-button {
+  width: 50%;
 }
 
 .click-to-play-plugins-notification-description-box {
-  /*border-bottom: 1px solid #9C9CFF;
-  -moz-border-start: 1px solid #9C9CFF;*/
-  padding-top: 12px;
-  -moz-padding-end: 11px;
-  padding-bottom: 9px;
-  -moz-padding-start: 10px;
+  margin-left: 5px;
+  margin-right: 5px;
+  margin-top: 0;
+  padding-bottom: 3px;
 }
 
-.click-to-play-plugins-notification-center-box {
-  border-top: 1px solid #FF9F00;
-  border-bottom: 1px solid #FF9F00;
-  /*-moz-border-start: 1px solid #9C9CFF;*/
-  background-color: #000000;
-  -moz-margin-end: 4px;
+.click-to-play-plugins-outer-description {
+  margin-top: 1px;
 }
 
-.click-to-play-plugins-notification-button-container {
-  /*border-top: 1px solid #9C9CFF;
-  -moz-border-start: 1px solid #9C9CFF;*/
-  margin: 0px;
-  padding: 16px;
+.click-to-play-plugins-notification-link,
+.center-item-link {
+  margin: 0;
 }
 
-.center-item-box {
-  padding: 12px 16px 0px 16px;
+.messageImage[value="plugin-hidden"] {
+  list-style-image: url("chrome://browser/skin/notification-pluginNormal.png");
 }
 
-.center-item-box[padbottom="true"] {
-  padding-bottom: 12px;
+/* Keep any changes to this style in sync with pluginProblem.css */
+notification.pluginVulnerable {
+}
+
+notification.pluginVulnerable .messageImage {
+  list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png");
 }
 
-.center-item-icon {
-  background-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+/* === END plugin-doorhanger.inc.css === */
+
+#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;
-  width: 16px;
-  margin-bottom: 4px;
 }
 
-.center-item-box[warn="true"] {
-  background-color: #FFCF00;
-  color: #000000;
-  padding: 8px 16px 6px 16px;
+/* === BEGIN customizeMode.inc.css === */
+
+/* Customization mode */
+
+#main-window:-moz-any([customize-entering],[customize-entered]) #content-deck {
+  margin: 0 1em 1em;
+}
+
+#main-window:-moz-any([customize-entering],[customize-entered]) #navigator-toolbox {
+  margin-left: 1em;
+  margin-right: 1em;
+}
+
+#main-window:-moz-any([customize-entering],[customize-exiting]) #tab-view-deck {
+  pointer-events: none;
+}
+
+#main-window[customize-entered] .customization-target:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar))::before,
+#PanelUI-contents > .panel-customization-placeholder {
+  -moz-outline-radius: 2.5px;
+  outline: 1px dashed transparent;
+}
+
+#main-window[customize-entered] .customization-target:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar))::before {
+  /* Prevent jumping of tabs when switching a window between inactive and active (bug 853415). */
+  -moz-box-ordinal-group: 0;
+  content: "";
+  display: -moz-box;
+  height: 100%;
+  left: 0;
+  outline-offset: -2px;
+  pointer-events: none;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+/* Shift the TabsToolbar outline up 2px since the #nav-bar is shifted up by 1px and the
+   #TabsToolbar::after is a pixel higher to draw the bottom border of the tabstrip so this makes the
+   offset from the bottom effectively the same as other targets (-2px). */
+#main-window[customize-entered] #TabsToolbar.customization-target::before {
+  top: -2px;
+}
+
+/* The parents of the outline pseudo-elements need to be positioned so that the outline is positioned relative to it. */
+#main-window[customize-entered] .customization-target:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar)):hover,
+#main-window[customize-entered] .customization-target[customizing-dragovertarget]:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar)),
+#main-window[customize-entered] #nav-bar-customization-target.customization-target {
+  position: relative;
+}
+
+/* Most target outlines are shown on hover and drag over but the panel menu uses
+   placeholders instead. */
+#main-window[customize-entered] .customization-target:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar)):hover::before,
+#main-window[customize-entered] .customization-target[customizing-dragovertarget]:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar))::before,
+/* nav-bar and panel outlines are always shown */
+#nav-bar[showoutline=true] > #nav-bar-customization-target.customization-target::before {
+  outline-color: #A09090;
+}
+
+#nav-bar[showoutline=true] > #nav-bar-customization-target.customization-target::before {
+  transition: outline-color 250ms linear;
+}
+
+#PanelUI-contents[showoutline=true] > .panel-customization-placeholder {
+  transition: outline-color 250ms linear;
+  outline-color: #9C9CFF;
 }
 
-.center-item-box[padbottom="true"][warn="true"] {
-  padding-bottom: 4px;
+#PanelUI-contents > .panel-customization-placeholder {
+  cursor: auto;
+  outline-offset: -5px;
 }
 
-.center-item-box[showseparator="true"] {
+#main-window[customizing] .customization-target:not(#PanelUI-contents) {
+  min-width: 100px;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+#customization-container {
+  background-color: #000000;
+}
+
+#customization-palette,
+#customization-empty {
+  padding: 0 15px 15px;
+}
+
+#customization-header {
+  font-size: 1.5em;
+  line-height: 1.5em;
+  color: #9C9CFF;
+  font-weight: lighter;
+  margin-bottom: 1em;
+  padding: 15px 15px 0;
+}
+
+#customization-panel-container {
+  padding: 10px 10px 0px;
+}
+
+#customization-footer {
+  /*background-color: rgb(236,236,236);*/
   border-top: 1px solid #9C9CFF;
+  padding: 15px;
 }
 
-.center-item-box[warn="false"] > .center-item-warning {
-  display: none;
+.customizationmode-button {
+  margin: 0;
 }
 
-.center-item-warning > .text-link {
-  color: #6868AA;
+.customizationmode-button:hover {
 }
 
-.center-item-warning > .text-link[href=""] {
-  display: none;
+.customizationmode-button[disabled="true"] {
 }
 
-.center-item-warning-icon {
-  background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
-  background-repeat: no-repeat;
+#customization-titlebar-visibility-button {
+  list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png");
+  -moz-image-region: rect(0, 24px, 24px, 0);
+  padding: 2px 7px;
+  -moz-margin-end: 10px;
+}
+
+#customization-titlebar-visibility-button > .button-box > .button-text {
+  /* Sadly, button.css thinks its margins are perfect for everyone. */
+  -moz-margin-start: 6px !important;
+}
+
+#customization-titlebar-visibility-button[checked] {
+  -moz-image-region: rect(0, 48px, 24px, 24px);
+  background-color: #008484;
+}
+
+#customization-undo-reset-button {
+  -moz-margin-end: 10px;
+}
+
+#main-window[customize-entered] #customization-panel-container {
+  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
+  background-position: left top;
+  background-repeat: repeat;
+  background-size: auto;
+  background-attachment: fixed;
+}
+
+toolbarpaletteitem[place="toolbar"] {
+  transition: border-width 250ms ease-in-out;
+}
+
+toolbarpaletteitem[mousedown] {
+  outline: 1px solid #008484;
+  cursor: -moz-grabbing;
+  opacity: 0.8;
+}
+
+.panel-customization-placeholder,
+toolbarpaletteitem[place="palette"],
+toolbarpaletteitem[place="panel"] {
+  transition: transform .3s ease-in-out;
+}
+
+#customization-palette {
+  transition: opacity .3s ease-in-out;
+  opacity: 0;
+}
+
+#customization-palette[showing="true"] {
+  opacity: 1;
+}
+
+toolbarpaletteitem[notransition].panel-customization-placeholder,
+toolbarpaletteitem[notransition][place="toolbar"],
+toolbarpaletteitem[notransition][place="palette"],
+toolbarpaletteitem[notransition][place="panel"] {
+  transition: none;
+}
+
+toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon,
+toolbarpaletteitem > toolbaritem.panel-wide-item,
+toolbarpaletteitem > toolbarbutton[type="menu-button"] {
+  transition: transform .3s cubic-bezier(.6, 2, .75, 1.5) !important;
+}
+
+toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon {
+  transform: scale(1.3);
+}
+
+toolbarpaletteitem[mousedown] > toolbaritem.panel-wide-item,
+toolbarpaletteitem[mousedown] > toolbarbutton[type="menu-button"] {
+  transform: scale(1.1);
+}
+
+/* Override the toolkit styling for items being dragged over. */
+toolbarpaletteitem[place="toolbar"] {
+  border-left-width: 0;
+  border-right-width: 0;
+  margin-right: 0;
+  margin-left: 0;
+}
+
+#customization-palette:not([hidden]) {
+  margin-bottom: 25px;
+}
+
+#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton,
+#wrapper-edit-controls[place="palette"] > #edit-controls > separator,
+#wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton,
+#wrapper-zoom-controls[place="palette"] > #zoom-controls > separator {
+  margin-top: 20px;
+}
+
+/* Remove |:-moz-any(#customization-palette, #panelUI-contents)| selector when Australis lands - this makes it only apply post-Australis as those elements only exist there */
+#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton,
+:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton {
+  margin-left: 0;
+  margin-right: 0;
+  max-width: 24px;
+  min-width: 24px;
+  max-height: 24px;
+  height: 24px;
+  padding: 4px;
+}
+
+#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton > .toolbarbutton-icon,
+#wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton > .toolbarbutton-icon {
   width: 16px;
-  height: 15px;
-  margin-bottom: 4px;
 }
 
-.center-item-warning-description {
-  color: #828282;
+#wrapper-edit-controls > #edit-controls > toolbarbutton > .toolbarbutton-icon {
+  opacity: 1; /* To ensure these buttons always look enabled in customize mode */
 }
 
-.center-item-button {
-  min-width: 0;
+:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button,
+:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button + separator {
+  display: none;
 }
 
-#main-window[privatebrowsingmode=temporary] #toolbar-menubar {
-  background-image: url("chrome://browser/skin/privatebrowsing-dark.png");
-  background-position: top right;
+#wrapper-personal-bookmarks:not([place="toolbar"]) > #personal-bookmarks {
+  -moz-box-pack: center;
+  min-height: 48px;
+}
+
+#customization-palette > toolbarpaletteitem > label {
+  text-align: center;
+  margin-left: 0;
+  margin-right: 0;
+}
+
+/* === END customizeMode.inc.css === */
+
+/* === BEGIN customizeTip.inc.css === */
+
+#customization-tipPanel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+  margin: 0;
+  min-width: 400px;
+  max-width: 1000px;
+  min-height: 200px;
+  border-radius: 3px;
+/*  background-image: linear-gradient(90deg, #a0dfff 0%, #ceeeff 100%);*/
+  border: 1px solid #9C9CFF;
+}
+
+#customization-tipPanel > .panel-arrowcontainer > .panel-arrowcontent:-moz-locale-dir(rtl) {
+/*  background-image: linear-gradient(90deg, #ceeeff 0%, #a0dfff 100%);*/
+}
+
+.customization-tipPanel-infoBox {
+  margin: 20px 25px 25px;
+  width: 25px;
+  background-image: url("chrome://browser/skin/customizableui/info-icon-customizeTip.png");
   background-repeat: no-repeat;
 }
 
-#main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) {
-  background-position: top left;
+.customization-tipPanel-content {
+  margin: 25px 0;
+  font-size: 12px;
+  line-height: 18px;
 }
 
-#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;
+.customization-tipPanel-em {
+  margin: 0;
+  font-weight: bold;
+}
+
+.customization-tipPanel-contentImage {
+  margin-top: 25px;
+  list-style-image: url("chrome://browser/skin/customizableui/customize-illustration.png");
+  min-width: 300px;
+  max-width: 300px;
+  min-height: 190px;
+  max-height: 190px;
+  display: -moz-box;
+}
+
+.customization-tipPanel-contentImage:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/customizableui/customize-illustration-rtl.png");
+}
+
+.customization-tipPanel-link {
+  -moz-appearance: none;
+  background: transparent;
+  border: none;
+  box-shadow: none;
+  color: #3333FF;
+  margin: 0;
+  cursor: pointer;
+}
+
+.customization-tipPanel-link > .button-box > .button-text {
+  margin: 0 !important;
+}
+
+.customization-tipPanel-closeBox > .close-icon {
+  -moz-appearance: none;
+  border: 0;
+  -moz-margin-end: -25px;
 }
+
+#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"],
+#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] {
+  list-style-image: url("chrome://browser/skin/customizableui/panelarrow-customizeTip.png");
+}
+
+/* === END customizeTip.inc.css === */
+
+#main-window[customizing] {
+  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
+  background-attachment: fixed;
+}
+
+#main-window:-moz-any([customize-entering],[customize-entered]) #tab-view-deck {
+  padding: 0 2em 2em;
+}
+
+#customization-container {
+  border-left: 1px solid #9C9CFF;
+  border-right: 1px solid #9C9CFF;
+  background-clip: padding-box;
+}
+
+#main-window[privatebrowsingmode=temporary] #TabsToolbar::after {
+  content: "";
+  display: -moz-box;
+  width: 40px;
+  background: url("chrome://browser/skin/privatebrowsing-indicator.png") no-repeat center center;
+}
+
+/* === BEGIN UITour.inc.css === */
+
+/* UI Tour */
+
+html|div#UITourHighlight {
+  border-radius: 20px;
+  border: 2px #9C9CFF solid;
+  min-height: 32px;
+  min-width: 32px;
+  /* HACK for pre-Australis */
+  display: none;
+}
+
+html|div#UITourHighlight[active] {
+  /* HACK for pre-Australis */
+  display: none;
+}
+
+#UITourTooltip {
+  max-width: 20em;
+}
+
+#UITourTooltipTitle {
+  font-size: 130%;
+  font-weight: bold;
+  margin: 0 0 5px 0;
+}
+
+#UITourTooltipDescription {
+  max-width: 20em;
+}
+
+/* === END UITour.inc.css === */