X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=fbf85102b639c208c756b13242a4b91750f35756;hp=3457cbc44d1dc080fe47a13a5e38163d5ddecbe1;hb=cc4b0b0d84ada84e11e522567465e086f075f966;hpb=b27cc46e639c7b6f88a224a7492701957379c32c

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 3457cbc4..fbf85102 100644
--- 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 tabsontop doesn't exist there */
+#navigator-toolbox:not([tabsontop]) > 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 tabsontop doesn't exist there */
+#navigator-toolbox:not([tabsontop]) > #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,34 @@ 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 tabsontop doesn't exist there */
+#navigator-toolbox:not([tabsontop]) > #toolbar-menubar:not([autohide="true"]) {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
+}
+
+#main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) {
+  /* like menubar */
+  background-color: #6000CF;
+  color: #FF9F00;
+}
+
+#main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme):-moz-window-inactive {
+  background-color: #8050B0;
+  color: #FF9F00;
+}
 
 #navigator-toolbox {
 }
@@ -337,9 +376,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 {
@@ -437,66 +483,751 @@ menuitem.bookmark-item {
   -moz-image-region: auto;
 }
 
-.bookmark-item[container] {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
-  -moz-image-region: auto;
+.bookmark-item[container] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[container][open] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[container][livemark] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/livemark-folder.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[container][livemark] .bookmark-item {
+  list-style-image: url("chrome://communicator/skin/bookmarks/livemark-item.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.bookmark-item[container][livemark] .bookmark-item[visited] {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+.bookmark-item[container][query] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/query.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[query][tagContainer] {
+  list-style-image: url("chrome://mozapps/skin/places/tagContainerIcon.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[query][dayContainer] {
+  list-style-image: url("chrome://communicator/skin/history/calendar.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[query][hostContainer] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[query][hostContainer][open] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[cutting] > .toolbarbutton-icon,
+.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-icon {
+  opacity: 0.5;
+}
+
+.bookmark-item[cutting] > .toolbarbutton-text,
+.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text {
+  opacity: 0.7;
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+/* === BEGIN toolbarbuttons.inc.css === */
+
+/* Whole section of this included file: */
+/* Remove |#navigator-toolbox:not([tabsontop])| selector when Australis lands - this makes it only apply post-Australis as tabsontop doesn't exist there */
+#navigator-toolbox:not([tabsontop]) :-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([tabsontop]) #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  list-style-image: url("chrome://browser/skin/ToolbarFx.png");
+}
+
+#navigator-toolbox:not([tabsontop]) #back-button {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+#navigator-toolbox:not([tabsontop]) #back-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(18px, 36px, 36px, 18px);
+}
+
+#navigator-toolbox:not([tabsontop]) #back-button[disabled="true"] {
+  -moz-image-region: rect(36px, 36px, 54px, 18px);
+}
+
+#navigator-toolbox:not([tabsontop]) #forward-button {
+  -moz-image-region: rect(0, 72px, 18px, 54px);
+}
+
+#navigator-toolbox:not([tabsontop]) #forward-button:hover:not([disabled="true"]) {
+  -moz-image-region: rect(18px, 72px, 36px, 54px);
+}
+
+#navigator-toolbox:not([tabsontop]) #forward-button[disabled="true"] {
+  -moz-image-region: rect(36px, 72px, 54px, 54px);
+}
+
+#navigator-toolbox:not([tabsontop]) #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+#navigator-toolbox:not([tabsontop]) #forward-button:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+#navigator-toolbox:not([tabsontop]) #home-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 126px, 18px, 108px);
+}
+
+#navigator-toolbox:not([tabsontop]) #home-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 126px, 36px, 108px);
+}
+
+#navigator-toolbox:not([tabsontop]) #bookmarks-menu-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 144px, 18px, 126px);
+}
+
+#navigator-toolbox:not([tabsontop]) #bookmarks-menu-button[cui-areatype="toolbar"]:hover,
+#navigator-toolbox:not([tabsontop]) #bookmarks-menu-button[cui-areatype="toolbar"][open="true"] {
+  -moz-image-region: rect(18px, 144px, 36px, 126px);
+}
+
+#navigator-toolbox:not([tabsontop]) #bookmarks-menu-button[cui-areatype="toolbar"][starred] {
+  -moz-image-region: rect(0, 162px, 18px, 144px);
+}
+
+#navigator-toolbox:not([tabsontop]) #bookmarks-menu-button[cui-areatype="toolbar"][starred]:hover,
+#navigator-toolbox:not([tabsontop]) #bookmarks-menu-button[cui-areatype="toolbar"][starred][open="true"] {
+  -moz-image-region: rect(18px, 162px, 36px, 144px);
+}
+
+#navigator-toolbox:not([tabsontop]) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  -moz-image-region: rect(0, 630px, 18px, 612px);
+}
+
+#navigator-toolbox:not([tabsontop]) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker {
+  padding: 1px;
+  -moz-box-align: center;
+}
+
+#navigator-toolbox:not([tabsontop]) #bookmarks-menu-button[cui-areatype="toolbar"]:hover > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+#navigator-toolbox:not([tabsontop]) #bookmarks-menu-button[cui-areatype="toolbar"][open="true"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  -moz-image-region: rect(18px, 630px, 36px, 612px);
+}
+
+#navigator-toolbox:not([tabsontop]) #bookmarks-menu-button[cui-areatype="toolbar"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+#navigator-toolbox:not([tabsontop]) #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:not([tabsontop]) #history-panelmenu[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 180px, 18px, 162px);
+}
+
+#navigator-toolbox:not([tabsontop]) #history-panelmenu[cui-areatype="toolbar"]:hover,
+#navigator-toolbox:not([tabsontop]) #history-panelmenu[cui-areatype="toolbar"][open="true"] {
+  -moz-image-region: rect(18px, 180px, 36px, 162px);
+}
+
+#navigator-toolbox:not([tabsontop]) #downloads-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 198px, 18px, 180px);
+}
+
+#navigator-toolbox:not([tabsontop]) #downloads-button[cui-areatype="toolbar"]:hover,
+#navigator-toolbox:not([tabsontop]) #downloads-button[cui-areatype="toolbar"][open="true"] {
+  -moz-image-region: rect(18px, 198px, 36px, 180px);
+}
+
+#navigator-toolbox:not([tabsontop]) #add-ons-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 216px, 18px, 198px);
+}
+
+#navigator-toolbox:not([tabsontop]) #add-ons-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 216px, 36px, 198px);
+}
+
+#navigator-toolbox:not([tabsontop]) #switch-to-metro-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 648px, 18px, 630px);
+}
+
+#navigator-toolbox:not([tabsontop]) #switch-to-metro-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 648px, 36px, 630px);
+}
+
+#navigator-toolbox:not([tabsontop]) #open-file-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 234px, 18px, 216px);
+}
+
+#navigator-toolbox:not([tabsontop]) #open-file-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 234px, 36px, 216px);
+}
+
+#navigator-toolbox:not([tabsontop]) #save-page-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 252px, 18px, 234px);
+}
+
+#navigator-toolbox:not([tabsontop]) #save-page-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 252px, 36px, 234px);
+}
+
+#navigator-toolbox:not([tabsontop]) #sync-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 270px, 18px, 252px);
+}
+
+#navigator-toolbox:not([tabsontop]) #sync-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 270px, 36px, 252px);
+}
+
+#navigator-toolbox:not([tabsontop]) #feed-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 288px, 18px, 270px);
+}
+
+#navigator-toolbox:not([tabsontop]) #feed-button[cui-areatype="toolbar"]:hover:not([disabled="true"]) {
+  -moz-image-region: rect(18px, 288px, 36px, 270px);
+}
+
+#navigator-toolbox:not([tabsontop]) #feed-button[cui-areatype="toolbar"][disabled="true"] {
+  -moz-image-region: rect(36px, 288px, 54px, 270px);
+}
+
+#navigator-toolbox:not([tabsontop]) #social-share-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0px, 306px, 18px, 288px);
+}
+
+#navigator-toolbox:not([tabsontop]) #social-share-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 306px, 36px, 288px);
+}
+
+#navigator-toolbox:not([tabsontop]) #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:not([tabsontop]) #email-link-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 306px, 36px, 288px);
+}
+
+#navigator-toolbox:not([tabsontop]) #characterencoding-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 324px, 18px, 306px);
+}
+
+#navigator-toolbox:not([tabsontop]) #characterencoding-button[cui-areatype="toolbar"]:hover:not([disabled="true"]),
+#navigator-toolbox:not([tabsontop]) #characterencoding-button[cui-areatype="toolbar"][open="true"] {
+  -moz-image-region: rect(18px, 324px, 36px, 306px);
+}
+
+#navigator-toolbox:not([tabsontop]) #characterencoding-button[cui-areatype="toolbar"][disabled="true"] {
+  -moz-image-region: rect(36px, 324px, 54px, 306px);
+}
+
+#navigator-toolbox:not([tabsontop]) #new-window-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 342px, 18px, 324px);
+}
+
+#navigator-toolbox:not([tabsontop]) #new-window-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 342px, 36px, 324px);
+}
+
+#navigator-toolbox:not([tabsontop]) #new-tab-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 360px, 18px, 342px);
+}
+
+#navigator-toolbox:not([tabsontop]) #new-tab-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 360px, 36px, 342px);
+}
+
+#navigator-toolbox:not([tabsontop]) #privatebrowsing-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 378px, 18px, 360px);
+}
+
+#navigator-toolbox:not([tabsontop]) #privatebrowsing-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 378px, 36px, 360px);
+}
+
+#navigator-toolbox:not([tabsontop]) #find-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 396px, 18px, 378px);
+}
+
+#navigator-toolbox:not([tabsontop]) #find-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 396px, 36px, 378px);
+}
+
+#navigator-toolbox:not([tabsontop]) #print-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 414px, 18px, 396px);
+}
+
+#navigator-toolbox:not([tabsontop]) #print-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 414px, 36px, 396px);
+}
+
+#navigator-toolbox:not([tabsontop]) #fullscreen-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 432px, 18px, 414px);
+}
+
+#navigator-toolbox:not([tabsontop]) #fullscreen-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 432px, 36px, 414px);
+}
+
+#navigator-toolbox:not([tabsontop]) #developer-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 450px, 18px, 432px);
+}
+
+#navigator-toolbox:not([tabsontop]) #developer-button[cui-areatype="toolbar"]:hover,
+#navigator-toolbox:not([tabsontop]) #developer-button[cui-areatype="toolbar"][open="true"] {
+  -moz-image-region: rect(18px, 450px, 36px, 432px);
+}
+
+#navigator-toolbox:not([tabsontop]) #preferences-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 468px, 18px, 450px);
+}
+
+#navigator-toolbox:not([tabsontop]) #preferences-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 468px, 36px, 450px);
+}
+
+#navigator-toolbox:not([tabsontop]) #PanelUI-menu-button {
+  -moz-image-region: rect(0, 486px, 18px, 468px);
+}
+
+#navigator-toolbox:not([tabsontop]) #PanelUI-menu-button:hover,
+#navigator-toolbox:not([tabsontop]) #PanelUI-menu-button[open="true"] {
+  -moz-image-region: rect(18px, 486px, 36px, 468px);
+}
+
+#navigator-toolbox:not([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button {
+  -moz-image-region: rect(0, 504px, 18px, 486px);
+}
+
+#navigator-toolbox:not([tabsontop]) #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([tabsontop]) #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([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button {
+  -moz-image-region: rect(0, 522px, 18px, 504px);
+}
+
+#navigator-toolbox:not([tabsontop]) #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([tabsontop]) #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([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button {
+  -moz-image-region: rect(0, 540px, 18px, 522px);
+}
+
+#navigator-toolbox:not([tabsontop]) #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([tabsontop]) #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([tabsontop]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button {
+  -moz-image-region: rect(0, 558px, 18px, 540px);
+}
+
+#navigator-toolbox:not([tabsontop]) #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([tabsontop]) #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([tabsontop]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button {
+  -moz-image-region: rect(0, 576px, 18px, 558px);
+}
+
+#navigator-toolbox:not([tabsontop]) #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([tabsontop]) #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([tabsontop]) #webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) {
+  -moz-image-region: rect(0, 594px, 18px, 576px);
+}
+
+#navigator-toolbox:not([tabsontop]) #webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)):hover,
+#navigator-toolbox:not([tabsontop]) #webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem))[open="true"] {
+  -moz-image-region: rect(18px, 594px, 36px, 576px);
+}
+
+#navigator-toolbox:not([tabsontop]) #nav-bar-overflow-button {
+  -moz-image-region: rect(0, 612px, 18px, 594px);
+}
+
+#navigator-toolbox:not([tabsontop]) #nav-bar-overflow-button:hover,
+#navigator-toolbox:not([tabsontop]) #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"],
+#downloads-indicator[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,
+#downloads-indicator[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(32, 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);
 }
 
-.bookmark-item[container][open] {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
-  -moz-image-region: auto;
+#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);
 }
 
-.bookmark-item[container][livemark] {
-  list-style-image: url("chrome://communicator/skin/bookmarks/livemark-folder.png");
-  -moz-image-region: auto;
+#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);
 }
 
-.bookmark-item[container][livemark] .bookmark-item {
-  list-style-image: url("chrome://communicator/skin/bookmarks/livemark-item.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+#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);
 }
 
-.bookmark-item[container][livemark] .bookmark-item[visited] {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+#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);
 }
 
-.bookmark-item[container][query] {
-  list-style-image: url("chrome://communicator/skin/bookmarks/query.png");
-  -moz-image-region: auto;
+#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);
 }
 
-.bookmark-item[query][tagContainer] {
-  list-style-image: url("chrome://mozapps/skin/places/tagContainerIcon.png");
-  -moz-image-region: auto;
+#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);
 }
 
-.bookmark-item[query][dayContainer] {
-  list-style-image: url("chrome://communicator/skin/history/calendar.png");
-  -moz-image-region: auto;
+#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);
 }
 
-.bookmark-item[query][hostContainer] {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
-  -moz-image-region: auto;
+#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);
 }
 
-.bookmark-item[query][hostContainer][open] {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
-  -moz-image-region: auto;
+#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);
 }
 
-.bookmark-item[cutting] > .toolbarbutton-icon,
-.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-icon {
-  opacity: 0.5;
+#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);
 }
 
-.bookmark-item[cutting] > .toolbarbutton-text,
-.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text {
-  opacity: 0.7;
+#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);
 }
 
-/* ::::: primary toolbar buttons ::::: */
+#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");
@@ -571,8 +1302,8 @@ toolbar[mode="text"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolba
 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;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
 }
 
 toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
@@ -583,8 +1314,8 @@ toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][open="true"] > .t
 :-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;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
 }
 
 toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker[disabled="true"] {
@@ -683,6 +1414,8 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   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 {
@@ -697,6 +1430,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -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,
@@ -706,6 +1441,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -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"] {
@@ -736,6 +1473,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 /*  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 {
@@ -748,6 +1487,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   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) {
@@ -755,6 +1496,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   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) {
@@ -808,54 +1551,55 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   background-color: transparent;
 }
 
-#stop-button {
+/* A number of buttons use :-moz-any(#palette-box, #navigator-toolbox[tabsontop]) - this makes it only apply pre-Australis as tabsontop and the palette-box don't exist afterwards */
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #stop-button {
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
 
-#stop-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #stop-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 54px, 36px, 36px);
 }
 
-#stop-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #stop-button[disabled="true"] {
   -moz-image-region: rect(36px, 54px, 54px, 36px);
 }
 
-#reload-button {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #reload-button {
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
-#reload-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #reload-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 72px, 36px, 54px);
 }
 
-#reload-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #reload-button[disabled="true"] {
   -moz-image-region: rect(36px, 72px, 54px, 54px);
 }
 
-#home-button.bookmark-item {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #home-button.bookmark-item {
   list-style-image: url("chrome://browser/skin/FxToolbar.png");
 }
-#home-button {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #home-button {
   -moz-image-region: rect(0, 90px, 18px, 72px);
 }
 
-#home-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #home-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 90px, 36px, 72px);
 }
 
-#home-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #home-button[disabled="true"] {
   -moz-image-region: rect(36px, 90px, 54px, 72px);
 }
 
-#downloads-button {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #downloads-button {
   -moz-image-region: rect(0, 108px, 18px, 90px);
 }
 
-#downloads-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #downloads-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 108px, 36px, 90px);
 }
 
-#downloads-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #downloads-button[disabled="true"] {
   -moz-image-region: rect(36px, 108px, 54px, 90px);
 }
 
@@ -863,20 +1607,20 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   margin: 0;
 }
 
-#history-button {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #history-button {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
-#history-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #history-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 126px, 36px, 108px);
 }
 
-#history-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #history-button[disabled="true"] {
   -moz-image-region: rect(36px, 126px, 54px, 108px);
 }
 
-#bookmarks-button,
-#bookmarks-menu-button {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #bookmarks-button,
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #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 +1629,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[tabsontop]) #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[tabsontop]) #bookmarks-button:not([disabled="true"]):hover,
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #bookmarks-menu-button[open="true"],
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #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[tabsontop]) #bookmarks-button[disabled="true"],
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #bookmarks-menu-button[disabled="true"] {
   -moz-image-region: rect(36px, 144px, 54px, 126px);
 }
 
-#print-button {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #print-button {
   -moz-image-region: rect(0, 162px, 18px, 144px);
 }
 
-#print-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #print-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 162px, 36px, 144px);
 }
 
-#print-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #print-button[disabled="true"] {
   -moz-image-region: rect(36px, 162px, 54px, 144px);
 }
 
-#new-tab-button {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #new-tab-button {
   -moz-image-region: rect(0, 180px, 18px, 162px);
 }
 
-#new-tab-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #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[tabsontop]) #new-tab-button[disabled="true"] {
   -moz-image-region: rect(36px, 180px, 54px, 162px);
 }
 
-#new-window-button {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #new-window-button {
   -moz-image-region: rect(0, 198px, 18px, 180px);
 }
 
-#new-window-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #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[tabsontop]) #new-window-button[disabled="true"] {
   -moz-image-region: rect(36px, 198px, 54px, 180px);
 }
 
@@ -972,15 +1716,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[tabsontop]) #fullscreen-button {
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }
 
-#fullscreen-button:not([disabled="true"]):hover {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #fullscreen-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 270px, 36px, 252px);
 }
 
-#fullscreen-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #fullscreen-button[disabled="true"] {
   -moz-image-region: rect(36px, 270px, 54px, 252px);
 }
 
@@ -1009,38 +1753,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[tabsontop]) #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[tabsontop]) #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[tabsontop]) #sync-button[disabled="true"] {
   -moz-image-region: rect(36px, 324px, 54px, 306px);
 }
 
-#feed-button {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #feed-button {
   -moz-image-region: rect(0, 342px, 18px, 324px);
 }
 
-#feed-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #feed-button[disabled="true"] {
   -moz-image-region: rect(36px, 342px, 54px, 324px);
 }
 
-#webrtc-status-button {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #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[tabsontop]) #webrtc-status-button:not([disabled="true"]):hover,
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #webrtc-status-button[open="true"] {
   -moz-image-region: rect(18px, 360px, 36px, 342px);
 }
 
-#webrtc-status-button[disabled="true"] {
+:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #webrtc-status-button[disabled="true"] {
   -moz-image-region: rect(36px, 360px, 54px, 342px);
 }
 
@@ -1341,17 +2085,18 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   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;
@@ -1396,11 +2141,36 @@ 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);
+}
+
+.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 +2185,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);
 }
@@ -1435,6 +2238,13 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   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,
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:hover:active,
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity[open=true] {
@@ -1442,10 +2252,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   color: #000000;
 }
 
-#page-proxy-favicon[pageproxystate="invalid"] {
-  opacity: 0.3;
-}
-
 /* autocomplete */
 
 #treecolAutoCompleteImage {
@@ -1806,6 +2612,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 {
@@ -1825,6 +2638,8 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 /* Tabstrip */
 
+/* Remove selector when Australis lands - this makes it only apply post-Australis as tabsontop doesn't exist there */
+#navigator-toolbox:not([tabsontop]) > #TabsToolbar,
 #TabsToolbar {
   min-height: 0;
   padding: 0;
@@ -1862,6 +2677,10 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   background-color: #C09070;
 }
 
+.tabbrowser-tab[remote] {
+  text-decoration: underline;
+}
+
 .tabbrowser-tab:hover,
 .tabs-newtab-button:hover {
 }
@@ -2177,6 +2996,21 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   -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;
@@ -2253,8 +3087,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"] {
@@ -2334,7 +3169,7 @@ 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 {
@@ -2349,6 +3184,18 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png");
 }
 
+#plugins-notification-icon,
+#alert-plugins-notification-icon,
+#blocked-plugins-notification-icon {
+/*  -moz-image-region: rect(0, 16px, 16px, 0);*/
+}
+
+#plugins-notification-icon:hover,
+#alert-plugins-notification-icon:hover,
+#blocked-plugins-notification-icon:hover {
+/*  -moz-image-region: rect(0, 32px, 16px, 16px);*/
+}
+
 #plugin-install-notification-icon {
   list-style-image: url("chrome://browser/skin/pluginInstall-16.png");
 }
@@ -2400,10 +3247,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);
@@ -2671,7 +3514,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   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 {
@@ -2679,7 +3522,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   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%);
+  background-image: linear-gradient(to top right, transparent 50%, rgb(0, 132, 132) 50%);
 }
 
 .highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar,
@@ -2756,6 +3599,10 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
 /*  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);
@@ -2858,6 +3705,8 @@ html|*#gcli-output-frame {
 
 /* === END commandline.inc.css === */
 
+/* === BEGIN responsivedesign.inc.css === */
+
 /* Responsive Mode */
 
 .browserContainer[responsivemode] {
@@ -2880,15 +3729,53 @@ html|*#gcli-output-frame {
 .devtools-responsiveui-toolbar > menulist,
 .devtools-responsiveui-toolbar > toolbarbutton {
   min-width: 22px;
-  border-radius: 0;
+/*  border-radius: 0; */
 }
 
 .devtools-responsiveui-toolbar:-moz-locale-dir(ltr) > *:first-child,
 .devtools-responsiveui-toolbar:-moz-locale-dir(rtl) > *:last-child {
-  margin-left: 0;
+  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-resizebar {
+.devtools-responsiveui-resizebarV {
   width: 7px;
   height: 24px;
   cursor: ew-resize;
@@ -2896,6 +3783,14 @@ html|*#gcli-output-frame {
   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;
@@ -2904,6 +3799,10 @@ html|*#gcli-output-frame {
   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 {
@@ -3069,6 +3968,8 @@ html|*#gcli-output-frame {
   border-radius: inherit;
 }
 
+/* === BEGIN chat.inc.css === */
+
 .chat-status-icon {
   max-height: 16px;
   max-width: 16px;
@@ -3092,6 +3993,11 @@ html|*#gcli-output-frame {
   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-icons.png');
   -moz-image-region: rect(0, 16px, 16px, 0);
@@ -3194,6 +4100,10 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover {
   }
 }
 
+.chatbar-button > .toolbarbutton-icon {
+  width: 16px;
+}
+
 .chatbar-button > menupopup > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
   width: auto;
   height: auto;
@@ -3260,6 +4170,8 @@ window > chatbox {
   padding: 0px;
 }
 
+/* === END chat.inc.css === */
+
 /* === BEGIN plugin-doorhanger.inc.css === */
 
 /**
@@ -3267,7 +4179,7 @@ window > chatbox {
  */
 
 #notification-popup[popupid="click-to-play-plugins"] > .panel-arrowcontainer > .panel-arrowcontent {
-  padding: 0px;
+  padding: 6px 1px 2px;
 }
 
 .click-to-play-plugins-notification-content {
@@ -3275,11 +4187,10 @@ window > chatbox {
 }
 
 .click-to-play-plugins-notification-center-box {
-/*  background-color: rgba(255,255,255,0.3); */
 }
 
-.plugin-popupnotification-centeritem {
-  border-top: 1px solid #9C9CFF;
+.plugin-popupnotification-centeritem:nth-child(odd) {
+/*  background-color: rgba(0,0,0,0.1);*/
 }
 
 .center-item-label {
@@ -3296,7 +4207,6 @@ window > chatbox {
 }
 
 .click-to-play-plugins-notification-button-container {
-  border-top: 1px solid #9C9CFF;
 }
 
 .click-to-play-popup-button {
@@ -3304,14 +4214,14 @@ window > chatbox {
 }
 
 .click-to-play-plugins-notification-description-box {
-  margin-left: 10px;
-  margin-right: 10px;
-  margin-top: 2px;
-  padding-bottom: 2px;
+  margin-left: 5px;
+  margin-right: 5px;
+  margin-top: 0;
+  padding-bottom: 3px;
 }
 
 .click-to-play-plugins-outer-description {
-  margin-top: 8px;
+  margin-top: 1px;
 }
 
 .click-to-play-plugins-notification-link,
@@ -3319,6 +4229,8 @@ window > chatbox {
   margin: 0;
 }
 
+/* Customization mode */
+
 /* === END plugin-doorhanger.inc.css === */
 
 #main-window[privatebrowsingmode=temporary] #toolbar-menubar {
@@ -3336,3 +4248,202 @@ window > chatbox {
   width: 20px;
   height: 16px;
 }
+
+/* === BEGIN customizeMode.inc.css === */
+
+/* Customization mode */
+#nav-bar[customize-entered] > #nav-bar-customization-target {
+  margin: 1px 3px;
+}
+
+#nav-bar[customize-entered] > #nav-bar-customization-target,
+#PanelUI-contents > .panel-customization-placeholder {
+  outline: 1px dashed transparent;
+}
+
+#main-window[customizing-movingItem] #nav-bar-customization-target,
+#main-window[customizing-movingItem] .panel-customization-placeholder {
+  outline-color: #9C9CFF;
+}
+
+#PanelUI-contents > .panel-customization-placeholder {
+  cursor: auto;
+  outline-offset: -5px;
+}
+
+#main-window[customize-entered] .customization-target {
+  min-width: 100px;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+#customization-container {
+  background-color: #000000;
+}
+
+#customization-palette-container {
+  padding: 25px;
+}
+
+#customization-header {
+  font-size: 1.5em;
+  line-height: 1.5em;
+  color: #9C9CFF;
+  font-weight: lighter;
+  margin-bottom: 1em;
+}
+
+#customization-panel-container {
+  padding: 15px 25px 25px;
+  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
+  background-position: left top;
+  background-repeat: repeat;
+  background-size: auto;
+  background-attachment: fixed;
+}
+
+toolbarpaletteitem {
+  transition: background-color, border-color, box-shadow, border-width;
+  transition-duration: 10ms, 10ms, 10ms, 250ms;
+  transition-timing-function: linear, linear, linear, 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: background-color, border-color, box-shadow, transform;
+  transition-duration: 10ms, 10ms, 10ms, 250ms;
+  transition-timing-function: linear, linear, linear, ease-in-out;
+}
+
+toolbarpaletteitem[notransition][place="palette"],
+toolbarpaletteitem[notransition][place="panel"] {
+  transition: background-color, border-color, box-shadow;
+  transition-duration: 10ms, 10ms, 10ms;
+  transition-timing-function: linear, linear, linear;
+}
+
+toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon {
+  transition: transform 50ms ease-in-out;
+}
+
+toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon {
+  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;
+}
+
+/* Remove |:-moz-any(#customization-palette, #panelUI-contents)| selector when Australis lands - this makes it only apply post-Australis as those elements only exist there */
+#customization-palette > #wrapper-edit-controls,
+:-moz-any(#customization-palette, #panelUI-contents) > #customization-palette > #wrapper-zoom-controls {
+  width: 225px;
+}
+
+#wrapper-edit-controls[place="palette"] > .toolbarpaletteitem-box,
+#wrapper-zoom-controls[place="palette"] > .toolbarpaletteitem-box {
+  width: 225px;
+  max-width: 225px;
+}
+
+#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton,
+#wrapper-edit-controls[place="palette"] > #edit-controls > separator,
+:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton,
+:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > separator {
+  margin-top: 24px;
+}
+
+#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: 70px;
+  min-width: 70px;
+  max-height: 24px;
+  height: 24px;
+}
+
+#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton > .toolbarbutton-text,
+:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button > .toolbarbutton-text {
+  display: inline;
+}
+
+#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton > .toolbarbutton-icon,
+:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton > .toolbarbutton-icon {
+  margin: 0;
+  -moz-margin-start: 5px;
+}
+
+#customization-palette > toolbarpaletteitem > label {
+  text-align: center;
+  margin-left: 0;
+  margin-right: 0;
+}
+
+/* === END customizeMode.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;
+}
+
+/* End customization mode */
+
+#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;
+}
+
+#UITourTooltip {
+  max-width: 20em;
+}
+
+#UITourTooltipTitle {
+  font-size: 130%;
+  font-weight: bold;
+  margin: 0 0 5px 0;
+}
+
+#UITourTooltipDescription {
+  max-width: 20em;
+}
+
+/* === END UITour.inc.css === */