X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=657620f7949bf7de5b662505a649d8b15ffe018c;hp=60c6a30688083805761586a7518046a0b9c34b1a;hb=6f751fd100ed69c35ed979e9d0db9d0f991af80a;hpb=bcb9d005748b2ce85edf14e01a0ebfe1cf0973cf

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 60c6a306..657620f7 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -37,7 +37,18 @@ menubar {
 }
 
 :root {
-  --verified-identity-box-backgroundcolor: #000000;
+  /*--backbutton-urlbar-overlap: 5px;*/
+
+  /* icon width + border + horizontal padding (includes the overlap from backbutton-urlbar-overlap) */
+  --forwardbutton-width: 27px;
+  /* icon width + border + horizontal padding (without the overlap from backbutton-urlbar-overlap) /
+  --forwardbutton-width: 25px;*/
+
+  --identity-box-verified-background-color: #000000;
+
+  --panel-separator-color: #A09090;
+
+  --urlbar-separator-color: #9C9CFF;
 }
 
 #menubar-items {
@@ -68,21 +79,14 @@ menubar {
 /* We want a 4px gap between the TabsToolbar and the toolbar-menubar when the
    toolbar-menu is displayed, and a 16px gap when it is not. 1px is taken care
    of by the (light) outer shadow of the tab, the remaining 3/15 are these margins. */
-#toolbar-menubar:not([moz-collapsed=true]):not([autohide=true]) ~ #TabsToolbar,
-#toolbar-menubar:not([moz-collapsed=true])[autohide=true]:not([inactive]) ~ #TabsToolbar {
+#toolbar-menubar:not([autohide=true]) ~ #TabsToolbar:not([inFullscreen]),
+#toolbar-menubar[autohide=true]:not([inactive]) ~ #TabsToolbar:not([inFullscreen]) {
 /*  margin-top: 3px;*/
 }
 
 #main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen])[chromehidden~="menubar"] #toolbar-menubar ~ #TabsToolbar,
 #main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen]) #toolbar-menubar[autohide="true"][inactive] ~ #TabsToolbar {
-/*  margin-top: 15px;*/
-}
-
-@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");
-  }
+/*  margin-top: var(--space-above-tabbar);*/
 }
 
 @media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
@@ -179,6 +183,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; */
 }
@@ -227,7 +239,7 @@ menubar {
   -moz-appearance: none;
   margin-top: 6px;
   margin-top: 4px;
-  -moz-margin-end: 3px;
+  margin-inline-end: 3px;
   z-index: 1;
 }
 
@@ -240,37 +252,36 @@ 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) {
@@ -303,23 +314,30 @@ menubar {
 toolbarbutton.bookmark-item:not(.subviewbutton),
 #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder {
 /*  margin: 0;
-  padding: 2px 3px;*/
+  padding: 2px 3px;
+  -moz-appearance: none;
+  border: 1px solid transparent;*/
 }
 
-toolbarbutton.bookmark-item:not([disabled="true"]):not(.subviewbutton):hover:active,
-toolbarbutton.bookmark-item[open="true"] {
-/*  padding-top: 3px;
-  padding-bottom: 1px;
-  -moz-padding-start: 4px;
-  -moz-padding-end: 2px;*/
+toolbarbutton.bookmark-item:not(.subviewbutton):hover:not([disabled="true"]):not([open]) {
+/*  border-color: var(--toolbarbutton-hover-bordercolor);
+  background: var(--toolbarbutton-hover-background);*/
+}
+
+toolbarbutton.bookmark-item:not(.subviewbutton):hover:active:not([disabled="true"]),toolbarbutton.bookmark-item[open="true"] {
+/*  border-color: var(--toolbarbutton-active-bordercolor);
+  box-shadow: var(--toolbarbutton-active-boxshadow);
+  background: var(--toolbarbutton-active-background);*/
 }
 
 .bookmark-item > .toolbarbutton-icon,
 #personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
-  -moz-margin-start: 1px;
-  -moz-margin-end: 2px;
+  margin-inline-start: 1px;
+  margin-inline-end: 2px;
+  margin-top: 1px;
+  margin-bottom: 1px;
 }
 
 /* Force the display of the label for bookmarks */
@@ -334,6 +352,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,
@@ -416,7 +435,7 @@ menuitem.bookmark-item {
 }
 
 .bookmark-item > .menu-iconic-left > .menu-iconic-icon {
-  -moz-padding-start: 0px;
+  padding-inline-start: 0px;
 }
 
 /* ::::: bookmark items ::::: */
@@ -493,11 +512,10 @@ menuitem.bookmark-item {
 :-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,
           #social-share-button, #open-file-button, #find-button, #developer-button,
-          #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-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, #panic-button, #web-apps-button, #webide-button),
-
+          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #containers-panelmenu),
 #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
 }
@@ -584,8 +602,8 @@ menuitem.bookmark-item {
 #bookmarks-menu-button[cui-areatype="toolbar"][open="true"] > .toolbarbutton-menubutton-dropmarker {
   padding-top: 2px;
   padding-bottom: 0px;
-  -moz-padding-start: 2px;
-  -moz-padding-end: 0px;
+  padding-inline-start: 2px;
+  padding-inline-end: 0px;
 }
 
 #history-panelmenu[cui-areatype="toolbar"] {
@@ -631,30 +649,26 @@ menuitem.bookmark-item {
 }
 
 #sync-button[cui-areatype="toolbar"] {
-  -moz-image-region: rect(0, 270px, 18px, 252px);
+  -moz-image-region: rect(0, 792px, 18px, 774px);
 }
 
 #sync-button[cui-areatype="toolbar"]:hover {
-  -moz-image-region: rect(18px, 270px, 36px, 252px);
+  -moz-image-region: rect(18px, 792px, 36px, 774px);
 }
 
-#sync-button[cui-areatype="toolbar"][status="active"],
-#sync-button[cui-areatype="toolbar"][status="active"]:hover:active:not([disabled="true"]) {
-  list-style-image: url("chrome://browser/skin/syncProgress-toolbar.png");
-  -moz-image-region: rect(0, 18px, 18px, 0px);
+#containers-panelmenu[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 810px, 18px, 792px);
 }
 
-/*
-#sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext,
-#sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext:hover:active:not([disabled="true"]) {
-  list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png");
+#containers-panelmenu[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 810px, 36px, 792px);
 }
-*/
 
 #feed-button[cui-areatype="toolbar"] {
   -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);
 }
@@ -889,52 +903,6 @@ menuitem.bookmark-item {
   transform: scaleX(-1);
 }
 
-#web-apps-button[cui-areatype="toolbar"] {
-  -moz-image-region: rect(0, 720px, 18px, 702px);
-}
-
-#web-apps-button[cui-areatype="toolbar"]:hover {
-  -moz-image-region: rect(18px, 720px, 36px, 702px);
-}
-
-#loop-button-throttled > .toolbarbutton-badge-container,
-#loop-button > .toolbarbutton-badge-container {
-  list-style-image: url("chrome://browser/skin/loop/toolbarfx.png");
-  -moz-image-region: rect(0, 18px, 18px, 0);
-}
-
-#loop-button-throttled:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container,
-#loop-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
-  -moz-image-region: rect(0, 90px, 18px, 72px);
-}
-
-#loop-button-throttled[state="disabled"] > .toolbarbutton-badge-container,
-#loop-button-throttled[disabled="true"] > .toolbarbutton-badge-container,
-#loop-button[state="disabled"] > .toolbarbutton-badge-container,
-#loop-button[disabled="true"] > .toolbarbutton-badge-container {
-  -moz-image-region: rect(0, 36px, 18px, 18px);
-}
-
-#loop-button-throttled[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container,
-#loop-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
-  -moz-image-region: rect(0, 126px, 18px, 108px);
-}
-
-#loop-button-throttled:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container,
-#loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
-  -moz-image-region: rect(0, 54px, 18px, 36px);
-}
-
-#loop-button-throttled:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container,
-#loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
-  -moz-image-region: rect(0, 72px, 18px, 54px);
-}
-
-#loop-button-throttled:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container,
-#loop-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container {
-  -moz-image-region: rect(0, 108px, 18px, 90px);
-}
-
 #webide-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 738px, 18px, 720px);
 }
@@ -959,17 +927,17 @@ 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,
           #social-share-button, #open-file-button, #find-button, #developer-button,
-          #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-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, #panic-button, #web-apps-button, #webide-button)[cui-areatype="menu-panel"],
+          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #containers-panelmenu)[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,
           #social-share-button, #open-file-button, #find-button, #developer-button,
-          #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-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, #panic-button, #web-apps-button, #webide-button) {
+          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #containers-panelmenu) {
   list-style-image: var(--menupanel-list-style-image);
 }
 
@@ -1053,17 +1021,23 @@ toolbarpaletteitem[place="palette"] > #save-page-button:hover {
 
 #sync-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #sync-button {
-  -moz-image-region: rect(0px, 384px, 32px, 352px);
+  -moz-image-region: rect(0px, 1024px, 32px, 992px);
 }
 
 #sync-button[cui-areatype="menu-panel"]:hover,
 toolbarpaletteitem[place="palette"] > #sync-button:hover {
-  -moz-image-region: rect(32px, 384px, 64px, 352px);
+  -moz-image-region: rect(32px, 1024px, 64px, 992px);
+}
+
+#containers-panelmenu[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #containers-panelmenu {
+  -moz-image-region: rect(0px, 1056px, 32px, 1024px);
 }
 
-#sync-button[cui-areatype="menu-panel"][status="active"] {
-  list-style-image: url("chrome://browser/skin/syncProgress-menuPanel.png");
-  -moz-image-region: rect(0px, 32px, 32px, 0px);
+#containers-panelmenu[cui-areatype="menu-panel"]:hover,
+toolbarpaletteitem[place="palette"] > #containers-panelmenu:hover,
+#containers-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+  -moz-image-region: rect(32px, 1056px, 64px, 1024px);
 }
 
 #feed-button[cui-areatype="menu-panel"],
@@ -1256,16 +1230,6 @@ toolbarpaletteitem[place="palette"] > #panic-button:hover,
   -moz-image-region: rect(32px, 896px, 64px, 864px);
 }
 
-#web-apps-button[cui-areatype="menu-panel"],
-toolbarpaletteitem[place="palette"] > #web-apps-button {
-  -moz-image-region: rect(0, 928px, 32px, 896px);
-}
-
-#web-apps-button[cui-areatype="menu-panel"]:hover,
-toolbarpaletteitem[place="palette"] > #web-apps-button:hover {
-  -moz-image-region: rect(32px, 928px, 64px, 896px);
-}
-
 #webide-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #webide-button {
   -moz-image-region: rect(0px, 960px, 32px, 928px);
@@ -1280,52 +1244,6 @@ toolbaritem[sdkstylewidget="true"] > toolbarbutton {
   -moz-image-region: rect(0, 832px, 32px, 800px);
 }
 
-#loop-button-throttled[cui-areatype="menu-panel"] > .toolbarbutton-badge-container,
-toolbarpaletteitem[place="palette"] > #loop-button-throttled > .toolbarbutton-badge-container,
-#loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container,
-toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container {
-  list-style-image: url("chrome://browser/skin/loop/menuPanel.png");
-  -moz-image-region: rect(0, 32px, 32px, 0);
-}
-
-/* Make sure that the state icons are not shown in the customization palette. */
-toolbarpaletteitem[place="palette"] > #loop-button-throttled > .toolbarbutton-badge-container,
-toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container {
-  -moz-image-region: rect(0, 32px, 32px, 0) !important;
-}
-
-#loop-button-throttled[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container,
-#loop-button[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
-  -moz-image-region: rect(0, 160px, 32px, 128px);
-}
-
-#loop-button-throttled[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container,
-#loop-button-throttled[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container,
-#loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container,
-#loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container {
-  -moz-image-region: rect(0, 64px, 32px, 32px);
-}
-
-#loop-button-throttled[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container,
-#loop-button[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
-  -moz-image-region: rect(0, 224px, 32px, 192px);
-}
-
-#loop-button-throttled[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container,
-#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
-  -moz-image-region: rect(0, 96px, 32px, 64px);
-}
-
-#loop-button-throttled[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container,
-#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
-  -moz-image-region: rect(0, 128px, 32px, 96px);
-}
-
-#loop-button-throttled[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container,
-#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container {
-  -moz-image-region: rect(0, 192px, 32px, 160px);
-}
-
 /* Wide panel control icons */
 
 #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
@@ -1439,8 +1357,8 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button[disabled=
 .toolbarbutton-1:hover:active > .toolbarbutton-menubutton-button {
   padding-top: 2px;
   padding-bottom: 0px;
-  -moz-padding-start: 3px;
-  -moz-padding-end: 1px;
+  padding-inline-start: 3px;
+  padding-inline-end: 1px;
 }
 
 #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-icon,
@@ -1473,10 +1391,11 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-bri
 }
 
 #nav-bar #PanelUI-menu-button {
-/*  -moz-padding-start: 7px;
-  -moz-padding-end: 5px;*/
+/*  padding-inline-start: 7px;
+  padding-inline-end: 5px;*/
 }
 
+#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;*/
@@ -1491,18 +1410,18 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-bri
 }
 
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-/*  -moz-padding-end: 0;*/
+/*  padding-inline-end: 0;*/
 }
 
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-/*  -moz-padding-start: 0;
+/*  padding-inline-start: 0;
   -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-wrapper > .toolbarbutton-1:-moz-any([disabled=true],:not([open]):not([disabled=true]):not(:active)) > .toolbarbutton-icon {
@@ -1513,26 +1432,36 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-an
   transition-duration: 150ms;*/
 }
 /*
-#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-badge-container,
-#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  padding: 3px 7px;
+#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon)) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon)) > .toolbarbutton-badge-stack,
+#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+   padding: calc(var(--toolbarbutton-vertical-inner-padding) + 1px) 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(#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;*/
+/*  padding-inline-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 {
@@ -1561,7 +1490,7 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   display: -moz-box;
   width: 1px;
   height: 16px;
-  -moz-margin-end: -1px;
+  margin-inline-end: -1px;
 */
 }
 
@@ -1574,7 +1503,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-an
 #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,
+#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 {
 }
@@ -1584,7 +1513,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button:not([ope
 #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,
@@ -1617,12 +1546,13 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button:not([ope
 }
 
 #forward-button {
-  -moz-margin-start: -4px !important;
-  padding-left: 4px;
-  padding-right: 2px;
+  margin-inline-start: -4px !important;
+  padding-left: 5px;
+  padding-right: 5px;
   margin-top: 3px;
   margin-bottom: 3px;
   border-radius: 0 10000px 10000px 0;
+/*  max-width: calc(var(--forwardbutton-width) + var(--backbutton-urlbar-overlap)) !important; */
 }
 
 #forward-button:-moz-locale-dir(rtl) {
@@ -1634,7 +1564,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not([switchingtabs]) > #fo
 }
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] {
-  margin-left: -27px !important;
+  margin-left: calc(0px - var(--forwardbutton-width)/* - var(--backbutton-urlbar-overlap)*/);
 }
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs]) > #forward-button[disabled] {
@@ -1644,14 +1574,14 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs])
 
 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;
+  margin-left: calc(-0.01px - var(--forwardbutton-width)/* - var(--backbutton-urlbar-overlap)*/);
 }
 
 #back-button {
 /*  padding-top: 3px !important;
   padding-bottom: 3px !important;
-  -moz-padding-start: 5px !important;
-  -moz-padding-end: 0 !important;*/
+  padding-inline-start: 5px !important;
+  padding-inline-end: 0 !important;*/
   position: relative;
   z-index: 1;
   border-radius: 10000px;
@@ -1760,7 +1690,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
   list-style-image: url(chrome://browser/skin/undoCloseTab.png);
 }
 
-@media (min-resolution: 1.25dppx) {
+@media (min-resolution: 1.1dppx) {
   #alltabs_undoCloseTab {
     list-style-image: url(chrome://browser/skin/undoCloseTab@2x.png);
   }
@@ -1781,39 +1711,52 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
 
 /* ::::: fullscreen window controls ::::: */
 
-#window-controls {
-  -moz-margin-start: 4px;
-}
-
 #minimize-button,
 #restore-button,
 #close-button {
-/*  list-style-image: url("chrome://global/skin/icons/windowControls.png");
-  padding: 0; */
+  -moz-appearance: none;
+  border: none;
+/*  margin: 0 !important;
+  padding: 6px 12px;*/
 }
 
 #minimize-button {
-  list-style-image: url("chrome://navigator/skin/icons/win-minimize.gif");
+  list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize);
 }
 
 #minimize-button: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);
 }
 
 #restore-button {
-  list-style-image: url("chrome://navigator/skin/icons/win-restore.gif");
+  list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore);
 }
 
 #restore-button: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);
+}
+
+#minimize-button:hover,
+#restore-button:hover {
+/*  background-color: hsla(0, 0%, 0%, .12);*/
+}
+
+#minimize-button:hover:active,
+#restore-button:hover:active {
+/*  background-color: hsla(0, 0%, 0%, .22);*/
 }
 
 #close-button {
-  list-style-image: url("chrome://navigator/skin/icons/win-close.gif");
+  list-style-image: url(chrome://browser/skin/caption-buttons.svg#close);
 }
 
 #close-button:hover {
-  list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif");
+/*  background-color: hsl(355, 86%, 49%);*/
+  list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-hover);
+}
+
+#close-button:hover:active {
+/*  background-color: hsl(355, 82%, 69%);*/
 }
 
 /* ::::: Location Bar ::::: */
@@ -1822,7 +1765,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
 .searchbar-textbox {
   border-radius: 5px;
   margin: 2px 0;
-  -moz-margin-start: 3px;
+  margin-inline-start: 3px;
 }
 
 #urlbar {
@@ -1848,7 +1791,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
 }
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar {
-/*  -moz-border-start: none;
+/*  border-inline-start: none;
   margin-left: 0;*/
 }
 
@@ -1864,7 +1807,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar:-moz-locale-dir(
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
 /*  clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path");*/
-/*  -moz-margin-start: -5px; */
+/*  margin-inline-start: calc(-1 * var(--backbutton-urlbar-overlap)); */
 }
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper:-moz-locale-dir(rtl),
@@ -1892,7 +1835,17 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 }
 
 .urlbar-input-box {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
+}
+
+.urlbar-input-box,
+
+#urlbar-display-box {
+  padding-inline-start: 4px;
+  border-inline-start: 1px solid var(--urlbar-separator-color);
+  border-inline-end: 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-icons {
@@ -1901,9 +1854,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;
 }
@@ -1912,121 +1867,99 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   padding: 0;
 }
 
-.urlbar-icon:hover {
+#urlbar-search-footer {
+  border-top: 1px solid #A09090;
+}
+
+#urlbar-search-settings {
+}
+
+#urlbar-search-settings:hover {
 }
 
-.urlbar-icon[open="true"],
-.urlbar-icon:hover:active {
+#urlbar-search-settings:hover:active {
 }
 
 #urlbar-search-splitter {
   min-width: 6px;
-  -moz-margin-start: -3px;
+  margin-inline-start: -3px;
   border: none;
   background: transparent;
 }
 
 #urlbar-search-splitter + #urlbar-container > #urlbar,
 #urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
-  -moz-margin-start: 0;
-}
-
-#urlbar-display-box {
+  margin-inline-start: 0;
 }
 
 .urlbar-display {
-  -moz-border-end: 1px solid #9C9CFF;
-  -moz-margin-end: 3px;
+  border-inline-end: 1px solid #9C9CFF;
+  margin-inline-end: 3px;
   margin-top: 0;
   margin-bottom: 0;
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
   color: #8050B0;
 }
 
-#search-container {
-  min-width: calc(54px + 11ch);
-}
-
-/* identity box */
-
-#identity-box {
-  border-radius: 2px;
-  font-size: .9em;
-}
-
-#identity-box:-moz-locale-dir(ltr) {
-/*  border-top-left-radius: 1.5px;
-  border-bottom-left-radius: 1.5px;*/
-}
+/* === BEGIN urlbarSearchSuggestionsNotification.inc.css === */
 
-#identity-box:-moz-locale-dir(rtl) {
-/*  border-top-right-radius: 1.5px;
-  border-bottom-right-radius: 1.5px;*/
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] {
+  border-bottom: 1px solid #A09090;
+  background-color: #000000;
+  padding: 6px 0;
+  padding-inline-start: 44px;
+  padding-inline-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;
 }
 
-#notification-popup-box:not([hidden]) + #identity-box {
-  -moz-padding-start: 10px !important;
-  border-radius: 0;
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"]:-moz-locale-dir(rtl) {
+  background-position: right 20px center;
 }
 
-window:not([chromehidden~="toolbar"]) #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 {
+  margin: 0;
+  padding: 0;
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not([switchingtabs]) > #urlbar > #identity-box {
-  transition: padding-left, padding-right;
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description > label.text-link {
+  margin-inline-start: 0;
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar >
-    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
-  padding-left: 2px;
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button {
+  -moz-appearance: none;
+  min-width: 80px;
+  border-radius: 3px;
+  padding: 4px 16px;
+  margin: 0;
+  margin-inline-start: 10px;
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar >
-    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
-  padding-right: 2px;
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"] {
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs]) > #forward-button[disabled] + #urlbar >
-    #notification-popup-box[hidden] + #identity-box {
-  /* forward button hiding is delayed when hovered */
-  transition-delay: 100s;
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"]:hover {
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] + #urlbar >
-    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
-  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
-  padding-left: 2.01px;
+#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"] {
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] + #urlbar >
-    #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
-  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
-  padding-right: 2.01px;
+#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) {
-  var(--verified-identity-box-backgroundcolor);
+#identity-box.verifiedIdentity:not(:-moz-lwtheme):not(:hover):not([open=true]) {
+  background-color: var(--identity-box-verified-background-color);
 }
 
 #identity-box:-moz-focusring {
@@ -2039,11 +1972,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
   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"]) {
@@ -2051,9 +1979,19 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
 }
 
 #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;
+}
+
+#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker {
+  transition: none;
+}
+
+#navigator-toolbox:not(:hover) #nav-bar:not([customizing="true"]) #urlbar:not([focused]) > .urlbar-textbox-container > .urlbar-history-dropmarker {
+  opacity: 0;
 }
 
 .urlbar-history-dropmarker:hover {
@@ -2067,79 +2005,172 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
 
 /* === BEGIN identity-block.inc.css === */
 
-:root {
+#identity-box {
   --identity-box-verified-color: #008484;
   /* Default theme does different color per channel, we can't as they do it build-time. */
   --identity-box-chrome-color: #9C9CFF;
+
+  font-size: .9em;
+  border-radius: 2px;
+  padding: 3px 5px;
+  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;
+}
+
+#identity-box:-moz-locale-dir(ltr) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#identity-box:-moz-locale-dir(rtl) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
 }
 
 #urlbar[pageproxystate="valid"] > #identity-box.chromeUI {
   color: var(--identity-box-chrome-color);
-  -moz-border-end: 1px solid var(--identity-box-chrome-color);
+  border-inline-end: 1px solid var(--identity-box-chrome-color);
 }
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
   color: var(--identity-box-verified-color);
-  -moz-border-end: 1px solid var(--identity-box-verified-color);
+  border-inline-end: 1px solid var(--identity-box-verified-color);
 }
 
-#urlbar[pageproxystate="valid"] > #identity-box.chromeUI,
-#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
-  background-position: right;
-  background-size: 1px;
-  background-repeat: no-repeat;
+#identity-icon-labels:-moz-locale-dir(ltr) {
+  padding-left: 2px;
 }
 
-/* page proxy icon */
+#identity-icon-labels:-moz-locale-dir(rtl) {
+  padding-right: 2px;
+}
 
-#page-proxy-favicon {
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box {
+/*   border-radius: 0;
+  padding-inline-start: 2px; */
+  padding-inline-end: 2px;
+  margin-inline-end: 1px;
+}
+
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar > #identity-box {
+  padding-inline-start: 2px;
+}
+
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs]) > #forward-button[disabled] + #urlbar > #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 > #identity-box {
+  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
+  padding-inline-start: 2.01px;
+}
+
+/* MAIN IDENTITY ICON */
+
+#identity-icon {
   width: 16px;
   height: 16px;
-  list-style-image: url("chrome://browser/skin/identity-icons-generic.png");
-  margin: 2px;
+  list-style-image: url(chrome://browser/skin/identity-icon.svg#normal);
 }
 
-.chromeUI > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url("chrome://branding/content/identity-icons-brand.png");
+#identity-box:hover > #identity-icon:not(.no-hover),
+#identity-box[open=true] > #identity-icon {
+  list-style-image: url(chrome://browser/skin/identity-icon.svg#hover);
 }
 
-.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url("chrome://browser/skin/identity-icons-https.png");
+#identity-box.grantedPermissions > #identity-icon {
+  list-style-image: url(chrome://browser/skin/identity-icon.svg#notice);
 }
 
-.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url("chrome://browser/skin/identity-icons-https-ev.png");
+#identity-box.grantedPermissions:hover > #identity-icon:not(.no-hover),
+#identity-box.grantedPermissions[open=true] > #identity-icon {
+  list-style-image: url(chrome://browser/skin/identity-icon.svg#notice-hover);
 }
 
-.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-active.png");
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon {
+  list-style-image: url(chrome://branding/content/identity-icons-brand.svg);
 }
 
-.mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-display.png");
+#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon {
+  opacity: 0.3;
 }
 
-.mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-display.png");
+#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;
 }
 
-#page-proxy-favicon[pageproxystate="invalid"] {
-  opacity: 0.3;
+/* 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;
 }
 
-#identity-popup.chromeUI > #identity-popup-container > #identity-popup-icon {
-  list-style-image: url("chrome://branding/content/icon64.png");
+#tracking-protection-icon[state="loaded-tracking-content"] {
+  list-style-image: url(chrome://browser/skin/tracking-protection-disabled-16.svg);
 }
 
-#identity-popup-brandName {
-  font-weight: bold;
-  font-size: 1.25em;
-  margin-top: .5em;
-  margin-bottom: .5em;
+#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;
 }
 
-#identity-popup-content-box {
-  max-width: 50ch;
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon {
+  list-style-image: url(chrome://browser/skin/identity-secure.svg);
+  visibility: visible;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon {
+  list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.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;
 }
 
 /* === END identity-block.inc.css === */
@@ -2149,7 +2180,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
 }
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box > #page-proxy-favicon {
-/*  -moz-margin-end: 1px;*/
+/*  margin-inline-end: 1px;*/
 }
 
 #identity-box:hover > #page-proxy-favicon {
@@ -2192,72 +2223,125 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   max-width: 36px;
 }
 
-.ac-result-type-bookmark,
-.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/bookmark.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-  width: 16px;
-  height: 16px;
+/*
+.autocomplete-richlistbox {
+  padding: 4px;
 }
 
-richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-bookmark,
-.autocomplete-treebody::-moz-tree-image(selected, current, bookmark, treecolAutoCompleteImage) {
-/*  -moz-image-region: rect(0px 48px 16px 32px);*/
+.autocomplete-richlistitem {
+  height: 30px;
+  min-height: 30px;
+  font: message-box;
+  border-radius: 2px;
+  border: 1px solid transparent;
 }
 
-.ac-result-type-keyword,
-.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;
+.autocomplete-richlistitem[selected=true] {
+  background-color: hsl(210, 80%, 52%);
+}
+*/
+.ac-title {
+  font-size: 14px;
+/*  color: hsl(0, 0%, 0%);*/
 }
 
-  .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");
-  width: 16px;
-  height: 16px;
+.ac-tags {
+  font-size: 12px;
+}
+/*
+html|span.ac-tag {
+  background-color: hsl(216, 0%, 88%);
+  color: hsl(0, 0%, 0%);
+  border-radius: 2px;
+  border: 1px solid transparent;
+  padding: 0 1px;
 }
+*/
 
-.ac-comment {
-  font-size: 1.06em;
+.ac-separator,
+.ac-url,
+.ac-action {
+  font-size: 12px;
 }
 
-.ac-extra > .ac-comment {
-  font-size: 1em;
+.ac-separator {
+/*  color: hsl(0, 0%, 50%);*/
 }
 
-.ac-url-text,
-.ac-action-text {
-  font-size: 1em;
+.ac-url {
   color: #9C9CFF;
 }
 
-richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon {
-  list-style-image: url("chrome://browser/skin/actionicon-tab.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-  padding: 0 3px;
+.ac-action {
+  color: #9C9CFF;
 }
 
-richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-box > .ac-action-icon {
-  -moz-image-region: rect(16px, 16px, 32px, 0);
+.ac-title[selected=true],
+.ac-separator[selected],
+.ac-url[selected=true],
+.ac-action[selected=true] {
+  color: #000000;
 }
 
-.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
-  color: #8050B0;
+.ac-tags-text[selected] > html|span.ac-tag {
+  background-color: #A09090;
+  color: #000000;
+}
+
+html|span.ac-emphasize-text-title,
+html|span.ac-emphasize-text-tag,
+html|span.ac-emphasize-text-url {
+  font-weight: 600;
+}
+
+.ac-type-icon[type=bookmark] {
+  list-style-image: url("chrome://browser/skin/urlbar-star.svg#star");
+}
+
+.ac-type-icon[type=bookmark][selected][current] {
+/*  list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted");*/
+}
+
+.ac-result-type-bookmark,
+.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
+  list-style-image: url("chrome://browser/skin/places/bookmark.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+  width: 16px;
+  height: 16px;
+}
+
+richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-bookmark,
+.autocomplete-treebody::-moz-tree-image(selected, current, bookmark, treecolAutoCompleteImage) {
+/*  -moz-image-region: rect(0px 48px 16px 32px);*/
+}
+
+.ac-type-icon[type=keyword],
+.ac-site-icon[type=searchengine],
+.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
+  list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon");
+}
+
+.ac-type-icon[type=keyword][selected],
+.ac-site-icon[type=searchengine][selected],
+.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) {
+  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");
+  width: 16px;
+  height: 16px;
+}
+
+.ac-type-icon[type=switchtab],
+.ac-type-icon[type=remotetab] {
+  list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab");
 }
 
-.ac-comment[selected="true"],
-.ac-url-text[selected="true"],
-.ac-action-text[selected="true"] {
-  color: inherit !important;
+.ac-type-icon[type=switchtab][selected],
+.ac-type-icon[type=remotetab][selected] {
+  list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab-inverted");
 }
 
 .autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment),
@@ -2273,13 +2357,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;
+#urlbar-go-button,
+#urlbar-reload-button,
+#urlbar-stop-button {
+  border-style: none;
   list-style-image: url("chrome://browser/skin/reload-stop-goFx.png");
-  -moz-border-start: 1px solid #9C9CFF;
+/*  margin: 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 {
@@ -2294,8 +2384,8 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 #urlbar > toolbarbutton:not([disabled=true]):active:hover,
 #urlbar-reload-button:not(:hover) {
-  -moz-border-start-style: none;
-  -moz-padding-start: 3px;
+  border-inline-start-style: none;
+  padding-inline-start: 3px;
 }
 
 #urlbar-reload-button {
@@ -2334,57 +2424,68 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-image-region: rect(14px, 28px, 28px, 14px);
 }
 
-/* popup blocker button */
+@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");
+  }
 
-#page-report-button {
-  list-style-image: url("chrome://browser/skin/urlbar-popup-blocked.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
+  #urlbar-go-button > .toolbarbutton-icon,
+  #urlbar-reload-button > .toolbarbutton-icon,
+  #urlbar-stop-button > .toolbarbutton-icon {
+    width: 14px;
+  }
 
-#page-report-button:hover ,
-#page-report-button:hover:active,
-#page-report-button[open="true"] {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
+  #urlbar-go-button {
+    -moz-image-region: rect(0, 84px, 28px, 56px);
+  }
 
-/* === BEGIN readinglist.inc.css === */
+  #urlbar-go-button:hover {
+    -moz-image-region: rect(28px, 84px, 56px, 56px);
+  }
 
-/* Reading List button */
+  #urlbar-go-button:hover:active {
+    -moz-image-region: rect(56px, 84px, 84px, 56px);
+  }
 
-#urlbar:not([focused]):not(:hover) #readinglist-addremove-button {
-  opacity: 0;
-  width: 0px;
-}
+  #urlbar-reload-button {
+    -moz-image-region: rect(0, 28px, 28px, 0);
+  }
 
-#readinglist-addremove-button {
-  list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage");
-  -moz-image-region: rect(0, 14px, 14px, 0);
-  transition: width 150ms ease-in-out, opacity 150ms ease-in-out 150ms;
-  opacity: 1;
-  width: 20px;
-}
+  #urlbar-reload-button:not([disabled]):hover {
+    -moz-image-region: rect(28px, 28px, 56px, 0);
+  }
 
-#readinglist-addremove-button:hover {
-  list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-hover");
-}
+  #urlbar-reload-button:not([disabled]):hover:active {
+    -moz-image-region: rect(56px, 28px, 84px, 0);
+  }
 
-#readinglist-addremove-button:active {
-  list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-active");
-}
+  #urlbar-stop-button {
+    -moz-image-region: rect(0, 56px, 28px, 28px);
+  }
 
-#readinglist-addremove-button[already-added="true"] {
-  list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded");
-}
+  #urlbar-stop-button:not([disabled]):hover {
+    -moz-image-region: rect(28px, 56px, 56px, 28px);
+  }
 
-#readinglist-addremove-button[already-added="true"]:hover {
-  list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-hover");
+  #urlbar-stop-button:hover:active {
+    -moz-image-region: rect(56px, 56px, 84px, 28px);
+  }
 }
 
-#readinglist-addremove-button[already-added="true"]:active {
-  list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-active");
+/* popup blocker button */
+
+#page-report-button {
+  list-style-image: url("chrome://browser/skin/urlbar-popup-blocked.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-/* === END readinglist.inc.css === */
+#page-report-button:hover ,
+#page-report-button:hover:active,
+#page-report-button[open="true"] {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
 
 /* Reader mode button */
 
@@ -2451,13 +2552,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   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;
@@ -2503,11 +2597,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;
 }
@@ -2550,38 +2640,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   min-width: 27em;
 }
 
-.panel-promo-box {
-  margin: 5px 0 -6px;
-  padding: 5px 0;
-  border-top: 1px solid #9C9CFF;
-  border-bottom-left-radius: 5px;
-  border-bottom-right-radius: 5px;
-}
-
-.panel-promo-icon {
-  list-style-image: url("chrome://browser/skin/sync-notification-24.png");
-  -moz-margin-end: 10px;
-  vertical-align: middle;
-}
-
-.panel-promo-closebutton {
-  list-style-image: url("chrome://global/skin/icons/close-button.gif");
-  -moz-margin-end: -3px;
-  margin-top: -3px;
-}
-
-.panel-promo-closebutton:hover {
-  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
-}
-
-.panel-promo-closebutton:hover:active {
-  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
-}
-
-.panel-promo-closebutton > .toolbarbutton-text {
-  padding: 0;
-}
-
 /* ::::: content area ::::: */
 
 #sidebar-box {
@@ -2594,7 +2652,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 }
 
 #sidebar-splitter {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #sidebar-header {
@@ -2603,7 +2661,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 }
 
 #sidebar-title {
-  -moz-padding-start: 0px;
+  padding-inline-start: 0px;
 }
 
 #sidebar-header > .close-icon {
@@ -2654,6 +2712,15 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 /* === BEGIN tabs.inc.css === */
 
+:root {
+  /* --tab-toolbar-navbar-overlap: 1px; */
+  /* --navbar-tab-toolbar-highlight-overlap: 1px; */
+  /* --tab-min-height: 31px; */
+}
+#TabsToolbar {
+  /* --tab-stroke-background-size: auto 100%; */
+}
+
 .tabbrowser-tab,
 .tabs-newtab-button,
 #TabsToolbar > #new-tab-button {
@@ -2665,26 +2732,26 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 }
 
 .tabbrowser-tab:first-of-type {
-  -moz-margin-start: 2px;
+  margin-inline-start: 2px;
 }
 
 .tabs-newtab-button,
-#TabsToolbar > #new-tab-button {
+#TabsToolbar > #new-tab-button,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button[cui-areatype="toolbar"] {
   border-radius: 8px 8px 0px 0px;
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 .tabs-newtab-button:not(:hover),
-#TabsToolbar > #new-tab-button:not(:hover) {
+#TabsToolbar > #new-tab-button:not(:hover),
+#TabsToolbar > toolbarpaletteitem > #new-tab-button,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button[cui-areatype="toolbar"] {
   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;*/
 }
@@ -2695,21 +2762,110 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tab-content {
 }
 
-.tab-/*throbber*/,
+.tab-content[pinned] {
+}
+
+.tab-throbber,
 .tab-icon-image,
+.tab-sharing-icon-overlay,
+.tab-icon-sound,
 .tab-close-button {
 }
 
 .tab-throbber,
+.tab-sharing-icon-overlay,
 .tab-icon-image {
   height: 16px;
   width: 16px;
+  margin-inline-end: 3px;
 }
 
 .tab-icon-image {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
+.tab-icon-image[sharing]:not([selected]),
+.tab-sharing-icon-overlay {
+  animation: 3s linear pulse infinite;
+}
+
+@keyframes pulse {
+  0%, 16.66%, 83.33%, 100% {
+    opacity: 0;
+  }
+  33.33%, 66.66% {
+    opacity: 1;
+  }
+}
+
+.tab-icon-image[sharing]:not([selected]) {
+  animation-delay: -1.5s;
+}
+
+.tab-sharing-icon-overlay {
+  /* 16px of the icon + 6px of margin-inline-end of .tab-icon-image */
+  margin-inline-start: -22px;
+  position: relative;
+}
+
+.tab-sharing-icon-overlay[sharing="camera"] {
+  list-style-image: url("chrome://browser/skin/notification-icons.svg#camera");
+}
+
+.tab-sharing-icon-overlay[sharing="microphone"] {
+  list-style-image: url("chrome://browser/skin/notification-icons.svg#microphone");
+}
+
+.tab-sharing-icon-overlay[sharing="screen"] {
+  list-style-image: url("chrome://browser/skin/notification-icons.svg#screen");
+}
+
+.tab-sharing-icon-overlay[sharing] {
+  filter: url("chrome://browser/skin/filters.svg#fill");
+  fill: #FFCF00;
+}
+
+.tab-icon-overlay {
+  width: 16px;
+  height: 16px;
+  margin-top: -8px;
+  margin-inline-start: -15px;
+  margin-inline-end: -1px;
+  position: relative;
+}
+
+.tab-icon-overlay[crashed] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg");
+}
+
+.tab-icon-overlay[soundplaying],
+.tab-icon-overlay[muted]:not([crashed]) {
+  border-radius: 10px;
+}
+
+.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");
 }
@@ -2718,15 +2874,20 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.png");
 }
 
-.tab-throbber:not([pinned]),
-.tab-icon-image:not([pinned]) {
-  -moz-margin-end: 3px;
+@media (min-resolution: 1.1dppx) {
+  .tab-throbber[busy] {
+    list-style-image: url("chrome://communicator/skin/brand/throbber-anim-connect.png");
+  }
+
+  .tab-throbber[progress] {
+    list-style-image: url("chrome://communicator/skin/brand/throbber-anim.png");
+  }
 }
 
 .tab-throbber[pinned],
 .tab-icon-image[pinned] {
-  -moz-margin-start: 2px;
-  -moz-margin-end: 2px;
+  margin-inline-start: 2px;
+  margin-inline-end: 2px;
 }
 
 .tab-label {
@@ -2736,6 +2897,97 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   margin-bottom: 2px !important;
 }
 
+.tab-icon-sound {
+  margin-inline-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 {
   margin-top: 1px;
   padding: 0;
@@ -2772,15 +3024,15 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator {
 }
 
-.tab-background-start[selected=true]::after,
-.tab-background-start[selected=true]::before,
+.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 {
 }
 
@@ -2791,7 +3043,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 /* Selected tab */
 
-.tabbrowser-tab[selected="true"] {
+.tabbrowser-tab[visuallyselected="true"] {
 }
 
 /* End selected tab */
@@ -2804,46 +3056,92 @@ 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;
 }
 
-/* Handle a case where the last separator in a customized tab bar with a
-   separated new tab button causes the width of the tab to extend and causes
-   jittering with a small tab curve width (Bug 1111091). */
-#TabsToolbar[currentset]:not([currentset*="tabbrowser-tabs,new-tab-button"]) #tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
+/* Tab separators */
+/*
+.tabbrowser-tab::after,
+.tabbrowser-tab::before {
+  width: 1px;
+  margin-inline-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 + @tabCurveWidth@); */
+  /* width: calc(36px + var(--tab-curve-width)); */
 }
+@media (min-resolution: 1.1dppx) {
+  /* image preloading hack from like lowdpi styles */
+  #tabbrowser-tabs::before {
+  }
 
-/* === END tabs.inc.css === */
+  .tabbrowser-tab:hover > .tab-stack > .tab-background:not([visuallyselected=true]),
+  .tabs-newtab-button:hover {
+  }
 
-/* Background tabs:
- *
- * Decrease the height of the hoverable region of background tabs whenever the tabs are at the top
- * of the window (e.g. no menubar, tabs in titlebar, etc.) to make it easier to drag the window by
- * the titlebar. We don't need this in fullscreen since window dragging is not an issue there.
- */
-#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar .tab-background-middle:not([selected=true]) {
-/*  clip-path: url(chrome://browser/content/browser.xul#tab-hover-clip-path);*/
+  .tab-background-middle[visuallyselected=true] {
+  }
+
+  .tab-background-start[visuallyselected=true]:-moz-locale-dir(ltr)::after,
+  .tab-background-end[visuallyselected=true]:-moz-locale-dir(rtl)::after {
+  }
+
+  .tab-background-end[visuallyselected=true]:-moz-locale-dir(ltr)::after,
+  .tab-background-start[visuallyselected=true]:-moz-locale-dir(rtl)::after {
+  }
+
+  .tab-icon-image {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
 }
 
+/* === END tabs.inc.css === */
+
 /* Tab DnD indicator */
 .tab-drop-indicator {
   list-style-image: url("chrome://browser/skin/tabbrowser/tabDragIndicator.png");
@@ -2914,15 +3212,14 @@ 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/newtabFx.png");
-  -moz-image-region: rect(0, 16px, 18px, 0);
+  list-style-image: url("chrome://browser/skin/tabbrowser/newtab.svg");
+  -moz-image-region: auto;
 }
 
 .tabs-newtab-button,
 .tabs-newtab-button:hover,
 #TabsToolbar > #new-tab-button,
 #TabsToolbar > #new-tab-button:hover {
-  -moz-image-region: rect(0, 32px, 18px, 16px);
 }
 
 #main-window[tabsintitlebar]:not([inFullscreen]) .tabs-newtab-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
@@ -2970,13 +3267,27 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 }
 
 .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
-  list-style-image: url("chrome://global/skin/icons/loading.gif");
+  list-style-image: url("chrome://global/skin/icons/loading.png");
+}
+
+@media (min-resolution: 1.1dppx) {
+  .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
+    list-style-image: url("chrome://global/skin/icons/loading@2x.png");
+  }
 }
 
 .alltabs-item[tabIsVisible]:not([_moz-menuactive="true"]) {
   background-color: #402800;
 }
 
+.alltabs-endimage[muted] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted");
+}
+
+.alltabs-endimage[soundplaying] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio");
+}
+
 toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
 }
@@ -3004,8 +3315,15 @@ toolbarbutton.chevron > .toolbarbutton-icon {
 }
 
 #sidebar-throbber[loading="true"] {
-  list-style-image: url("chrome://global/skin/icons/loading.gif");
-  -moz-margin-end: 4px;
+  list-style-image: url("chrome://global/skin/icons/loading.png");
+  margin-inline-end: 4px;
+}
+
+@media (min-resolution: 1.1dppx) {
+  #sidebar-throbber[loading="true"] {
+    list-style-image: url("chrome://global/skin/icons/loading@2x.png");
+    width: 16px;
+  }
 }
 
 /* Bookmarks toolbar */
@@ -3029,310 +3347,262 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 .menupopup-drop-indicator {
   list-style-image: none;
   height: 2px;
-  -moz-margin-end: -4em;
+  margin-inline-end: -4em;
   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;
-}
+/* === BEGIN notification-icons.inc.css === */
 
-#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;
+#notification-popup-box {
+  border-radius: 3px 0 0 3px;
+  padding: 5px 0px;
+  margin: -5px 0px;
+  margin-inline-end: -5px;
+  padding-inline-end: 5px;
 }
 
-.verifiedDomain > #identity-popup-content-owner {
-  font-weight: normal;
+/* This class can be used alone or in combination with the class defining the
+   type of icon displayed. This rule must be defined before the others in order
+   for its list-style-image to be overridden. */
+.notification-anchor-icon {
+  width: 16px;
+  height: 16px;
+  margin-inline-start: 2px;
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
 }
 
-#identity-popup-content-verifier {
-  margin: 4px 0 2px;
+.notification-anchor-icon:-moz-focusring {
+  outline: 1px dotted #008484;
 }
 
-#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption ,
-#identity-popup-content-box.verifiedDomain > #identity-popup-encryption {
-  margin-top: 10px;
-  -moz-margin-start: -24px;
+@media (min-resolution: 1.1dppx) {
+  .notification-anchor-icon {
+    list-style-image: url(chrome://global/skin/icons/information-32.png);
+  }
 }
 
-#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");
+.popup-notification-icon {
+  width: 64px;
+  height: 64px;
+  margin-inline-end: 10px;
 }
 
-#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;
+#notification-popup-box > .notification-anchor-icon:not(.in-use):hover {
+  fill: #000000;
 }
 
-#identity-popup-help-icon > .button-box > .button-text {
-  display: none;
-}
+/* INDIVIDUAL NOTIFICATIONS */
 
-#identity-popup-help-icon > .button-box > .button-icon {
-  height: 16px;
-  width: 16px;
+/* For the moment we apply the color filter only on the icons listed here.
+   The first two selectors are used by socialchat.xml (bug 1275558). */
+.webRTC-sharingDevices-notification-icon,
+.webRTC-sharingMicrophone-notification-icon,
+.camera-icon,
+.geo-icon,
+.indexedDB-icon,
+.install-icon,
+.login-icon,
+.microphone-icon,
+.plugin-icon,
+.pointerLock-icon,
+.popup-icon,
+.screen-icon,
+.desktop-notification-icon,
+.popup-notification-icon[popupid="geolocation"],
+.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
+.popup-notification-icon[popupid="password"],
+.popup-notification-icon[popupid="pointerLock"],
+.popup-notification-icon[popupid="webRTC-shareDevices"],
+.popup-notification-icon[popupid="webRTC-shareMicrophone"],
+.popup-notification-icon[popupid="webRTC-shareScreen"],
+.popup-notification-icon[popupid="webRTC-sharingDevices"],
+.popup-notification-icon[popupid="webRTC-sharingMicrophone"],
+.popup-notification-icon[popupid="webRTC-sharingScreen"],
+.popup-notification-icon[popupid="web-notifications"] {
+  filter: url(chrome://browser/skin/filters.svg#fill);
+  fill: #A09090;
 }
 
-#identity-popup-more-info-button {
-  margin-top: 6px;
-  margin-bottom: 0;
-  -moz-margin-end: 0;
+/* The first two selectors are used by socialchat.xml (bug 1275558). The
+   notifications in the chat window are only shown when they are in use. */
+.webRTC-sharingDevices-notification-icon,
+.webRTC-sharingMicrophone-notification-icon,
+.in-use {
+  fill: #008484;
 }
 
-#identity-popup > .panel-arrowcontainer > .panel-arrowcontent {
-  padding: 0;
+.popup-notification-icon[popupid="web-notifications"],
+.desktop-notification-icon {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#desktop-notification);
 }
 
-#identity-popup-container {
-  min-width: 280px;
-  padding: 10px;
+.desktop-notification-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#desktop-notification-blocked);
 }
 
-#identity-popup-button-container {
-/*  background: linear-gradient(to bottom, rgba(0,0,0,0.04) 60%, transparent);*/
-  padding: 10px;
-  margin-top: 5px;
+.geo-icon {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-windows);
 }
 
-.popup-notification-icon {
-  width: 64px;
-  height: 64px;
-  -moz-margin-end: 10px;
+.geo-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-windows-blocked);
 }
 
 .popup-notification-icon[popupid="geolocation"] {
-  list-style-image: url("chrome://browser/skin/Geolocation-64.png");
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-windows-detailed);
 }
 
-.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="indexedDB-permissions-prompt"],
+.indexedDB-icon {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#indexedDB);
 }
 
-.popup-notification-icon[popupid="click-to-play-plugins"] {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked-64.png");
+.indexedDB-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#indexedDB-blocked);
 }
 
-.popup-notification-icon[popupid="web-notifications"] {
-  list-style-image: url("chrome://browser/skin/notification-64.png");
+.login-icon {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#login);
 }
 
-.addon-progress-description {
-  width: 350px;
-  max-width: 350px;
+.popup-notification-icon[popupid="password"] {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#login-detailed);
 }
 
-.popup-progress-label,
-.popup-progress-meter {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+#login-fill-notification-icon {
+  /* Temporary solution until the capture and fill doorhangers are unified. */
+  transform: scaleX(-1);
 }
 
-.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);
+/* The first selector is used by socialchat.xml (bug 1275558). */
+.webRTC-sharingDevices-notification-icon,
+.camera-icon,
+.popup-notification-icon[popupid="webRTC-shareDevices"],
+.popup-notification-icon[popupid="webRTC-sharingDevices"] {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#camera);
 }
 
-.popup-progress-cancel:hover {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
+.camera-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#camera-blocked);
 }
 
-.popup-progress-cancel:active {
-  -moz-image-region: rect(32px, 32px, 48px, 16px);
+/* The first selector is used by socialchat.xml (bug 1275558). */
+.webRTC-sharingMicrophone-notification-icon,
+.microphone-icon {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone);
 }
 
-.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");
+.microphone-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-blocked);
 }
 
-.popup-notification-icon[popupid="password-save"],
-.popup-notification-icon[popupid="password-change"] {
-  list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png");
+.popup-notification-icon[popupid="webRTC-shareMicrophone"],
+.popup-notification-icon[popupid="webRTC-sharingMicrophone"] {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-detailed);
 }
 
-.popup-notification-icon[popupid="webapps-install-progress"],
-.popup-notification-icon[popupid="webapps-install"] {
-  list-style-image: url("chrome://global/skin/icons/webapps-64.png");
+.popup-notification-icon[popupid="webRTC-shareScreen"],
+.popup-notification-icon[popupid="webRTC-sharingScreen"],
+.screen-icon {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#screen);
 }
 
-.popup-notification-icon[popupid="bad-content"] {
-  list-style-image: url("chrome://browser/skin/bad-content-blocked-64.png");
+.screen-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#screen-blocked);
 }
 
-.popup-notification-icon[popupid="bad-content"][mixedblockdisabled],
-.popup-notification-icon[popupid="bad-content"][trackingblockdisabled] {
-  list-style-image: url(chrome://browser/skin/bad-content-unblocked-64.png);
+.popup-notification-icon[popupid="pointerLock"],
+.pointerLock-icon {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#pointerLock);
 }
 
-.popup-notification-icon[popupid="webRTC-sharingDevices"],
-.popup-notification-icon[popupid="webRTC-shareDevices"] {
-  list-style-image: url("chrome://browser/skin/webRTC-shareDevice-64.png");
+.pointerLock-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#pointerLock-blocked);
 }
 
-.popup-notification-icon[popupid="webRTC-sharingMicrophone"],
-.popup-notification-icon[popupid="webRTC-shareMicrophone"] {
-  list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-64.png");
+/* This icon has a block sign in it, so we don't need a blocked version. */
+.popup-icon {
+  list-style-image: url("chrome://browser/skin/notification-icons.svg#popup");
 }
 
-.popup-notification-icon[popupid="webRTC-sharingScreen"],
-.popup-notification-icon[popupid="webRTC-shareScreen"] {
-  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-64.png);
-}
+/* EME */
 
-.popup-notification-icon[popupid="pointerLock"] {
-  list-style-image: url("chrome://browser/skin/pointerLock-64.png");
+.popup-notification-icon[popupid="drmContentPlaying"],
+.drm-icon {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
 }
 
-/* Notification icon box */
-#notification-popup .panel-promo-box {
-/*  margin: 10px -10px -10px; */
+.drm-icon:hover:active {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed");
 }
 
-#notification-popup-box {
-  position: relative;
-  background-color: #000000;
-  background-clip: padding-box;
-  padding-left: 3px;
-  padding-right: 8px;
-  border-radius: 3px 0 0 3px;
-  border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 / 0 8px 0 0;
-  -moz-margin-end: -8px;
-  border-right-width: 8px;
+#eme-notification-icon[firstplay=true] {
+  animation: emeTeachingMoment 0.2s linear 0s 5 normal;
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar > #notification-popup-box {
-/*  padding-left: 7px; */
+@keyframes emeTeachingMoment {
+  0% {transform: translateX(0); }
+  25% {transform: translateX(3px) }
+  75% {transform: translateX(-3px) }
+  100% { transform: translateX(0); }
 }
 
-#notification-popup-box:-moz-locale-dir(rtl),
-.notification-anchor-icon:-moz-locale-dir(rtl) {
-  transform: scaleX(-1);
-}
+/* INSTALL ADDONS */
 
-.notification-anchor-icon {
-  width: 16px;
-  height: 16px;
-  margin: 0 2px;
+.install-icon {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default);
 }
 
-.notification-anchor-icon:-moz-focusring {
-  outline: 1px dotted #008484;
+.popup-notification-icon[popupid="xpinstall-disabled"],
+.popup-notification-icon[popupid="addon-install-blocked"],
+.popup-notification-icon[popupid="addon-install-origin-blocked"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-blocked.svg);
 }
 
-.default-notification-icon,
-#default-notification-icon {
-  list-style-image: url("chrome://global/skin/icons/information-16.png");
+.popup-notification-icon[popupid="addon-progress"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-downloading.svg);
 }
 
-.identity-notification-icon,
-#identity-notification-icon {
-  list-style-image: url("chrome://mozapps/skin/profile/profileicon.png");
+.popup-notification-icon[popupid="addon-install-failed"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-error.svg);
 }
 
-.geo-notification-icon,
-#geo-notification-icon {
-  list-style-image: url("chrome://browser/skin/Geolocation-16.png");
+.popup-notification-icon[popupid="addon-install-confirmation"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-confirm.svg);
 }
 
-#addons-notification-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+#addon-install-confirmation-notification[warning] .popup-notification-icon[popupid="addon-install-confirmation"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-warning.svg);
 }
 
-.indexedDB-notification-icon,
-#indexedDB-notification-icon {
-  list-style-image: url("chrome://global/skin/icons/question-16.png");
+.popup-notification-icon[popupid="addon-install-complete"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-installed.svg);
 }
 
-#password-notification-icon {
-  list-style-image: url("chrome://mozapps/skin/passwordmgr/key-16.png");
+.popup-notification-icon[popupid="addon-install-restart"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-restart.svg);
 }
 
-#webapps-notification-icon {
-  list-style-image: url("chrome://gobal/skin/icons/webapps-16.png");
+.popup-notification-icon[popupid="click-to-play-plugins"] {
+  list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png);
 }
 
-#plugins-notification-icon {
-  list-style-image: url("chrome://browser/skin/notification-pluginNormal.png");
-}
+/* OFFLINE APPS */
 
-#plugins-notification-icon.plugin-hidden {
-  list-style-image: url("chrome://browser/skin/notification-pluginAlert.png");
+.popup-notification-icon[popupid*="offline-app-requested"],
+.popup-notification-icon[popupid="offline-app-usage"] {
+  list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 
-#plugins-notification-icon.plugin-blocked {
-  list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png");
-}
+/* PLUGINS */
 
-#plugins-notification-icon {
-/*  -moz-image-region: rect(0, 16px, 16px, 0);*/
+.plugin-icon {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#plugin);
 }
 
-#plugins-notification-icon:hover {
-/*  -moz-image-region: rect(0, 32px, 16px, 16px);*/
+.plugin-icon.plugin-blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#plugin-blocked);
+  fill: #FF0000 !important; /* important! to override the default hover color */
 }
 
 #notification-popup-box[hidden] {
@@ -3355,56 +3625,33 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   }
 }
 
-.bad-content-blocked-notification-icon,
-#bad-content-blocked-notification-icon {
-  list-style-image: url("chrome://browser/skin/bad-content-blocked-16.png");
-}
-
-.bad-content-unblocked-notification-icon,
-#bad-content-unblocked-notification-icon {
-  list-style-image: url(chrome://browser/skin/bad-content-unblocked-16.png);
-}
+/* SOCIAL API */
 
-.webRTC-shareDevices-notification-icon,
-#webRTC-shareDevices-notification-icon {
-  list-style-image: url("chrome://browser/skin/webRTC-shareDevice-16.png");
+.popup-notification-icon[popupid="servicesInstall"] {
+  list-style-image: url(chrome://browser/skin/social/services-64.png);
 }
 
-.webRTC-sharingDevices-notification-icon,
-#webRTC-sharingDevices-notification-icon {
-  list-style-image: url("chrome://browser/skin/webRTC-sharingDevice-16.png");
+.service-icon {
+  list-style-image: url(chrome://browser/skin/social/services-16.png);
 }
 
-.webRTC-shareMicrophone-notification-icon,
-#webRTC-shareMicrophone-notification-icon {
-  list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-16.png");
-}
+/* TRANSLATION */
 
-.webRTC-sharingMicrophone-notification-icon,
-#webRTC-sharingMicrophone-notification-icon {
-  list-style-image: url("chrome://browser/skin/webRTC-sharingMicrophone-16.png");
+.translation-icon {
+  list-style-image: url(chrome://browser/skin/translation-16.png);
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
-.webRTC-shareScreen-notification-icon,
-#webRTC-shareScreen-notification-icon {
-  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png);
+.translation-icon.in-use {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
-.webRTC-sharingScreen-notification-icon,
-#webRTC-sharingScreen-notification-icon {
-  list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png);
-}
+/* === END notification-icons.inc.css === */
 
-.web-notifications-notification-icon,
-#web-notifications-notification-icon {
-  list-style-image: url("chrome://browser/skin/notification-16.png");
-}
-
-#pointerLock-notification-icon {
-  list-style-image: url("chrome://browser/skin/pointerLock-16.png");
-}
-#pointerLock-cancel {
-  margin: 0px;
+.popup-notification-body[popupid="addon-progress"],
+.popup-notification-body[popupid="addon-install-confirmation"] {
+  width: 28em;
+  max-width: 28em;
 }
 
 /* Translation infobar */
@@ -3434,6 +3681,10 @@ notification[value="translation"][state="translating"] .messageImage {
   }
 }
 
+notification[value="translation"] hbox[anonid="details"] {
+  overflow: hidden;
+}
+
 notification[value="translation"] button,
 notification[value="translation"] menulist {
   min-width: 0;
@@ -3472,7 +3723,7 @@ notification[value="translation"] menulist > .menulist-dropmarker {
 }
 
 .translation-welcome-content {
-  -moz-margin-start: 16px;
+  margin-inline-start: 16px;
 }
 
 .translation-welcome-headline {
@@ -3491,27 +3742,13 @@ notification[value="translation"] {
   min-height: 40px;
 }
 
-.translate-notification-icon,
-#translate-notification-icon {
-  list-style-image: url("chrome://browser/skin/translation-16.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-.translated-notification-icon,
-#translated-notification-icon {
-  list-style-image: url("chrome://browser/skin/translation-16.png");
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
 .translation-menupopup {
   -moz-appearance: none;
 }
 
 /* Bookmarks roots menu-items */
 #subscribeToPageMenuitem:not([disabled]),
-#subscribeToPageMenupopup,
-#BMB_subscribeToPageMenuitem:not([disabled]),
-#BMB_subscribeToPageMenupopup {
+#subscribeToPageMenupopup {
   list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
 }
 
@@ -3528,27 +3765,13 @@ notification[value="translation"] {
   -moz-image-region: auto;
 }
 
-#menu_readingList,
-#BMB_readingList {
-  list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg");
-  -moz-image-region: auto;
-}
-
-/* ::::: Keyboard UI Panel ::::: */
-
-.KUI-panel {
-  color: #FF9F00;
-  border-style: none;
-  border-radius: 20px;
-}
-
-.KUI-panel[level="top"] {
-  /*background-color: rgba(27%,27%,27%,.65);*/
-}
-
 /* Ctrl-Tab */
 
 #ctrlTab-panel {
+  -moz-appearance: none;
+  background: rgba(0%,0%,0%,.7);
+  color: #FF9F00;
+  border-style: none;
   padding: 20px 10px 10px;
   font-weight: bold;
 }
@@ -3561,6 +3784,7 @@ notification[value="translation"] {
 }
 
 .ctrlTab-preview-inner > .tabPreview-canvas {
+/*  box-shadow: 1px 1px 2px hsl(0,0%,12%);*/
 }
 
 .ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner > .tabPreview-canvas {
@@ -3594,35 +3818,6 @@ notification[value="translation"] {
   margin-top: .5em;
 }
 
-/* Sync Panel */
-
-.sync-panel-icon {
-  height:32px;
-  width: 32px;
-  background: url("chrome://browser/content/abouthome/sync.png") top left no-repeat;
-}
-
-.sync-panel-inner {
-  width: 0;
-  padding-left: 10px;
-}
-
-.sync-panel-button-box {
-  margin-top: 1em;
-}
-
-#sync-error-panel-title,
-#sync-start-panel-title {
-  font-size: 120%;
-  font-weight: bold;
-  margin-bottom: 5px;
-}
-
-#sync-start-panel-subtitle,
-#sync-error-panel-subtitle {
-  margin: 0;
-}
-
 /* Status panel */
 
 .statuspanel-label {
@@ -3655,38 +3850,82 @@ notification[value="translation"] {
   background-color: transparent !important;
 }
 
-#full-screen-warning-message {
-  background-color: #000000;
-  color: #FF9F00;
+/* === BEGIN fullscreen/warning.inc.css === */
+
+html|*.pointerlockfswarning {
+  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;
-  margin-top: 30px;
-  padding: 30px 50px;
-  box-shadow: 0 0 2px #9C9CFF;
+  padding: 24px 16px;
+  font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+}
+
+html|*.pointerlockfswarning::before {
+  margin: 0;
+  width: 24px; height: 24px;
 }
 
-#full-screen-warning-container[obscure-browser] {
-  background-color: rgba(0,0,0,0.3);
+html|*.pointerlockfswarning[data-identity="verifiedIdentity"]::before,
+html|*.pointerlockfswarning[data-identity="verifiedDomain"]::before {
+  content: url("chrome://browser/skin/fullscreen/secure.svg");
 }
 
-.full-screen-description {
-  font-size: 150%;
+html|*.pointerlockfswarning[data-identity="unknownIdentity"]::before {
+  content: url("chrome://browser/skin/fullscreen/insecure.svg");
 }
 
-#full-screen-domain-text {
-  font-size: 300%;
+html|*.pointerlockfswarning-domain-text,
+html|*.pointerlockfswarning-generic-text {
+  font-size: 21px;
+  font-weight: lighter;
+  color: #A09090;
+  margin: 0 16px;
 }
 
-.full-screen-approval-button,
-#full-screen-remember-decision {
-  font-size: 120%;
+html|*.pointerlockfswarning-domain {
+  font-weight: bold;
+  margin: 0;
 }
 
+html|*.pointerlockfswarning-exit-button {
+  padding: 5px 30px;
+  font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+  font-size: 14px;
+  font-weight: lighter;
+  margin: 0;
+  box-sizing: content-box;
+
+  border-radius: 300px;
+  border: none;
+  background-color: #C09070;
+  color: #000000;
+}
+
+/* === END fullscreen/warning.inc.css === */
+
 /* === BEGIN commandline.inc.css === */
 
+/* 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 */
+  --command-line-image: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme); /* --theme-command-line-image */
+  --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme-focus); /* --theme-command-line-image-focus */
+}
+
 /* Developer toolbar */
 
 #developer-toolbar {
-  border-top: 3px solid #000000;
+  border-top: 3px solid var(--gcli-background-color);
   border-bottom: none;
 }
 
@@ -3711,7 +3950,9 @@ notification[value="translation"] {
 }
 
 #developer-toolbar > toolbarbutton {
-/*  margin: 0;
+/*  border: none;
+  background-color: transparent;
+  margin: 0;
   padding: 0 10px;
   width: 32px; */
 }
@@ -3724,14 +3965,13 @@ notification[value="translation"] {
   display: none;
 }
 
-.developer-toolbar-button > .toolbarbutton-icon,
-#developer-toolbar-closebutton > .toolbarbutton-icon {
+.developer-toolbar-button > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
 }
 
 #developer-toolbar-toolbox-button {
-  list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png");
+  list-style-image: url("chrome://devtools/skin/images/toggle-tools.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
@@ -3741,50 +3981,19 @@ notification[value="translation"] {
 
 #developer-toolbar-toolbox-button:hover,
 #developer-toolbar-toolbox-button:hover:active,
-#developer-toolbar-toolbox-button[checked=true] {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-@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);
-  min-width: 16px;
-  width: 16px;
-}
-
-#developer-toolbar-closebutton > .toolbarbutton-icon {
-}
-
-#developer-toolbar-closebutton > .toolbarbutton-text {
-  display: none;
-}
-
-#developer-toolbar-closebutton:hover,
-#developer-toolbar-closebutton:hover:active {
+#developer-toolbar-toolbox-button[checked=true] {
   -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");
+  #developer-toolbar-toolbox-button {
+    list-style-image: url("chrome://devtools/skin/images/toggle-tools@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px);
   }
 
-  #developer-toolbar-closebutton:hover,
-  #developer-toolbar-closebutton:hover:active {
+  #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);
   }
 }
@@ -3818,11 +4027,11 @@ html|*#gcli-output-frame {
 /*  line-height: 32px;
   outline-style: none; */
   background-repeat: no-repeat;
-  background-color: rgba(0, 0, 0, .75);
+  background-color: var(--gcli-input-background);
 }
 
 .gclitoolbar-input-node[focused="true"] {
-  background-color: #000000;
+  background-color: var(--gcli-input-focused-background);
 }
 
 .gclitoolbar-input-node::before {
@@ -3832,19 +4041,11 @@ html|*#gcli-output-frame {
   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;
+  background-image: var(--command-line-image);
 }
 
 .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");
-  }
+  background-image: var(--command-line-image-focus);
 }
 
 .gclitoolbar-input-node:not([focused="true"]) {
@@ -3852,9 +4053,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 {
@@ -3923,6 +4123,22 @@ html|*#gcli-output-frame {
   border-bottom-width: 0;
 }
 
+.devtools-responsiveui-textinput {
+/*  -moz-appearance: none;
+  background: #333;
+  color: #fff;
+  border: 1px solid #111;
+  border-radius: 2px;
+  padding: 0 5px;*/
+  width: 200px;
+  margin: 0;
+}
+
+.devtools-responsiveui-textinput[attention] {
+/*  border-color: #38ace6;
+  background: rgba(56,172,230,0.4);*/
+}
+
 .devtools-responsiveui-menulist,
 .devtools-responsiveui-toolbarbutton {
   -moz-box-align: center;
@@ -3996,7 +4212,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.svg");
+  list-style-image: url("chrome://devtools/skin/dropmarker.svg");
   -moz-box-align: center;
   border-width: 0;
   min-width: 16px;*/
@@ -4005,7 +4221,7 @@ html|*#gcli-output-frame {
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
 /*  color: inherit;
   border-width: 0;
-  -moz-border-end: 1px solid hsla(210,8%,5%,.45);
+  border-inline-end: 1px solid hsla(210,8%,5%,.45);
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15) inset, 1px 0 0 hsla(210,16%,76%,.15);*/
 }
 
@@ -4020,7 +4236,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.svg");
+/*  list-style-image: url("chrome://devtools/skin/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px;*/
 }
@@ -4031,16 +4247,15 @@ html|*#gcli-output-frame {
 }
 
 .devtools-responsiveui-close {
-  list-style-image: url("chrome://browser/skin/devtools/close.png");
-  -moz-image-region: rect(0px,16px,16px,0px);
+  list-style-image: url("chrome://devtools/skin/close.svg");
 }
 
 .devtools-responsiveui-close:hover {
-  -moz-image-region: rect(0px,32px,16px,16px);
+  filter: url(images/filters.svg#checked-icon-state);
 }
 
 .devtools-responsiveui-rotate {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png");
+  list-style-image: url("chrome://devtools/skin/images/responsiveui-rotate.png");
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
@@ -4049,16 +4264,8 @@ html|*#gcli-output-frame {
 }
 
 @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");
+    list-style-image: url("chrome://devtools/skin/images/responsiveui-rotate@2x.png");
   }
 
   .devtools-responsiveui-rotate:hover {
@@ -4067,7 +4274,7 @@ html|*#gcli-output-frame {
 }
 
 .devtools-responsiveui-touch {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png");
+  list-style-image: url("chrome://devtools/skin/images/responsiveui-touch.png");
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
@@ -4079,7 +4286,7 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 2dppx) {
   .devtools-responsiveui-touch {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/responsiveui-touch@2x.png");
     -moz-image-region: rect(0px,32px,32px,0px);
   }
 
@@ -4091,7 +4298,7 @@ html|*#gcli-output-frame {
 }
 
 .devtools-responsiveui-screenshot {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png");
+  list-style-image: url("chrome://devtools/skin/images/responsiveui-screenshot.png");
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
@@ -4101,7 +4308,7 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 2dppx) {
   .devtools-responsiveui-screenshot {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/responsiveui-screenshot@2x.png");
   }
 
   .devtools-responsiveui-screenshot:hover {
@@ -4115,7 +4322,7 @@ html|*#gcli-output-frame {
   cursor: ew-resize;
   transform: translate(12px, -12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png");
+  background-image: url("chrome://devtools/skin/images/responsive-vertical-resizer.png");
 }
 
 .devtools-responsiveui-resizebarH {
@@ -4124,7 +4331,7 @@ html|*#gcli-output-frame {
   cursor: ns-resize;
   transform: translate(-12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer.png");
+  background-image: url("chrome://devtools/skin/images/responsive-horizontal-resizer.png");
 }
 
 .devtools-responsiveui-resizehandle {
@@ -4133,7 +4340,7 @@ html|*#gcli-output-frame {
   cursor: se-resize;
   transform: translate(12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png");
+  background-image: url("chrome://devtools/skin/images/responsive-se-resizer.png");
 }
 
 /* FxOS custom mode with additional buttons and phone look'n feel */
@@ -4178,12 +4385,14 @@ html|*#gcli-output-frame {
 }
 
 .devtools-responsiveui-home-button {
+  -moz-user-focus: ignore;
   width: 40px;
   height: 30px;
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png");
+  list-style-image: url("chrome://devtools/skin/images/responsiveui-home.png");
 }
 
 .devtools-responsiveui-sleep-button {
+  -moz-user-focus: ignore;
   -moz-appearance: none;
   /* compensate browserStack top padding */
   margin-top: -67px;
@@ -4211,6 +4420,7 @@ html|*#gcli-output-frame {
 
 .devtools-responsiveui-volume-up-button,
 .devtools-responsiveui-volume-down-button {
+  -moz-user-focus: ignore;
   -moz-appearance: none;
   border: 1px solid red;
   min-width: 8px;
@@ -4237,15 +4447,15 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 2dppx) {
   .devtools-responsiveui-resizebarV {
-    background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png");
+    background-image: url("chrome://devtools/skin/images/responsive-vertical-resizer@2x.png");
   }
 
   .devtools-responsiveui-resizebarH {
-    background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer@2x.png");
+    background-image: url("chrome://devtools/skin/images/responsive-horizontal-resizer@2x.png");
   }
 
   .devtools-responsiveui-resizehandle {
-    background-image: url("chrome://browser/skin/devtools/responsive-se-resizer@2x.png");
+    background-image: url("chrome://devtools/skin/images/responsive-se-resizer@2x.png");
   }
 }
 
@@ -4261,56 +4471,7 @@ html|*#gcli-output-frame {
   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;
-  -moz-margin-start: 2px;
-}
-
-#social-notification-icon-mentions:hover {
-  background-color: #FFCF00;
-}
-
-#social-notification-icon-mentions[open="true"] {
-  background-color: #FF9F00;
-}
-
-#social-sidebar-splitter {
-  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 {
-  -moz-margin-start: 0; /* override default label margin to match description margin */
-}
-
-#socialActivatedNotification .popup-notification-button-container {
-  margin-left: 6px;
-}
-
-.social-activation-icon {
-  width: auto;
-  height: auto;
-  max-height: 64px;
-  max-width: 64px;
-}
-
-#social-activation-message {
-  max-width: 250px;
-}
-
-#social-activation-message > label {
-  margin: 0;
+  margin-inline-end: 5px;
 }
 
 /* social toolbar provider menu */
@@ -4390,7 +4551,7 @@ html|*#gcli-output-frame {
 }
 
 #social-sidebar-button[loading="true"] {
-  list-style-image: url("chrome://global/skin/icons/loading.gif");
+  list-style-image: url("chrome://global/skin/icons/loading.png");
 }
 
 #social-sidebar-favico {
@@ -4414,14 +4575,6 @@ html|*#gcli-output-frame {
   background: none;
 }
 
-.chat-toolbarbutton:hover {
-/*  background-color: rgba(255,255,255,.35);*/
-}
-
-.chat-toolbarbutton:hover:active {
-/*  background-color: rgba(255,255,255,.5);*/
-}
-
 .chat-toolbarbutton > .toolbarbutton-text {
   display: none;
 }
@@ -4435,7 +4588,11 @@ html|*#gcli-output-frame {
   list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close");
 }
 
-.chat-close-button:-moz-any(:hover,:hover:active) {
+.chat-close-button:hover {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-hover");
+}
+
+.chat-close-button:hover:active {
   list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-active");
 }
 
@@ -4443,7 +4600,11 @@ html|*#gcli-output-frame {
   list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize");
 }
 
-.chat-minimize-button:-moz-any(:hover,:hover:active) {
+.chat-minimize-button:hover {
+  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");
 }
 
@@ -4452,7 +4613,11 @@ html|*#gcli-output-frame {
   transform: rotate(180deg);
 }
 
-.chat-swap-button:-moz-any(:hover,:hover:active) {
+.chat-swap-button:hover {
+  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");
 }
 
@@ -4461,8 +4626,7 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
 }
 
 .chat-title {
-  font-weight: bold;
-  font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+  color: #000000;
   text-shadow: none;
   cursor: inherit;
 }
@@ -4470,14 +4634,21 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
 .chat-titlebar {
   background-color: #9C9CFF;
   color: #000000;
-  height: 30px;
-  min-height: 30px;
+  height: 26px;
+  min-height: 26px;
   width: 100%;
   margin: 0;
-  padding: 7px 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;
 }
 
 .chat-titlebar > .notification-anchor-icon {
@@ -4497,18 +4668,6 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   background-color: #E7ADE7;
 }
 
-chatbox[dark=true] > .chat-titlebar,
-chatbox[dark=true] > .chat-titlebar[selected] {
-/*  border-bottom: none;
-  background-color: #000;
-  background-image: none;*/
-}
-
-chatbox[dark=true] > .chat-titlebar > hbox > .chat-title {
-/*  font-weight: normal;
-  color: #c1c1c1;*/
-}
-
 .chat-frame {
   padding: 0;
   margin: 0;
@@ -4524,7 +4683,7 @@ chatbox[dark=true] > .chat-titlebar > hbox > .chat-title {
   height: 21px;
   width: 21px;
   border-top: 1px solid #008484;
-  -moz-border-end: 1px solid #008484;
+  border-inline-end: 1px solid #008484;
 }
 
 @media (min-resolution: 2dppx) {
@@ -4533,6 +4692,17 @@ chatbox[dark=true] > .chat-titlebar > hbox > .chat-title {
   }
 }
 
+.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;
 }
@@ -4546,7 +4716,7 @@ chatbox[dark=true] > .chat-titlebar > hbox > .chat-title {
 
 .chatbar-button > .toolbarbutton-icon {
   opacity: .6;
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 .chatbar-button:hover > .toolbarbutton-icon,
 .chatbar-button[open="true"] > .toolbarbutton-icon {
@@ -4572,23 +4742,26 @@ chatbox[dark=true] > .chat-titlebar > hbox > .chat-title {
 
 .chatbar-innerbox {
   background: transparent;
-  margin: -285px 0 0;
   overflow: hidden;
 }
 
 chatbar {
-  -moz-margin-end: 20px;
+  margin-inline-end: 20px;
+}
+
+chatbox {
+  margin-inline-start: 4px;
+  background-color: transparent;
 }
 
 chatbar > chatbox {
-  height: 285px;
-  width: 260px;
-  -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;
+  /* 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. */
+/*  margin-inline-end: 5px;*/
 }
 
 chatbox[minimized="true"] {
@@ -4597,7 +4770,7 @@ chatbox[minimized="true"] {
 }
 
 window > chatbox {
-  -moz-margin-start: 0px;
+  margin-inline-start: 0px;
   margin: 0px;
   border: none;
   padding: 0px;
@@ -4605,36 +4778,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 === */
 
 /**
@@ -4662,7 +4805,7 @@ chatbox {
   background-repeat: no-repeat;
   width: 16px;
   height: 15px;
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
 }
 
 .click-to-play-plugins-notification-button-container {
@@ -4689,7 +4832,9 @@ chatbox {
 }
 
 .messageImage[value="plugin-hidden"] {
-  list-style-image: url("chrome://browser/skin/notification-pluginNormal.png");
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#plugin);
+  filter: url(chrome://browser/skin/filters.svg#fill);
+  fill: #A09090;
 }
 
 /* Keep any changes to this style in sync with pluginProblem.css */
@@ -4697,52 +4842,103 @@ notification.pluginVulnerable {
 }
 
 notification.pluginVulnerable .messageImage {
-  list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png");
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#plugin-blocked);
+  filter: url(chrome://browser/skin/filters.svg#fill);
+  fill: #FF0000;
 }
 
 /* === END plugin-doorhanger.inc.css === */
 
-/* === BEGIN badcontent-doorhanger.inc.css === */
+/* === BEGIN login-doorhanger.inc.css === */
 
-.popup-notification-item-title[popupid="bad-content"] {
-  font-weight: bold;
+#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;
 }
 
-.popup-notification-item-message[popupid="bad-content"] {
-  width: 17em;
+#login-fill-mainview,
+#login-fill-details {
+  padding: var(--panel-arrowcontent-padding);
 }
 
-.popup-notification-item-message[popupid="bad-content"][mixedblockdisabled]:not(.popup-notification-item-message-critical),
-.popup-notification-item-message[popupid="bad-content"][trackingblockdisabled]:not(.popup-notification-item-message-critical) {
-  color: #8050B0;
+#login-fill-doorhanger[inDetailView] > #login-fill-mainview {
+  transform: translateX(-14px);
 }
 
-.popup-notification-item-message-critical[popupid="bad-content"] {
+#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-style: italic;
+  font-weight: bold;
+}
+
+#login-fill-list {
+  border: 1px solid #9C9CFF;
+  max-height: 20em;
+}
+
+.login-fill-item[disabled] {
+  color: #8050B0;
+  background-color: #000000;
 }
 
-.popup-notification-footer[popupid="bad-content"] {
-  padding-top: 1em;
+.login-fill-item[disabled][selected] {
+  background-color: #008484;
 }
 
-/* === END badcontent-doorhanger.inc.css === */
+.login-hostname {
+  margin: 4px;
+  font-weight: bold;
+}
 
-/* EME notifications */
+.login-fill-item.different-hostname > .login-hostname {
+  color: #A09090;
+  font-style: italic;
+}
 
-.popup-notification-icon[popupid="drmContentPlaying"],
-#eme-notification-icon {
-  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
+.login-username {
+  margin: 4px;
+  color: #A09090;
 }
 
-#eme-notification-icon:hover:active {
-  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed");
+#login-fill-details {
+  padding: 4px;
+  background: var(--panel-arrowcontent-background);
+  color: var(--panel-arrowcontent-color);
+  background-clip: padding-box;
+  border-left: 1px solid #9C9CFF;
+  margin-inline-start: 38px;
 }
 
+/* === END login-doorhanger.inc.css === */
+
 /* === BEGIN customizeMode.inc.css === */
 
 /* Customization mode */
 
+:root {
+  --drag-drop-transition-duration: .3s;
+}
+
 #main-window:-moz-any([customize-entering],[customize-entered]) #browser-bottombox {
   margin-bottom: 1em;
 }
@@ -4892,13 +5088,17 @@ notification.pluginVulnerable .messageImage {
 #customization-titlebar-visibility-button {
   list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
-  padding: 0px 5px;
 }
 
 #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;
@@ -4909,9 +5109,17 @@ notification.pluginVulnerable .messageImage {
   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;
+  margin-inline-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 {
@@ -4932,6 +5140,25 @@ notification.pluginVulnerable .messageImage {
   background-color: #FF9F00;
 }
 
+@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-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 {
   background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
   background-position: left top;
@@ -4953,7 +5180,7 @@ toolbarpaletteitem[mousedown] {
 .panel-customization-placeholder,
 toolbarpaletteitem[place="palette"],
 toolbarpaletteitem[place="panel"] {
-  transition: transform .3s ease-in-out;
+  transition: transform var(--drag-drop-transition-duration) ease-in-out;
 }
 
 #customization-palette {
@@ -4965,6 +5192,10 @@ toolbarpaletteitem[place="panel"] {
   opacity: 1;
 }
 
+toolbarpaletteitem toolbarbutton[disabled] {
+/*  color: inherit !important;*/
+}
+
 toolbarpaletteitem[notransition].panel-customization-placeholder,
 toolbarpaletteitem[notransition][place="toolbar"],
 toolbarpaletteitem[notransition][place="palette"],
@@ -4973,14 +5204,14 @@ toolbarpaletteitem[notransition][place="panel"] {
 }
 
 toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon,
-toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-container > .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;
+  transition: transform  var(--drag-drop-transition-duration) cubic-bezier(.6, 2, .75, 1.5) !important;
 }
 
 toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon,
-toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon {
+toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon {
   transform: scale(1.3);
 }
 
@@ -5001,6 +5232,25 @@ toolbarpaletteitem[place="toolbar"] {
   margin-bottom: 25px;
 }
 
+toolbarpaletteitem[place="palette"]:-moz-focusring,
+toolbarpaletteitem[place="panel"]:-moz-focusring,
+toolbarpaletteitem[place="toolbar"]:-moz-focusring {
+  outline-width: 0;
+}
+
+toolbarpaletteitem[place="palette"]:not([mousedown="true"]):-moz-focusring,
+toolbarpaletteitem[place="panel"]:not([mousedown="true"]):-moz-focusring,
+toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring {
+  /* Delay adding the focusring back until after the transform transition completes. */
+  transition: outline-width .01s linear var(--drag-drop-transition-duration);
+  outline: 1px dotted #A09090;
+  -moz-outline-radius: 2.5px;
+}
+
+toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring {
+  outline-offset: -5px;
+}
+
 #wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton,
 #wrapper-edit-controls[place="palette"] > #edit-controls > separator,
 #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton,
@@ -5039,7 +5289,7 @@ toolbarpaletteitem[place="toolbar"] {
 }
 
 #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 
 #customization-palette > toolbarpaletteitem > label {
@@ -5064,9 +5314,9 @@ toolbarpaletteitem[place="toolbar"] {
   -moz-appearance: none;
   margin: 0 -5px 5px;
   padding-top: 0;
-  -moz-padding-end: 5px;
+  padding-inline-end: 5px;
   padding-bottom: 0;
-  -moz-padding-start: 0;
+  padding-inline-start: 0;
 }
 
 .customization-lwtheme-menu-theme[defaulttheme] {
@@ -5202,7 +5452,7 @@ toolbarpaletteitem[place="toolbar"] {
 .customization-tipPanel-closeBox > .close-icon {
   -moz-appearance: none;
   border: 0;
-  -moz-margin-end: -25px;
+  margin-inline-end: -25px;
 }
 
 #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"],
@@ -5294,7 +5544,7 @@ toolbarpaletteitem[place="toolbar"] {
 
 #TabsToolbar > .private-browsing-indicator {
   background: url("chrome://browser/skin/privatebrowsing-mask-tabstrip.png") no-repeat center -3px;
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   width: 48px;
 }
 
@@ -5305,7 +5555,7 @@ toolbarpaletteitem[place="toolbar"] {
 #private-browsing-indicator-titlebar > .private-browsing-indicator,
 #main-window[inFullscreen] #TabsToolbar > .private-browsing-indicator {
   background: url("chrome://browser/skin/privatebrowsing-mask-titlebar.png") no-repeat center 0px;
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
   width: 40px;
   height: 20px;
   position: relative;
@@ -5343,22 +5593,18 @@ toolbarpaletteitem[place="toolbar"] {
 }
 
 #UITourTooltipBody {
-  -moz-margin-end: 14px;
-}
-
-#UITourTooltipBody > vbox {
-  padding-top: 4px;
+  -moz-box-align: start;
 }
 
-#UITourTooltipIconContainer {
-  -moz-margin-start: -16px;
+#UITourTooltipTitleContainer {
+  -moz-box-align: start;
+  margin-bottom: 10px;
 }
 
 #UITourTooltipIcon {
   width: 48px;
   height: 48px;
-  -moz-margin-start: 28px;
-  -moz-margin-end: 28px;
+  margin-inline-end: 10px;
 }
 
 #UITourTooltipTitle,
@@ -5369,25 +5615,24 @@ toolbarpaletteitem[place="toolbar"] {
 #UITourTooltipTitle {
   font-size: 1.45rem;
   font-weight: bold;
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
-  margin: 0 0 9px 0;
+  margin: 0;
 }
 
 #UITourTooltipDescription {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
   font-size: 1.15rem;
   line-height: 1.8rem;
   margin-bottom: 0; /* Override global.css */
 }
 
 #UITourTooltipClose {
+  position: relative;
   -moz-appearance: none;
   border: none;
   background-color: transparent;
   min-width: 0;
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   margin-top: -2px;
 }
 
@@ -5399,24 +5644,32 @@ toolbarpaletteitem[place="toolbar"] {
   -moz-box-pack: end;
   background-color: rgba(0,0,0,.2);
   border-top: 1px solid rgba(0,0,0,.4);
-  margin: 24px -16px -16px;
-  padding: 2em 15px;
+  margin: 10px -16px -16px;
+  padding: 16px;
 }
 
+#UITourTooltipButtons > label,
 #UITourTooltipButtons > button {
   margin: 0 15px;
 }
 
+#UITourTooltipButtons > label:first-child,
 #UITourTooltipButtons > button:first-child {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
+}
+
+#UITourTooltipButtons > label:last-child,
+#UITourTooltipButtons > button:last-child {
+  margin-inline-end: 0;
 }
 
 #UITourTooltipButtons > button[image] > .button-box > .button-icon {
   width: 16px;
   height: 16px;
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 
+#UITourTooltipButtons > label,
 #UITourTooltipButtons > button .button-text {
   font-size: 1.15rem;
 }
@@ -5437,6 +5690,7 @@ toolbarpaletteitem[place="toolbar"] {
   color: #000000;
 }
 
+#UITourTooltipButtons > label,
 #UITourTooltipButtons > button.button-link {
   -moz-appearance: none;
   background: transparent;
@@ -5464,58 +5718,11 @@ toolbarpaletteitem[place="toolbar"] {
   color: #000000;
 }
 
-.SearchHighlight {
-  -moz-margin-end: 6px;
-  font-size: 110%;
-  width: 225px;
-}
-
-.SearchHighlight label,
-.SearchHighlight description {
-  color: #008484;
-  margin: 0 0 8px 0;
-  padding: 0;
-}
-
-.SearchHighlightTitle {
-  font-weight: bold;
-}
-
-.SearchHighlight .dot {
-  width: 7px;
-  height: 7px;
-  background-image: -moz-image-rect(url("chrome://browser/skin/dots.png"), 0, 100%, 100%, 9);
-  background-size: 7px;
-  background-position: center center;
-  background-repeat: no-repeat;
-  -moz-margin-end: 2px;
-}
-
-.SearchHighlight .dot.filled {
-  background-image: -moz-image-rect(url("chrome://browser/skin/dots.png"), 0, 7, 100%, 0);
-}
-
-.SearchHighlight button {
-  margin: 0;
-  /* On some platforms clicking the button will steal focus from the search box
-     causing the popup to close. */
-  -moz-user-focus: ignore;
-}
-
-@media not all and (max-resolution: 1dppx) {
-  .SearchHighlight .dot {
-    background-image: -moz-image-rect(url("chrome://browser/skin/dots@2x.png"), 0, 100%, 100%, 18);
-  }
-
-  .SearchHighlight .dot.filled {
-    background-image: -moz-image-rect(url("chrome://browser/skin/dots@2x.png"), 0, 14, 100%, 0);
-  }
-}
-
 /* Notification overrides for Heartbeat UI */
 
 notification.heartbeat {
   background-color: #A09090;
+/*  height: 40px;*/
 }
 
 @keyframes pulse-onshow {
@@ -5552,17 +5759,15 @@ notification.heartbeat {
 
 .messageText.heartbeat {
   color: #000000;
-/*  font-weight: normal;
-  font-family: "Lucida Grande", Segoe, Ubuntu;
-  font-size: 14px;
-  line-height: 16px;
-  text-shadow: none; */
+/*  text-shadow: none; */
+  margin-inline-start: 0px;
 }
 
 .messageImage.heartbeat {
-  width: 36px;
-  height: 36px;
-  -moz-margin-end: 10px;
+  width: 24px;
+  height: 24px;
+  margin-inline-start: 8px;
+  margin-inline-end: 8px;
 }
 
 .messageImage.heartbeat.pulse-onshow {
@@ -5579,9 +5784,25 @@ notification.heartbeat {
   animation-timing-function: linear;
 }
 
+/* Learn More link styles */
+.heartbeat > .text-link {
+  color: #3333FF;
+  margin-inline-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 {
@@ -5603,22 +5824,27 @@ notification.heartbeat {
 .heartbeat > #star-rating-container > .star-x  {
   background: url("chrome://browser/skin/heartbeat-star-off.svg");
   cursor: pointer;
-  width: 24px;
-  height: 24px;
+  /* Overrides the margin-inline-end for all platforms defined in the .plain class */
+  margin-inline-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");
-  cursor: pointer;
-  width: 24px;
-  height: 24px;
 }
 
 /* === 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 === */
@@ -5720,6 +5946,21 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
   -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) {
@@ -5743,6 +5984,10 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
   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 {
@@ -5751,3 +5996,8 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
 #context-sep-navigation {
 /*  margin-top: -4px; */
 }
+
+.browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+  overflow: hidden;
+}