X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=f0055864e5aa0d0c9dad2bd38b4cd08cb5977091;hp=848f52972af7c389d4e88e45e44cd75d8820b7e0;hb=ed88669caec874222dbeeb427afef95fbd787acb;hpb=83e3b5cf4c1a3617c23d59a79d432fa709003810

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 848f5297..f0055864 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");
 }
@@ -61,13 +69,23 @@ menubar {
 /*  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 {
@@ -95,7 +113,9 @@ menubar {
 #navigator-toolbox > toolbar:not(:-moz-lwtheme) {
 }
 
-/* indent due to non-applicable aero rule */
+@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. */
   #toolbar-menubar {
     background-color: transparent !important;
   }
@@ -113,6 +133,10 @@ menubar {
     color: #FF9F00;
   }
 
+  #main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) {
+    /*color: inherit;*/
+  }
+
   #TabsToolbar:-moz-lwtheme {
     /*background: linear-gradient(to top, @toolbarShadowColor@ 2px, transparent 2px);*/
   }
@@ -125,12 +149,13 @@ menubar {
     -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
     visibility: visible;
   }
+}
 
-/* Make the menu inherit the toolbar's color. On non-compositor (Aero Basic, XP modern, classic)
- * this is defined above. Otherwise (Aero Glass, Windows 8 inactive windows), this is hardcoded
- * to black in browser-aero.css. */
-#main-menubar > menu:not(:-moz-lwtheme) {
-/*  color: inherit;*/
+@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;
+  }
 }
 
 #nav-bar {
@@ -171,6 +196,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,
@@ -178,7 +212,9 @@ 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;
 }
@@ -225,6 +261,31 @@ 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),
@@ -415,11 +476,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");
 }
@@ -560,6 +624,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);
 }
@@ -580,16 +657,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);
 }
@@ -611,6 +678,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);
 }
@@ -677,72 +756,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);
 }
 
@@ -755,6 +834,10 @@ 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);
 }
@@ -779,23 +862,57 @@ menuitem.bookmark-item {
   -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"],
@@ -810,19 +927,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);
 }
 
@@ -836,6 +949,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);
@@ -846,16 +963,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);
@@ -896,6 +1003,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);
@@ -921,22 +1033,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);
@@ -952,6 +1048,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);
@@ -962,6 +1062,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);
@@ -982,6 +1092,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);
@@ -1022,6 +1142,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);
@@ -1032,86 +1156,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);
 }
@@ -1187,7 +1374,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-bri
 }
 
 #nav-bar .toolbarbutton-1 > menupopup.cui-widget-panel {
-/*  margin-top: -8px;*/
+  margin-top: -4px;
 }
 
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
@@ -1204,7 +1391,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-bri
 #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-container > .toolbarbutton-1:-moz-any([disabled],:not([open]):not([disabled]):not(:active)) > .toolbarbutton-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;
@@ -1264,19 +1451,20 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
 */
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container > .toolbarbutton-1:-moz-any([disabled],:not([open]):not([disabled]):not(:active)) > .toolbarbutton-icon {
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-any([disabled=true],:not([open]):not([disabled=true]):not(:active)) > .toolbarbutton-icon {
 }
 
+#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-container > #forward-button:not([open]):not(:active):not([disabled]):hover > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon {
+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 {
 }
 
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover:active > .toolbarbutton-icon,
+#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,
@@ -1299,6 +1487,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button:not([o
 /* unified back/forward button */
 
 #forward-button {
+  -moz-box-align: stretch; /* let the button shape grow vertically with the location bar */
 }
 
 #forward-button > menupopup {
@@ -1308,13 +1497,13 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button:not([o
 #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#windows-keyhole-forward-clip-path) !important;*/
+  /*clip-path: url(chrome://browser/content/browser.xul#keyhole-forward-clip-path) !important;*/
 }
 
 #forward-button {
-  -moz-margin-start: -6px !important;
-  padding-left: 7px;
-  padding-right: 3px;
+  -moz-margin-start: -4px !important;
+  padding-left: 4px;
+  padding-right: 2px;
   margin-top: 3px;
   margin-bottom: 3px;
   border-radius: 0 10000px 10000px 0;
@@ -1324,16 +1513,22 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button:not([o
   border-radius: 10000px 0 0 10000px;
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container:not([switchingtabs]) > #forward-button {
-  transition: opacity @forwardTransitionLength@ ease-out;
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not([switchingtabs]) > #forward-button {
+  transition: margin-left 150ms ease-out;
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container:not(:hover) > #forward-button[disabled] {
-  opacity: 0;
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] {
+  margin-left: -27px !important;
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button[occluded-by-urlbar] {
-  visibility: hidden;
+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;
+}
+
+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;
 }
 
 #back-button {
@@ -1362,24 +1557,26 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button[occlud
   background-clip: padding-box !important;
 /*  background-color: hsla(210,25%,98%,.08) !important;
   padding: 6px !important;
-  border-color: hsla(210,4%,10%,.25) !important;*/
-  transition-property: background-color, border-color !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;
 }
 
 #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon {
-/*  background-color: hsla(210,4%,10%,.08) !important;
-  box-shadow: none !important;*/
+/*  background-color: hsla(210,4%,10%,.08) !important;*/
 }
 
 #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,80%,20%,.1) inset !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;*/
 }
 
-#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
-#forward-button:-moz-locale-dir(rtl) {
+#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
   transform: scaleX(-1);
 }
 /*
@@ -1442,6 +1639,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button[occlud
   -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 {
@@ -1484,12 +1691,11 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button[occlud
 #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;
 }
@@ -1511,55 +1717,34 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button[occlud
 /*  background-color: white;*/
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper {
-  padding-left: 22px;
-  -moz-margin-start: -22px;
-  position: relative;
-  pointer-events: none;
-}
-
-window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar {
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar {
 /*  -moz-border-start: none;
-  margin-left: 0; */
-  pointer-events: all;
+  margin-left: 0;*/
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container:not([switchingtabs]) > #urlbar-wrapper > #urlbar {
-  transition: margin-left 150ms ease-out;
-}
-
-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"]) #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"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper {
-/*  clip-path: url("chrome://browser/content/browser.xul#windows-urlbar-back-button-clip-path");*/
-}
-
-window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar {
-  margin-left: -22px;
-}
-
-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 {
+/*  clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path");*/
+/*  -moz-margin-start: -5px; */
 }
 
-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"]) #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"]) #urlbar-container > #urlbar-wrapper:-moz-locale-dir(rtl),
-window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
-  /* let windows-urlbar-back-button-mask 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,
@@ -1578,7 +1763,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 
 .urlbar-input-box {
   -moz-margin-start: 0;
-  min-width: 4em;
 }
 
 #urlbar-icons {
@@ -1655,38 +1839,40 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   border-radius: 0;
 }
 
-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"]) #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"]) #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"]) #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"]) #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"]) #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;
@@ -1827,7 +2013,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:ho
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar > #identity-box > #page-proxy-favicon {
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box > #page-proxy-favicon {
 /*  -moz-margin-end: 1px;*/
 }
 
@@ -1965,7 +2151,7 @@ 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;
@@ -1975,11 +2161,11 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-image-region: rect(0px, 14px, 14px, 0px);
 }
 
-#urlbar-reload-button[disabled] {
+#urlbar-reload-button[disabled=true] {
   -moz-image-region: rect(28px, 14px, 42px, 0px);
 }
 
-#urlbar-reload-button:not([disabled]):hover {
+#urlbar-reload-button:not([disabled=true]):hover {
   -moz-image-region: rect(14px, 14px, 28px, 0px);
 }
 
@@ -1991,7 +2177,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-image-region: rect(0, 42px, 14px, 28px);
 }
 
-#urlbar-go-button:hover,
+#urlbar-go-button:hover {
   -moz-image-region: rect(14px, 42px, 28px, 28px);
 }
 
@@ -2190,8 +2376,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;
@@ -2232,6 +2418,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;
@@ -2257,7 +2455,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 }
 
 #main-window:not([customizing]) #TabsToolbar:not(:-moz-lwtheme) {
- }
+}
 
 #main-window[tabsintitlebar] #TabsToolbar {
   background-color: transparent;
@@ -2306,7 +2504,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tab-content {
 }
 
-.tab-throbber,
+.tab-/*throbber*/,
 .tab-icon-image,
 .tab-close-button {
 }
@@ -2341,6 +2539,10 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 }
 
 .tab-label {
+  /* this needs to add up to the 16px of the icon image */
+  height: 12px;
+  margin-top: 2px !important;
+  margin-bottom: 2px !important;
 }
 
 .tab-close-button {
@@ -2380,16 +2582,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 /* End selected tab */
 
-/* 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]:not([sizemode="maximized"]):not([inFullscreen]) #toolbar-menubar:-moz-any([autohide="true"][inactive], :not([autohide])) + #TabsToolbar .tab-background-middle:not([selected=true]) {
-}
-
-/* End background tabs */
-
 /* Tab pointer-events */
 /*
 .tabbrowser-tab {
@@ -2421,6 +2613,16 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 /* === END tabs.inc.css === */
 
+/* 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 */
 .tab-drop-indicator {
   list-style-image: url("chrome://browser/skin/tabbrowser/tabDragIndicator.png");
@@ -2457,7 +2659,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-lwtheme-brighttext,
 .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-lwtheme-brighttext {
  }
- 
+
 .tabbrowser-arrowscrollbox > .scrollbutton-up[disabled],
 .tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] {
  }
@@ -2554,26 +2756,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;
 }
@@ -2825,11 +3007,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;
@@ -2842,8 +3033,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   border-right-width: 8px;
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #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),
@@ -2953,6 +3144,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
   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");
@@ -2965,6 +3166,71 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
   margin: 0px;
 }
 
+/* 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"] {
+  min-height: 40px;
+}
+
+notification[value="translation"] button,
+notification[value="translation"] menulist {
+  min-width: 0;
+/*  min-height: 30px;
+  -moz-padding-end: 1ch; */
+}
+
+notification[value="translation"] button > .button-box,
+notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker {
+  padding: 0;
+/*  -moz-margin-start: 3ch; */
+}
+
+notification[value="translation"] button:not([type="menu"]) > .button-box {
+/*  -moz-margin-end: 3ch; */
+}
+
+notification[value="translation"] button,
+notification[value="translation"] menulist,
+notification[value="translation"] menulist > .menulist-label-box {
+/*  -moz-margin-start: 1ch;
+  -moz-margin-end: 1ch; */
+}
+
+notification[value="translation"] menulist > .menulist-dropmarker {
+}
+
+/* === END infobar.inc.css === */
+
+.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 */
 #subscribeToPageMenuitem:not([disabled]),
 #subscribeToPageMenupopup,
@@ -3046,6 +3312,35 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
   margin-top: .5em;
 }
 
+/* Sync Panel */
+
+.sync-panel-icon {
+  height:32px;
+  width: 32px;
+  background: url("chrome://browser/content/abouthome/sync.png") top left no-repeat;
+}
+
+.sync-panel-inner {
+  width: 0;
+  padding-left: 10px;
+}
+
+.sync-panel-button-box {
+  margin-top: 1em;
+}
+
+#sync-error-panel-title,
+#sync-start-panel-title {
+  font-size: 120%;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+
+#sync-start-panel-subtitle,
+#sync-error-panel-subtitle {
+  margin: 0;
+}
+
 /* Status panel */
 
 .statuspanel-label {
@@ -3080,16 +3375,40 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
 
 /* === 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 */
@@ -3109,6 +3428,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
 /* 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;
@@ -3126,35 +3446,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 {
@@ -3655,8 +3946,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 */
 }
 
@@ -3724,6 +4014,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;
@@ -4027,10 +4351,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;
@@ -4129,8 +4455,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;
 }
@@ -4147,21 +4477,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;
 }
@@ -4207,12 +4560,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);
 }
 
@@ -4247,7 +4602,7 @@ toolbarpaletteitem[place="toolbar"] {
   max-width: 24px;
   min-width: 24px;
   max-height: 24px;
-  height: 24px;
+  min-height: 24px;
   padding: 4px;
 }
 
@@ -4369,12 +4724,17 @@ toolbarpaletteitem[place="toolbar"] {
   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;
 }
@@ -4385,29 +4745,61 @@ 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 */
@@ -4558,3 +4950,108 @@ toolbarpaletteitem[place="toolbar"] {
 #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 === */