X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=ac032a459deff05c6f9cdf41e93fbb0383d68712;hp=f4a49cc0292e1766585bc24ca582440819d6e734;hb=0bcd55874801a7433d9e74c9377f866abf9d3d1a;hpb=7d3f7f148d3392390dd58f221ab52974b8000807

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index f4a49cc0..ac032a45 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -7,6 +7,7 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
+@namespace svg url("http://www.w3.org/2000/svg");
 
 toolbar {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar");
@@ -16,6 +17,13 @@ toolbar[customizable="true"] {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-browsercustom");
 }
 
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme), (-moz-mac-yosemite-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
+  toolbar[customizable="true"]:not([nowindowdrag="true"]) {
+    -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
+  }
+}
+
 toolbar[type="menubar"][autohide="true"] {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-menubar-autohide");
 }
@@ -56,18 +64,28 @@ menubar {
 /* 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([moz-collapsed=true]):not([autohide="true"]) ~ #TabsToolbar,
-#toolbar-menubar:not([moz-collapsed=true])[autohide="true"]:not([inactive]) ~ #TabsToolbar {
+#toolbar-menubar:not([moz-collapsed=true]):not([autohide=true]) ~ #TabsToolbar,
+#toolbar-menubar:not([moz-collapsed=true])[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 {
+#main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen])[chromehidden~="menubar"] #toolbar-menubar ~ #TabsToolbar,
+#main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen]) #toolbar-menubar[autohide="true"][inactive] ~ #TabsToolbar {
 /*  margin-top: 15px;*/
 }
 
-#toolbar-menubar:not([autohide="true"]) {
-  -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
+@media (-moz-mac-graphite-theme: 0) and (-moz-mac-lion-theme: 0) {
+  /* This is a hackish workaround to exclude most of Mac OS until bug 1060941 gets fixed. */
+  #toolbar-menubar:not([autohide="true"]) {
+    -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
+  }
+}
+
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
+  #main-window[tabsintitlebar]:not([inFullscreen="true"]) #TabsToolbar {
+    padding-left: 60px;
+  }
 }
 
 #main-window[tabsintitlebar] #toolbar-menubar .toolbar-endcap {
@@ -91,285 +109,65 @@ menubar {
   -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
   height: 1px;
 }
-#navigator-toolbox[tabsontop=false]::after,
-#main-window[disablechrome] #navigator-toolbox::after {
-  visibility: collapse;
-}
 
 #navigator-toolbox > toolbar: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][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
-  background-color: #8050B0;
-  color: #FF9F00;
-}
-#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar > .tabbrowser-tabs > .tabbrowser-tab {
-  padding-top: 3px;
-}
-
-#main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
-  visibility: hidden;
-}
-#main-window[tabsintitlebar] #titlebar-content:-moz-lwtheme {
-  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
-  visibility: visible;
-}
-
-#nav-bar[tabsontop="true"],
-#nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + toolbar,
-#nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + #customToolbars + #PersonalToolbar {
-  /* background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0)); */
-  /* Position the toolbar above the bottom of background tabs */
-  position: relative;
-  z-index: 1;
-}
-
-#personal-bookmarks {
-/*  min-height: 24px; */
-}
-
-#print-preview-toolbar:not(:-moz-lwtheme) {
-  /* -moz-appearance: toolbox; */
-}
-
-/* ::::: 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;
-  border-radius: 0;
-  border: none;
-  border-right: 3px solid #000000;
-  color: #000000;
-  font-weight: bold;
-  padding: 1px 1.5em;
-  margin: 0;
-}
-
-#appmenu-button:-moz-locale-dir(rtl) {
-  border-left: 3px solid #000000;
-  border-right: none;
+#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) {
 }
 
-#main-window[privatebrowsingmode=temporary] #appmenu-button {
-  background-color: #6000CF;
-  color: #FFCF00;
-}
-
-#appmenu-button:hover:not(:active):not([open]) {
-}
-
-#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:not(:active):not([open]) {
-}
-
-#appmenu-button:hover,
-#appmenu-button:hover:active,
-#appmenu-button[open] {
-  background-color: #FFCF00;
-  color: #000000;
-}
-
-#appmenu-button > .button-box > .button-menu-dropmarker {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
-  width: auto;
-  height: auto;
-  padding: 0;
-  margin: 0;
-  border: none;
-  background-color: transparent;
-  -moz-margin-start: .5em;
-}
-
-#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .button-menu-dropmarker {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
-}
-
-#appmenuPrimaryPane > menuitem,
-#appmenuSecondaryPane > menuitem,
-#appmenuPrimaryPane > menu {
-  padding: 2px;
-}
-
-.splitmenu-menuitem {
-  -moz-padding-start: 2px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  -moz-margin-end: 1px;
-}
-
-.splitmenu-menu {
-  padding-top: 2px;
-  padding-bottom: 2px;
-  -moz-box-pack: end;
-}
-
-.appmenu-edit-button {
-}
-
-.appmenu-edit-button[disabled="true"] {
-}
-
-#appmenuPrimaryPane {
-  -moz-border-end: 1px solid #9C9CFF;
-}
-/*
-  #appmenu-popup {
-  }
-  #appmenuPrimaryPane {
-  }
-  #appmenuSecondaryPane {
-  }
-  #appmenuSecondaryPane:-moz-locale-dir(rtl) {
+@media (-moz-mac-graphite-theme: 0) and (-moz-mac-lion-theme: 0) {
+  /* This is a hackish workaround to exclude most of Mac OS until bug 1060941 gets fixed. */
+  /* Indent also due to non-applicable aero rule in original Windows theme. */
+  #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme),
+  #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme) {
+    /* like menubar */
+    background-color: #6000CF;
+    color: #FF9F00;
   }
 
-  #appmenuSecondaryPane menupopup {
+  #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive,
+  #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
+    background-color: #8050B0;
+    color: #FF9F00;
   }
 
-  .appmenu-menuseparator {
+  #main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) {
+    /*color: inherit;*/
   }
 
-  .appmenu-edit-button:not([disabled]):hover {
+  #main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
+    visibility: hidden;
   }
-*/
-#appmenuSecondaryPane-spacer {
-  min-height: 1em;
-}
-
-#appmenu-editmenu {
-  -moz-box-pack: end;
-}
 
-#appmenu_print,
-#appmenu_print_popup,
-.appmenu-edit-button,
-#appmenu-editmenu-cut,
-#appmenu-editmenu-copy,
-#appmenu-editmenu-paste,
-#appmenu-quit {
-  list-style-image: url("appmenu-icons.png");
-}
-
-#appmenu-cut,
-#appmenu-editmenu-cut {
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-#appmenu-cut:hover:not([disabled="true"]),
-#appmenu-editmenu-cut:hover:not([disabled="true"]) {
-  -moz-image-region: rect(16px 16px 32px 0);
-}
-
-#appmenu-cut[disabled="true"],
-#appmenu-editmenu-cut[disabled="true"] {
-  -moz-image-region: rect(32px 16px 48px 0);
-}
-
-#appmenu-copy,
-#appmenu-editmenu-copy {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-#appmenu-copy:hover:not([disabled="true"]),
-#appmenu-editmenu-copy:hover:not([disabled="true"]) {
-  -moz-image-region: rect(16px 32px 32px 16px);
-}
-
-#appmenu-copy[disabled="true"],
-#appmenu-editmenu-copy[disabled="true"] {
-  -moz-image-region: rect(32px 32px 48px 16px);
-}
-
-#appmenu-paste,
-#appmenu-editmenu-paste {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-#appmenu-paste:hover:not([disabled="true"]),
-#appmenu-editmenu-paste:hover:not([disabled="true"]) {
-  -moz-image-region: rect(16px 48px 32px 32px);
-}
-
-#appmenu-paste[disabled="true"],
-#appmenu-editmenu-paste[disabled="true"] {
-  -moz-image-region: rect(32px 48px 48px 32px);
-}
-
-#appmenu_print,
-#appmenu_print_popup {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-#appmenu_print:hover:not([disabled="true"]),
-#appmenu_print[open="true"],
-#appmenu_print_popup:hover:not([disabled="true"]) {
-  -moz-image-region: rect(16px 64px 32px 48px);
-}
-
-#appmenu-print[disabled="true"],
-#appmenu_print_popup[disabled="true"] {
-  -moz-image-region: rect(32px 64px 48px 48px);
-}
-
-#appmenu-quit {
-  -moz-image-region: rect(0 80px 16px 64px);
-}
-
-#appmenu-quit:hover {
-  -moz-image-region: rect(16px 80px 32px 64px);
-}
-
-#appmenu-edit-label {
-  -moz-appearance: none;
-  background: transparent;
-  font-style: italic;
-}
-
-#appmenu_bookmarks {
-  list-style-image: url("chrome://browser/skin/places/bookmark.png");
-  -moz-image-region: rect(0px 48px 16px 32px);
+  #main-window[tabsintitlebar] #titlebar-content:-moz-lwtheme {
+    -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
+    visibility: visible;
+  }
 }
 
-#appmenu_privateBrowsing,
-#appmenu_newPrivateWindow {
-  list-style-image: url("chrome://browser/skin/Privacy-16.png");
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
+  #titlebar-buttonbox > .titlebar-button {
+    display: none;
+  }
 }
 
-@media (min-resolution: 1.25dppx) {
-  #appmenu_privateBrowsing,
-  #appmenu_newPrivateWindow {
-    list-style-image: url("chrome://browser/skin/Privacy-32.png");
-  }
+#nav-bar {
+  /* Position the toolbar above the bottom of background tabs */
+  position: relative;
+  z-index: 1;
 }
 
-#appmenu_addons {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+#personal-bookmarks {
+/*  min-height: 24px; */
 }
 
-@media (min-resolution: 1.25dppx) {
-  #appmenu_addons {
-    list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-  }
+#print-preview-toolbar:not(:-moz-lwtheme) {
+  /* -moz-appearance: toolbox; */
 }
 
-#BMB_bookmarkThisPage,
-#appmenu_bookmarkThisPage {
-  list-style-image: url("chrome://browser/skin/places/bookmark.png");
-  -moz-image-region: rect(0 16px 16px 0);
+#browser-bottombox:not(:-moz-lwtheme) {
 }
 
 /* ::::: titlebar ::::: */
@@ -393,6 +191,15 @@ menubar {
   margin-top: 4px;
 }
 
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
+  #main-window[sizemode="normal"] > #titlebar,
+  #main-window[sizemode="maximized"] > #titlebar {
+    margin-top: 19px;
+    /* There is a margin-bottom set to -23 by code. */
+  }
+}
+
 /* 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,
@@ -400,14 +207,13 @@ menubar {
  * themes with Aero Glass.
  */
 #titlebar-buttonbox {
-  margin-top: 5px;
+  -moz-appearance: none;
+  margin-top: 6px;
+  margin-top: 4px;
   -moz-margin-end: 3px;
   z-index: 1;
 }
 
-#main-window[sizemode="maximized"] #titlebar-buttonbox {
-}
-
 .titlebar-placeholder[type="appmenu-button"] {
   margin-left: 4px;
 }
@@ -450,8 +256,47 @@ menubar {
   list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif");
 }
 
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
+  #titlebar-fullscreen-button {
+    -moz-appearance: none;
+    list-style-image: url("chrome://browser/skin/icons/mac-fullscreen-icon.png");
+    -moz-image-region: rect(0px, 16px, 16px, 0px);
+  }
+
+  #titlebar-fullscreen-button:hover {
+    -moz-image-region: rect(0px, 32px, 16px, 16px);
+  }
+
+  @media (min-resolution: 2dppx) {
+    #titlebar-fullscreen-button {
+      list-style-image: url("chrome://browser/skin/icons/mac-fullscreen-icon@2x.png");
+      -moz-image-region: rect(0px, 32px, 32px, 0px);
+    }
+
+    #titlebar-fullscreen-button:hover {
+      -moz-image-region: rect(0px, 64px, 32px, 32px);
+    }
+  }
+}
+
+
 /* ::::: bookmark buttons ::::: */
 
+toolbarbutton.bookmark-item:not(.subviewbutton),
+#personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder {
+/*  margin: 0;
+  padding: 2px 3px;*/
+}
+
+toolbarbutton.bookmark-item:not([disabled="true"]):not(.subviewbutton):hover:active,
+toolbarbutton.bookmark-item[open="true"] {
+/*  padding-top: 3px;
+  padding-bottom: 1px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 2px;*/
+}
+
 .bookmark-item > .toolbarbutton-icon,
 #personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
   width: 16px;
@@ -468,10 +313,6 @@ menubar {
   display: none;
 }
 
-#wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
-  background: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") no-repeat center;
-}
-
 #bookmarks-toolbar-placeholder {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") !important;
 }
@@ -514,6 +355,17 @@ toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-p
   opacity: 0;
 }
 
+#bookmarked-notification-dropmarker-anchor {
+  z-index: -1;
+  position: relative;
+}
+
+#bookmarked-notification-dropmarker-icon {
+  width: 18px;
+  height: 18px;
+  visibility: hidden;
+}
+
 #bookmarked-notification-anchor[notification="finish"] > #bookmarked-notification {
   background-image: url("chrome://browser/skin/places/bookmarks-notification-finish.png");
   animation: animation-bookmarkAdded 800ms;
@@ -521,6 +373,11 @@ toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-p
 }
 
 #bookmarks-menu-button[notification="finish"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  list-style-image: none !important;
+}
+
+#bookmarked-notification-dropmarker-anchor[notification="finish"] > #bookmarked-notification-dropmarker-icon {
+  visibility: visible;
   animation: animation-bookmarkPulse 300ms;
   animation-delay: 600ms;
   animation-timing-function: ease-out;
@@ -614,11 +471,14 @@ menuitem.bookmark-item {
 /* === BEGIN toolbarbuttons.inc.css === */
 
 /* Whole section of this included file: */
-:-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),
+:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button,
+          #new-tab-button, #new-window-button, #fullscreen-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, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
+          #copy-button, #paste-button, #e10s-button),
+
 #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
 }
@@ -680,7 +540,10 @@ menuitem.bookmark-item {
 }
 
 #bookmarks-menu-button[cui-areatype="toolbar"][starred]:hover,
-#bookmarks-menu-button[cui-areatype="toolbar"][starred][open="true"] {
+#bookmarks-menu-button[cui-areatype="toolbar"][starred][open="true"],
+#bookmarks-menu-button[cui-areatype="toolbar"][starred] > .toolbarbutton-menubutton-button[open="true"] {
+  /* When starred and clicked (for edit/delete dialog),
+   * then only the menubutton-button itself is open, but not the whole menubutton. */
   -moz-image-region: rect(18px, 162px, 36px, 144px);
 }
 
@@ -732,14 +595,6 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 216px, 36px, 198px);
 }
 
-#switch-to-metro-button[cui-areatype="toolbar"] {
-  -moz-image-region: rect(0, 648px, 18px, 630px);
-}
-
-#switch-to-metro-button[cui-areatype="toolbar"]:hover {
-  -moz-image-region: rect(18px, 648px, 36px, 630px);
-}
-
 #open-file-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 234px, 18px, 216px);
 }
@@ -764,6 +619,19 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 270px, 36px, 252px);
 }
 
+#sync-button[cui-areatype="toolbar"][status="active"],
+#sync-button[cui-areatype="toolbar"][status="active"]:hover:active:not([disabled="true"]) {
+  list-style-image: url("chrome://browser/skin/syncProgress-toolbar.png");
+  -moz-image-region: rect(0, 18px, 18px, 0px);
+}
+
+/*
+#sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext,
+#sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext:hover:active:not([disabled="true"]) {
+  list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png");
+}
+*/
+
 #feed-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 288px, 18px, 270px);
 }
@@ -784,16 +652,6 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 306px, 36px, 288px);
 }
 
-#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);
-}
-
-#email-link-button[cui-areatype="toolbar"]:hover {
-  -moz-image-region: rect(18px, 306px, 36px, 288px);
-}
-
 #characterencoding-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 324px, 18px, 306px);
 }
@@ -815,6 +673,18 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 342px, 36px, 324px);
 }
 
+#e10s-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 342px, 18px, 324px);
+}
+
+#e10s-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 342px, 36px, 324px);
+}
+
+#e10s-button > .toolbarbutton-icon {
+  transform: scaleY(-1);
+}
+
 #new-tab-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 360px, 18px, 342px);
 }
@@ -881,72 +751,72 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 486px, 36px, 468px);
 }
 
-#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button {
+#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button {
   -moz-image-region: rect(0, 504px, 18px, 486px);
 }
 
-#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button:hover:not([disabled="true"]) {
+#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button:hover:not([disabled="true"]) {
   -moz-image-region: rect(18px, 504px, 36px, 486px);
 }
 
-#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button[disabled="true"] {
+#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button[disabled="true"] {
   -moz-image-region: rect(36px, 504px, 54px, 486px);
 }
 
-#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button {
+#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #copy-button {
   -moz-image-region: rect(0, 522px, 18px, 504px);
 }
 
-#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button:hover:not([disabled="true"]) {
+#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #copy-button:hover:not([disabled="true"]) {
   -moz-image-region: rect(18px, 522px, 36px, 504px);
 }
 
-#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button[disabled="true"] {
+#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #copy-button[disabled="true"] {
   -moz-image-region: rect(36px, 522px, 54px, 504px);
 }
 
-#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button {
+#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #paste-button {
   -moz-image-region: rect(0, 540px, 18px, 522px);
 }
 
-#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button:hover:not([disabled="true"]) {
+#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #paste-button:hover:not([disabled="true"]) {
   -moz-image-region: rect(18px, 540px, 36px, 522px);
 }
 
-#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button[disabled="true"] {
+#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #paste-button[disabled="true"] {
   -moz-image-region: rect(36px, 540px, 54px, 522px);
 }
 
-#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button {
+#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-out-button {
   -moz-image-region: rect(0, 558px, 18px, 540px);
 }
 
-#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button:hover:not([disabled="true"]) {
+#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-out-button:hover:not([disabled="true"]) {
   -moz-image-region: rect(18px, 558px, 36px, 540px);
 }
 
-#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button[disabled="true"] {
+#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-out-button[disabled="true"] {
   -moz-image-region: rect(36px, 558px, 54px, 540px);
 }
 
-#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button {
+#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-in-button {
   -moz-image-region: rect(0, 576px, 18px, 558px);
 }
 
-#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button:hover:not([disabled="true"]) {
+#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-in-button:hover:not([disabled="true"]) {
   -moz-image-region: rect(18px, 576px, 36px, 558px);
 }
 
-#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button[disabled="true"] {
+#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-in-button[disabled="true"] {
   -moz-image-region: rect(36px, 576px, 54px, 558px);
 }
 
-#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) {
+#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) {
   -moz-image-region: rect(0, 594px, 18px, 576px);
 }
 
-#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)):hover,
-#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem))[open="true"] {
+#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])):hover,
+#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]))[open="true"] {
   -moz-image-region: rect(18px, 594px, 36px, 576px);
 }
 
@@ -959,23 +829,85 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 612px, 36px, 594px);
 }
 
+#nav-bar-overflow-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
+}
+
+#tabview-button {
+  -moz-image-region: rect(0, 648px, 18px, 630px);
+}
+
+#tabview-button:hover {
+  -moz-image-region: rect(18px, 648px, 36px, 630px);
+}
+
+#email-link-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 666px, 18px, 648px);
+}
+
+#email-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 666px, 36px, 648px);
+}
+
+#sidebar-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 684px, 18px, 666px);
+}
+
+#sidebar-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 684px, 36px, 666px);
+}
+
+#loop-call-button > .toolbarbutton-badge-container {
+  list-style-image: url("chrome://browser/skin/loop/toolbarfx.png");
+  -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+#loop-call-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 90px, 18px, 72px);
+}
+
+#loop-call-button[disabled="true"] > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+#loop-call-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 126px, 18px, 108px);
+}
+
+#loop-call-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 54px, 18px, 36px);
+}
+
+#loop-call-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 72px, 18px, 54px);
+}
+
+#loop-call-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 108px, 18px, 90px);
+}
+
 /* === END toolbarbuttons.inc.css === */
 
 /* === BEGIN menupanel.inc.css === */
 
 /* Menu panel and palette styles */
 
-:-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"],
-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");
+toolbaritem[sdkstylewidget="true"] > toolbarbutton,
+:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button,
+          #new-tab-button, #new-window-button, #fullscreen-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, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
+          #copy-button, #paste-button, #e10s-button)[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button,
+          #new-tab-button, #new-window-button, #fullscreen-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, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
+          #copy-button, #paste-button, #e10s-button) {
+  list-style-image: url("chrome://browser/skin/menuPanelFx.png"); /* avoid aero overrides with changed filename */
 }
 
 #home-button[cui-areatype="menu-panel"],
@@ -990,19 +922,15 @@ toolbarpaletteitem[place="palette"] > #home-button:hover {
 
 #bookmarks-menu-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #bookmarks-menu-button {
-  -moz-image-region: rect(0px, 160px, 32px, 128px);
+  -moz-image-region: rect(0px, 192px, 32px, 160px);
 }
 
 #bookmarks-menu-button[cui-areatype="menu-panel"]:hover,
 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);
+  -moz-image-region: rect(32px, 192px, 64px, 160px);
 }
 
-#bookmarks-menu-button[starred][cui-areatype="menu-panel"]:hover {
+#bookmarks-menu-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
   -moz-image-region: rect(32px, 192px, 64px, 160px);
 }
 
@@ -1016,6 +944,10 @@ toolbarpaletteitem[place="palette"] > #history-panelmenu:hover {
   -moz-image-region: rect(32px, 224px, 64px, 192px);
 }
 
+#history-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+  -moz-image-region: rect(32px, 224px, 64px, 192px);
+}
+
 #downloads-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #downloads-button {
   -moz-image-region: rect(0px, 256px, 32px, 224px);
@@ -1026,16 +958,6 @@ toolbarpaletteitem[place="palette"] > #downloads-button:hover {
   -moz-image-region: rect(32px, 256px, 64px, 224px);
 }
 
-#switch-to-metro-button[cui-areatype="menu-panel"],
-toolbarpaletteitem[place="palette"] > #switch-to-metro-button {
-  -moz-image-region: rect(0px, 800px, 32px, 768px);
-}
-
-#switch-to-metro-button[cui-areatype="menu-panel"]:hover,
-toolbarpaletteitem[place="palette"] > #switch-to-metro-button:hover {
-  -moz-image-region: rect(32px, 800px, 64px, 768px);
-}
-
 #add-ons-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #add-ons-button {
   -moz-image-region: rect(0px, 288px, 32px, 256px);
@@ -1076,6 +998,11 @@ toolbarpaletteitem[place="palette"] > #sync-button:hover {
   -moz-image-region: rect(32px, 384px, 64px, 352px);
 }
 
+#sync-button[cui-areatype="menu-panel"][status="active"] {
+  list-style-image: url("chrome://browser/skin/syncProgress-menuPanel.png");
+  -moz-image-region: rect(0px, 32px, 32px, 0px);
+}
+
 #feed-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #feed-button {
   -moz-image-region: rect(0px, 416px, 32px, 384px);
@@ -1101,22 +1028,6 @@ toolbarpaletteitem[place="palette"] > #social-share-button:hover {
   -moz-image-region: rect(32px, 448px, 64px, 416px);
 }
 
-#email-link-button[cui-areatype="menu-panel"],
-toolbarpaletteitem[place="palette"] > #email-link-button {
-  -moz-image-region: rect(0, 448px, 32px, 416px);
-}
-
-#email-link-button[cui-areatype="menu-panel"]:hover,
-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,
-toolbarpaletteitem[place="palette"] > #email-link-button > image {
-  transform: scale(-1, -1);
-}
-
 #characterencoding-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #characterencoding-button {
   -moz-image-region: rect(0px, 480px, 32px, 448px);
@@ -1132,6 +1043,10 @@ toolbarpaletteitem[place="palette"] > #characterencoding-button[disabled="true"]
   -moz-image-region: rect(64px, 480px, 96px, 448px);
 }
 
+#characterencoding-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+  -moz-image-region: rect(32px, 480px, 64px, 448px);
+}
+
 #new-window-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #new-window-button {
   -moz-image-region: rect(0px, 512px, 32px, 480px);
@@ -1142,6 +1057,16 @@ toolbarpaletteitem[place="palette"] > #new-window-button:hover {
   -moz-image-region: rect(32px, 512px, 64px, 480px);
 }
 
+#e10s-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #e10s-button {
+  -moz-image-region: rect(0px, 512px, 32px, 480px);
+}
+
+#e10s-button[cui-areatype="menu-panel"]:hover,
+toolbarpaletteitem[place="palette"] > #e10s-button:hover {
+  -moz-image-region: rect(32px, 512px, 64px, 480px);
+}
+
 #new-tab-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #new-tab-button {
   -moz-image-region: rect(0px, 544px, 32px, 512px);
@@ -1162,6 +1087,16 @@ toolbarpaletteitem[place="palette"] > #privatebrowsing-button:hover {
   -moz-image-region: rect(32px, 576px, 64px, 544px);
 }
 
+#tabview-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #tabview-button {
+  -moz-image-region: rect(0px, 608px, 32px, 576px);
+}
+
+#tabview-button[cui-areatype="menu-panel"]:hover,
+toolbarpaletteitem[place="palette"] > #tabview-button:hover {
+  -moz-image-region: rect(32px, 608px, 64px, 576px);
+}
+
 #find-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #find-button {
   -moz-image-region: rect(0px, 640px, 32px, 608px);
@@ -1202,6 +1137,10 @@ toolbarpaletteitem[place="palette"] > #developer-button:hover {
   -moz-image-region: rect(32px, 736px, 64px, 704px);
 }
 
+#developer-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+  -moz-image-region: rect(32px, 736px, 64px, 704px);
+}
+
 #preferences-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #preferences-button {
   -moz-image-region: rect(0px, 768px, 32px, 736px);
@@ -1212,86 +1151,149 @@ toolbarpaletteitem[place="palette"] > #preferences-button:hover {
   -moz-image-region: rect(32px, 768px, 64px, 736px);
 }
 
+#email-link-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #email-link-button {
+  -moz-image-region: rect(0, 800px, 32px, 768px);
+}
+
+#email-link-button[cui-areatype="menu-panel"]:hover,
+toolbarpaletteitem[place="palette"] > #email-link-button:hover {
+  -moz-image-region: rect(32px, 800px, 64px, 768px);
+}
+
+#sidebar-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #sidebar-button {
+  -moz-image-region: rect(0, 864px, 32px, 832px);
+}
+
+#sidebar-button[cui-areatype="menu-panel"]:hover,
+toolbarpaletteitem[place="palette"] > #sidebar-button:hover {
+  -moz-image-region: rect(32px, 864px, 64px, 832px);
+}
+
+#sidebar-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+  -moz-image-region: rect(32px, 864px, 64px, 832px);
+}
+
+toolbaritem[sdkstylewidget="true"] > toolbarbutton {
+  -moz-image-region: rect(0, 832px, 32px, 800px);
+}
+
+#loop-call-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container,
+toolbarpaletteitem[place="palette"] > #loop-call-button > .toolbarbutton-badge-container {
+  list-style-image: url("chrome://browser/skin/loop/menuPanel.png");
+  -moz-image-region: rect(0, 32px, 32px, 0);
+}
+
+/* Make sure that the state icons are not shown in the customization palette. */
+toolbarpaletteitem[place="palette"] > #loop-call-button > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 32px, 32px, 0) !important;
+}
+
+#loop-call-button[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 160px, 32px, 128px);
+}
+
+#loop-call-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 64px, 32px, 32px);
+}
+
+#loop-call-button[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 224px, 32px, 192px);
+}
+
+#loop-call-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 96px, 32px, 64px);
+}
+
+#loop-call-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 128px, 32px, 96px);
+}
+
+#loop-call-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container {
+  -moz-image-region: rect(0, 192px, 32px, 160px);
+}
+
 /* Wide panel control icons */
 
-#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton,
-#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton,
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
 toolbarpaletteitem[place="palette"] > #edit-controls > toolbarbutton,
 toolbarpaletteitem[place="palette"] > #zoom-controls > toolbarbutton {
-  list-style-image: url("chrome://browser/skin/menuPanel-small.png");
+  list-style-image: url("chrome://browser/skin/menuPanelFx-small.png"); /* avoid aero overrides with changed filename */
 }
 
-#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #cut-button,
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #cut-button,
 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"]),
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #cut-button:hover:not([disabled="true"]),
 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"],
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #cut-button[disabled="true"],
 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,
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #copy-button,
 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"]),
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #copy-button:hover:not([disabled="true"]),
 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"],
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #copy-button[disabled="true"],
 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,
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #paste-button,
 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"]),
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #paste-button:hover:not([disabled="true"]),
 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"],
+#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #paste-button[disabled="true"],
 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,
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-out-button,
 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"]),
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-out-button:hover:not([disabled="true"]),
 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"],
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-out-button[disabled="true"],
 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,
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-in-button,
 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"]),
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-in-button:hover:not([disabled="true"]),
 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"],
+#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-in-button[disabled="true"],
 toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button[disabled="true"] {
   -moz-image-region: rect(32px, 96px, 48px, 80px);
 }
@@ -1304,12 +1306,8 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button[disabled=
 
 .toolbarbutton-1,
 .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  min-width: 36px;
-  min-height: 36px;
-}
-
-.toolbarbutton-1:not([type="menu-button"]) {
-  -moz-box-orient: vertical;
+/*  min-width: 36px;
+  min-height: 36px;*/
 }
 
 .toolbarbutton-1,
@@ -1328,376 +1326,295 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button[disabled=
   -moz-padding-end: 1px;
 }
 
-/* Help SDK icons fit: */
-toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
-  width: 16px;
-}
-
-#nav-bar toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
-  /* XXXgijs box models strike again: this is 16px + 2 * 7px padding + 2 * 1px border (from the rules above) */
-  width: 32px;
-}
-
-/* ::::: 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;
+#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-icon,
+#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker,
+#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
+#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled=true] > .toolbarbutton-icon {
 }
 
-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;
+.toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
+.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
 }
 
-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;
+toolbar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker:-moz-lwtheme-brighttext,
+toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-brighttext {
 }
 
-#forward-button {
-  -moz-margin-start: 0;
+.toolbarbutton-1 > .toolbarbutton-icon,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
 }
 
-#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 .toolbarbutton-1,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 }
-/*
-#nav-bar #back-button:-moz-locale-dir(ltr) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
+
+#nav-bar .toolbarbutton-1:not([type=menu-button]),
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
 }
 
-#nav-bar #back-button:-moz-locale-dir(rtl),
-#nav-bar #forward-button {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
+#nav-bar #PanelUI-menu-button {
+/*  -moz-padding-start: 7px;
+  -moz-padding-end: 5px;*/
 }
-*/
-#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);
+
+#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button):not(#PanelUI-menu-button) {
+/*  padding-left: 5px;
+  padding-right: 5px;*/
 }
 
-#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);
+#nav-bar .toolbarbutton-1 > menupopup {
+/*  margin-top: -3px;*/
 }
 
-#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);
+#nav-bar .toolbarbutton-1 > menupopup.cui-widget-panel {
+  margin-top: -4px;
 }
 
-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 {
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+/*  -moz-padding-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 > #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"] {
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+/*  -moz-padding-start: 0;
+  -moz-box-align: center;*/
 }
 
-#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; */
+#nav-bar .toolbarbutton-1 > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-text,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-any([disabled=true],:not([open]):not([disabled=true]):not(:active)) > .toolbarbutton-icon {
+/*  padding: 2px 6px;
+  border: 1px solid;
+  border-color: transparent;
+  transition-property: background-color, border-color;
+  transition-duration: 150ms;*/
 }
+/*
+#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-badge-container,
+#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+  padding: 3px 7px;
+}
+*/
 
-#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; */
+/* Help SDK icons fit: */
+toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
+  width: 16px;
 }
 
-#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;
+#nav-bar toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
+  /* XXXgijs box models strike again: this is 16px + 2 * 7px padding + 2 * 1px border (from the rules above) */
+  width: 32px;
 }
 
-#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;
+#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button):not(#PanelUI-menu-button) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ {
+/*  -moz-padding-end: 17px;*/
 }
 
-#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;
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
 }
 
-.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;
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
 }
 
-.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;
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
 }
 
-.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;
+#nav-bar .toolbaritem-combined-buttons {
+/*  margin-left: 2px;
+  margin-right: 2px;*/
 }
 
-.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;
+#nav-bar .toolbaritem-combined-buttons > .toolbarbutton-1 {
+/*  padding-left: 0;
+  padding-right: 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 > #forward-button {
-/*  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  -moz-margin-end: 0; */
+#nav-bar .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before,
+#nav-bar .toolbaritem-combined-buttons > .toolbarbutton-1:-moz-any(:not(:hover):not([open]),[disabled=true]) + .toolbarbutton-1:-moz-any(:not(:hover):not([open]),[disabled=true])::before {
+/*
+  content: "";
+  display: -moz-box;
+  width: 1px;
+  height: 16px;
+  -moz-margin-end: -1px;
+*/
 }
 
-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"]) #urlbar-wrapper > .toolbarbutton-1:-moz-any([disabled=true],:not([open]):not([disabled=true]):not(:active)) > .toolbarbutton-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(:hover) > #forward-button[disabled],
-window:not([chromehidden~="toolbar"]) #urlbar-container:not(:hover) > #forward-button[disabled] {
-  opacity: 0;
+#nav-bar .toolbarbutton-1:not([disabled=true]) > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text,
+#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-container,
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button:not([open]):not(:active):not([disabled=true]):hover > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-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:hover > #forward-button[disabled],
-window:not([chromehidden~="toolbar"]) #urlbar-container:hover > #forward-button[disabled] {
-  background-color: transparent;
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open]) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-text,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-container {
 }
 
-#downloads-button > .toolbarbutton-icon {
-  margin: 0;
+#TabsToolbar .toolbarbutton-1,
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+.tabbrowser-arrowscrollbox > .scrollbutton-up,
+.tabbrowser-arrowscrollbox > .scrollbutton-down {
 }
 
-#cut-button {
-  -moz-image-region: rect(0, 216px, 18px, 198px);
+#TabsToolbar .toolbarbutton-1:not([disabled=true]):hover,
+#TabsToolbar .toolbarbutton-1[open],
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover,
+.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled=true]):hover,
+.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled=true]):hover {
 }
 
-#cut-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(18px, 216px, 36px, 198px);
+/* unified back/forward button */
+
+#forward-button {
+  -moz-box-align: stretch; /* let the button shape grow vertically with the location bar */
 }
 
-#cut-button[disabled="true"] {
-  -moz-image-region: rect(36px, 216px, 54px, 198px);
+#forward-button > menupopup {
+  margin-top: 1px !important;
 }
 
-#copy-button {
-  -moz-image-region: rect(0, 234px, 18px, 216px);
+#forward-button > .toolbarbutton-icon {
+  background-clip: padding-box !important;
+  /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
+  /*clip-path: url(chrome://browser/content/browser.xul#keyhole-forward-clip-path) !important;*/
 }
 
-#copy-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(18px, 234px, 36px, 216px);
+#forward-button {
+  -moz-margin-start: -4px !important;
+  padding-left: 4px;
+  padding-right: 2px;
+  margin-top: 3px;
+  margin-bottom: 3px;
+  border-radius: 0 10000px 10000px 0;
 }
 
-#copy-button[disabled="true"] {
-  -moz-image-region: rect(36px, 234px, 54px, 216px);
+#forward-button:-moz-locale-dir(rtl) {
+  border-radius: 10000px 0 0 10000px;
 }
 
-#paste-button {
-  -moz-image-region: rect(0, 252px, 18px, 234px);
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not([switchingtabs]) > #forward-button {
+  transition: margin-left 150ms ease-out;
 }
 
-#paste-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(18px, 252px, 36px, 234px);
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] {
+  margin-left: -27px !important;
 }
 
-#paste-button[disabled="true"] {
-  -moz-image-region: rect(36px, 252px, 54px, 234px);
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs]) > #forward-button[disabled] {
+  /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
+  transition-delay: 100s;
 }
 
-#zoom-out-button {
-  -moz-image-region: rect(0, 288px, 18px, 270px);
-  -moz-margin-end: 0;
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] {
+  /* when not hovered anymore, trigger a new transition to hide the forward button immediately */
+  margin-left: -27.01px !important;
 }
 
-#zoom-in-button {
-  -moz-image-region: rect(0, 306px, 18px, 288px);
+#back-button {
+/*  padding-top: 3px !important;
+  padding-bottom: 3px !important;
+  -moz-padding-start: 5px !important;
+  -moz-padding-end: 0 !important;*/
+  position: relative;
+  z-index: 1;
+  border-radius: 10000px;
+  width: 30px;
+  height: 30px;
+  margin-top: -2px;
+  margin-bottom: -2px;
 }
 
-#zoom-out-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(18px, 288px, 36px, 270px);
+#back-button:-moz-locale-dir(rtl) {
 }
 
-#zoom-out-button[disabled="true"] {
-  -moz-image-region: rect(36px, 288px, 54px, 270px);
+#back-button > menupopup {
+  margin-top: -1px !important;
 }
 
-#zoom-in-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(18px, 306px, 36px, 288px);
+#back-button > .toolbarbutton-icon {
+  border-radius: 10000px !important;
+  background-clip: padding-box !important;
+/*  background-color: hsla(210,25%,98%,.08) !important;
+  padding: 6px !important;
+  border-style: none !important;
+  box-shadow: 0 1px 0 0 hsla(210,4%,10%,.25),
+              0 0 0 1px hsla(210,4%,10%,.25);*/
+  transition-property: background-color, box-shadow !important;
+  transition-duration: 250ms !important;
 }
 
-#zoom-in-button[disabled="true"] {
-  -moz-image-region: rect(36px, 306px, 54px, 288px);
+#back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon {
+/*  background-color: hsla(210,4%,10%,.08) !important;*/
 }
 
-/* tabview button & menu item */
+#back-button:not([disabled="true"]):hover:active > .toolbarbutton-icon,
+#back-button[open="true"] > .toolbarbutton-icon {
+/*  background-color: hsla(210,4%,10%,.12) !important;
+  box-shadow: 0 1px 0 0 hsla(210,4%,10%,.25),
+              0 0 0 1px hsla(210,4%,10%,.25),
+              0 1px 0 0 hsla(210,80%,20%,.1) inset !important;*/
+}
 
-#tabview-button,
-#menu_tabview {
-  list-style-image: url("chrome://browser/skin/tabview/tabview.png") !important;
+#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
+}
+/*
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr),
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/menu-back.png") !important;
 }
 
-#tabview-button {
-  -moz-image-region: rect(0, 90px, 18px, 72px);
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr),
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
 }
 
-#tabview-button[groups="0"] {
-  -moz-image-region: rect(0, 18px, 18px, 0);
+#home-button.bookmark-item {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
-#tabview-button[groups="1"] {
-  -moz-image-region: rect(0, 36px, 18px, 18px);
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbarpaletteitem > #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbarpaletteitem > toolbaritem > :-moz-any(@nestedButtons@):-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbaritem > :-moz-any(@nestedButtons@):-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbarpaletteitem > :-moz-any(@primaryToolbarButtons@):-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > :-moz-any(@primaryToolbarButtons@):-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#home-button.bookmark-item:-moz-lwtheme-brighttext {
+  position: relative;
+  z-index: 1;
+  list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
 }
 
-#tabview-button[groups="2"] {
-  -moz-image-region: rect(0, 54px, 18px, 36px);
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > #sync-button[status="active"]:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbarpaletteitem > #sync-button[status="active"]:-moz-system-metric(windows-classic):not(:-moz-lwtheme) {
+  list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png");
 }
+*/
 
-#tabview-button[groups="3"] {
-  -moz-image-region: rect(0, 72px, 18px, 54px);
+#downloads-button > .toolbarbutton-icon {
+  margin: 0;
 }
 
+/* tabview button & menu item */
+
 #menu_tabview {
+  list-style-image: url("chrome://browser/skin/tabview/tabview.png");
   -moz-image-region: rect(1px, 89px, 17px, 73px);
 }
 
@@ -1717,6 +1634,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-container:hover > #forward-button[
   -moz-image-region: rect(1px, 71px, 17px, 55px);
 }
 
+/* zoom control text (reset) button special case: */
+
+#nav-bar #zoom-reset-button > .toolbarbutton-text {
+  /* To make this line up with the icons, it needs the same height (18px) +
+   * padding (2 * 2px) + border (2 * 1px), but as a minimum because otherwise
+   * increase in text sizes would break things...
+   */
+  min-height: 20px;
+}
+
 /* ::::: fullscreen window controls ::::: */
 
 #window-controls {
@@ -1726,7 +1653,8 @@ window:not([chromehidden~="toolbar"]) #urlbar-container:hover > #forward-button[
 #minimize-button,
 #restore-button,
 #close-button {
-/*  padding: 0; */
+/*  list-style-image: url("chrome://global/skin/icons/windowControls.png");
+  padding: 0; */
 }
 
 #minimize-button {
@@ -1758,12 +1686,11 @@ window:not([chromehidden~="toolbar"]) #urlbar-container:hover > #forward-button[
 #urlbar,
 .searchbar-textbox {
   border-radius: 5px;
-  margin: 0;
+  margin: 2px 0;
   -moz-margin-start: 3px;
 }
 
 #urlbar {
-  width: 7em;
   /* make color as light as possible to deal with dark non-domain parts */
   color: #FFBFFF;
 }
@@ -1775,81 +1702,44 @@ window:not([chromehidden~="toolbar"]) #urlbar-container:hover > #forward-button[
   color: black; */
 }
 
-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,
-window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper {
-  padding-left: 22px;
-  -moz-margin-start: -22px;
-  position: relative;
-  pointer-events: none;
+#urlbar:-moz-lwtheme:hover:not([focused]):not([readonly]),
+.searchbar-textbox:-moz-lwtheme:hover:not([focused]) {
+/*  background-color: rgba(255,255,255,.9);*/
 }
 
-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,
-window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar {
-/*  -moz-border-start: none;
-  margin-left: 0; */
-  pointer-events: all;
+#urlbar:-moz-lwtheme[focused]:not([readonly]),
+.searchbar-textbox:-moz-lwtheme[focused] {
+/*  background-color: white;*/
 }
 
-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,
-window:not([chromehidden~="toolbar"]) #urlbar-container:not([switchingtabs]) > #urlbar-wrapper > #urlbar {
-  transition: margin-left 150ms ease-out;
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar {
+/*  -moz-border-start: none;
+  margin-left: 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(ltr),
-window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar:-moz-locale-dir(ltr) {
+window:not([chromehidden~="toolbar"]) #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),
-window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
+window:not([chromehidden~="toolbar"]) #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,
-window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar {
-  margin-left: -22px;
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
+/*  clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path");*/
+/*  -moz-margin-start: -5px; */
 }
 
-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,
-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"]) #urlbar-wrapper:-moz-locale-dir(rtl),
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
+  /* let urlbar-back-button-clip-path clip the urlbar's right side for RTL */
+  transform: scaleX(-1);
 }
 
-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,
-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;
-}
-
-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:-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),
-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);
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper:-moz-locale-dir(rtl) {
+  -moz-box-direction: reverse;
 }
 
 html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
@@ -1857,11 +1747,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   color: #E7ADE7;
 }
 
-#urlbar:-moz-lwtheme[focused="true"],
-.searchbar-textbox:-moz-lwtheme[focused="true"] {
-/*  background-color: white; */
-}
-
 #urlbar-container {
   -moz-box-orient: horizontal;
   -moz-box-align: stretch;
@@ -1873,7 +1758,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 
 .urlbar-input-box {
   -moz-margin-start: 0;
-  min-width: 4em;
 }
 
 #urlbar-icons {
@@ -1950,61 +1834,40 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   border-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 > #identity-box,
-window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar > #identity-box {
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box {
 /*   border-radius: 0; */
   -moz-padding-start: 2px;
   -moz-padding-end: 2px;
   -moz-margin-end: 1px;
 }
 
-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),
-window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar >
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not([switchingtabs]) > #urlbar > #identity-box {
+  transition: padding-left, padding-right;
+}
+
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #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),
-window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar > 
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #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,
-window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:hover:not([switchingtabs]) > #urlbar-wrapper > #urlbar > 
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs]) > #forward-button[disabled] + #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),
-window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar > 
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] + #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),
-window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar > 
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] + #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;
@@ -2145,6 +2008,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:ho
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box > #page-proxy-favicon {
+/*  -moz-margin-end: 1px;*/
+}
+
 #identity-box:hover > #page-proxy-favicon {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
@@ -2193,6 +2060,11 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:ho
   height: 16px;
 }
 
+richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-bookmark,
+.autocomplete-treebody::-moz-tree-image(selected, current, bookmark, treecolAutoCompleteImage) {
+/*  -moz-image-region: rect(0px 48px 16px 32px);*/
+}
+
 .ac-result-type-keyword,
 .autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
   list-style-image: url("chrome://global/skin/icons/Search-glass.png");
@@ -2209,15 +2081,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:ho
 }
 
 .ac-comment {
-  font-size: 1.15em;
+  font-size: 1.06em;
 }
 
 .ac-extra > .ac-comment {
-  font-size: inherit;
+  font-size: 1em;
 }
 
 .ac-url-text,
 .ac-action-text {
+  font-size: 1em;
   color: #9C9CFF;
 }
 
@@ -2254,21 +2127,15 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 /* combined go/reload/stop button in location bar */
 
-#go-button,
 #urlbar > toolbarbutton {
-  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  /* margin: -2px; */
   -moz-margin-start: 0;
   padding: 0 2px;
   background-origin: border-box;
   border: none;
+  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
   -moz-border-start: 1px solid #9C9CFF;
 }
 
-#go-button {
-  padding: 0 3px;
-}
-
 #urlbar:-moz-locale-dir(ltr) > toolbarbutton {
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
@@ -2279,39 +2146,38 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   border-bottom-right-radius: 0px;
 }
 
-#urlbar > toolbarbutton:not([disabled]):active:hover,
+#urlbar > toolbarbutton:not([disabled=true]):active:hover,
 #urlbar-reload-button:not(:hover) {
   -moz-border-start-style: none;
   -moz-padding-start: 3px;
 }
 
-#urlbar > toolbarbutton:not([disabled]):active:hover {
+#urlbar-reload-button {
+  -moz-image-region: rect(0px, 14px, 14px, 0px);
 }
 
-#urlbar-go-button {
-  -moz-image-region: rect(0, 42px, 14px, 28px);
+#urlbar-reload-button[disabled=true] {
+  -moz-image-region: rect(28px, 14px, 42px, 0px);
 }
 
-#go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
-#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  transform: scaleX(-1);
+#urlbar-reload-button:not([disabled=true]):hover {
+  -moz-image-region: rect(14px, 14px, 28px, 0px);
 }
 
-#urlbar-go-button:hover,
-#go-button:hover {
-  -moz-image-region: rect(14px, 42px, 28px, 28px);
+#urlbar-reload-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
 }
 
-#urlbar-reload-button {
-  -moz-image-region: rect(0px, 14px, 14px, 0px);
+#urlbar-go-button {
+  -moz-image-region: rect(0, 42px, 14px, 28px);
 }
 
-#urlbar-reload-button[disabled] {
-  -moz-image-region: rect(28px, 14px, 42px, 0px);
+#urlbar-go-button:hover {
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
 }
 
-#urlbar-reload-button:not([disabled]):hover {
-  -moz-image-region: rect(14px, 14px, 28px, 0px);
+#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
 }
 
 #urlbar-stop-button {
@@ -2343,11 +2209,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   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; */
@@ -2451,35 +2312,40 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-/* star button */
+/* bookmarks menu-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);
+#bookmarks-menu-button.bookmark-item {
+  list-style-image: url("chrome://browser/skin/places/bookmark.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-#urlbar-container > #urlbar > #urlbar-icons > #star-button:hover {
-  -moz-image-region: rect(16px 32px 32px 16px);
+#bookmarks-menu-button.bookmark-item[starred] {
+  -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-#urlbar-container > #urlbar > #urlbar-icons > #star-button:hover:active {
-  -moz-image-region: rect(16px 48px 32px 32px);
+#bookmarks-menu-button.bookmark-item > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+  -moz-margin-start: 5px;
 }
 
-#urlbar-container > #urlbar > #urlbar-icons > #star-button[starred="true"] {
-  -moz-image-region: rect(0px 16px 16px 0px);
+#bookmarks-menu-button[cui-areatype="toolbar"]:not(.bookmark-item):not([overflowedItem=true]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  padding-top: 2px;
+  padding-bottom: 2px;
 }
 
-#urlbar-container > #urlbar > #urlbar-icons > #star-button[starred="true"]:hover {
-  -moz-image-region: rect(0px 32px 16px 16px);
+#BMB_bookmarksPopup[side="top"],
+#BMB_bookmarksPopup[side="bottom"] {
+  margin-left: -20px;
+  margin-right: -20px;
 }
 
-#urlbar-container > #urlbar > #urlbar-icons > #star-button[starred="true"]:hover:active {
-  -moz-image-region: rect(0px 48px 16px 32px);
+#BMB_bookmarksPopup[side="left"],
+#BMB_bookmarksPopup[side="right"] {
+  margin-top: -20px;
+  margin-bottom: -20px;
 }
 
 /* bookmarking panel */
+
 #editBookmarkPanelStarIcon {
   list-style-image: url("chrome://browser/skin/places/starred48.png");
   width: 48px;
@@ -2505,8 +2371,8 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 }
 
 .panel-promo-box {
-  margin: 5px -6px -6px;
-  padding: 5px;
+  margin: 5px 0 -6px;
+  padding: 5px 0;
   border-top: 1px solid #9C9CFF;
   border-bottom-left-radius: 5px;
   border-bottom-right-radius: 5px;
@@ -2547,6 +2413,18 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   -moz-padding-start: 0px;
 }
 
+#sidebar-header > .close-icon {
+/*  padding: 4px 2px;
+  margin: 0;
+  border: none;*/
+  list-style-image: url("chrome://global/skin/icons/close-button.gif");
+}
+
+#sidebar-header > .close-icon:hover,
+#sidebar-header > .close-icon:hover:active {
+  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
+}
+
 .browserContainer > findbar {
 /*
   background-color: -moz-dialog;
@@ -2554,34 +2432,9 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 */
 }
 
-/* ::::: throbber ::::: */
-
-#navigator-throbber {
-  width: 16px;
-  min-height: 16px;
-  margin: 0 3px;
-}
-
-#navigator-throbber[busy="true"] {
-  list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.png");
-}
-
-#navigator-throbber,
-#wrapper-navigator-throbber > #navigator-throbber {
-  list-style-image: url("chrome://communicator/skin/brand/throbber16-single.png");
-}
-
 /* Tabstrip */
 
-/* Remove selector when Australis lands - this makes it only apply pre-Australis as iconsize only exists there */
-#navigator-toolbox[iconsize] > #TabsToolbar {
-  min-height: 0;
-  padding: 0;
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
-}
-
-/* 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;
   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar");
@@ -2596,35 +2449,118 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   border-bottom: 1px solid #008484;
 }
 
-/* === BEGIN tabs.inc.css === */
+/* === BEGIN tabs.inc.css === */
+
+.tabbrowser-tab,
+.tabs-newtab-button,
+#TabsToolbar > #new-tab-button {
+  margin-top: 0px;
+}
+
+.tabbrowser-tab {
+  padding: 1px 4px 2px;
+}
+
+.tabbrowser-tab:first-of-type {
+  -moz-margin-start: 2px;
+}
+
+.tabs-newtab-button,
+#TabsToolbar > #new-tab-button {
+  border-radius: 8px 8px 0px 0px;
+  -moz-margin-start: 0;
+}
+
+.tabs-newtab-button:not(:hover),
+#TabsToolbar > #new-tab-button:not(:hover) {
+  background-color: #C09070;
+}
+
+.tabbrowser-tab[remote] {
+  text-decoration: underline;
+}
+
+/* The selected tab should appear above adjacent tabs, .tabs-newtab-button and the highlight of #nav-bar */
+.tabbrowser-tab[selected=true] {
+/*  position: relative;
+  z-index: 2;*/
+}
+
+.tab-background-middle {
+}
+
+.tab-content {
+}
+
+.tab-/*throbber*/,
+.tab-icon-image,
+.tab-close-button {
+}
+
+.tab-throbber,
+.tab-icon-image {
+  height: 16px;
+  width: 16px;
+}
+
+.tab-icon-image {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+.tab-throbber[busy] {
+  list-style-image: url("chrome://communicator/skin/brand/throbber16-anim-connect.png");
+}
+
+.tab-throbber[progress] {
+  list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.png");
+}
+
+.tab-throbber:not([pinned]),
+.tab-icon-image:not([pinned]) {
+  -moz-margin-end: 3px;
+}
+
+.tab-throbber[pinned],
+.tab-icon-image[pinned] {
+  -moz-margin-start: 2px;
+  -moz-margin-end: 2px;
+}
+
+.tab-label {
+  /* this needs to add up to the 16px of the icon image */
+  height: 12px;
+  margin-top: 2px !important;
+  margin-bottom: 2px !important;
+}
 
-.tabbrowser-tab,
-.tabs-newtab-button,
-#TabsToolbar > #new-tab-button {
-  margin-top: 0px;
+.tab-close-button {
+  margin-top: 1px;
+  padding: 0;
 }
 
-.tabbrowser-tab {
-  padding: 1px 4px 2px;
+.tab-background,
+.tabs-newtab-button {
+  /* overlap the tab curves */
 }
 
-.tabbrowser-tab:first-of-type {
-  -moz-margin-start: 2px;
+.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
 }
 
-.tabs-newtab-button,
-#TabsToolbar > #new-tab-button {
-  border-radius: 8px 8px 0px 0px;
-  -moz-margin-start: 0;
+.tab-background-start[selected=true]::after,
+.tab-background-start[selected=true]::before,
+.tab-background-start,
+.tab-background-end,
+.tab-background-end[selected=true]::after,
+.tab-background-end[selected=true]::before {
 }
 
-.tabs-newtab-button:not(:hover),
-#TabsToolbar > #new-tab-button:not(:hover) {
-  background-color: #C09070;
+.tabbrowser-tab:not([selected=true]),
+.tabbrowser-tab:-moz-lwtheme {
 }
 
-.tabbrowser-tab[remote] {
-  text-decoration: underline;
+/* tabbrowser-tab focus ring */
+.tabbrowser-tab:focus {
+  outline: 1px dotted;
 }
 
 /* Selected tab */
@@ -2634,11 +2570,24 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 /* End selected tab */
 
+/* Tab pointer-events */
+/*
+.tabbrowser-tab {
+  pointer-events: none;
+}
+
+.tab-background-middle,
+.tabs-newtab-button,
+.tab-close-button {
+  pointer-events: auto;
+}
+*/
 /* Pinned tabs */
 
 .tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
   background-color: #E7ADE7;
 }
+
 .tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
   background-color: #3333FF;
   color: #000000;
@@ -2650,38 +2599,16 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   width: 28px;
 }
 
-#TabsToolbar > #new-tab-button {
-  width: 26px;
-}
-
 /* === END tabs.inc.css === */
 
-.tab-throbber,
-.tab-icon-image {
-  width: 16px;
-  height: 16px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-  -moz-image-region: auto;
-  -moz-margin-end: 3px;
-}
-
-.tab-throbber {
-  list-style-image: url("chrome://communicator/skin/brand/throbber16-anim-connect.png");
-}
-
-.tab-throbber[progress] {
-  list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.png");
-}
-
-.tab-throbber[pinned],
-.tab-icon-image[pinned] {
-  -moz-margin-start: 2px;
-  -moz-margin-end: 2px;
-}
-
-/* tabbrowser-tab focus ring */
-.tabbrowser-tab:focus > .tab-stack {
-  outline: 1px dotted;
+/* Background tabs:
+ *
+ * Decrease the height of the hoverable region of background tabs whenever the tabs are at the top
+ * of the window (e.g. no menubar, tabs in titlebar, etc.) to make it easier to drag the window by
+ * the titlebar. We don't need this in fullscreen since window dragging is not an issue there.
+ */
+#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar .tab-background-middle:not([selected=true]) {
+/*  clip-path: url(chrome://browser/content/browser.xul#tab-hover-clip-path);*/
 }
 
 /* Tab DnD indicator */
@@ -2692,9 +2619,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 /* Tab close button */
 .tab-close-button {
-  border: none;
-  padding: 0px;
-  margin-top: 1px;
   list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
 
@@ -2715,12 +2639,39 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   margin: 0;
   padding-top: 0;
   padding-bottom: 0;
+  background-origin: border-box;
+}
+
+#main-window[tabsintitlebar]:not([inFullscreen]) .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-lwtheme-brighttext,
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-lwtheme-brighttext {
+ }
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled],
+.tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] {
+ }
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) {
+/*  transform: scaleX(-1);*/
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-down {
+  transition: 1s background-color ease-out;
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-down[notifybgtab] {
   background-color: #008484;
 }
 
+.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]),
+.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]) {
+/*  border-width: 0 2px 0 0;
+  border-style: solid;
+  border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 fill;*/
+}
+
 .tabs-newtab-button > .toolbarbutton-icon {
   margin-top: -1px;
   margin-bottom: -1px;
@@ -2734,21 +2685,27 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   -moz-image-region: rect(0, 16px, 18px, 0);
 }
 
-/* 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,
 #TabsToolbar > #new-tab-button:hover {
   -moz-image-region: rect(0, 32px, 18px, 16px);
 }
 
-#alltabs-button {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+#main-window[tabsintitlebar]:not([inFullscreen]) .tabs-newtab-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar > #new-tab-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+.tabs-newtab-button:-moz-lwtheme-brighttext,
+#TabsToolbar > #new-tab-button:-moz-lwtheme-brighttext,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-lwtheme-brighttext {
 }
 
-#alltabs-button > .toolbarbutton-menu-dropmarker {
-  display: none;
+#TabsToolbar > #new-tab-button {
+  width: 26px;
+}
+
+#alltabs-button {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
 }
 
 #alltabs-button:hover,
@@ -2757,6 +2714,18 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
 }
 
+#main-window[tabsintitlebar]:not([inFullscreen]) #alltabs-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#alltabs-button:-moz-lwtheme-brighttext {
+}
+
+#alltabs-button > .toolbarbutton-icon {
+/*  margin: 0 2px;*/
+}
+
+#alltabs-button > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
 /* All tabs menupopup */
 .alltabs-item > .menu-iconic-left > .menu-iconic-icon {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
@@ -2775,26 +2744,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   background-color: #402800;
 }
 
-/* Tabstrip close button */
-.tabs-closebutton {
-  -moz-box-flex: 1;
-  margin: 0px;
-  padding: 2px;
-  list-style-image: url("chrome://global/skin/icons/close-button.gif");
-}
-
-.tabs-closebutton > .toolbarbutton-icon {
-}
-
-.tabs-closebutton > .toolbarbutton-text {
-  display: none;
-}
-
-.tabs-closebutton:hover,
-.tabs-closebutton:hover:active {
-  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
-}
-
 toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
 }
@@ -2817,10 +2766,6 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   margin: 0;
 }
 
-toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
-  display: -moz-box; /* display chevron icon in text mode */
-}
-
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading.gif");
   -moz-margin-end: 4px;
@@ -3050,11 +2995,20 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://browser/skin/webRTC-shareDevice-64.png");
 }
 
+.popup-notification-icon[popupid="webRTC-sharingMicrophone"],
+.popup-notification-icon[popupid="webRTC-shareMicrophone"] {
+  list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-64.png");
+}
+
 .popup-notification-icon[popupid="pointerLock"] {
   list-style-image: url("chrome://browser/skin/pointerLock-64.png");
 }
 
 /* Notification icon box */
+#notification-popup .panel-promo-box {
+/*  margin: 10px -10px -10px; */
+}
+
 #notification-popup-box {
   position: relative;
   background-color: #000000;
@@ -3067,10 +3021,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   border-right-width: 8px;
 }
 
-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 {
-/*  padding-left: 5px; */
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar > #notification-popup-box {
+/*  padding-left: 7px; */
 }
 
 #notification-popup-box:-moz-locale-dir(rtl),
@@ -3086,7 +3038,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 .notification-anchor-icon:-moz-focusring {
   outline: 1px dotted #008484;
-/*  outline-offset: -3px; */
 }
 
 .default-notification-icon,
@@ -3180,6 +3131,16 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   list-style-image: url("chrome://browser/skin/webRTC-sharingDevice-16.png");
 }
 
+.webRTC-shareMicrophone-notification-icon,
+#webRTC-shareMicrophone-notification-icon {
+  list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-16.png");
+}
+
+.webRTC-sharingMicrophone-notification-icon,
+#webRTC-sharingMicrophone-notification-icon {
+  list-style-image: url("chrome://browser/skin/webRTC-sharingMicrophone-16.png");
+}
+
 .web-notifications-notification-icon,
 #web-notifications-notification-icon {
   list-style-image: url("chrome://browser/skin/notification-16.png");
@@ -3192,14 +3153,53 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   margin: 0px;
 }
 
-#download-monitor {
-  list-style-image: url("chrome://browser/skin/FxToolbar.png");
-  -moz-image-region: rect(0, 108px, 18px, 90px);
+/* Translation infobar */
+
+/* === BEGIN infobar.inc.css === */
+
+notification[value="translation"] .messageImage {
+  list-style-image: url(chrome://browser/skin/translation-16.png);
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+@media (min-resolution: 1.25dppx) {
+  notification[value="translation"] .messageImage {
+    list-style-image: url(chrome://browser/skin/translation-16@2x.png);
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+}
+
+notification[value="translation"] button,
+notification[value="translation"] menulist {
+  min-width: 0;
+}
+
+notification[value="translation"] menulist > .menulist-dropmarker {
+}
+
+/* === END infobar.inc.css === */
+
+notification[value="translation"] {
+  min-height: 40px;
+}
+
+.translate-notification-icon,
+#translate-notification-icon {
+  list-style-image: url("chrome://browser/skin/translation-16.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.translated-notification-icon,
+#translated-notification-icon {
+  list-style-image: url("chrome://browser/skin/translation-16.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+.translation-menupopup {
+  -moz-appearance: none;
 }
 
 /* Bookmarks roots menu-items */
-#appmenu_subscribeToPage:not([disabled]),
-#appmenu_subscribeToPageMenu,
 #subscribeToPageMenuitem:not([disabled]),
 #subscribeToPageMenupopup,
 #BMB_subscribeToPageMenuitem:not([disabled]),
@@ -3208,14 +3208,14 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 }
 
 #bookmarksToolbarFolderMenu,
-#appmenu_bookmarksToolbar,
-#BMB_bookmarksToolbar {
+#BMB_bookmarksToolbar,
+#panelMenu_bookmarksToolbar {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png");
   -moz-image-region: auto;
 }
 
-#appmenu_unsortedBookmarks,
-#BMB_unsortedBookmarks {
+#BMB_unsortedBookmarks,
+#panelMenu_unsortedBookmarks {
   list-style-image: url("chrome://communicator/skin/bookmarks/unsortedBookmarks.png");
   -moz-image-region: auto;
 }
@@ -3280,57 +3280,33 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   margin-top: .5em;
 }
 
-/* Add-on bar */
-
-#addon-bar {
-  min-height: 20px;
-  border-top: 3px solid #000000;
-  border-bottom-width: 0;
-}
-
-#addon-bar .toolbar-holder {
-  background-color: #8050B0;
-  color: #FFCF00;
-}
-
-#addon-bar .toolbar-holder {
-  background-color: #8050B0;
-  color: #FFCF00;
-}
+/* Sync Panel */
 
-#addon-bar .toolbar-startcap,
-#addon-bar .toolbar-endcap{
-  background-color: #6000CF;
+.sync-panel-icon {
+  height:32px;
+  width: 32px;
+  background: url("chrome://browser/content/abouthome/sync.png") top left no-repeat;
 }
 
-#status-bar {
-  -moz-binding: url("chrome://global/content/bindings/general.xml#statusbar");
-  margin-top: .3em;
-  border-width: 0;
+.sync-panel-inner {
+  width: 0;
+  padding-left: 10px;
 }
 
-#addon-bar[customizing] > #status-bar {
-  opacity: .5;
-/*  background-image: -moz-repeating-linear-gradient(-45deg,
-                                                   rgba(255,255,255,.3), rgba(255,255,255,.3) 5px,
-                                                   rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px);*/
+.sync-panel-button-box {
+  margin-top: 1em;
 }
 
-/* Remove all borders from statusbarpanel children of
-   the statusbar.
-#status-bar > statusbarpanel {
-  border-width: 0;
-} */
-
-#addonbar-closebutton {
-  border: none;
-  padding: 3px 5px;
-  list-style-image: url("chrome://global/skin/icons/close-button.gif");
+#sync-error-panel-title,
+#sync-start-panel-title {
+  font-size: 120%;
+  font-weight: bold;
+  margin-bottom: 5px;
 }
 
-#addonbar-closebutton:hover,
-#addonbar-closebutton:hover:active {
-  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
+#sync-start-panel-subtitle,
+#sync-error-panel-subtitle {
+  margin: 0;
 }
 
 /* Status panel */
@@ -3367,16 +3343,40 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 /* === BEGIN highlighter.inc.css === */
 
-/* Highlighter */
+/* Box model highlighter */
+svg|g.box-model-container {
+  opacity: 0.4;
+}
+
+svg|polygon.box-model-content {
+  fill: #008484;
+}
+
+svg|polygon.box-model-padding {
+  fill: #9C9CFF;
+}
+
+svg|polygon.box-model-border {
+  fill: #FFCF00;
+}
+
+svg|polygon.box-model-margin {
+  fill: #A09090;
+}
 
-.highlighter-outline {
-  box-shadow: 0 0 0 1px black;
-  outline: 1px dashed #A09090;
+svg|polygon.box-model-content,
+svg|polygon.box-model-padding,
+svg|polygon.box-model-border,
+svg|polygon.box-model-margin {
+  stroke: none;
 }
 
-.highlighter-outline[locked]  {
-  box-shadow: 0 0 0 1px rgba(0,0,0,0.3);
-  outline-color: rgba(255,255,255,0.7);
+svg|line.box-model-guide-top,
+svg|line.box-model-guide-right,
+svg|line.box-model-guide-bottom,
+svg|line.box-model-guide-left {
+  stroke: #E7ADE7;
+  stroke-dasharray: 5 3;
 }
 
 /* Highlighter - Node Infobar */
@@ -3396,6 +3396,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 /* Highlighter - Node Infobar - text */
 
 .highlighter-nodeinfobar-text {
+  text-align: center;
   /* 100% - size of the buttons and margins */
   max-width: calc(100% - 2 * (26px + 6px));
   padding-bottom: 1px;
@@ -3413,35 +3414,6 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   color: #FF9F00;
 }
 
-/* Highlighter - Node Infobar - buttons */
-
-.highlighter-nodeinfobar-button {
-  padding: 0;
-  width: 26px;
-  min-height: 26px;
-}
-
-.highlighter-nodeinfobar-inspectbutton {
-  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-  -moz-margin-start: 0px;
-  -moz-margin-end: 2px;
-}
-
-.highlighter-nodeinfobar-inspectbutton:hover,
-.highlighter-nodeinfobar-inspectbutton:hover:active/*,
-.highlighter-nodeinfobar-container:not([locked]) >  .highlighter-nodeinfobar >  .highlighter-nodeinfobar-inspectbutton*/ {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-.highlighter-nodeinfobar-menu {
-}
-
-.highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
-  -moz-box-align: center;
-  -moz-margin-start: -1px;
-}
-
 /* Highlighter - Node Infobar - box & arrow */
 
 .highlighter-nodeinfobar-arrow {
@@ -3540,6 +3512,12 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   display: none;
 }
 
+.developer-toolbar-button > .toolbarbutton-icon,
+#developer-toolbar-closebutton > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
 #developer-toolbar-toolbox-button {
   list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
@@ -3555,6 +3533,19 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #developer-toolbar-toolbox-button {
+    list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png");
+    -moz-image-region: rect(0px, 32px, 32px, 0px);
+  }
+
+  #developer-toolbar-toolbox-button:hover,
+  #developer-toolbar-toolbox-button:hover:active,
+  #developer-toolbar-toolbox-button[checked=true] {
+    -moz-image-region: rect(0px, 64px, 32px, 32px);
+  }
+}
+
 #developer-toolbar-closebutton {
   list-style-image: url("chrome://browser/skin/devtools/close.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
@@ -3574,6 +3565,18 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #developer-toolbar-closebutton {
+    list-style-image: url("chrome://browser/skin/devtools/close@2x.png");
+    -moz-image-region: rect(0px, 32px, 32px, 0px);
+  }
+
+  #developer-toolbar-closebutton:hover,
+  #developer-toolbar-closebutton:hover:active {
+    -moz-image-region: rect(0px, 64px, 32px, 32px);
+  }
+}
+
 /* GCLI */
 
 html|*#gcli-tooltip-frame,
@@ -3600,19 +3603,38 @@ html|*#gcli-output-frame {
 }
 
 .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::before {
+  content: "";
+  display: inline-block;
+  -moz-box-ordinal-group: 0;
+  width: 16px;
+  height: 16px;
+  margin: 0 2px;
+  background-image: url("chrome://browser/skin/devtools/commandline-icon.png");
+  background-position: 0 center;
+  background-size: 32px 16px;
+}
+
+.gclitoolbar-input-node[focused="true"]::before {
+  background-position: -16px center;
+}
+
+@media (min-resolution: 2dppx) {
+  .gclitoolbar-input-node::before {
+    background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png");
+  }
+}
+
 .gclitoolbar-input-node:not([focused="true"]) {
   border-color: transparent;
 }
@@ -3669,7 +3691,7 @@ html|*#gcli-output-frame {
 /* Responsive Mode */
 
 .browserContainer[responsivemode] {
-  background: #221500 url("chrome://browser/skin/devtools/responsive-background.png");
+  background-color: #221500;
   padding: 0 20px 20px 20px;
 }
 
@@ -3697,6 +3719,11 @@ html|*#gcli-output-frame {
 /*  margin: 0 3px; */
 }
 
+.devtools-responsiveui-toolbarbutton > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
 .devtools-responsiveui-toolbarbutton > .toolbarbutton-menubutton-button {
   -moz-box-orient: horizontal;
 }
@@ -3744,7 +3771,7 @@ html|*#gcli-output-frame {
 .devtools-responsiveui-menulist > .menulist-dropmarker {
 /*  display: -moz-box;
   background-color: transparent;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
+  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
   -moz-box-align: center;
   border-width: 0;
   min-width: 16px;*/
@@ -3768,7 +3795,7 @@ html|*#gcli-output-frame {
 
 .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");
+/*  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px;*/
 }
@@ -3796,6 +3823,24 @@ html|*#gcli-output-frame {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
+@media (min-resolution: 2dppx) {
+  .devtools-responsiveui-close {
+    list-style-image: url("chrome://browser/skin/devtools/close@2x.png");
+  }
+
+  .devtools-responsiveui-close:hover {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+
+  .devtools-responsiveui-rotate {
+    list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate@2x.png");
+  }
+
+  .devtools-responsiveui-rotate:hover {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+}
+
 .devtools-responsiveui-touch {
   list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png");
   -moz-image-region: rect(0px,16px,16px,0px);
@@ -3807,6 +3852,19 @@ html|*#gcli-output-frame {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
+@media (min-resolution: 2dppx) {
+  .devtools-responsiveui-touch {
+    list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png");
+    -moz-image-region: rect(0px,32px,32px,0px);
+  }
+
+  .devtools-responsiveui-touch:hover,
+  .devtools-responsiveui-touch[checked],
+  .devtools-responsiveui-touch[checked]:hover {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+}
+
 .devtools-responsiveui-screenshot {
   list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png");
   -moz-image-region: rect(0px,16px,16px,0px);
@@ -3816,11 +3874,22 @@ html|*#gcli-output-frame {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
+@media (min-resolution: 2dppx) {
+  .devtools-responsiveui-screenshot {
+    list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png");
+  }
+
+  .devtools-responsiveui-screenshot:hover {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+}
+
 .devtools-responsiveui-resizebarV {
   width: 7px;
   height: 24px;
   cursor: ew-resize;
   transform: translate(12px, -12px);
+  background-size: cover;
   background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png");
 }
 
@@ -3829,6 +3898,7 @@ html|*#gcli-output-frame {
   height: 7px;
   cursor: ns-resize;
   transform: translate(-12px, 12px);
+  background-size: cover;
   background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer.png");
 }
 
@@ -3837,9 +3907,24 @@ html|*#gcli-output-frame {
   height: 16px;
   cursor: se-resize;
   transform: translate(12px, 12px);
+  background-size: cover;
   background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png");
 }
 
+@media (min-resolution: 2dppx) {
+  .devtools-responsiveui-resizebarV {
+    background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png");
+  }
+
+  .devtools-responsiveui-resizebarH {
+    background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer@2x.png");
+  }
+
+  .devtools-responsiveui-resizehandle {
+    background-image: url("chrome://browser/skin/devtools/responsive-se-resizer@2x.png");
+  }
+}
+
 /* === END responsivedesign.inc.css === */
 
 /* === including indicator.css is done at the start of the file === */
@@ -3872,7 +3957,7 @@ html|*#gcli-output-frame {
   position: relative;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container {
+#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container {
   padding: 2px 2px;
 }
 
@@ -3903,7 +3988,7 @@ html|*#gcli-output-frame {
   right: 0;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
+#nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
   top: 1px;
   right: 1px;
 }
@@ -3913,7 +3998,7 @@ html|*#gcli-output-frame {
   right: auto;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+#nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
   left: 1px;
   right: auto;
 }
@@ -3942,8 +4027,7 @@ html|*#gcli-output-frame {
 #servicesInstall-notification-icon {
   list-style-image: url("chrome://browser/skin/social/services-16.png");
 }
-#social-undoactivation-button,
-#servicesInstall-learnmore-link {
+#social-undoactivation-button {
   -moz-margin-start: 0; /* override default label margin to match description margin */
 }
 
@@ -4011,6 +4095,40 @@ html|*#gcli-output-frame {
 
 /* === BEGIN chat.inc.css === */
 
+#social-sidebar-header {
+  padding: 3px;
+}
+
+#social-sidebar-button {
+  -moz-appearance: none;
+  list-style-image: url("chrome://browser/skin/social/gear_default.png");
+  border: none;
+  padding: 0;
+  margin: 2px;
+}
+#social-sidebar-button > .toolbarbutton-icon {
+  min-height: 16px;
+  min-width: 16px;
+}
+#social-sidebar-button:hover,
+#social-sidebar-button:hover:active {
+  list-style-image: url("chrome://browser/skin/social/gear_clicked.png");
+}
+#social-sidebar-button > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+#social-sidebar-button[loading="true"] {
+  list-style-image: url("chrome://global/skin/icons/loading.gif");
+}
+
+#social-sidebar-favico {
+  max-height: 16px;
+  max-width: 16px;
+  padding: 0;
+  margin: 2px;
+}
+
 .chat-status-icon {
   max-height: 16px;
   max-width: 16px;
@@ -4213,6 +4331,36 @@ window > chatbox {
 
 /* === END chat.inc.css === */
 
+.chat-titlebar {
+/*  background-color: #c4cfde; */
+}
+
+.chat-titlebar[selected] {
+/*  background-color: #dae3f0; */
+}
+
+.chatbar-button {
+  -moz-appearance: none;
+/*  background-color: #c4cfde; */
+}
+
+.chatbar-button > .toolbarbutton-icon {
+/*  -moz-margin-end: 0; */
+}
+
+.chatbar-button:hover,
+.chatbar-button[open="true"] {
+/*  background-color: #dae3f0; */
+}
+
+.chatbar-button[activity]:not([open="true"]) {
+}
+
+chatbox {
+/*  border-top-left-radius: 2.5px;
+  border-top-right-radius: 2.5px; */
+}
+
 /* === BEGIN plugin-doorhanger.inc.css === */
 
 /**
@@ -4284,10 +4432,12 @@ notification.pluginVulnerable .messageImage {
 
 /* Customization mode */
 
-#main-window:-moz-any([customize-entering],[customize-entered]) #content-deck {
-  margin: 0 1em 1em;
+#main-window:-moz-any([customize-entering],[customize-entered]) #browser-bottombox {
+  margin-bottom: 1em;
 }
 
+#main-window:-moz-any([customize-entering],[customize-entered]) #content-deck,
+#main-window:-moz-any([customize-entering],[customize-entered]) #browser-bottombox,
 #main-window:-moz-any([customize-entering],[customize-entered]) #navigator-toolbox {
   margin-left: 1em;
   margin-right: 1em;
@@ -4386,8 +4536,12 @@ notification.pluginVulnerable .messageImage {
   padding: 10px 10px 0px;
 }
 
+#main-window:-moz-any([customize-entering],[customize-entered]) #browser-bottombox,
 #customization-footer {
   /*background-color: rgb(236,236,236);*/
+}
+
+#customization-footer {
   border-top: 1px solid #9C9CFF;
   padding: 15px;
 }
@@ -4404,21 +4558,44 @@ notification.pluginVulnerable .messageImage {
 
 #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-image-region: rect(0, 16px, 16px, 0);
+  padding: 0px 5px;
   -moz-margin-end: 10px;
 }
 
+#customization-titlebar-visibility-button:hover {
+  -moz-image-region: rect(16px, 16px, 32px, 0);
+}
+
+#customization-titlebar-visibility-button > .button-box {
+  padding-top: 0;
+  padding-bottom: 1px;
+}
+
+#customization-titlebar-visibility-button:hover:active > .button-box {
+  padding-top: 1px;
+  padding-bottom: 0;
+}
+
 #customization-titlebar-visibility-button > .button-box > .button-text {
   /* Sadly, button.css thinks its margins are perfect for everyone. */
-  -moz-margin-start: 6px !important;
+  -moz-margin-start: 5px !important;
 }
 
 #customization-titlebar-visibility-button[checked] {
-  -moz-image-region: rect(0, 48px, 24px, 24px);
+  -moz-image-region: rect(0, 32px, 16px, 16px);
   background-color: #008484;
 }
 
+#customization-titlebar-visibility-button[checked]:hover {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+  background-color: #FFCF00;
+}
+
+#customization-titlebar-visibility-button[checked]:hover:active {
+  background-color: #FF9F00;
+}
+
 #customization-undo-reset-button {
   -moz-margin-end: 10px;
 }
@@ -4464,12 +4641,14 @@ toolbarpaletteitem[notransition][place="panel"] {
 }
 
 toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon,
+toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-container > .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 {
+toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon,
+toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon {
   transform: scale(1.3);
 }
 
@@ -4497,15 +4676,14 @@ toolbarpaletteitem[place="toolbar"] {
   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 {
+#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;
+  min-height: 24px;
   padding: 4px;
 }
 
@@ -4518,8 +4696,8 @@ toolbarpaletteitem[place="toolbar"] {
   opacity: 1; /* To ensure these buttons always look enabled in customize mode */
 }
 
-:-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 {
+#wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button,
+#wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button + separator {
   display: none;
 }
 
@@ -4612,17 +4790,32 @@ toolbarpaletteitem[place="toolbar"] {
 
 /* === END customizeTip.inc.css === */
 
+/**
+ * This next rule is a hack to disable subpixel anti-aliasing on all
+ * labels during the customize mode transition. Subpixel anti-aliasing
+ * on Windows with Direct2D layers acceleration is particularly slow to
+ * paint, so this hack is how we sidestep that performance bottleneck.
+ */
+#main-window:-moz-any([customize-entering],[customize-exiting]) label {
+  transform: perspective(0.01px);
+}
+
 #main-window[customize-entered] {
   background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
   background-attachment: fixed;
 }
 
-#customization-container {
+#main-window[customize-entered] #browser-bottombox,
+#main-window[customize-entered] #customization-container {
   border-left: 1px solid #9C9CFF;
   border-right: 1px solid #9C9CFF;
   background-clip: padding-box;
 }
 
+#main-window[customize-entered] #browser-bottombox {
+  border-bottom: 1px solid #9C9CFF;
+}
+
 #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"] {
   margin-right: -2px;
 }
@@ -4633,59 +4826,320 @@ toolbarpaletteitem[place="toolbar"] {
 
 /* End customization mode */
 
-#main-window[privatebrowsingmode=temporary] #toolbar-menubar {
-  background-image: url("chrome://browser/skin/privatebrowsing-dark.png");
-  background-position: top right;
-  background-repeat: no-repeat;
+/* Private browsing indicators */
+
+/**
+ * Currently, we have two places where we put private browsing indicators on
+ * Windows. When tabsintitlebar is enabled, we draw the indicator in the titlebar.
+ * When tabsintitlebar is disabled, we draw the indicator at the end of the
+ * tabstrip. The titlebar indicator is the fiddliest of the bunch, since we
+ * want the bottom border of the image to line up with the bottom of the window
+ * caption buttons. That's why there's so much special-casing going on in here.
+ */
+.private-browsing-indicator {
+  display: none;
+  pointer-events: none;
 }
 
-#main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) {
-  background-position: top left;
+#private-browsing-indicator-titlebar {
+  display: block;
+  position: absolute;
 }
 
-#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;
+#main-window[privatebrowsingmode=temporary][tabsintitlebar] #private-browsing-indicator-titlebar > .private-browsing-indicator {
+  display: block;
 }
 
-#main-window[privatebrowsingmode=temporary] #TabsToolbar::after {
-  content: "";
+#main-window[privatebrowsingmode=temporary]:-moz-any([inFullscreen],:not([tabsintitlebar])) #TabsToolbar > .private-browsing-indicator {
   display: -moz-box;
+}
+
+#TabsToolbar > .private-browsing-indicator {
+  background: url("chrome://browser/skin/privatebrowsing-mask-tabstrip.png") no-repeat center -3px;
+  -moz-margin-start: 4px;
+  width: 48px;
+}
+
+/* Bug 1008183: We're intentionally using the titlebar asset here for fullscreen
+ * mode, since the tabstrip "mimics" the titlebar in that case with its own
+ * min/max/close window buttons.
+ */
+#private-browsing-indicator-titlebar > .private-browsing-indicator,
+#main-window[inFullscreen] #TabsToolbar > .private-browsing-indicator {
+  background: url("chrome://browser/skin/privatebrowsing-mask-titlebar.png") no-repeat center 0px;
+  -moz-margin-end: 4px;
   width: 40px;
-  background: url("chrome://browser/skin/privatebrowsing-indicator.png") no-repeat center center;
+  height: 20px;
+  position: relative;
 }
 
+/* This one is for Linux */
+#main-window[privatebrowsingmode=temporary] #private-browsing-indicator {
+  background: url("chrome://browser/skin/privatebrowsing-mask-tabstrip.png") center no-repeat;
+  width: 48px;
+}
+
+/* End private browsing indicators */
+
 /* === BEGIN UITour.inc.css === */
 
 /* UI Tour */
 
-html|div#UITourHighlight {
-  border-radius: 20px;
-  border: 2px #9C9CFF solid;
+#UITourHighlightContainer {
+  -moz-appearance: none;
+  border: none;
+  background-color: transparent;
+  /* This is a buffer to compensate for the movement in the "wobble" effect */
+  padding: 4px;
+}
+
+#UITourHighlight {
+  background-image: radial-gradient(50% 100%, rgba(0,132,132,0.4) 50%, rgba(0,132,132,0.6) 100%);
+  border-radius: 40px;
+  border: 1px solid #9C9CFF;
+  /* The box-shadow opacity needs to be < 0.5 so it doesn't appear at 100% opacity
+     on Linux without an X compositor where opacity is either 0 or 1. */
+  box-shadow: 0 0 3px 0 rgba(0,0,0,0.49);
   min-height: 32px;
   min-width: 32px;
-  /* HACK for pre-Australis */
-  display: none;
 }
 
-html|div#UITourHighlight[active] {
-  /* HACK for pre-Australis */
-  display: none;
+#UITourTooltipBody {
+  -moz-margin-end: 14px;
+}
+
+#UITourTooltipBody > vbox {
+  padding-top: 4px;
+}
+
+#UITourTooltipIconContainer {
+  -moz-margin-start: -16px;
+}
+
+#UITourTooltipIcon {
+  width: 48px;
+  height: 48px;
+  -moz-margin-start: 28px;
+  -moz-margin-end: 28px;
 }
 
-#UITourTooltip {
-  max-width: 20em;
+#UITourTooltipTitle,
+#UITourTooltipDescription {
+  max-width: 20rem;
 }
 
 #UITourTooltipTitle {
-  font-size: 130%;
+  font-size: 1.45rem;
   font-weight: bold;
-  margin: 0 0 5px 0;
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
+  margin: 0 0 9px 0;
 }
 
 #UITourTooltipDescription {
-  max-width: 20em;
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
+  font-size: 1.15rem;
+  line-height: 1.8rem;
+  margin-bottom: 0; /* Override global.css */
+}
+
+#UITourTooltipClose {
+  -moz-appearance: none;
+  border: none;
+  background-color: transparent;
+  min-width: 0;
+  -moz-margin-start: 4px;
+  margin-top: -2px;
+}
+
+#UITourTooltipClose > .toolbarbutton-text {
+  display: none;
+}
+
+#UITourTooltipButtons {
+  -moz-box-pack: end;
+  background-color: rgba(0,0,0,.2);
+  border-top: 1px solid rgba(0,0,0,.4);
+  margin: 24px -16px -16px;
+  padding: 2em 15px;
+}
+
+#UITourTooltipButtons > button {
+  margin: 0 15px;
+}
+
+#UITourTooltipButtons > button:first-child {
+  -moz-margin-start: 0;
+}
+
+#UITourTooltipButtons > button[image] > .button-box > .button-icon {
+  width: 16px;
+  height: 16px;
+  -moz-margin-end: 5px;
+}
+
+#UITourTooltipButtons > button .button-text {
+  font-size: 1.15rem;
+}
+
+#UITourTooltipButtons > button:not(.button-link) {
+  -moz-appearance: none;
+  background-color: #C09070;
+  border-radius: 3000px;
+  border: none;
+  color: #000000;
+  padding: 4px 30px;
+  transition-property: background-color, color;
+  transition-duration: 150ms;
+}
+
+#UITourTooltipButtons > button:not(.button-link):not(:active):hover {
+  background-color: #FFCF00;
+  color: #000000;
+}
+
+#UITourTooltipButtons > button.button-link {
+  -moz-appearance: none;
+  background: transparent;
+  border: none;
+  box-shadow: none;
+  color: rgba(0,0,0,0.35);
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+#UITourTooltipButtons > button.button-link:hover {
+  color: black;
+}
+
+/* The primary button gets the same color as the customize button. */
+#UITourTooltipButtons > button.button-primary {
+  background-color: #A06060; /* LCARS default button background color */
+  color: #000000;
+  padding-left: 30px;
+  padding-right: 30px;
+}
+
+#UITourTooltipButtons > button.button-primary:not(:active):hover {
+  background-color: #FFCF00;
+  color: #000000;
 }
 
 /* === END UITour.inc.css === */
+
+#UITourTooltipButtons {
+  margin: 24px -4px -4px;
+}
+
+/* === BEGIN contextmenu.inc.css === */
+
+menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
+}
+
+#context-navigation > .menuitem-iconic {
+  -moz-box-flex: 1;
+  -moz-box-pack: center;
+  -moz-box-align: center;
+}
+
+#context-navigation > .menuitem-iconic[disabled="true"] {
+  background-color: transparent;
+}
+
+#context-navigation > .menuitem-iconic > .menu-iconic-left {
+  -moz-appearance: none;
+}
+
+#context-navigation > #context-back > .menu-iconic-left {
+  list-style-image: url("chrome://browser/skin/ToolbarFx.png");
+  -moz-image-region: rect(0, 54px, 18px, 36px);
+}
+
+#context-navigation > #context-back:not([disabled="true"]):hover > .menu-iconic-left {
+  -moz-image-region: rect(18px, 54px, 36px, 36px);
+}
+
+#context-navigation > #context-back[disabled="true"] > .menu-iconic-left {
+  -moz-image-region: rect(36px, 54px, 54px, 36px);
+}
+
+#context-navigation > #context-forward > .menu-iconic-left {
+  list-style-image: url("chrome://browser/skin/ToolbarFx.png");
+  -moz-image-region: rect(0, 72px, 18px, 54px);
+}
+
+#context-navigation > #context-forward:not([disabled="true"]):hover > .menu-iconic-left {
+  -moz-image-region: rect(18px, 72px, 36px, 54px);
+}
+
+#context-navigation > #context-forward[disabled="true"] > .menu-iconic-left {
+  -moz-image-region: rect(36px, 72px, 54px, 54px);
+}
+
+#context-navigation > #context-reload > .menu-iconic-left {
+  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+  -moz-image-region: rect(0, 14px, 14px, 0);
+}
+
+#context-navigation > #context-reload:not([disabled="true"]):hover > .menu-iconic-left {
+  -moz-image-region: rect(14px, 14px, 28px, 0);
+}
+
+#context-navigation > #context-reload[disabled="true"] > .menu-iconic-left {
+  -moz-image-region: rect(28px, 14px, 42px, 0);
+}
+
+#context-navigation > #context-stop > .menu-iconic-left {
+  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+  -moz-image-region: rect(0, 28px, 14px, 14px);
+}
+
+#context-navigation > #context-stop:not([disabled="true"]):hover > .menu-iconic-left {
+  -moz-image-region: rect(14px, 28px, 28px, 14px);
+}
+
+#context-navigation > #context-stop[disabled="true"] > .menu-iconic-left {
+  -moz-image-region: rect(28px, 28px, 42px, 14px);
+}
+
+#context-navigation > #context-bookmarkpage > .menu-iconic-left {
+  list-style-image: url("chrome://browser/skin/ToolbarFx.png");
+  -moz-image-region: rect(0, 144px, 18px, 126px);
+}
+
+#context-navigation > #context-bookmarkpage:not([disabled="true"]):hover > .menu-iconic-left {
+  -moz-image-region: rect(18px, 144px, 36px, 126px);
+}
+
+#context-navigation > #context-bookmarkpage[disabled="true"] > .menu-iconic-left {
+  -moz-image-region: rect(36px, 144px, 54px, 126px);
+}
+
+#context-back:-moz-locale-dir(rtl),
+#context-forward:-moz-locale-dir(rtl),
+#context-reload:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
+  width: 18px;
+  height: 18px;
+  margin: 7px;
+}
+
+#context-navigation > #context-reload > .menu-iconic-left > .menu-iconic-icon,
+#context-navigation > #context-stop > .menu-iconic-left > .menu-iconic-icon {
+  width: 14px;
+  height: 14px;
+  margin: 9px;
+}
+
+/* === END contextmenu.inc.css === */
+
+#context-navigation {
+}
+
+#context-sep-navigation {
+/*  margin-top: -4px; */
+}