seventh part of syncing LCARStrek with Firefox 42-44 windows theme changes
[themes.git] / LCARStrek / browser / browser.css
index a733193e28667300fb5419f4816ef0ded0167f57..3418f2548b8d649fc3dd195ed9d1ee28a9167fca 100644 (file)
@@ -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");
 }
@@ -28,6 +36,16 @@ menubar {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#menubar");
 }
 
+:root {
+  /*--backbutton-urlbar-overlap: 5px;*/
+
+  --identity-box-verified-background-color: #000000;
+
+  --panel-separator-color: #A09090;
+
+  --urlbar-separator-color: #9C9CFF;
+}
+
 #menubar-items {
   -moz-box-orient: vertical; /* for flex hack */
 }
@@ -61,13 +79,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 {
-/*  margin-top: 15px;*/
+#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: var(--space-above-tabbar);*/
 }
 
-#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 {
@@ -92,14 +120,27 @@ menubar {
   height: 1px;
 }
 
-#navigator-toolbox > toolbar:not(:-moz-lwtheme) {
+#navigator-toolbox > toolbar {
 }
 
-/* indent due to non-applicable aero rule */
-  #toolbar-menubar {
-    background-color: transparent !important;
-  }
+#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) {
+}
+
+#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(#addon-bar) {
+  overflow: -moz-hidden-unscrollable;
+  max-height: 4em;
+  transition: min-height 170ms ease-out, max-height 170ms ease-out;
+}
 
+#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(#addon-bar)[collapsed=true] {
+  min-height: 0.1px;
+  max-height: 0;
+  transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear;
+}
+
+@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 */
@@ -113,8 +154,8 @@ menubar {
     color: #FF9F00;
   }
 
-  #TabsToolbar:-moz-lwtheme {
-    /*background: linear-gradient(to top, @toolbarShadowColor@ 2px, transparent 2px);*/
+  #main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) {
+    /*color: inherit;*/
   }
 
   #main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
@@ -125,13 +166,14 @@ 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, but only for tabsintitlebar. Otherwise (Aero Glass, Windows 8),
- * this is hardcoded to black in browser-aero.css, even without tabsintitlebar. */
-  #main-window[tabsintitlebar] #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 {
   /* Position the toolbar above the bottom of background tabs */
@@ -143,6 +185,14 @@ menubar {
 /*  min-height: 24px; */
 }
 
+#PersonalToolbar > #home-button {
+  -moz-box-orient: horizontal;
+}
+
+#PersonalToolbar > #home-button > .toolbarbutton-text {
+  display: block;
+}
+
 #print-preview-toolbar:not(:-moz-lwtheme) {
   /* -moz-appearance: toolbox; */
 }
@@ -171,14 +221,26 @@ 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,
  * can swallow those events. It will also place the buttons above the fog on
  * themes with Aero Glass.
  */
-#titlebar-buttonbox {
-  margin-top: 5px;
+#titlebar-buttonbox,
+#main-window[sizemode="maximized"] #titlebar-buttonbox {
+  -moz-appearance: none;
+  margin-top: 6px;
+  margin-top: 4px;
   -moz-margin-end: 3px;
   z-index: 1;
 }
@@ -192,39 +254,63 @@ menubar {
 }
 
 /* titlebar command buttons */
-
 #titlebar-min {
-  list-style-image: url("chrome://navigator/skin/icons/win-minimize.gif");
+  list-style-image: url("chrome://browser/skin/caption-buttons.svg#minimize");
 }
 
 #titlebar-min:hover {
-  list-style-image: url("chrome://navigator/skin/icons/win-minimize-hover.gif");
+  list-style-image: url("chrome://browser/skin/caption-buttons.svg#minimize-hover");
 }
 
 #titlebar-max {
-  list-style-image: url("chrome://browser/skin/win-maximize.gif");
+  list-style-image: url("chrome://browser/skin/caption-buttons.svg#maximize");
 }
 
 #titlebar-max:hover {
-  list-style-image: url("chrome://browser/skin/win-maximize-hover.gif");
+  list-style-image: url("chrome://browser/skin/caption-buttons.svg#maximize-hover");
 }
 
 #main-window[sizemode="maximized"] #titlebar-max {
-  list-style-image: url("chrome://navigator/skin/icons/win-restore.gif");
+  list-style-image: url("chrome://browser/skin/caption-buttons.svg#restore");
 }
 
 #main-window[sizemode="maximized"] #titlebar-max:hover {
-  list-style-image: url("chrome://navigator/skin/icons/win-restore-hover.gif");
+  list-style-image: url("chrome://browser/skin/caption-buttons.svg#restore-hover");
 }
 
 #titlebar-close {
-  list-style-image: url("chrome://navigator/skin/icons/win-close.gif");
+  list-style-image: url("chrome://browser/skin/caption-buttons.svg#close");
 }
 
 #titlebar-close:hover {
-  list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif");
+  list-style-image: url("chrome://browser/skin/caption-buttons.svg#close-hover");
+}
+
+@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),
@@ -245,6 +331,10 @@ toolbarbutton.bookmark-item[open="true"] {
 #personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
+  -moz-margin-start: 1px;
+  -moz-margin-end: 2px;
+  margin-top: 1px;
+  margin-bottom: 1px;
 }
 
 /* Force the display of the label for bookmarks */
@@ -259,6 +349,7 @@ toolbarbutton.bookmark-item[open="true"] {
 
 #bookmarks-toolbar-placeholder {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") !important;
+  -moz-box-orient: horizontal;
 }
 
 toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-placeholder,
@@ -417,15 +508,19 @@ menuitem.bookmark-item {
 /* 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, #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,
+          #social-share-button, #open-file-button, #find-button, #developer-button,
+          #preferences-button, #privatebrowsing-button, #save-page-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),
-
+          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #loop-button,
+          #pocket-button),
 #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
 }
+toolbar[brighttext] #pocket-button,
+#pocket-button {
+  list-style-image: url("chrome://browser/skin/ToolbarFx.png") !important; /* override pocket.css */
+}
 
 #back-button {
   -moz-image-region: rect(0, 36px, 18px, 18px);
@@ -580,6 +675,7 @@ menuitem.bookmark-item {
   -moz-image-region: rect(0, 288px, 18px, 270px);
 }
 
+#feed-button[cui-areatype="menu-panel"][panel-multiview-anchor=true],
 #feed-button[cui-areatype="toolbar"]:hover:not([disabled="true"]) {
   -moz-image-region: rect(18px, 288px, 36px, 270px);
 }
@@ -592,10 +688,15 @@ menuitem.bookmark-item {
   -moz-image-region: rect(0px, 306px, 18px, 288px);
 }
 
-#social-share-button[cui-areatype="toolbar"]:hover {
+#social-share-button[cui-areatype="toolbar"]:hover:not([disabled="true"]),
+#social-share-button[cui-areatype="toolbar"][open="true"] {
   -moz-image-region: rect(18px, 306px, 36px, 288px);
 }
 
+#social-share-button[cui-areatype="toolbar"][disabled="true"] {
+  -moz-image-region: rect(36px, 306px, 54px, 288px);
+}
+
 #characterencoding-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 324px, 18px, 306px);
 }
@@ -755,15 +856,6 @@ menuitem.bookmark-item {
   -moz-image-region: rect(36px, 576px, 54px, 558px);
 }
 
-#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=true])):hover,
-#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]))[open="true"] {
-  -moz-image-region: rect(18px, 594px, 36px, 576px);
-}
-
 #nav-bar-overflow-button {
   -moz-image-region: rect(0, 612px, 18px, 594px);
 }
@@ -789,10 +881,14 @@ menuitem.bookmark-item {
   -moz-image-region: rect(0, 666px, 18px, 648px);
 }
 
-#email-button[cui-areatype="toolbar"]:hover {
+#email-button[cui-areatype="toolbar"]:hover:not([disabled="true"]) {
   -moz-image-region: rect(18px, 666px, 36px, 648px);
 }
 
+#email-button[cui-areatype="toolbar"][disabled="true"] {
+  -moz-image-region: rect(36px, 666px, 54px, 648px);
+}
+
 #sidebar-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 684px, 18px, 666px);
 }
@@ -801,28 +897,104 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 684px, 36px, 666px);
 }
 
+#panic-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 702px, 18px, 684px);
+}
+
+#panic-button[cui-areatype="toolbar"]:hover,
+#panic-button[cui-areatype="toolbar"][open] {
+  -moz-image-region: rect(18px, 702px, 36px, 684px);
+}
+
+#panic-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
+}
+
+#loop-button,
+#loop-button > .toolbarbutton-badge-stack {
+  list-style-image: url("chrome://browser/skin/loop/toolbarfx.png");
+  -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+#loop-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]),
+#loop-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-stack {
+  -moz-image-region: rect(0, 90px, 18px, 72px);
+}
+
+#loop-button[state="disabled"],
+#loop-button[disabled="true"],
+#loop-button[state="disabled"] > .toolbarbutton-badge-stack,
+#loop-button[disabled="true"] > .toolbarbutton-badge-stack {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+#loop-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]),
+#loop-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-stack {
+  -moz-image-region: rect(0, 126px, 18px, 108px);
+}
+
+#loop-button:not([disabled="true"])[state="error"],
+#loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-stack {
+  -moz-image-region: rect(0, 54px, 18px, 36px);
+}
+
+#loop-button:not([disabled="true"])[state="action"],
+#loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-stack {
+  -moz-image-region: rect(0, 72px, 18px, 54px);
+}
+
+#loop-button:not([disabled="true"])[state="active"],
+#loop-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-stack {
+  -moz-image-region: rect(0, 108px, 18px, 90px);
+}
+
+#webide-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 738px, 18px, 720px);
+}
+
+#webide-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 738px, 36px, 720px);
+}
+
+#pocket-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 774px, 18px, 756px);
+}
+
+#pocket-button[cui-areatype="toolbar"]:hover,
+#pocket-button[cui-areatype="toolbar"][open] {
+  -moz-image-region: rect(18px, 774px, 36px, 756px);
+}
+
 /* === END toolbarbuttons.inc.css === */
 
 /* === BEGIN menupanel.inc.css === */
 
 /* Menu panel and palette styles */
 
+:root {
+   /* avoid aero overrides with changed filenames */
+  --menupanel-list-style-image: url(chrome://browser/skin/menuPanelFx.png);
+  --menupanel-small-list-style-image: url(chrome://browser/skin/menuPanelFx-small.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,
+          #social-share-button, #open-file-button, #find-button, #developer-button,
+          #preferences-button, #privatebrowsing-button, #save-page-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"],
+          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #loop-button,
+          #pocket-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,
+          #social-share-button, #open-file-button, #find-button, #developer-button,
+          #preferences-button, #privatebrowsing-button, #save-page-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/menuPanel.png");
+          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #loop-button,
+                                                #pocket-button) {
+  list-style-image: var(--menupanel-list-style-image);
 }
 
 #home-button[cui-areatype="menu-panel"],
@@ -938,11 +1110,16 @@ toolbarpaletteitem[place="palette"] > #social-share-button {
   -moz-image-region: rect(0px, 448px, 32px, 416px);
 }
 
-#social-share-button[cui-areatype="menu-panel"]:hover,
-toolbarpaletteitem[place="palette"] > #social-share-button:hover {
+#social-share-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]),
+toolbarpaletteitem[place="palette"] > #social-share-button:hover:not([disabled="true"]) {
   -moz-image-region: rect(32px, 448px, 64px, 416px);
 }
 
+#social-share-button[cui-areatype="menu-panel"][disabled="true"],
+toolbarpaletteitem[place="palette"] > #social-share-button[disabled="true"] {
+  -moz-image-region: rect(64px, 448px, 96px, 416px);
+}
+
 #characterencoding-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #characterencoding-button {
   -moz-image-region: rect(0px, 480px, 32px, 448px);
@@ -1071,36 +1248,104 @@ 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 {
+#email-link-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]),
+toolbarpaletteitem[place="palette"] > #email-link-button:hover:not([disabled="true"]) {
   -moz-image-region: rect(32px, 800px, 64px, 768px);
 }
 
+#email-link-button[cui-areatype="menu-panel"][disabled="true"],
+toolbarpaletteitem[place="palette"] > #email-link-button[disabled="true"] {
+  -moz-image-region: rect(64px, 800px, 96px, 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 {
+toolbarpaletteitem[place="palette"] > #sidebar-button:hover,
+#sidebar-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
   -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);
+#panic-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #panic-button {
+  -moz-image-region: rect(0, 896px, 32px, 864px);
+}
+
+#panic-button[cui-areatype="menu-panel"]:hover,
+toolbarpaletteitem[place="palette"] > #panic-button:hover,
+#panic-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+  -moz-image-region: rect(32px, 896px, 64px, 864px);
+}
+
+#webide-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #webide-button {
+  -moz-image-region: rect(0px, 960px, 32px, 928px);
+}
+
+#webide-button[cui-areatype="menu-panel"]:hover,
+toolbarpaletteitem[place="palette"] > #webide-button:hover {
+  -moz-image-region: rect(32px, 960px, 64px, 928px);
+}
+
+#pocket-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #pocket-button {
+  -moz-image-region: rect(0px, 992px, 32px, 960px);
+}
+
+#pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+  -moz-image-region: rect(32px, 992px, 64px, 960px);
 }
 
 toolbaritem[sdkstylewidget="true"] > toolbarbutton {
   -moz-image-region: rect(0, 832px, 32px, 800px);
 }
 
+#loop-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #loop-button {
+  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-button {
+  -moz-image-region: rect(0, 32px, 32px, 0) !important;
+}
+
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) {
+  -moz-image-region: rect(0, 160px, 32px, 128px);
+}
+
+#loop-button[cui-areatype="menu-panel"][state="disabled"],
+#loop-button[cui-areatype="menu-panel"][disabled="true"] {
+  -moz-image-region: rect(0, 64px, 32px, 32px);
+}
+
+#loop-button[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]) {
+  -moz-image-region: rect(0, 224px, 32px, 192px);
+}
+
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] {
+  -moz-image-region: rect(0, 96px, 32px, 64px);
+}
+
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] {
+  -moz-image-region: rect(0, 128px, 32px, 96px);
+}
+
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] {
+  -moz-image-region: rect(0, 192px, 32px, 160px);
+}
+
 /* Wide panel control icons */
 
 #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: var(--menupanel-small-list-style-image);
 }
 
 #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #cut-button,
@@ -1178,6 +1423,11 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button[disabled=
   -moz-image-region: rect(32px, 96px, 48px, 80px);
 }
 
+#add-share-provider {
+  list-style-image: var(--menupanel-small-list-style-image);
+  -moz-image-region: rect(0px, 96px, 16px, 80px);
+}
+
 /* === END menupanel.inc.css === */
 
 .toolbarbutton-1:not([type="menu-button"]) {
@@ -1225,6 +1475,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-bri
 .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
 }
 
+.findbar-button,
 #nav-bar .toolbarbutton-1,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 }
@@ -1239,7 +1490,8 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-bri
   -moz-padding-end: 5px;*/
 }
 
-#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button):not(#PanelUI-menu-button) {
+#nav-bar .toolbarbutton-1[type=panel],
+#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) {
 /*  padding-left: 5px;
   padding-right: 5px;*/
 }
@@ -1249,7 +1501,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 {
@@ -1261,12 +1513,13 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-bri
   -moz-box-align: center;*/
 }
 
+.findbar-button > .toolbarbutton-text,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-icon,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-text,
-#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-stack,
 #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=true],:not([open]):not([disabled=true]):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;
@@ -1275,27 +1528,37 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > .toolbarbutton-1:-moz-
 }
 /*
 #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-badge-stack,
 #nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   padding: 3px 7px;
 }
 */
 
 /* Help SDK icons fit: */
-toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
+toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon,
+toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon {
   width: 16px;
 }
 
-#nav-bar toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
+#nav-bar toolbarbutton[constrain-size="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;
 }
 
-#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=panel] > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1[type=panel] > .toolbarbutton-badge-stack,
+#nav-bar .toolbarbutton-1[type=menu]:not(#PanelUI-menu-button):not(#back-button):not(#forward-button) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1[type=menu]:not(#PanelUI-menu-button) > .toolbarbutton-badge-stack,
 #nav-bar .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ {
 /*  -moz-padding-end: 17px;*/
 }
 
+#nav-bar .toolbarbutton-1[type=panel] > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1[type=menu]:not(#PanelUI-menu-button):not(#back-button):not(#forward-button) > .toolbarbutton-icon {
+  /* horizontal padding + border + icon width */
+/*  max-width: 43px;*/
+}
+
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
 }
 
@@ -1326,23 +1589,26 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
 */
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container > .toolbarbutton-1:-moz-any([disabled=true],:not([open]):not([disabled=true]):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 {
 }
 
+.findbar-button:not(:-moz-any([checked="true"],[disabled="true"])):hover > .toolbarbutton-text,
+#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=true]):hover > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack,
+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,
+.findbar-button:not([disabled=true]):-moz-any([checked="true"],:hover:active) > .toolbarbutton-text,
+#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 {
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
 }
 
 #TabsToolbar .toolbarbutton-1,
@@ -1361,6 +1627,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 {
@@ -1374,9 +1641,9 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button:not([o
 }
 
 #forward-button {
-  -moz-margin-start: -6px !important;
-  padding-left: 7px;
-  padding-right: 3px;
+  -moz-margin-start: -4px !important;
+  padding-left: 5px;
+  padding-right: 5px;
   margin-top: 3px;
   margin-bottom: 3px;
   border-radius: 0 10000px 10000px 0;
@@ -1386,16 +1653,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 150ms 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=true] {
-  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 {
@@ -1424,24 +1697,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);
 }
 /*
@@ -1481,10 +1756,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button[occlud
   margin: 0;
 }
 
-/* tabview button & menu item */
+/* tabview menu item */
 
 #menu_tabview {
-  list-style-image: url("chrome://browser/skin/tabview/tabview.png");
+  list-style-image: url("chrome://browser/skin/tabview/tabviewFx.png");
   -moz-image-region: rect(1px, 89px, 17px, 73px);
 }
 
@@ -1504,6 +1779,20 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button[occlud
   -moz-image-region: rect(1px, 71px, 17px, 55px);
 }
 
+/* undo close tab menu item */
+#alltabs_undoCloseTab {
+  list-style-image: url(chrome://browser/skin/undoCloseTab.png);
+}
+
+@media (min-resolution: 1.1dppx) {
+  #alltabs_undoCloseTab {
+    list-style-image: url(chrome://browser/skin/undoCloseTab@2x.png);
+  }
+  #alltabs_undoCloseTab > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
 /* zoom control text (reset) button special case: */
 
 #nav-bar #zoom-reset-button > .toolbarbutton-text {
@@ -1556,7 +1845,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button[occlud
 #urlbar,
 .searchbar-textbox {
   border-radius: 5px;
-  margin: 0;
+  margin: 2px 0;
   -moz-margin-start: 3px;
 }
 
@@ -1565,6 +1854,11 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button[occlud
   color: #FFBFFF;
 }
 
+/* overlap the urlbar's border */
+#PopupAutoCompleteRichResult {
+  margin-top: -1px;
+}
+
 #urlbar:-moz-lwtheme,
 .searchbar-textbox:-moz-lwtheme {
   /* background-color: rgba(255,255,255,.8);
@@ -1582,55 +1876,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 {
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
 /*  clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path");*/
+/*  margin-inline-start: calc(-1 * var(--backbutton-urlbar-overlap)); */
 }
 
-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-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,
@@ -1657,9 +1930,11 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 
 .urlbar-icon {
   padding: 0 2px;
+  /* 16x16 icon with border-box sizing */
+  width: 20px;
+  height: 16px;
 }
 
-.searchbar-engine-button,
 .search-go-container {
   padding: 2px;
 }
@@ -1668,11 +1943,17 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   padding: 0;
 }
 
-.urlbar-icon:hover {
+#urlbar-search-footer {
+  border-top: 1px solid #A09090;
+}
+
+#urlbar-search-settings {
 }
 
-.urlbar-icon[open="true"],
-.urlbar-icon:hover:active {
+#urlbar-search-settings:hover {
+}
+
+#urlbar-search-settings:hover:active {
 }
 
 #urlbar-search-splitter {
@@ -1690,7 +1971,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 #urlbar-display-box {
 }
 
-#urlbar-display {
+.urlbar-display {
   -moz-border-end: 1px solid #9C9CFF;
   -moz-margin-end: 3px;
   margin-top: 0;
@@ -1699,88 +1980,65 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   color: #8050B0;
 }
 
-#search-container {
-  min-width: calc(54px + 11ch);
-}
-
-/* identity box */
-
-#identity-box {
-  border-radius: 2px;
-  font-size: .9em;
-}
+/* === BEGIN urlbarSearchSuggestionsNotification.inc.css === */
 
-#identity-box:-moz-locale-dir(ltr) {
-/*  border-top-left-radius: 1.5px;
-  border-bottom-left-radius: 1.5px;*/
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] {
+  border-bottom: 1px solid #A09090;
+  background-color: #000000;
+  padding: 6px 0;
+  -moz-padding-start: 44px;
+  -moz-padding-end: 6px;
+  background-image: url("chrome://browser/skin/info.svg");
+  background-clip: padding-box;
+  background-position: 20px center;
+  background-repeat: no-repeat;
+  background-size: 16px 16px;
 }
 
-#identity-box:-moz-locale-dir(rtl) {
-/*  border-top-right-radius: 1.5px;
-  border-bottom-right-radius: 1.5px;*/
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"]:-moz-locale-dir(rtl) {
+  background-position: right 20px center;
 }
 
-#notification-popup-box:not([hidden]) + #identity-box {
-  -moz-padding-start: 10px !important;
-  border-radius: 0;
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description {
+  margin: 0;
+  padding: 0;
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container > #urlbar-wrapper > #urlbar > #identity-box {
-/*   border-radius: 0; */
-  -moz-padding-start: 2px;
-  -moz-padding-end: 2px;
-  -moz-margin-end: 1px;
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description > label.text-link {
+  -moz-margin-start: 0;
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar >
-    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
-  padding-left: 2px;
-  transition: padding-left;
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button {
+  -moz-appearance: none;
+  min-width: 80px;
+  border-radius: 3px;
+  padding: 4px 16px;
+  margin: 0;
+  -moz-margin-start: 10px;
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar > 
-    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
-  padding-right: 2px;
-  transition: padding-right;
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"] {
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:hover:not([switchingtabs]) > #urlbar-wrapper > #urlbar > 
-    #notification-popup-box[hidden] + #identity-box {
-  /* forward button hiding is delayed when hovered */
-  transition-delay: 100s;
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"]:hover {
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar > 
-    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
-  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
-  padding-left: 2.01px;
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"] {
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar > 
-    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
-  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
-  padding-right: 2.01px;
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"]:hover {
 }
 
-#urlbar[pageproxystate="valid"] > #identity-box.chromeUI,
-#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
-  -moz-margin-end: 3px;
-}
+/* === END urlbarSearchSuggestionsNotification.inc.css === */
 
-#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:-moz-locale-dir(ltr),
-#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:-moz-locale-dir(ltr) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
+#search-container {
+  min-width: calc(54px + 11ch);
 }
 
-#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:-moz-locale-dir(rtl),
-#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
+/* identity box */
 
-#identity-box.verifiedIdentity:not(:-moz-lwtheme) {
-  background-color: #000000;
+#identity-box.verifiedIdentity:not(:-moz-lwtheme):not(:hover):not([open=true]) {
+  var(--identity-box-verified-background-color);
 }
 
 #identity-box:-moz-focusring {
@@ -1793,11 +2051,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:ho
   outline-color: #000000;
 }
 
-#identity-icon-labels {
-  -moz-margin-start: 1px;
-  -moz-margin-end: 3px;
-}
-
 /* Location bar dropmarker */
 
 .urlbar-history-dropmarker:not(:hover):not([open="true"]) {
@@ -1805,9 +2058,15 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:ho
 }
 
 #urlbar-container[combined="true"] > #urlbar > .urlbar-history-dropmarker,
-#urlbar-wrapper > #urlbar > .urlbar-history-dropmarker {
+#urlbar-wrapper > #urlbar > .urlbar-history-dropmarker,
+#urlbar-wrapper > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker {
   border: none;
   border-radius: 0px;
+  transition: opacity 0.15s ease;
+}
+
+#navigator-toolbox:not(:hover) .urlbar-history-dropmarker {
+  opacity: 0;
 }
 
 .urlbar-history-dropmarker:hover {
@@ -1821,55 +2080,134 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:ho
 
 /* === BEGIN identity-block.inc.css === */
 
-#urlbar[pageproxystate="valid"] > #identity-box.chromeUI {
+#identity-box {
+  --identity-box-verified-color: #008484;
   /* Default theme does different color per channel, we can't as they do it build-time. */
-  color: #9C9CFF;
-  -moz-border-end: 1px solid #9C9CFF;
-}
+  --identity-box-chrome-color: #9C9CFF;
 
-#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
-  color: #008484;
-  -moz-border-end: 1px solid #008484;
+  border-inline-end: 1px solid --urlbar-separator-color);
+  font-size: .9em;
+  border-radius: 2px;
+  padding: 3px 5px;
+  margin-inline-end: 4px;
+  overflow: hidden;
+  /* The latter two properties have a transition to handle the delayed hiding of
+     the forward button when hovered. */
+  transition: background-color 150ms ease, padding-left, padding-right;
 }
 
-#urlbar[pageproxystate="valid"] > #identity-box.chromeUI,
-#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
-  background-position: right;
-  background-size: 1px;
-  background-repeat: no-repeat;
+#identity-box:-moz-locale-dir(ltr) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
 }
 
-/* page proxy icon */
-
-#page-proxy-favicon {
-  width: 16px;
-  height: 16px;
-  list-style-image: url("chrome://browser/skin/identity-icons-generic.png");
-  margin: 2px;
+#identity-box:-moz-locale-dir(rtl) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
 }
 
-.chromeUI > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url("chrome://branding/content/identity-icons-brand.png");
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI {
+  color: var(--identity-box-chrome-color);
+  -moz-border-end: 1px solid var(--identity-box-chrome-color);
 }
 
-.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url("chrome://browser/skin/identity-icons-https.png");
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
+  color: var(--identity-box-verified-color);
+  -moz-border-end: 1px solid var(--identity-box-verified-color);
 }
 
-.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url("chrome://browser/skin/identity-icons-https-ev.png");
-}
+#notification-popup-box:not([hidden]) + #identity-box {
+  padding-inline-start: 10px !important;
+  border-radius: 0;
+}
+
+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-wrapper > #forward-button[disabled] + #urlbar >
+    #notification-popup-box[hidden] + #identity-box {
+  padding-inline-start: 2px;
+}
+
+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, so we should use the same
+     delay for the identity box. We handle both horizontal paddings (for LTR and
+     RTL), the latter two delays here are for padding-left and padding-right. */
+  transition-delay: 0s, 100s, 100s;
+}
+
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] + #urlbar >
+    #notification-popup-box[hidden] + #identity-box {
+  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
+  padding-inline-start: 2.01px;
+}
+
+/* TRACKING PROTECTION ICON */
+
+#tracking-protection-icon {
+  width: 16px;
+  height: 16px;
+  margin-inline-start: 0;
+  list-style-image: url("chrome://browser/skin/tracking-protection-16.svg");
+  opacity: 1;
+}
+
+#tracking-protection-icon[state="loaded-tracking-content"] {
+  list-style-image: url("chrome://browser/skin/tracking-protection-disabled-16.svg");
+}
+
+#tracking-protection-icon[animate] {
+  transition: margin-left 200ms ease-out, margin-right 200ms ease-out;
+}
+
+#tracking-protection-icon:not([state]) {
+  margin-inline-start: -18px;
+  pointer-events: none;
+  opacity: 0;
+  /* Only animate the shield in, when it disappears hide it immediately. */
+  transition: none;
+}
+
+#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icons > #tracking-protection-icon {
+  visibility: collapse;
+}
+
+/* MAIN IDENTITY ICON */
+
+#page-proxy-favicon {
+  width: 16px;
+  height: 16px;
+  list-style-image: url("chrome://browser/skin/identity-not-secure.svg");
+  margin: 2px;
+}
+
+.chromeUI > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://branding/content/identity-icons-brand.svg");
+}
+
+.verifiedDomain > #identity-icons > #page-proxy-favicon[pageproxystate="valid"],
+.verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-secure.svg");
+}
 
-.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-active.png");
+.insecureLoginForms > #identity-icons > #page-proxy-favicon[pageproxystate="valid"],
+.mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-mixed-active-loaded.svg");
 }
 
-.mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-display.png");
+.weakCipher > #identity-icons > #page-proxy-favicon[pageproxystate="valid"],
+.mixedDisplayContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"],
+.mixedDisplayContentLoadedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-mixed-passive-loaded.svg");
 }
 
-.mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-display.png");
+.mixedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-mixed-active-blocked.svg");
 }
 
 #page-proxy-favicon[pageproxystate="invalid"] {
@@ -1891,13 +2229,114 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled]:not(:ho
   max-width: 50ch;
 }
 
+#urlbar[actiontype="searchengine"] > #identity-box > #identity-icons > #page-proxy-favicon {
+  -moz-image-region: inherit;
+  list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon);
+  width: 16px;
+  height: 16px;
+  opacity: 1;
+}
+
+/* MAIN IDENTITY ICON */
+
+#identity-icon {
+  width: 16px;
+  height: 16px;
+  list-style-image: url(chrome://browser/skin/identity-icon.svg#normal);
+}
+
+#identity-box:hover > #identity-icon,
+#identity-box[open=true] > #identity-icon {
+  list-style-image: url(chrome://browser/skin/identity-icon.svg#hover);
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon {
+  list-style-image: url(chrome://branding/content/identity-icons-brand.svg);
+}
+
+#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon {
+  opacity: 0.3;
+}
+
+#urlbar[actiontype="searchengine"] > #identity-box > #identity-icon {
+  -moz-image-region: inherit;
+  list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon);
+  width: 16px;
+  height: 16px;
+  opacity: 1;
+}
+
+/* TRACKING PROTECTION ICON */
+
+#tracking-protection-icon {
+  width: 16px;
+  height: 16px;
+  margin-inline-start: 2px;
+  margin-inline-end: 0;
+  list-style-image: url(chrome://browser/skin/tracking-protection-16.svg);
+  opacity: 1;
+}
+
+#tracking-protection-icon[state="loaded-tracking-content"] {
+  list-style-image: url(chrome://browser/skin/tracking-protection-disabled-16.svg);
+}
+
+#tracking-protection-icon[animate] {
+  transition: margin-left 200ms ease-out, margin-right 200ms ease-out;
+}
+
+#tracking-protection-icon:not([state]) {
+  margin-inline-end: -18px;
+  pointer-events: none;
+  opacity: 0;
+  /* Only animate the shield in, when it disappears hide it immediately. */
+  transition: none;
+}
+
+#urlbar[pageproxystate="invalid"] > #identity-box > #tracking-protection-icon {
+  visibility: collapse;
+}
+
+/* CONNECTION ICON */
+
+#connection-icon {
+  width: 16px;
+  height: 16px;
+  margin-inline-start: 2px;
+  visibility: collapse;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon {
+  list-style-image: url(chrome://browser/skin/identity-secure.svg);
+  visibility: visible;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.insecureLoginForms > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveContent > #connection-icon {
+  list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg);
+  visibility: visible;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon {
+  list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg);
+  visibility: visible;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon {
+  list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg);
+  visibility: visible;
+}
+
 /* === END identity-block.inc.css === */
 
 #page-proxy-favicon {
   -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;*/
 }
 
@@ -1955,13 +2394,19 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-
 }
 
 .ac-result-type-keyword,
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://global/skin/icons/Search-glass.png");
-  -moz-image-region: rect(0px 32px 16px 16px);
+.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage),
+richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-site-icon {
+  list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon");
   width: 16px;
   height: 16px;
 }
 
+  .ac-result-type-keyword[selected="true"],
+  .autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected),
+  richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-title-box > .ac-site-icon {
+    list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted");
+  }
+
 .ac-result-type-tag,
 .autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
   list-style-image: url("chrome://mozapps/skin/places/tagContainerIcon.png");
@@ -1969,17 +2414,20 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-
   height: 16px;
 }
 
-.ac-comment {
-  font-size: 1.06em;
+.ac-comment,
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description,
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button {
+  font-size: 1.05em;
 }
 
-.ac-extra > .ac-comment {
+.ac-extra > .ac-comment,
+.ac-url-text,
+.ac-action-text {
   font-size: 1em;
 }
 
 .ac-url-text,
 .ac-action-text {
-  font-size: 1em;
   color: #9C9CFF;
 }
 
@@ -1987,6 +2435,15 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://browser/skin/actionicon-tab.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
   padding: 0 3px;
+  width: 22px;
+  height: 16px;
+}
+
+@media (min-resolution: 1.1dppx) {
+  richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon {
+    list-style-image: url("chrome://browser/skin/actionicon-tab@2x.png");
+    -moz-image-region: rect(0, 32px, 32px, 0);
+  }
 }
 
 richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-box > .ac-action-icon {
@@ -2016,13 +2473,19 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 /* combined go/reload/stop button in location bar */
 
-#urlbar > toolbarbutton {
-  -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;
+#urlbar-go-button,
+#urlbar-reload-button,
+#urlbar-stop-button {
+  border-style: none;
+  list-style-image: url("chrome://browser/skin/reload-stop-goFx.png");
+/*  padding: 0 9px;*/
+  margin-inline-start: 0px;
+  border-inline-start: 1px solid var(--urlbar-separator-color);
+  border-image: linear-gradient(transparent 15%,
+                                var(--urlbar-separator-color) 15%,
+                                var(--urlbar-separator-color) 85%,
+                                transparent 85%);
+  border-image-slice: 1;
 }
 
 #urlbar:-moz-locale-dir(ltr) > toolbarbutton {
@@ -2061,7 +2524,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);
 }
 
@@ -2077,6 +2540,56 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-image-region: rect(14px, 28px, 28px, 14px);
 }
 
+@media (min-resolution: 1.1dppx) {
+  #urlbar-go-button,
+  #urlbar-reload-button,
+  #urlbar-stop-button {
+    list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
+  }
+
+  #urlbar-go-button > .toolbarbutton-icon,
+  #urlbar-reload-button > .toolbarbutton-icon,
+  #urlbar-stop-button > .toolbarbutton-icon {
+    width: 14px;
+  }
+
+  #urlbar-go-button {
+    -moz-image-region: rect(0, 84px, 28px, 56px);
+  }
+
+  #urlbar-go-button:hover {
+    -moz-image-region: rect(28px, 84px, 56px, 56px);
+  }
+
+  #urlbar-go-button:hover:active {
+    -moz-image-region: rect(56px, 84px, 84px, 56px);
+  }
+
+  #urlbar-reload-button {
+    -moz-image-region: rect(0, 28px, 28px, 0);
+  }
+
+  #urlbar-reload-button:not([disabled]):hover {
+    -moz-image-region: rect(28px, 28px, 56px, 0);
+  }
+
+  #urlbar-reload-button:not([disabled]):hover:active {
+    -moz-image-region: rect(56px, 28px, 84px, 0);
+  }
+
+  #urlbar-stop-button {
+    -moz-image-region: rect(0, 56px, 28px, 28px);
+  }
+
+  #urlbar-stop-button:not([disabled]):hover {
+    -moz-image-region: rect(28px, 56px, 56px, 28px);
+  }
+
+  #urlbar-stop-button:hover:active {
+    -moz-image-region: rect(56px, 56px, 84px, 28px);
+  }
+}
+
 /* popup blocker button */
 
 #page-report-button {
@@ -2090,109 +2603,97 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
+/* Reader mode button */
+
+#reader-mode-button {
+  list-style-image: url("chrome://browser/skin/readerMode.svg");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+#reader-mode-button:hover,
+#reader-mode-button[readeractive]:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+#reader-mode-button:hover:active,
+#reader-mode-button[readeractive] {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
 /* social share panel */
 
-#social-share-panel > iframe {
-/*  background: linear-gradient(to bottom, #f0f4f7, #fafbfc);*/
-  width: 300px;
+.social-share-frame {
+  min-width: 756px;
   height: 150px;
 }
 
-.social-share-toolbar {
-  border-right: 1px solid #9C9CFF;
-/*  background-color: #000000; */
+#share-container {
+  min-width: 756px;
+  background-color: white;
+  background-repeat: no-repeat;
+  background-position: center center;
 }
-
-#social-share-provider-buttons {
-  padding: 6px;
+#share-container[loading] {
+  background-image: url(chrome://browser/skin/tabbrowser/pendingpaint.png);
+}
+#share-container > browser {
+  transition: opacity 150ms ease-in-out;
+  opacity: 1;
+}
+#share-container[loading] > browser {
+  opacity: 0;
 }
 
-#social-share-provider-buttons > .share-provider-button {
-  -moz-appearance: none;
-  padding: 5px;
-  margin: 1px;
-  border: none;
-  background: none;
-  border-radius: 2px;
+.social-share-toolbar {
+  border-bottom: 1px solid #9C9CFF;
+  padding: 2px;
 }
 
-#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]),
-#social-share-provider-buttons > .share-provider-button:hover,
-#social-share-provider-buttons > .share-provider-button:active {
-  padding: 4px;
+#social-share-provider-buttons {
+  padding: 0;
+  margin: 0;
 }
 
-#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]) {
+.share-provider-button {
+  padding: 5px;
+  margin: 2px;
 }
 
-#social-share-provider-buttons > .share-provider-button > .toolbarbutton-text {
+.share-provider-button > .toolbarbutton-text {
   display: none;
 }
-#social-share-provider-buttons > .share-provider-button > .toolbarbutton-icon {
+.share-provider-button > .toolbarbutton-icon {
   width: 16px;
   min-height: 16px;
   max-height: 16px;
 }
 
-toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
-  width: auto;
-  height: auto;
-  max-width: 32px;
-  max-height: 24px;
-}
-
 /* fixup corners for share panel */
 .social-panel > .social-panel-frame {
   border-radius: inherit;
 }
 
 #social-share-panel {
-  max-height: 600px;
   min-height: 100px;
-  max-width: 800px;
-  min-width: 300px;
+  min-width: 766px;
 }
 
+#share-container,
 .social-share-frame {
-/*  background: linear-gradient(to bottom, #f0f4f7, #fafbfc); */
-  width: 330px;
-  height: 150px;
-  /* we resize our panels dynamically, make it look nice */
-  transition: height 100ms ease-out, width 100ms ease-out;
-}
-
-.social-share-frame:-moz-locale-dir(ltr) {
   border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  border-top-right-radius: inherit;
-  border-bottom-right-radius: inherit;
-}
-
-.social-share-frame:-moz-locale-dir(rtl) {
-  border-top-left-radius: inherit;
   border-bottom-left-radius: inherit;
   border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
+  border-bottom-right-radius: inherit;
 }
 
-#social-share-panel > .social-share-toolbar:-moz-locale-dir(ltr) {
+#social-share-panel > .social-share-toolbar {
   border-top-left-radius: inherit;
-  border-bottom-left-radius: inherit;
-}
-
-#social-share-panel > .social-share-toolbar:-moz-locale-dir(rtl) {
   border-top-right-radius: inherit;
-  border-bottom-right-radius: inherit;
 }
 
-#social-share-provider-buttons:-moz-locale-dir(ltr) {
+#social-share-provider-buttons {
   border-top-left-radius: inherit;
-  border-bottom-left-radius: inherit;
-}
-
-#social-share-provider-buttons:-moz-locale-dir(rtl) {
   border-top-right-radius: inherit;
-  border-bottom-right-radius: inherit;
 }
 
 /* social recommending panel */
@@ -2212,11 +2713,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-#bookmarks-menu-button.bookmark-item > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  -moz-margin-start: 5px;
-}
-
-#bookmarks-menu-button[cui-areatype="toolbar"]:not(.bookmark-item):not([overflowedItem=true]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+#nav-bar #bookmarks-menu-button[cui-areatype="toolbar"]:not([overflowedItem=true]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   padding-top: 2px;
   padding-bottom: 2px;
 }
@@ -2289,19 +2786,54 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 .panel-promo-closebutton > .toolbarbutton-text {
   padding: 0;
-  margin: 0;
 }
 
 /* ::::: content area ::::: */
 
+#sidebar-box {
+  background-color: #9C9CFF;
+  color: #000000;
+}
+
 #sidebar {
-  background-color: Window;
+  background-color: #000000;
+}
+
+#sidebar-splitter {
+  -moz-margin-start: 0;
+}
+
+#sidebar-header {
+  color: #000000;
+  padding: 2px;
 }
 
 #sidebar-title {
   -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");
+}
+
+#sidebar-splitter:-moz-locale-dir(ltr),
+#sidebar:-moz-locale-dir(ltr) {
+  border-radius: 0 5px 0 0;
+}
+
+#sidebar-splitter:-moz-locale-dir(rtl),
+#sidebar:-moz-locale-dir(rtl) {
+  border-radius: 5px 0 0 0;
+}
+
 .browserContainer > findbar {
 /*
   background-color: -moz-dialog;
@@ -2326,14 +2858,16 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   border-bottom: 1px solid #008484;
 }
 
-#main-window:not([customizing]) #TabsToolbar:not(:-moz-lwtheme) {
-}
+/* === BEGIN tabs.inc.css === */
 
-#main-window[tabsintitlebar] #TabsToolbar {
-  background-color: transparent;
+:root {
+  /* --tab-toolbar-navbar-overlap: 1px; */
+  /* --navbar-tab-toolbar-highlight-overlap: 1px; */
+  /* --tab-min-height: 31px; */
+}
+#TabsToolbar {
+  /* --tab-stroke-background-size: auto 100%; */
 }
-
-/* === BEGIN tabs.inc.css === */
 
 .tabbrowser-tab,
 .tabs-newtab-button,
@@ -2360,12 +2894,8 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   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] {
+.tabbrowser-tab[visuallyselected=true] {
 /*  position: relative;
   z-index: 2;*/
 }
@@ -2376,8 +2906,12 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tab-content {
 }
 
-.tab-/*throbber*/,
+.tab-content[pinned] {
+}
+
+.tab-throbber,
 .tab-icon-image,
+.tab-icon-sound,
 .tab-close-button {
 }
 
@@ -2385,32 +2919,163 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tab-icon-image {
   height: 16px;
   width: 16px;
+  -moz-margin-end: 3px;
 }
 
 .tab-icon-image {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
-.tab-throbber {
-  list-style-image: url("chrome://communicator/skin/brand/throbber16-anim-connect.png");
+.tab-icon-overlay {
+  width: 16px;
+  height: 16px;
+  margin-top: -8px;
+  -moz-margin-start: -15px;
+  position: relative;
 }
 
-.tab-throbber[progress] {
-  list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.png");
+.tab-icon-overlay[crashed] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg");
 }
 
-.tab-throbber:not([pinned]),
-.tab-icon-image:not([pinned]) {
-  -moz-margin-end: 3px;
+.tab-icon-overlay[soundplaying],
+.tab-icon-overlay[muted]:not([crashed]) {
+  border-radius: 10px;
 }
 
-.tab-throbber[pinned],
-.tab-icon-image[pinned] {
-  -moz-margin-start: 2px;
+.tab-icon-overlay[soundplaying]:hover,
+.tab-icon-overlay[muted]:hover {
+  background-color: #FFCF00;
+}
+
+.tab-icon-overlay[soundplaying] {
+  display: -moz-box;
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio");
+}
+
+.tab-icon-overlay[muted]:not([crashed]) {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-muted");
+}
+
+#TabsToolbar[brighttext] .tab-icon-overlay[soundplaying]:not(:hover) {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white");
+}
+
+
+#TabsToolbar[brighttext] .tab-icon-overlay[muted]:not([crashed]):not(:hover) {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-muted");
+}
+
+.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[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;
+}
+
+.tab-icon-sound {
+  -moz-margin-start: 4px;
+  width: 16px;
+  height: 16px;
+  padding: 0;
+}
+
+.tab-icon-sound[muted] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted");
+}
+
+.tab-icon-sound[muted]:hover {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted-hover");
+}
+
+.tab-icon-sound[muted]:hover:active {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted-pressed");
+}
+
+.tab-icon-sound[soundplaying] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-backgroundTab");
+}
+
+.tab-icon-sound[soundplaying]:hover {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-backgroundTab-hover");
+}
+
+.tab-icon-sound[soundplaying]:hover:active {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-backgroundTab-pressed");
+}
+
+.tab-icon-sound[muted] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-backgroundTab-muted");
+}
+
+.tab-icon-sound[muted]:hover {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-backgroundTab-muted-hover");
+}
+
+.tab-icon-sound[muted]:hover:active {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-backgroundTab-muted-pressed");
+}
+
+.tab-icon-sound[visuallyselected=true][soundplaying] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio");
+}
+
+.tab-icon-sound[visuallyselected=true][soundplaying]:hover {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-hover");
+}
+
+.tab-icon-sound[visuallyselected=true][soundplaying]:hover:active {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-pressed");
+}
+
+.tab-icon-sound[visuallyselected=true][muted] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted");
+}
+
+.tab-icon-sound[visuallyselected=true][muted]:hover {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted-hover");
+}
+
+.tab-icon-sound[visuallyselected=true][muted]:hover:active {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted-pressed");
+}
+
+#TabsToolbar[brighttext] .tab-icon-sound[soundplaying] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-white");
+}
+
+#TabsToolbar[brighttext] .tab-icon-sound[soundplaying]:hover {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-white-hover");
+}
+
+#TabsToolbar[brighttext] .tab-icon-sound[soundplaying]:hover:active {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-white-pressed");
+}
+
+#TabsToolbar[brighttext] .tab-icon-sound[muted] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted-white");
+}
+
+#TabsToolbar[brighttext] .tab-icon-sound[muted]:hover {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted-white-hover");
+}
+
+#TabsToolbar[brighttext] .tab-icon-sound[muted]:hover:active {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted-white-pressed");
 }
 
 .tab-close-button {
@@ -2426,15 +3091,38 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
 }
 
-.tab-background-start[selected=true]::after,
-.tab-background-start[selected=true]::before,
+/* Tab Overflow */
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]),
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:-moz-locale-dir(rtl),
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:-moz-locale-dir(ltr) {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]) {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator[collapsed],
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator[collapsed] {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator,
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator {
+}
+
+.tab-background-start[visuallyselected=true]::after,
+.tab-background-start[visuallyselected=true]::before,
 .tab-background-start,
 .tab-background-end,
-.tab-background-end[selected=true]::after,
-.tab-background-end[selected=true]::before {
+.tab-background-end[visuallyselected=true]::after,
+.tab-background-end[visuallyselected=true]::before {
 }
 
-.tabbrowser-tab:not([selected=true]),
+.tabbrowser-tab:not([visuallyselected=true]),
 .tabbrowser-tab:-moz-lwtheme {
 }
 
@@ -2445,20 +3133,35 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 /* Selected tab */
 
-.tabbrowser-tab[selected="true"] {
+.tabbrowser-tab[visuallyselected="true"] {
 }
 
 /* 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]) {
+/* User Context UI - change tab decoration depending on userContextId.
+   Defaults to gray for unknown usercontextids. */
+.tabbrowser-tab[usercontextid] {
+  background-image: linear-gradient(to right, transparent 20%, #A09090 30%, #A09090 70%, transparent 80%);
+  background-size: auto 2px;
+  background-repeat: no-repeat;
 }
 
-/* End background tabs */
+/* Personal User Context */
+.tabbrowser-tab[usercontextid="1"] {
+  background-image: linear-gradient(to right, transparent 20%, #9C9CFF 30%, #9C9CFF 70%, transparent 80%);
+}
+/* Work User Context */
+.tabbrowser-tab[usercontextid="2"] {
+  background-image: linear-gradient(to right, transparent 20%, #FF9F00 30%, #FF9F00 70%, transparent 80%);
+}
+/* Banking User Context */
+.tabbrowser-tab[usercontextid="3"] {
+  background-image: linear-gradient(to right, transparent 20%, #008484 30%, #008484 70%, transparent 80%);
+}
+/* Shopping User Context */
+.tabbrowser-tab[usercontextid="4"] {
+  background-image: linear-gradient(to right, transparent 20%, #E7ADE7 30%, #E7ADE7 70%, transparent 80%);
+}
 
 /* Tab pointer-events */
 /*
@@ -2468,29 +3171,78 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 .tab-background-middle,
 .tabs-newtab-button,
+.tab-icon-overlay[soundplaying],
+.tab-icon-overlay[muted]:not([crashed]),
+.tab-icon-sound,
 .tab-close-button {
   pointer-events: auto;
 }
 */
 /* Pinned tabs */
 
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
+/*
+.tabbrowser-tab:-moz-any([image], [pinned]) > .tab-stack > .tab-content[attention]:not([visuallyselected="true"]),
+.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([visuallyselected="true"]) {
+*/
+.tabbrowser-tab:-moz-any([image], [pinned]):-moz-any([attention], [titlechanged]):not([visuallyselected="true"]) {
   background-color: #E7ADE7;
 }
 
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
+.tab-label[attention]:not([visuallyselected="true"]) {
+  font-weight: bold;
+}
+
+.tabbrowser-tab[pinned][titlechanged]:not([visuallyselected="true"]):hover {
   background-color: #3333FF;
   color: #000000;
 }
 
+/* Tab separators */
+/*
+.tabbrowser-tab::after,
+.tabbrowser-tab::before {
+  width: 1px;
+  -moz-margin-start: -1px;
+  background-image: linear-gradient(transparent 5px,
+                                    currentColor 5px,
+                                    currentColor calc(100% - 4px),
+                                    transparent calc(100% - 4px));
+  opacity: 0.2;
+}
+
+#TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-tab::before,
+#TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-tab::after {
+  opacity: 0.4;
+}
+*/
+/* Also show separators beside the selected tab when dragging it. */
+/*
+#tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
+.tabbrowser-tab:not([visuallyselected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
+#tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([visuallyselected]):not([beforehovered]):not(:hover)::after {
+  content: "";
+  display: -moz-box;
+}
+*/
 /* New tab button */
 
 .tabs-newtab-button {
   width: 28px;
+  /* width: calc(36px + var(--tab-curve-width)); */
 }
 
 /* === 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([visuallyselected=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");
@@ -2527,7 +3279,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] {
  }
@@ -2561,7 +3313,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 #TabsToolbar > #new-tab-button,
 #TabsToolbar > toolbarpaletteitem > #new-tab-button,
 #TabsToolbar > toolbarpaletteitem > #new-tab-button[cui-areatype="toolbar"] {
-  list-style-image: url("chrome://browser/skin/tabbrowser/newtab.png");
+  list-style-image: url("chrome://browser/skin/tabbrowser/newtabFx.png");
   -moz-image-region: rect(0, 16px, 18px, 0);
 }
 
@@ -2624,24 +3376,12 @@ 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 {
+.alltabs-endimage[muted] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted");
 }
 
-.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");
+.alltabs-endimage[soundplaying] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio");
 }
 
 toolbarbutton.chevron {
@@ -2651,7 +3391,11 @@ toolbarbutton.chevron {
 toolbarbutton.chevron:hover {
   list-style-image: url("chrome://global/skin/toolbar/chevron-hover.gif") !important;
 }
-
+/*
+toolbar[brighttext] toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/toolbar/chevron-inverted.png") !important;
+}
+*/
 toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 toolbarbutton.chevron:-moz-locale-dir(rtl):hover > .toolbarbutton-icon {
   transform: scaleX(-1);
@@ -2696,114 +3440,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   background-color: #008484;
 }
 
-/* ::::: Identity Indicator Styling ::::: */
-
-/* Popup Icons */
-#identity-popup-icon {
-  height: 64px;
-  width: 64px;
-  padding: 0;
-  list-style-image: url("chrome://browser/skin/identity.png");
-  -moz-image-region: rect(0px, 64px, 64px, 0px);
-}
-
-#identity-popup.verifiedDomain > #identity-popup-container > #identity-popup-icon {
-  -moz-image-region: rect(64px, 64px, 128px, 0px);
-}
-
-#identity-popup.verifiedIdentity > #identity-popup-container > #identity-popup-icon {
-  -moz-image-region: rect(128px, 64px, 192px, 0px);
-}
-
-/* Popup Body Text */
-.identity-popup-description {
-  white-space: pre-wrap;
-  -moz-padding-start: 15px;
-  margin: 2px 0 4px;
-}
-
-.identity-popup-label {
-  white-space: pre-wrap;
-  -moz-padding-start: 15px;
-  margin: 0;
-}
-
-#identity-popup-content-host,
-#identity-popup-content-box.verifiedIdentity > #identity-popup-content-owner {
-  font-size: 1.2em;
-}
-
-#identity-popup-content-host {
-  margin-top: 3px;
-  margin-bottom: 5px;
-  font-weight: bold;
-  max-width: 300px;
-}
-
-#identity-popup-content-owner {
-  margin-top: 4px;
-  margin-bottom: 0 !important;
-  font-weight: bold;
-  max-width: 300px;
-}
-
-.verifiedDomain > #identity-popup-content-owner {
-  font-weight: normal;
-}
-
-#identity-popup-content-verifier {
-  margin: 4px 0 2px;
-}
-
-#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption ,
-#identity-popup-content-box.verifiedDomain > #identity-popup-encryption {
-  margin-top: 10px;
-  -moz-margin-start: -24px;
-}
-
-#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon ,
-#identity-popup-content-box.verifiedDomain > #identity-popup-encryption > vbox > #identity-popup-encryption-icon {
-  list-style-image: url("chrome://browser/skin/Secure24.png");
-}
-
-#identity-popup-help-icon {
-  border: none;
-  margin: 7px 0 0 -3px;
-  background: none;
-  min-width: 0;
-  list-style-image: url("chrome://global/skin/icons/question-16.png");
-  cursor: pointer;
-}
-
-#identity-popup-help-icon > .button-box > .button-text {
-  display: none;
-}
-
-#identity-popup-help-icon > .button-box > .button-icon {
-  height: 16px;
-  width: 16px;
-}
-
-#identity-popup-more-info-button {
-  margin-top: 6px;
-  margin-bottom: 0;
-  -moz-margin-end: 0;
-}
-
-#identity-popup > .panel-arrowcontainer > .panel-arrowcontent {
-  padding: 0;
-}
-
-#identity-popup-container {
-  min-width: 280px;
-  padding: 10px;
-}
-
-#identity-popup-button-container {
-/*  background: linear-gradient(to bottom, rgba(0,0,0,0.04) 60%, transparent);*/
-  padding: 10px;
-  margin-top: 5px;
-}
+/* === BEGIN notification-icons.inc.css === */
 
 .popup-notification-icon {
   width: 64px;
@@ -2816,68 +3453,50 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 .popup-notification-icon[popupid="xpinstall-disabled"],
-.popup-notification-icon[popupid="addon-progress"],
-.popup-notification-icon[popupid="addon-install-cancelled"],
 .popup-notification-icon[popupid="addon-install-blocked"],
-.popup-notification-icon[popupid="addon-install-failed"],
-.popup-notification-icon[popupid="addon-install-complete"] {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-  width: 32px;
-  height: 32px;
+.popup-notification-icon[popupid="addon-install-origin-blocked"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-blocked.svg);
 }
 
-.popup-notification-icon[popupid="click-to-play-plugins"] {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked-64.png");
+.popup-notification-icon[popupid="addon-progress"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-downloading.svg);
 }
 
-.popup-notification-icon[popupid="plugins-not-found"] {
-  list-style-image: url("chrome://browser/skin/pluginInstall-64.png");
+.popup-notification-icon[popupid="addon-install-failed"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-error.svg);
 }
 
-.popup-notification-icon[popupid="web-notifications"] {
-  list-style-image: url("chrome://browser/skin/notification-64.png");
+.popup-notification-icon[popupid="addon-install-confirmation"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-confirm.svg);
 }
 
-.addon-progress-description {
-  width: 350px;
-  max-width: 350px;
+#addon-install-confirmation-notification[warning] .popup-notification-icon[popupid="addon-install-confirmation"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-warning.svg);
 }
 
-.popup-progress-label,
-.popup-progress-meter {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+.popup-notification-icon[popupid="addon-install-complete"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-installed.svg);
 }
 
-.popup-progress-cancel {
-  -moz-appearance: none;
-  background: transparent;
-  border: none;
-  padding: 0;
-  margin: 0;
-  min-height: 0;
-  min-width: 0;
-  list-style-image: url("chrome://mozapps/skin/downloads/downloadButtons.png");
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+.popup-notification-icon[popupid="addon-install-restart"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-restart.svg);
 }
 
-.popup-progress-cancel:hover {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
+.popup-notification-icon[popupid="click-to-play-plugins"] {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked-64.png");
 }
 
-.popup-progress-cancel:active {
-  -moz-image-region: rect(32px, 32px, 48px, 16px);
+.popup-notification-icon[popupid="web-notifications"] {
+  list-style-image: url("chrome://browser/skin/web-notifications-icon.svg");
 }
 
 .popup-notification-icon[popupid="indexedDB-permissions-prompt"],
-.popup-notification-icon[popupid="indexedDB-quota-prompt"],
 .popup-notification-icon[popupid*="offline-app-requested"],
 .popup-notification-icon[popupid="offline-app-usage"] {
   list-style-image: url("chrome://global/skin/icons/alert-question.gif");
 }
 
-.popup-notification-icon[popupid="password-save"],
-.popup-notification-icon[popupid="password-change"] {
+.popup-notification-icon[popupid="password"] {
   list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png");
 }
 
@@ -2886,20 +3505,30 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://global/skin/icons/webapps-64.png");
 }
 
-.popup-notification-icon[popupid="mixed-content-blocked"] {
-  list-style-image: url("chrome://browser/skin/mixed-content-blocked-64.png");
-}
-
 .popup-notification-icon[popupid="webRTC-sharingDevices"],
 .popup-notification-icon[popupid="webRTC-shareDevices"] {
   list-style-image: url("chrome://browser/skin/webRTC-shareDevice-64.png");
 }
 
+.popup-notification-icon[popupid="webRTC-sharingMicrophone"],
+.popup-notification-icon[popupid="webRTC-shareMicrophone"] {
+  list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-64.png");
+}
+
+.popup-notification-icon[popupid="webRTC-sharingScreen"],
+.popup-notification-icon[popupid="webRTC-shareScreen"] {
+  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-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;
@@ -2912,16 +3541,27 @@ 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; */
 }
 
+/* This changes the direction of the main notification box on the url bar. */
 #notification-popup-box:-moz-locale-dir(rtl),
+/* This adds a second flip for the notification anchors, as they don't switch direction
+   for RTL mode. */
 .notification-anchor-icon:-moz-locale-dir(rtl) {
   transform: scaleX(-1);
 }
 
+/* For the anchor icons in the chat window, we don't have the notification popup box,
+   so we need to cancel the RTL transform. */
+.notification-anchor-icon.chat-toolbarbutton:-moz-locale-dir(rtl) {
+  transform: none;
+}
+
 .notification-anchor-icon {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
+
   width: 16px;
   height: 16px;
   margin: 0 2px;
@@ -2929,12 +3569,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
 
 .notification-anchor-icon:-moz-focusring {
   outline: 1px dotted #008484;
-/*  outline-offset: -3px; */
-}
-
-.default-notification-icon,
-#default-notification-icon {
-  list-style-image: url("chrome://global/skin/icons/information-16.png");
 }
 
 .identity-notification-icon,
@@ -2948,7 +3582,15 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
 }
 
 #addons-notification-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+  list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default);
+}
+
+#addons-notification-icon:hover {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#hover);
+}
+
+#addons-notification-icon:hover:active {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#active);
 }
 
 .indexedDB-notification-icon,
@@ -2960,6 +3602,12 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
   list-style-image: url("chrome://mozapps/skin/passwordmgr/key-16.png");
 }
 
+#login-fill-notification-icon {
+  /* Temporary icon until the capture and fill doorhangers are unified. */
+  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png);
+  transform: scaleX(-1);
+}
+
 #webapps-notification-icon {
   list-style-image: url("chrome://gobal/skin/icons/webapps-16.png");
 }
@@ -2984,10 +3632,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
 /*  -moz-image-region: rect(0, 32px, 16px, 16px);*/
 }
 
-#plugin-install-notification-icon {
-  list-style-image: url("chrome://browser/skin/pluginInstall-16.png");
-}
-
 #notification-popup-box[hidden] {
   /* Override display:none to make the pluginBlockedNotification animation work
      when showing the notification repeatedly. */
@@ -3008,11 +3652,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
   }
 }
 
-.mixed-content-blocked-notification-icon,
-#mixed-content-blocked-notification-icon {
-  list-style-image: url("chrome://browser/skin/mixed-content-blocked-16.png");
-}
-
 .webRTC-shareDevices-notification-icon,
 #webRTC-shareDevices-notification-icon {
   list-style-image: url("chrome://browser/skin/webRTC-shareDevice-16.png");
@@ -3023,16 +3662,253 @@ 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");
+}
+
+.webRTC-shareScreen-notification-icon,
+#webRTC-shareScreen-notification-icon {
+  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png);
+}
+
+.webRTC-sharingScreen-notification-icon,
+#webRTC-sharingScreen-notification-icon {
+  list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png);
+}
+
 .web-notifications-notification-icon,
 #web-notifications-notification-icon {
-  list-style-image: url("chrome://browser/skin/notification-16.png");
+  list-style-image: url("chrome://browser/skin/web-notifications-tray.svg");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.web-notifications-notification-icon:hover,
+#web-notifications-notification-icon:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.web-notifications-notification-icon:hover:active,
+#web-notifications-notification-icon:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 #pointerLock-notification-icon {
   list-style-image: url("chrome://browser/skin/pointerLock-16.png");
 }
-#pointerLock-cancel {
-  margin: 0px;
+
+.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);
+}
+
+.popup-notification-icon[popupid="servicesInstall"] {
+  list-style-image: url("chrome://browser/skin/social/services-64.png");
+}
+#servicesInstall-notification-icon {
+  list-style-image: url("chrome://browser/skin/social/services-16.png");
+}
+
+/* EME notifications */
+
+.popup-notification-icon[popupid="drmContentPlaying"],
+#eme-notification-icon {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
+}
+
+#eme-notification-icon:hover:active {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed");
+}
+
+#eme-notification-icon[firstplay=true] {
+  animation: emeTeachingMoment 0.2s linear 0s 5 normal;
+}
+
+@keyframes emeTeachingMoment {
+  0% {transform: translateX(0); }
+  25% {transform: translateX(3px) }
+  75% {transform: translateX(-3px) }
+  100% { transform: translateX(0); }
+}
+
+/* HiDPI notification icons */
+@media (min-resolution: 1.1dppx) {
+/*  #notification-popup-box {
+    border-image: url("chrome://browser/skin/urlbar-arrow@2x.png") 0 16 0 0 fill;
+  }
+*/
+  .notification-anchor-icon {
+    list-style-image: url(chrome://global/skin/icons/information-32.png);
+  }
+
+  .webRTC-shareDevices-notification-icon,
+  #webRTC-shareDevices-notification-icon {
+    list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16@2x.png);
+  }
+
+  .webRTC-sharingDevices-notification-icon,
+  #webRTC-sharingDevices-notification-icon {
+    list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16@2x.png);
+  }
+
+  .webRTC-shareMicrophone-notification-icon,
+  #webRTC-shareMicrophone-notification-icon {
+    list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16@2x.png);
+  }
+
+  .webRTC-sharingMicrophone-notification-icon,
+  #webRTC-sharingMicrophone-notification-icon {
+    list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16@2x.png);
+  }
+
+  .webRTC-shareScreen-notification-icon,
+  #webRTC-shareScreen-notification-icon {
+    list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16@2x.png);
+  }
+
+  .webRTC-sharingScreen-notification-icon,
+  #webRTC-sharingScreen-notification-icon {
+    list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16@2x.png);
+  }
+
+  .popup-notification-icon[popupid="webRTC-sharingDevices"],
+  .popup-notification-icon[popupid="webRTC-shareDevices"] {
+    list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64@2x.png);
+  }
+
+  .popup-notification-icon[popupid="webRTC-sharingMicrophone"],
+  .popup-notification-icon[popupid="webRTC-shareMicrophone"] {
+    list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-64@2x.png);
+  }
+
+  .popup-notification-icon[popupid="webRTC-sharingScreen"],
+  .popup-notification-icon[popupid="webRTC-shareScreen"] {
+    list-style-image: url(chrome://browser/skin/webRTC-shareScreen-64@2x.png);
+  }
+}
+
+/* === END notification-icons.inc.css === */
+
+.popup-notification-body[popupid="addon-progress"],
+.popup-notification-body[popupid="addon-install-confirmation"] {
+  width: 28em;
+  max-width: 28em;
+}
+
+/* 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"][state="translating"] .messageImage {
+  list-style-image: url("chrome://browser/skin/translating-16.png");
+  -moz-image-region: auto;
+}
+
+@media (min-resolution: 1.25dppx) {
+  notification[value="translation"][state="translating"] .messageImage {
+    list-style-image: url("chrome://browser/skin/translating-16@2x.png");
+  }
+}
+
+notification[value="translation"] hbox[anonid="details"] {
+  overflow: hidden;
+}
+
+notification[value="translation"] button,
+notification[value="translation"] menulist {
+  min-width: 0;
+}
+
+notification[value="translation"] menulist > .menulist-dropmarker {
+}
+
+.translation-menupopup arrowscrollbox {
+  padding-bottom: 0;
+}
+
+.translation-attribution {
+  cursor: pointer;
+  -moz-box-align: end;
+  font-size: small;
+}
+
+.translation-attribution > label {
+  margin-bottom: 0;
+}
+
+.translation-attribution > image {
+  width: 70px;
+}
+
+.translation-welcome-panel {
+  width: 305px;
+}
+
+.translation-welcome-logo {
+  height: 32px;
+  width: 32px;
+  list-style-image: url(chrome://browser/skin/translation-16@2x.png);
+  -moz-image-region: rect(0, 64px, 32px, 32px);
+}
+
+.translation-welcome-content {
+  -moz-margin-start: 16px;
+}
+
+.translation-welcome-headline {
+  font-size: larger;
+  font-weight: bold;
+}
+
+.translation-welcome-body {
+  padding: 1em 0;
+  margin: 0 0;
+}
+
+/* === END infobar.inc.css === */
+
+notification[value="translation"] {
+  min-height: 40px;
+}
+
+.translation-menupopup {
+  -moz-appearance: none;
+}
+
+/* Loop/ Hello browser styles */
+
+notification[value="loop-sharing-notification"] .button-menubutton-button {
+  min-width: 0;
+  border: 0;
+  margin: 0;
+}
+
+notification[value="loop-sharing-notification"] .messageImage {
+  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png);
 }
 
 /* Bookmarks roots menu-items */
@@ -3056,6 +3932,12 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
   -moz-image-region: auto;
 }
 
+#panelMenu_pocket,
+#menu_pocket,
+#BMB_pocket {
+  list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16.png");
+}
+
 /* ::::: Keyboard UI Panel ::::: */
 
 .KUI-panel {
@@ -3119,6 +4001,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
 /* Sync Panel */
 
 .sync-panel-icon {
+  height:32px;
   width: 32px;
   background: url("chrome://browser/content/abouthome/sync.png") top left no-repeat;
 }
@@ -3132,14 +4015,14 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
   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;
+#sync-start-panel-subtitle {
+  margin-bottom: 0;
 }
 
 /* Status panel */
@@ -3174,111 +4057,80 @@ window:not([chromehidden~="toolbar"]) #urlbar-container[forwarddisabled] > #urlb
   background-color: transparent !important;
 }
 
-/* === BEGIN highlighter.inc.css === */
-
-/* Highlighter */
-
-.highlighter-outline {
-  box-shadow: 0 0 0 1px black;
-  outline: 1px dashed #A09090;
-}
+/* === BEGIN fullscreen/warning.inc.css === */
 
-/* Highlighter - Node Infobar */
-
-.highlighter-nodeinfobar {
-  color: #FF9F00;
-  border-radius: 3px;
-  background-color: #000000;
-  background-clip: padding-box;
-  border: 1px solid #008484;
-  padding: 5px;
-  /* Avoid cases where the infobar is smaller than the arrow, when the text is
-  short */
-  min-width: 75px;
-}
-
-/* Highlighter - Node Infobar - text */
-
-.highlighter-nodeinfobar-text {
-  text-align: center;
-  /* 100% - size of the buttons and margins */
-  max-width: calc(100% - 2 * (26px + 6px));
-  padding-bottom: 1px;
-}
-
-html|*.highlighter-nodeinfobar-tagname {
-  color: #FFCF00;
-}
-
-html|*.highlighter-nodeinfobar-id {
-  color: #9C9CFF;
+html|*#fullscreen-warning {
+  align-items: center;
+  background: rgba(0, 0, 0, 0.9);
+  border: 2px solid #A09090;
+  box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.5);
+  border-radius: 8px;
+  padding: 24px 16px;
+  font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
 }
 
-html|*.highlighter-nodeinfobar-pseudo-classes {
-  color: #FF9F00;
+html|*#fullscreen-warning::before {
+  margin: 0;
+  width: 24px; height: 24px;
 }
 
-/* Highlighter - Node Infobar - box & arrow */
-
-.highlighter-nodeinfobar-arrow {
-  width: 14px;
-  height: 14px;
-  -moz-margin-start: calc(50% - 7px);
-  transform: rotate(-45deg);
-  background-clip: padding-box;
-  background-repeat: no-repeat;
+html|*#fullscreen-warning.verifiedIdentity::before,
+html|*#fullscreen-warning.verifiedDomain::before {
+  content: url("chrome://browser/skin/fullscreen/secure.svg");
 }
 
-.highlighter-nodeinfobar-arrow-top {
-  margin-bottom: -8px;
-  margin-top: 8px;
-  background-image: linear-gradient(to bottom left, transparent 50%, rgb(0, 132, 132) 50%);
+html|*#fullscreen-warning.unknownIdentity::before {
+  content: url("chrome://browser/skin/fullscreen/insecure.svg");
 }
 
-.highlighter-nodeinfobar-arrow-bottom {
-  margin-top: -8px;
-  margin-bottom: 8px;
-  background-image: linear-gradient(to top right, transparent 50%, rgb(0, 132, 132) 50%);
+html|*#fullscreen-domain-text,
+html|*#fullscreen-generic-text {
+  font-size: 21px;
+  font-weight: lighter;
+  color: #A09090;
+  margin: 0 16px;
 }
 
-.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
-  margin: 7px 0;
+html|*#fullscreen-domain {
+  font-weight: bold;
+  margin: 0;
 }
 
-/* === END highlighter.inc.css === */
-
-#full-screen-warning-message {
-  background-color: #000000;
-  color: #FF9F00;
-  border-radius: 8px;
-  margin-top: 30px;
-  padding: 30px 50px;
-  box-shadow: 0 0 2px #9C9CFF;
-}
+html|*#fullscreen-exit-button {
+  padding: 5px 30px;
+  font: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+  font-size: 14px;
+  font-weight: lighter;
+  margin: 0;
+  box-sizing: content-box;
 
-#full-screen-warning-container[obscure-browser] {
-  background-color: rgba(0,0,0,0.3);
+  border-radius: 300px;
+  border: none;
+  background-color: #C09070;
+  color: #000000;
 }
 
-.full-screen-description {
-  font-size: 150%;
-}
+/* === END fullscreen/warning.inc.css === */
 
-#full-screen-domain-text {
-  font-size: 300%;
-}
+/* === BEGIN commandline.inc.css === */
 
-.full-screen-approval-button,
-#full-screen-remember-decision {
-  font-size: 120%;
+/* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
+   We are copy/pasting variables from light-theme and dark-theme,
+   since they aren't loaded in this context (within browser.css). */
+:root #developer-toolbar {
+  --gcli-background-color: #000000; /* --theme-toolbar-background */
+  --gcli-input-background: rgba(0, 0, 0, .75); /* --theme-tab-toolbar-background */
+  --gcli-input-focused-background: #000000; /* --theme-sidebar-background */
+  --gcli-input-color: #FF9F00; /* --theme-body-color-alt */
+  --gcli-border-color: #9C9CFF; /* --theme-splitter-color */
+  --selection-background: #008484; /* --theme-selection-background */
+  --selection-color: #000000; /* --theme-selection-color */
 }
 
-/* === BEGIN commandline.inc.css === */
-
 /* Developer toolbar */
 
 #developer-toolbar {
-  border-top: 3px solid #000000;
+  border-top: 3px solid var(--gcli-background-color);
   border-bottom: none;
 }
 
@@ -3316,6 +4168,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);
@@ -3331,6 +4189,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);
@@ -3350,6 +4221,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,
@@ -3376,17 +4259,36 @@ 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);
+  background-color: var(--gcli-input-background);
 }
 
 .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;
+  background-color: var(--gcli-input-focused-background);
+}
+
+.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"]) {
@@ -3394,9 +4296,8 @@ html|*#gcli-output-frame {
 }
 
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
-  background-color: #008484;
-  color: #000000;
-  text-shadow: none;
+  background-color: var(--selection-background);
+  color: var(--selection-color);
 }
 
 .gclitoolbar-complete-node {
@@ -3445,7 +4346,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;
 }
 
@@ -3473,6 +4374,24 @@ html|*#gcli-output-frame {
 /*  margin: 0 3px; */
 }
 
+.devtools-responsiveui-menulist .menulist-editable-box {
+  background-color: transparent;
+}
+
+.devtools-responsiveui-menulist html|*.menulist-editable-input {
+  color: inherit;
+  text-align: center;
+}
+
+.devtools-responsiveui-menulist html|*.menulist-editable-input::-moz-selection {
+/*  background: hsla(212,7%,57%,.35);*/
+}
+
+.devtools-responsiveui-toolbarbutton > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
 .devtools-responsiveui-toolbarbutton > .toolbarbutton-menubutton-button {
   -moz-box-orient: horizontal;
 }
@@ -3520,7 +4439,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;*/
@@ -3544,7 +4463,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;*/
 }
@@ -3572,6 +4491,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);
@@ -3583,6 +4520,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);
@@ -3592,11 +4542,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");
 }
 
@@ -3605,6 +4566,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");
 }
 
@@ -3613,87 +4575,143 @@ 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");
 }
 
-/* === END responsivedesign.inc.css === */
+/* FxOS custom mode with additional buttons and phone look'n feel */
 
-/* === including indicator.css is done at the start of the file === */
+/* Hide devtools manual resizer */
+.browserStack[responsivemode].fxos-mode .devtools-responsiveui-resizehandle,
+.browserStack[responsivemode].fxos-mode .devtools-responsiveui-resizebarH,
+.browserStack[responsivemode].fxos-mode .devtools-responsiveui-resizebarV {
+  display: none;
+}
+
+/* Gives responsive mode a phone look'n feel */
+.browserStack[responsivemode].fxos-mode {
+  padding: 60px 15px 0;
+
+  border-radius: 25px / 20px;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  border: 1px solid #FFFFFF;
+  border-bottom-width: 0;
+
+  background-color: #353535;
 
-/* Error counter */
+  box-shadow: 0 3px 0.7px 1px #777777, 0 5px rgba(0, 0, 0, 0.4) inset;
 
-#developer-toolbar-toolbox-button[error-count]:before {
-  color: #000000;
-  min-width: 16px;
-  text-shadow: none;
-  background-color: #FF0000;
-  border-radius: 1px;
-  -moz-margin-end: 5px;
+  background-image: linear-gradient(to right, #111 11%, #333 56%);
+  min-width: 320px;
 }
 
-/* Social toolbar item */
+.devtools-responsiveui-hardware-buttons {
+  -moz-appearance: none;
+  padding: 20px;
 
-#social-provider-button {
-  -moz-image-region: rect(0, 16px, 16px, 0);
-  list-style-image: url("chrome://browser/skin/social/services-16.png");
+  border: 1px solid #FFFFFF;
+  border-bottom-left-radius: 25px;
+  border-bottom-right-radius: 25px;
+  border-top-width: 0;
+
+  box-shadow: 0 3px 0.7px 1px #777777, 0 -7px rgba(0, 0, 0, 0.4) inset;
+
+  background-image: linear-gradient(to right, #111 11%, #333 56%);
 }
 
-#social-provider-button > .toolbarbutton-menu-dropmarker {
-  display: none;
+.devtools-responsiveui-home-button {
+  -moz-user-focus: ignore;
+  width: 40px;
+  height: 30px;
+  list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png");
 }
 
-.toolbarbutton-badge-container {
-  margin: 0;
-  padding: 0;
-  position: relative;
+.devtools-responsiveui-sleep-button {
+  -moz-user-focus: ignore;
+  -moz-appearance: none;
+  /* compensate browserStack top padding */
+  margin-top: -67px;
+  margin-right: 10px;
+
+  min-width: 10px;
+  width: 50px;
+  height: 5px;
+
+  border: 1px solid #444;
+  border-top-right-radius: 12px;
+  border-top-left-radius: 12px;
+  border-bottom-color: transparent;
+
+  background-image: linear-gradient(to top, #111 11%, #333 56%);
 }
 
-#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container {
-  padding: 2px 2px;
+.devtools-responsiveui-sleep-button:hover:active {
+  background-image: linear-gradient(to top, #aaa 11%, #ddd 56%);
 }
 
-.toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon {
-  position: absolute;
-  top: 2px;
-  right: 2px;
+.devtools-responsiveui-volume-buttons {
+  margin-left: -29px;
 }
 
-.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) {
-  -moz-margin-end: 0;
+.devtools-responsiveui-volume-up-button,
+.devtools-responsiveui-volume-down-button {
+  -moz-user-focus: ignore;
+  -moz-appearance: none;
+  border: 1px solid red;
+  min-width: 8px;
+  height: 40px;
+
+  border: 1px solid #444;
+  border-right-color: transparent;
+
+  background-image: linear-gradient(to right, #111 11%, #333 56%);
 }
 
-.toolbarbutton-badge[badge=""] {
-  display: none;
+.devtools-responsiveui-volume-up-button:hover:active,
+.devtools-responsiveui-volume-down-button:hover:active {
+  background-image: linear-gradient(to right, #aaa 11%, #ddd 56%);
 }
-.toolbarbutton-badge[badge]:not([badge=""])::after {
-  /* The |content| property is set in the content stylesheet. */
-  font-size: 9px;
-  font-weight: bold;
-  padding: 0 1px;
-  color: #FF9F00;
-  background-color: #000000;
-  border: 1px solid #9C9CFF;
-  border-radius: 2px;
-  position: absolute;
-  top: 0;
-  right: 0;
+
+.devtools-responsiveui-volume-up-button {
+  border-top-left-radius: 12px;
 }
 
-#nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
-  top: 1px;
-  right: 1px;
+.devtools-responsiveui-volume-down-button {
+  border-bottom-left-radius: 12px;
 }
 
-.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
-  left: 0;
-  right: auto;
+@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");
+  }
 }
 
-#nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
-  left: 1px;
-  right: auto;
+/* === END responsivedesign.inc.css === */
+
+/* === including indicator.css is done at the start of the file === */
+
+/* Error counter */
+
+#developer-toolbar-toolbox-button[error-count]:before {
+  color: #000000;
+  min-width: 16px;
+  text-shadow: none;
+  background-color: #FF0000;
+  border-radius: 1px;
+  -moz-margin-end: 5px;
 }
 
+/* Social toolbar item */
+
 #social-notification-icon-mentions {
   background-color: #000000;
   border-radius: 3px;
@@ -3712,17 +4730,6 @@ html|*#gcli-output-frame {
   border: 0;
 }
 
-.popup-notification-icon[popupid="servicesInstall"] {
-  list-style-image: url("chrome://browser/skin/social/services-64.png");
-}
-#servicesInstall-notification-icon {
-  list-style-image: url("chrome://browser/skin/social/services-16.png");
-}
-#social-undoactivation-button,
-#servicesInstall-learnmore-link {
-  -moz-margin-start: 0; /* override default label margin to match description margin */
-}
-
 #socialActivatedNotification .popup-notification-button-container {
   margin-left: 6px;
 }
@@ -3791,20 +4798,28 @@ html|*#gcli-output-frame {
   padding: 3px;
 }
 
+#manage-share-providers,
+#social-sidebar-button {
+  list-style-image: url("chrome://browser/skin/ToolbarFx.png");
+  -moz-image-region: rect(0, 468px, 18px, 450px);
+}
+
 #social-sidebar-button {
   -moz-appearance: none;
-  list-style-image: url("chrome://browser/skin/social/gear_default.png");
   border: none;
   padding: 0;
   margin: 2px;
 }
+#manage-share-providers > .toolbarbutton-icon,
 #social-sidebar-button > .toolbarbutton-icon {
-  min-height: 16px;
-  min-width: 16px;
+  min-height: 18px;
+  min-width: 18px;
 }
+#manage-share-providers:hover,
+#manage-share-providers:hover:active,
 #social-sidebar-button:hover,
 #social-sidebar-button:hover:active {
-  list-style-image: url("chrome://browser/skin/social/gear_clicked.png");
+  -moz-image-region: rect(18px, 468px, 36px, 450px);
 }
 #social-sidebar-button > .toolbarbutton-menu-dropmarker {
   display: none;
@@ -3830,10 +4845,9 @@ html|*#gcli-output-frame {
 .chat-toolbarbutton {
   -moz-appearance: none;
   border: none;
-  padding: 0;
+  padding: 0 3px;
   margin: 0;
   background: none;
-  width: 16px;
 }
 
 .chat-toolbarbutton > .toolbarbutton-text {
@@ -3841,73 +4855,110 @@ html|*#gcli-output-frame {
 }
 
 .chat-toolbarbutton > .toolbarbutton-icon {
-  width: inherit;
+  width: 16px;
+  height: 16px;
 }
 
-.chat-toolbarbutton.notification-anchor-icon > .toolbarbutton-icon {
-  width: inherit;
-  margin-top: -2px;
+.chat-close-button {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close");
 }
 
-.chat-close-button {
-  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
-  -moz-image-region: rect(0, 16px, 16px, 0);
+.chat-close-button:hover {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-hover");
 }
 
-.chat-close-button:hover,
 .chat-close-button:hover:active {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-active");
 }
 
 .chat-minimize-button {
-  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
-  -moz-image-region: rect(16px, 16px, 32px, 0);
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize");
 }
 
-.chat-minimize-button:hover:active,
 .chat-minimize-button:hover {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-hover");
+}
+
+.chat-minimize-button:hover:active {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-active");
 }
 
 .chat-swap-button {
-  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
-  -moz-image-region: rect(48px, 16px, 64px, 0);
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand");
+  transform: rotate(180deg);
 }
 
-.chat-swap-button:hover:active,
 .chat-swap-button:hover {
-  -moz-image-region: rect(48px, 32px, 64px, 16px);
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-hover");
+}
+
+.chat-swap-button:hover:active {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-active");
 }
 
 chatbar > chatbox > .chat-titlebar > .chat-swap-button {
-  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
-  -moz-image-region: rect(32px, 16px, 48px, 0);
+  transform: none;
 }
 
-chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active,
-chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover {
-  -moz-image-region: rect(32px, 32px, 48px, 16px);
+chatbox[src^="about:loopconversation#"] .chat-minimize-button {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-white");
+}
+
+chatbox[src^="about:loopconversation#"] .chat-swap-button {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-white");
+}
+
+.chat-loop-hangup {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white");
+  background-color: #FF0000;
+  border: 1px solid #FFC000;
+  border-top-right-radius: 4px;
+  width: 32px;
+  height: 26px;
+  margin-top: -6px;
+  margin-bottom: -5px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: -5px;
+}
+
+.chat-toolbarbutton.chat-loop-hangup:-moz-any(:hover,:hover:active) {
+  background-color: #FFCF00;
+  border-color: #FF0000;
 }
 
 .chat-title {
-  font-weight: bold;
-  font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+  color: #000000;
   text-shadow: none;
   cursor: inherit;
 }
 
+chatbox[src^="about:loopconversation#"] .chat-title {
+/*  color: white;*/
+}
+
 .chat-titlebar {
   background-color: #9C9CFF;
   color: #000000;
-  height: 20px;
-  min-height: 16px;
+  height: 26px;
+  min-height: 26px;
   width: 100%;
   margin: 0;
-  padding: 2px;
-  -moz-padding-start: 6px;
-  border: none;
-  border-bottom: 1px solid #008484;
+  padding: 5px 4px;
+  border: 1px solid #008484;
+  border-bottom: 0;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
   cursor: pointer;
+  background-color: #A09090;
+}
+
+.chat-titlebar[selected] {
+  background-color: #008484;
+}
+
+chatbox[src^="about:loopconversation#"] > .chat-titlebar {
+  background-color: #008484;
+  border-color: #008484;
 }
 
 .chat-titlebar > .notification-anchor-icon {
@@ -3951,6 +5002,17 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover {
   }
 }
 
+.chatbar-button:hover {
+  background-color: #FFCF00;
+}
+.chatbar-button[open="true"] {
+  background-color: #FF9F00;
+}
+
+.chatbar-button[activity]:not([open]) {
+  background-image: radial-gradient(circle farthest-corner at center 2px, rgb(160,144,144) 3%, rgba(160,144,144,0.9) 12%, rgba(156,156,255,0.6) 30%, rgba(156,156,255,0.2) 70%);
+}
+
 .chatbar-button > .toolbarbutton-icon {
   width: 16px;
 }
@@ -3990,7 +5052,6 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover {
 
 .chatbar-innerbox {
   background: transparent;
-  margin: -285px 0 0;
   overflow: hidden;
 }
 
@@ -3998,15 +5059,19 @@ chatbar {
   -moz-margin-end: 20px;
 }
 
-chatbar > chatbox {
-  height: 285px;
-  width: 260px;
+chatbox {
   -moz-margin-start: 4px;
-  background-color: #000000;
-  border: 1px solid #9C9CFF;
-  border-bottom: none;
-  border-top-left-radius: 2.5px;
-  border-top-right-radius: 2.5px;
+  background-color: transparent;
+}
+
+chatbar > chatbox {
+  /* Apply the same border-radius as the .chat-titlebar to make the box-shadow
+     go round nicely. */
+/*  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;*/
+  /* Offset the chatbox the same amount as the box-shadows' spread, to make it
+     visible. */
+/*  -moz-margin-end: 5px;*/
 }
 
 chatbox[minimized="true"] {
@@ -4023,36 +5088,6 @@ 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 === */
 
 /**
@@ -4120,6 +5155,88 @@ notification.pluginVulnerable .messageImage {
 
 /* === END plugin-doorhanger.inc.css === */
 
+/* === BEGIN login-doorhanger.inc.css === */
+
+#notification-popup[popupid="login-fill"] > .panel-arrowcontainer > .panel-arrowcontent {
+  /* Since we display a sliding subview that extends to the border, we cannot
+   * keep the default padding of arrow panels. We use the same padding in the
+   * individual content views instead. Since we removed the padding, we also
+   * have to ensure the contents are clipped to the border box. */
+  padding: 0;
+  overflow: hidden;
+}
+
+#login-fill-mainview,
+#login-fill-details {
+  padding: var(--panel-arrowcontent-padding);
+}
+
+#login-fill-doorhanger[inDetailView] > #login-fill-mainview {
+  transform: translateX(-14px);
+}
+
+#login-fill-mainview,
+#login-fill-details {
+  transition: transform 150ms;
+}
+
+#login-fill-doorhanger:not([inDetailView]) > #login-fill-details {
+  transform: translateX(105%);
+}
+
+#login-fill-doorhanger:not([inDetailView]) > #login-fill-details:-moz-locale-dir(rtl) {
+  transform: translateX(-105%);
+}
+
+#login-fill-doorhanger[inDetailView] > #login-fill-clickcapturer {
+  background-color: hsla(240,39%,100%,.1);
+}
+
+#login-fill-testing {
+  color: #FF0000;
+  font-weight: bold;
+}
+
+#login-fill-list {
+  border: 1px solid #9C9CFF;
+  max-height: 20em;
+}
+
+.login-fill-item[disabled] {
+  color: #8050B0;
+  background-color: #000000;
+}
+
+.login-fill-item[disabled][selected] {
+  background-color: #008484;
+}
+
+.login-hostname {
+  margin: 4px;
+  font-weight: bold;
+}
+
+.login-fill-item.different-hostname > .login-hostname {
+  color: #A09090;
+  font-style: italic;
+}
+
+.login-username {
+  margin: 4px;
+  color: #A09090;
+}
+
+#login-fill-details {
+  padding: 4px;
+  background: var(--panel-arrowcontent-background);
+  color: var(--panel-arrowcontent-color);
+  background-clip: padding-box;
+  border-left: 1px solid #9C9CFF;
+  -moz-margin-start: 38px;
+}
+
+/* === END login-doorhanger.inc.css === */
+
 /* === BEGIN customizeMode.inc.css === */
 
 /* Customization mode */
@@ -4208,6 +5325,7 @@ notification.pluginVulnerable .messageImage {
 
 #customization-container {
   background-color: #000000;
+  color: #FF9F00;
 }
 
 #customization-palette,
@@ -4216,12 +5334,13 @@ notification.pluginVulnerable .messageImage {
 }
 
 #customization-header {
-  font-size: 1.5em;
-  line-height: 1.5em;
+  font-size: 1.75em;
+  line-height: 1.75em;
   color: #9C9CFF;
-  font-weight: lighter;
-  margin-bottom: 1em;
-  padding: 15px 15px 0;
+  font-weight: 200;
+  margin: 25px 25px 12px;
+  padding-bottom: 12px;
+  border-bottom: 1px solid #A09090;
 }
 
 #customization-panel-container {
@@ -4235,38 +5354,111 @@ notification.pluginVulnerable .messageImage {
 
 #customization-footer {
   border-top: 1px solid #9C9CFF;
-  padding: 15px;
+  padding: 10px;
 }
 
 .customizationmode-button {
-  margin: 0;
+  margin: 5px;
 }
 
 .customizationmode-button:hover {
 }
 
+#customization-titlebar-visibility-button[checked],
+#customization-devedition-theme-button[checked] {
+  background-color: #008484;
+}
+
+#customization-titlebar-visibility-button[checked]:hover,
+#customization-devedition-theme-button[checked]:hover {
+  background-color: #FFCF00;
+}
+
+#customization-titlebar-visibility-button[checked]:hover:active,
+#customization-devedition-theme-button[checked]:hover:active {
+  background-color: #FF9F00;
+}
+
 .customizationmode-button[disabled="true"] {
 }
 
+.customizationmode-button > .box-inherit > .box-inherit > .button-icon,
+.customizationmode-button > .button-box > .button-icon {
+/*  height: 24px;*/
+}
+
 #customization-titlebar-visibility-button {
   list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png");
-  -moz-image-region: rect(0, 24px, 24px, 0);
-  padding: 2px 7px;
-  -moz-margin-end: 10px;
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+#customization-titlebar-visibility-button:hover {
+  -moz-image-region: rect(16px, 16px, 32px, 0);
+}
+
+#customization-lwtheme-button,
+#customization-titlebar-visibility-button  {
+  padding: 0px 5px;
+}
+
+#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-lwtheme-button > .box-inherit > .box-inherit > .button-text,
+#customization-titlebar-visibility-button > .button-box > .button-text {
+  /* Sadly, button.css thinks its margins are perfect for everyone. */
+  -moz-margin-start: 5px !important;
+}
+
+#customization-lwtheme-button > .box-inherit > .box-inherit > .button-icon {
+  width: 20px;
+  height: 20px;
+  border-radius: 2px;
+  background-size: contain;
+}
+
+#customization-titlebar-visibility-button > .button-box > .button-icon {
+  vertical-align: middle;
+}
+
+#customization-titlebar-visibility-button[checked] {
+  -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 > .button-box > .button-text {
-  /* Sadly, button.css thinks its margins are perfect for everyone. */
-  -moz-margin-start: 6px !important;
+#customization-titlebar-visibility-button[checked]:hover:active {
+  background-color: #FF9F00;
 }
 
-#customization-titlebar-visibility-button[checked] {
-  -moz-image-region: rect(0, 48px, 24px, 24px);
-  background-color: #008484;
-}
+@media (min-resolution: 1.1dppx) {
+  #customization-titlebar-visibility-button {
+    list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle@2x.png");
+    -moz-image-region: rect(0, 48px, 48px, 0);
+  }
 
-#customization-undo-reset-button {
-  -moz-margin-end: 10px;
+  #customization-titlebar-visibility-button:hover {
+    -moz-image-region: rect(48px, 48px, 96px, 0);
+  }
+
+  #customization-titlebar-visibility-button[checked] {
+    -moz-image-region: rect(0, 96px, 48px, 48px);
+  }
+  
+  #customization-titlebar-visibility-button[checked]:hover {
+    -moz-image-region: rect(48px, 96px, 96px, 48px);
+  }
 }
 
 #main-window[customize-entered] #customization-panel-container {
@@ -4310,12 +5502,14 @@ toolbarpaletteitem[notransition][place="panel"] {
 }
 
 toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon,
+toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-stack > .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-stack > .toolbarbutton-icon {
   transform: scale(1.3);
 }
 
@@ -4373,12 +5567,101 @@ toolbarpaletteitem[place="toolbar"] {
   min-height: 48px;
 }
 
+#personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
+  -moz-margin-end: 5px;
+}
+
 #customization-palette > toolbarpaletteitem > label {
   text-align: center;
   margin-left: 0;
   margin-right: 0;
 }
 
+#customization-lwtheme-menu > .panel-arrowcontainer > .panel-arrowcontent {
+  -moz-box-orient: vertical;
+  /* Make the panel padding uniform across all platforms due to the
+     styling of the section headers and footer. */
+  padding: 10px;
+}
+
+.customization-lwtheme-menu-theme > .toolbarbutton-icon {
+  width: 32px;
+  height: 32px;
+}
+
+.customization-lwtheme-menu-theme {
+  -moz-appearance: none;
+  margin: 0 -5px 5px;
+  padding-top: 0;
+  -moz-padding-end: 5px;
+  padding-bottom: 0;
+  -moz-padding-start: 0;
+}
+
+.customization-lwtheme-menu-theme[defaulttheme] {
+  list-style-image: url(chrome://browser/skin/Fxtheme-switcher-icon.png);
+}
+
+.customization-lwtheme-menu-theme[active="true"] {
+  background-color: #008484;
+}
+
+.customization-lwtheme-menu-theme > .toolbarbutton-icon {
+  margin: 5px;
+}
+
+.customization-lwtheme-menu-theme > .toolbarbutton-text {
+  text-align: start;
+}
+
+#customization-lwtheme-menu-header,
+#customization-lwtheme-menu-recommended {
+  padding: 10px;
+  margin-bottom: 5px;
+}
+
+#customization-lwtheme-menu-header,
+#customization-lwtheme-menu-recommended,
+#customization-lwtheme-menu-footer {
+  background-color: #A09090;
+  color: #000000;
+  margin-right: -10px;
+  margin-left: -10px;
+}
+
+#customization-lwtheme-menu-header {
+  margin-top: -10px;
+  border-top-right-radius: 3px;
+  border-top-left-radius: 3px;
+}
+
+#customization-lwtheme-menu-recommended {
+}
+
+#customization-lwtheme-menu-footer {
+  margin-bottom: -10px;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+
+.customization-lwtheme-menu-footeritem {
+  -moz-appearance: none;
+  -moz-box-flex: 1;
+  background-color: #C09070;
+  color: #000000;
+  border: 1px solid transparent;
+  padding: 10px;
+  margin-left: 0;
+  margin-right: 0;
+}
+
+.customization-lwtheme-menu-footeritem:hover {
+  background-color: #FFCF00;
+}
+
+.customization-lwtheme-menu-footeritem:first-child {
+}
+
 /* === END customizeMode.inc.css === */
 
 /* === BEGIN customizeTip.inc.css === */
@@ -4392,6 +5675,7 @@ toolbarpaletteitem[place="toolbar"] {
   border-radius: 3px;
 /*  background-image: linear-gradient(90deg, #a0dfff 0%, #ceeeff 100%);*/
   border: 1px solid #9C9CFF;
+  color: #FF9F00;
 }
 
 #customization-tipPanel > .panel-arrowcontainer > .panel-arrowcontent:-moz-locale-dir(rtl) {
@@ -4467,9 +5751,25 @@ toolbarpaletteitem[place="toolbar"] {
   transform: perspective(0.01px);
 }
 
-#main-window[customize-entered] {
+#main-window[customize-entered] > #tab-view-deck {
+  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
+  background-attachment: fixed;
+}
+
+#main-window[customization-lwtheme] > #tab-view-deck:-moz-lwtheme {
+  background-repeat: no-repeat;
+  background-position: right top;
+  background-attachment: fixed;
+  /* The image will get set from CustomizeMode.jsm */
+  background-image: none;
+  background-color: transparent;
+}
+
+#main-window[customization-lwtheme]:-moz-lwtheme {
   background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
+  background-repeat: repeat;
   background-attachment: fixed;
+  background-position: left top;
 }
 
 #main-window[customize-entered] #browser-bottombox,
@@ -4632,10 +5932,12 @@ toolbarpaletteitem[place="toolbar"] {
   padding: 2em 15px;
 }
 
+#UITourTooltipButtons > label,
 #UITourTooltipButtons > button {
   margin: 0 15px;
 }
 
+#UITourTooltipButtons > label:first-child,
 #UITourTooltipButtons > button:first-child {
   -moz-margin-start: 0;
 }
@@ -4646,6 +5948,7 @@ toolbarpaletteitem[place="toolbar"] {
   -moz-margin-end: 5px;
 }
 
+#UITourTooltipButtons > label,
 #UITourTooltipButtons > button .button-text {
   font-size: 1.15rem;
 }
@@ -4666,6 +5969,7 @@ toolbarpaletteitem[place="toolbar"] {
   color: #000000;
 }
 
+#UITourTooltipButtons > label,
 #UITourTooltipButtons > button.button-link {
   -moz-appearance: none;
   background: transparent;
@@ -4693,8 +5997,360 @@ toolbarpaletteitem[place="toolbar"] {
   color: #000000;
 }
 
+/* Notification overrides for Heartbeat UI */
+
+notification.heartbeat {
+  background-color: #A09090;
+/*  height: 40px;*/
+}
+
+@keyframes pulse-onshow {
+ 0% {
+   opacity: 0;
+   transform: scale(1.0);
+ }
+ 25% {
+   opacity: 1;
+   transform: scale(1.1);
+ }
+ 50% {
+   transform: scale(1.0);
+ }
+ 75% {
+   transform: scale(1.1);
+ }
+ 100% {
+   transform: scale(1.0);
+ }
+}
+
+@keyframes pulse-twice {
+ 0% {
+   transform: scale(1.1);
+ }
+ 50% {
+   transform: scale(0.8);
+ }
+ 100% {
+   transform: scale(1);
+ }
+}
+
+.messageText.heartbeat {
+  color: #000000;
+/*  text-shadow: none; */
+  -moz-margin-start: 0px;
+}
+
+.messageImage.heartbeat {
+  width: 24px;
+  height: 24px;
+  -moz-margin-start: 8px;
+  -moz-margin-end: 8px;
+}
+
+.messageImage.heartbeat.pulse-onshow {
+  animation-name: pulse-onshow;
+  animation-duration: 1.5s;
+  animation-iteration-count: 1;
+  animation-timing-function: cubic-bezier(.7,1.8,.9,1.1);
+}
+
+.messageImage.heartbeat.pulse-twice {
+  animation-name: pulse-twice;
+  animation-duration: 1s;
+  animation-iteration-count: 2;
+  animation-timing-function: linear;
+}
+
+/* Learn More link styles */
+.heartbeat > .text-link {
+  color: #3333FF;
+  -moz-margin-start: 0px;
+}
+
+.heartbeat > .text-link:hover {
+  color: #9C9CFF;
+  text-decoration: none;
+}
+
+.heartbeat > .text-link:hover:active {
+  color: #FF9F00;
+}
+
+/* Heartbeat UI Rating Star Classes */
+.heartbeat > #star-rating-container {
+  display: -moz-box;
+/*  margin-bottom: 4px;*/
+}
+
+.heartbeat > #star-rating-container > #star5 {
+  -moz-box-ordinal-group: 5;
+}
+
+.heartbeat > #star-rating-container > #star4 {
+  -moz-box-ordinal-group: 4;
+}
+
+.heartbeat > #star-rating-container > #star3 {
+  -moz-box-ordinal-group: 3;
+}
+
+.heartbeat > #star-rating-container > #star2 {
+  -moz-box-ordinal-group: 2;
+}
+
+.heartbeat > #star-rating-container > .star-x  {
+  background: url("chrome://browser/skin/heartbeat-star-off.svg");
+  cursor: pointer;
+  /* Overrides the -moz-margin-end for all platforms defined in the .plain class */
+  -moz-margin-end: 4px !important;
+  width: 16px;
+  height: 16px;
+}
+
+.heartbeat > #star-rating-container > .star-x:hover,
+.heartbeat > #star-rating-container > .star-x:hover ~ .star-x {
+  background: url("chrome://browser/skin/heartbeat-star-lit.svg");
+}
+
 /* === END UITour.inc.css === */
 
 #UITourTooltipButtons {
-  margin: 24px -4px -4px;
+  /**
+   * Override the --panel-arrowcontent-padding so the background extends
+   * to the sides and bottom of the panel.
+   */
+  margin-left: -10px;
+  margin-right: -10px;
+  margin-bottom: -10px;
+}
+
+/* === 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-back > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back"); */
+  list-style-image: url("chrome://browser/skin/ToolbarFx.png");
+  -moz-image-region: rect(0, 54px, 18px, 36px);
+}
+
+#context-back:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back-active"); */
+  -moz-image-region: rect(18px, 54px, 36px, 36px);
+}
+
+#context-back[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back-disabled"); */
+  -moz-image-region: rect(36px, 54px, 54px, 36px);
+}
+
+#context-forward > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward"); */
+  list-style-image: url("chrome://browser/skin/ToolbarFx.png");
+  -moz-image-region: rect(0, 72px, 18px, 54px);
+}
+
+#context-forward:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward-active"); */
+  -moz-image-region: rect(18px, 72px, 36px, 54px);
+}
+
+#context-forward[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward-disabled"); */
+  -moz-image-region: rect(36px, 72px, 54px, 54px);
+}
+
+#context-reload > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload"); */
+  list-style-image: url("chrome://browser/skin/reload-stop-goFx.png");
+  -moz-image-region: rect(0, 14px, 14px, 0);
+}
+
+#context-reload:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload-active"); */
+  -moz-image-region: rect(14px, 14px, 28px, 0);
+}
+
+#context-reload[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload-disabled"); */
+  -moz-image-region: rect(28px, 14px, 42px, 0);
+}
+
+#context-stop > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop"); */
+  list-style-image: url("chrome://browser/skin/reload-stop-goFx.png");
+  -moz-image-region: rect(0, 28px, 14px, 14px);
+}
+
+#context-stop:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop-active"); */
+  -moz-image-region: rect(14px, 28px, 28px, 14px);
+}
+
+#context-stop[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop-disabled"); */
+  -moz-image-region: rect(28px, 28px, 42px, 14px);
+}
+
+#context-bookmarkpage > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark"); */
+  list-style-image: url("chrome://browser/skin/ToolbarFx.png");
+  -moz-image-region: rect(0, 144px, 18px, 126px);
+}
+
+#context-bookmarkpage:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark-active"); */
+  -moz-image-region: rect(18px, 144px, 36px, 126px);
+}
+
+#context-bookmarkpage[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark-disabled"); */
+  -moz-image-region: rect(36px, 144px, 54px, 126px);
+}
+
+#context-bookmarkpage[starred=true] {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmarked"); */
+  -moz-image-region: rect(0px, 162px, 18px, 144px);
+}
+
+#context-bookmarkpage[starred=true][_moz-menuactive=true] {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmarked-active"); */
+  -moz-image-region: rect(18px, 162px, 36px, 144px);
 }
+
+#context-bookmarkpage[starred=true][disabled=true] {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmarked-disabled"); */
+  -moz-image-region: rect(36px, 162px, 54px, 144px);
+}
+
+#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; /*16px;*/
+  height: 18px; /*16px;*/
+  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;
+}
+
+#context-media-eme-learnmore {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
+}
+
+#context-media-eme-learnmore {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
+}
+
+/* === END contextmenu.inc.css === */
+
+#context-navigation {
+}
+
+#context-sep-navigation {
+/*  margin-top: -4px; */
+}
+
+.browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+  overflow: hidden;
+}
+
+/* === BEGIN usercontext.inc.css === */
+
+/* User Context UI browser styles */
+
+#menu_newUserContextTabPersonal {
+  list-style-image: url("chrome://browser/skin/usercontext/personal.svg");
+}
+
+#menu_newUserContextTabWork {
+  list-style-image: url("chrome://browser/skin/usercontext/work.svg");
+}
+
+#menu_newUserContextTabBanking {
+  list-style-image: url("chrome://browser/skin/usercontext/banking.svg");
+}
+
+#menu_newUserContextTabShopping {
+  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg");
+}
+
+/* URL Bar Decoration */
+
+#userContext-indicator {
+  height: 16px;
+  width: 16px;
+}
+
+#userContext-label {
+  margin-inline-end: 3px;
+  color: #A09090;
+}
+
+#userContext-icons:not([usercontextid]) {
+  display: none;
+}
+
+#userContext-icons {
+  -moz-box-align: center;
+}
+
+/* Personal User Context */
+#userContext-icons[usercontextid="1"] > #userContext-label {
+  color: #9C9CFF;
+}
+#userContext-icons[usercontextid="1"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/personal.svg");
+}
+
+/* Work User Context */
+#userContext-icons[usercontextid="2"] > #userContext-label {
+  color: #FF9F00;
+}
+#userContext-icons[usercontextid="2"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/work.svg");
+}
+
+/* Banking User Context */
+#userContext-icons[usercontextid="3"] > #userContext-label {
+  color: #008484;
+}
+#userContext-icons[usercontextid="3"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/banking.svg");
+}
+
+/* Shopping User Context */
+#userContext-icons[usercontextid="4"] > #userContext-label {
+  color: #E7ADE7;
+}
+#userContext-icons[usercontextid="4"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg");
+}
+
+/* === END usercontext.inc.css === */