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

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 5122af86..657620f7 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -79,8 +79,8 @@ 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;*/
 }
 
@@ -314,15 +314,20 @@ 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;
-  padding-inline-start: 4px;
-  padding-inline-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,
@@ -510,7 +515,7 @@ menuitem.bookmark-item {
           #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, #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");
 }
@@ -651,6 +656,14 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 792px, 36px, 774px);
 }
 
+#containers-panelmenu[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 810px, 18px, 792px);
+}
+
+#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);
 }
@@ -917,14 +930,14 @@ toolbaritem[sdkstylewidget="true"] > toolbarbutton,
           #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, #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, #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, #webide-button) {
+          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #containers-panelmenu) {
   list-style-image: var(--menupanel-list-style-image);
 }
 
@@ -1016,6 +1029,17 @@ toolbarpaletteitem[place="palette"] > #sync-button:hover {
   -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);
+}
+
+#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"],
 toolbarpaletteitem[place="palette"] > #feed-button {
   -moz-image-region: rect(0px, 416px, 32px, 384px);
@@ -1408,10 +1432,10 @@ 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-stack,
-#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;
 }
 */
 
@@ -1687,39 +1711,52 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
 
 /* ::::: fullscreen window controls ::::: */
 
-#window-controls {
-  margin-inline-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://browser/skin/caption-buttons.svg#restore-hover);
 }
 
+#minimize-button:hover,
 #restore-button:hover {
-  list-style-image: url("chrome://navigator/skin/icons/win-restore-hover.gif");
+/*  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 ::::: */
@@ -1801,6 +1838,16 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   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 {
   -moz-box-align: center;
 }
@@ -1845,9 +1892,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   margin-inline-start: 0;
 }
 
-#urlbar-display-box {
-}
-
 .urlbar-display {
   border-inline-end: 1px solid #9C9CFF;
   margin-inline-end: 3px;
@@ -1946,7 +1990,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   transition: none;
 }
 
-#navigator-toolbox:not(:hover) #urlbar:not([focused]) > .urlbar-textbox-container > .urlbar-history-dropmarker {
+#navigator-toolbox:not(:hover) #nav-bar:not([customizing="true"]) #urlbar:not([focused]) > .urlbar-textbox-container > .urlbar-history-dropmarker {
   opacity: 0;
 }
 
@@ -1962,17 +2006,13 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 /* === BEGIN identity-block.inc.css === */
 
 #identity-box {
-/*  --identity-box-hover-background-color: #FFCF00;
-  --identity-box-selected-background-color: #FF9F00; */
   --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;
 
-  border-inline-end: 1px solid var(--urlbar-separator-color);
   font-size: .9em;
   border-radius: 2px;
   padding: 3px 5px;
-  margin-inline-end: 4px;
   overflow: hidden;
   /* The latter two properties have a transition to handle the delayed hiding of
      the forward button when hovered. */
@@ -1994,11 +2034,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   border-inline-end: 1px solid var(--identity-box-chrome-color);
 }
 
-#identity-box:hover > :not(#identity-icon),
-#identity-box[open=true] > :not(#identity-icon) {
-/*  filter: grayscale(100%);*/
-}
-
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
   color: var(--identity-box-verified-color);
   border-inline-end: 1px solid var(--identity-box-verified-color);
@@ -2012,11 +2047,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   padding-right: 2px;
 }
 
-#notification-popup-box:not([hidden]) + #identity-box {
-  padding-inline-start: 10px;
-  border-radius: 0;
-}
-
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box {
 /*   border-radius: 0;
   padding-inline-start: 2px; */
@@ -2024,21 +2054,18 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   margin-inline-end: 1px;
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar >
-    #notification-popup-box[hidden] + #identity-box {
+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 >
-    #notification-popup-box[hidden] + #identity-box {
+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 >
-    #notification-popup-box[hidden] + #identity-box {
+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;
 }
@@ -2051,11 +2078,20 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
   list-style-image: url(chrome://browser/skin/identity-icon.svg#normal);
 }
 
-#identity-box:hover > #identity-icon,
+#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);
 }
 
+#identity-box.grantedPermissions > #identity-icon {
+  list-style-image: url(chrome://browser/skin/identity-icon.svg#notice);
+}
+
+#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);
+}
+
 #urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon {
   list-style-image: url(chrome://branding/content/identity-icons-brand.svg);
 }
@@ -2113,11 +2149,17 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
 }
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #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);
@@ -2131,16 +2173,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
   visibility: visible;
 }
 
-#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon {
-  list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.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;
-}
-
 /* === END identity-block.inc.css === */
 
 #page-proxy-favicon {
@@ -2330,7 +2362,7 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-
 #urlbar-stop-button {
   border-style: none;
   list-style-image: url("chrome://browser/skin/reload-stop-goFx.png");
-/*  padding: 0 9px;*/
+/*  margin: 0 9px; */
   margin-inline-start: 0px;
   border-inline-start: 1px solid var(--urlbar-separator-color);
   border-image: linear-gradient(transparent 15%,
@@ -2608,38 +2640,6 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-
   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");
-  margin-inline-end: 10px;
-  vertical-align: middle;
-}
-
-.panel-promo-closebutton {
-  list-style-image: url("chrome://global/skin/icons/close-button.gif");
-  margin-inline-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 {
@@ -2767,11 +2767,13 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-
 
 .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;
@@ -2782,6 +2784,47 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-
   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;
@@ -3005,31 +3048,6 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-
 
 /* End selected tab */
 
-/* User Context UI - change tab decoration depending on userContextId.
-   Defaults to gray for unknown usercontextids. */
-.tabbrowser-tab[usercontextid] {
-  background-image: linear-gradient(to right, transparent 20%, #A09090 30%, #A09090 70%, transparent 80%);
-  background-size: auto 2px;
-  background-repeat: no-repeat;
-}
-
-/* Personal User Context */
-.tabbrowser-tab[usercontextid="1"] {
-  background-image: linear-gradient(to right, transparent 20%, #9C9CFF 30%, #9C9CFF 70%, transparent 80%);
-}
-/* Work User Context */
-.tabbrowser-tab[usercontextid="2"] {
-  background-image: linear-gradient(to right, transparent 20%, #FF9F00 30%, #FF9F00 70%, transparent 80%);
-}
-/* Banking User Context */
-.tabbrowser-tab[usercontextid="3"] {
-  background-image: linear-gradient(to right, transparent 20%, #008484 30%, #008484 70%, transparent 80%);
-}
-/* Shopping User Context */
-.tabbrowser-tab[usercontextid="4"] {
-  background-image: linear-gradient(to right, transparent 20%, #E7ADE7 30%, #E7ADE7 70%, transparent 80%);
-}
-
 /* Tab pointer-events */
 /*
 .tabbrowser-tab {
@@ -3097,19 +3115,33 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-
   width: 28px;
   /* 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([visuallyselected=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");
@@ -3321,180 +3353,256 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 
 /* === BEGIN notification-icons.inc.css === */
 
+#notification-popup-box {
+  border-radius: 3px 0 0 3px;
+  padding: 5px 0px;
+  margin: -5px 0px;
+  margin-inline-end: -5px;
+  padding-inline-end: 5px;
+}
+
+/* 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");
+}
+
+.notification-anchor-icon:-moz-focusring {
+  outline: 1px dotted #008484;
+}
+
+@media (min-resolution: 1.1dppx) {
+  .notification-anchor-icon {
+    list-style-image: url(chrome://global/skin/icons/information-32.png);
+  }
+}
+
 .popup-notification-icon {
   width: 64px;
   height: 64px;
   margin-inline-end: 10px;
 }
 
-.popup-notification-icon[popupid="geolocation"] {
-  list-style-image: url("chrome://browser/skin/Geolocation-64.png");
+#notification-popup-box > .notification-anchor-icon:not(.in-use):hover {
+  fill: #000000;
 }
 
-.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);
+/* INDIVIDUAL NOTIFICATIONS */
+
+/* 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;
 }
 
-.popup-notification-icon[popupid="addon-progress"] {
-  list-style-image: url(chrome://browser/skin/addons/addon-install-downloading.svg);
+/* 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;
 }
 
-.popup-notification-icon[popupid="addon-install-failed"] {
-  list-style-image: url(chrome://browser/skin/addons/addon-install-error.svg);
+.popup-notification-icon[popupid="web-notifications"],
+.desktop-notification-icon {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#desktop-notification);
 }
 
-.popup-notification-icon[popupid="addon-install-confirmation"] {
-  list-style-image: url(chrome://browser/skin/addons/addon-install-confirm.svg);
+.desktop-notification-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#desktop-notification-blocked);
 }
 
-#addon-install-confirmation-notification[warning] .popup-notification-icon[popupid="addon-install-confirmation"] {
-  list-style-image: url(chrome://browser/skin/addons/addon-install-warning.svg);
+.geo-icon {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-windows);
 }
 
-.popup-notification-icon[popupid="addon-install-complete"] {
-  list-style-image: url(chrome://browser/skin/addons/addon-install-installed.svg);
+.geo-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-windows-blocked);
 }
 
-.popup-notification-icon[popupid="addon-install-restart"] {
-  list-style-image: url(chrome://browser/skin/addons/addon-install-restart.svg);
+.popup-notification-icon[popupid="geolocation"] {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#geo-windows-detailed);
 }
 
-.popup-notification-icon[popupid="click-to-play-plugins"] {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked-64.png");
+.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
+.indexedDB-icon {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#indexedDB);
 }
 
-.popup-notification-icon[popupid="web-notifications"] {
-  list-style-image: url("chrome://browser/skin/web-notifications-icon.svg");
+.indexedDB-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#indexedDB-blocked);
 }
 
-.popup-notification-icon[popupid="indexedDB-permissions-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");
+.login-icon {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#login);
 }
 
 .popup-notification-icon[popupid="password"] {
-  list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png");
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#login-detailed);
 }
 
-.popup-notification-icon[popupid="webRTC-sharingDevices"],
-.popup-notification-icon[popupid="webRTC-shareDevices"] {
-  list-style-image: url("chrome://browser/skin/webRTC-shareDevice-64.png");
+#login-fill-notification-icon {
+  /* Temporary solution until the capture and fill doorhangers are unified. */
+  transform: scaleX(-1);
 }
 
-.popup-notification-icon[popupid="webRTC-sharingMicrophone"],
-.popup-notification-icon[popupid="webRTC-shareMicrophone"] {
-  list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-64.png");
+/* 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-notification-icon[popupid="webRTC-sharingScreen"],
-.popup-notification-icon[popupid="webRTC-shareScreen"] {
-  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-64.png);
+.camera-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#camera-blocked);
 }
 
-.popup-notification-icon[popupid="pointerLock"] {
-  list-style-image: url("chrome://browser/skin/pointerLock-64.png");
+/* 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);
 }
 
-/* Notification icon box */
-#notification-popup .panel-promo-box {
-/*  margin: 10px -10px -10px; */
+.microphone-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-blocked);
 }
 
-#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;
-  margin-inline-end: -8px;
-  border-right-width: 8px;
+.popup-notification-icon[popupid="webRTC-shareMicrophone"],
+.popup-notification-icon[popupid="webRTC-sharingMicrophone"] {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-detailed);
 }
 
-window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar > #notification-popup-box {
-/*  padding-left: 7px; */
+.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);
 }
 
-/* This changes the direction of the main notification box on the url bar. */
-#notification-popup-box:-moz-locale-dir(rtl),
-/* This adds a second flip for the notification anchors, as they don't switch direction
-   for RTL mode. */
-.notification-anchor-icon:-moz-locale-dir(rtl) {
-  transform: scaleX(-1);
+.screen-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#screen-blocked);
 }
 
-/* For the anchor icons in the chat window, we don't have the notification popup box,
-   so we need to cancel the RTL transform. */
-.notification-anchor-icon.chat-toolbarbutton:-moz-locale-dir(rtl) {
-  transform: none;
+.popup-notification-icon[popupid="pointerLock"],
+.pointerLock-icon {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#pointerLock);
 }
 
-.notification-anchor-icon {
-  list-style-image: url("chrome://global/skin/icons/information-16.png");
+.pointerLock-icon.blocked {
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#pointerLock-blocked);
+}
 
-  width: 16px;
-  height: 16px;
-  margin: 0 2px;
+/* 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");
 }
 
-.notification-anchor-icon:-moz-focusring {
-  outline: 1px dotted #008484;
+/* EME */
+
+.popup-notification-icon[popupid="drmContentPlaying"],
+.drm-icon {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
 }
 
-.geo-notification-icon,
-#geo-notification-icon {
-  list-style-image: url("chrome://browser/skin/Geolocation-16.png");
+.drm-icon:hover:active {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed");
+}
+
+#eme-notification-icon[firstplay=true] {
+  animation: emeTeachingMoment 0.2s linear 0s 5 normal;
+}
+
+@keyframes emeTeachingMoment {
+  0% {transform: translateX(0); }
+  25% {transform: translateX(3px) }
+  75% {transform: translateX(-3px) }
+  100% { transform: translateX(0); }
 }
 
-#addons-notification-icon {
+/* INSTALL ADDONS */
+
+.install-icon {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default);
 }
 
-#addons-notification-icon:hover {
-  list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#hover);
+.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);
 }
 
-#addons-notification-icon:hover:active {
-  list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#active);
+.popup-notification-icon[popupid="addon-progress"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-downloading.svg);
 }
 
-.indexedDB-notification-icon,
-#indexedDB-notification-icon {
-  list-style-image: url("chrome://global/skin/icons/question-16.png");
+.popup-notification-icon[popupid="addon-install-failed"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-error.svg);
 }
 
-#password-notification-icon {
-  list-style-image: url("chrome://mozapps/skin/passwordmgr/key-16.png");
+.popup-notification-icon[popupid="addon-install-confirmation"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-confirm.svg);
 }
 
-#login-fill-notification-icon {
-  /* Temporary icon until the capture and fill doorhangers are unified. */
-  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png);
-  transform: scaleX(-1);
+#addon-install-confirmation-notification[warning] .popup-notification-icon[popupid="addon-install-confirmation"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-warning.svg);
+}
+
+.popup-notification-icon[popupid="addon-install-complete"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-installed.svg);
 }
 
-#plugins-notification-icon {
-  list-style-image: url("chrome://browser/skin/notification-pluginNormal.png");
+.popup-notification-icon[popupid="addon-install-restart"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-restart.svg);
 }
 
-#plugins-notification-icon.plugin-hidden {
-  list-style-image: url("chrome://browser/skin/notification-pluginAlert.png");
+.popup-notification-icon[popupid="click-to-play-plugins"] {
+  list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png);
 }
 
-#plugins-notification-icon.plugin-blocked {
-  list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png");
+/* OFFLINE APPS */
+
+.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 {
-/*  -moz-image-region: rect(0, 16px, 16px, 0);*/
+/* PLUGINS */
+
+.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] {
@@ -3517,153 +3625,27 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   }
 }
 
-.webRTC-shareDevices-notification-icon,
-#webRTC-shareDevices-notification-icon {
-  list-style-image: url("chrome://browser/skin/webRTC-shareDevice-16.png");
-}
-
-.webRTC-sharingDevices-notification-icon,
-#webRTC-sharingDevices-notification-icon {
-  list-style-image: url("chrome://browser/skin/webRTC-sharingDevice-16.png");
-}
-
-.webRTC-shareMicrophone-notification-icon,
-#webRTC-shareMicrophone-notification-icon {
-  list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-16.png");
-}
-
-.webRTC-sharingMicrophone-notification-icon,
-#webRTC-sharingMicrophone-notification-icon {
-  list-style-image: url("chrome://browser/skin/webRTC-sharingMicrophone-16.png");
-}
-
-.webRTC-shareScreen-notification-icon,
-#webRTC-shareScreen-notification-icon {
-  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png);
-}
+/* SOCIAL API */
 
-.webRTC-sharingScreen-notification-icon,
-#webRTC-sharingScreen-notification-icon {
-  list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png);
-}
-
-.web-notifications-notification-icon,
-#web-notifications-notification-icon {
-  list-style-image: url("chrome://browser/skin/web-notifications-tray.svg");
-  -moz-image-region: rect(0, 16px, 16px, 0);
+.popup-notification-icon[popupid="servicesInstall"] {
+  list-style-image: url(chrome://browser/skin/social/services-64.png);
 }
 
-.web-notifications-notification-icon:hover,
-#web-notifications-notification-icon:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
+.service-icon {
+  list-style-image: url(chrome://browser/skin/social/services-16.png);
 }
 
-.web-notifications-notification-icon:hover:active,
-#web-notifications-notification-icon:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
+/* TRANSLATION */
 
-#pointerLock-notification-icon {
-  list-style-image: url("chrome://browser/skin/pointerLock-16.png");
-}
-
-.translate-notification-icon,
-#translate-notification-icon {
-  list-style-image: url("chrome://browser/skin/translation-16.png");
+.translation-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");
+.translation-icon.in-use {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
-.popup-notification-icon[popupid="servicesInstall"] {
-  list-style-image: url("chrome://browser/skin/social/services-64.png");
-}
-#servicesInstall-notification-icon {
-  list-style-image: url("chrome://browser/skin/social/services-16.png");
-}
-
-/* EME notifications */
-
-.popup-notification-icon[popupid="drmContentPlaying"],
-#eme-notification-icon {
-  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
-}
-
-#eme-notification-icon:hover:active {
-  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed");
-}
-
-#eme-notification-icon[firstplay=true] {
-  animation: emeTeachingMoment 0.2s linear 0s 5 normal;
-}
-
-@keyframes emeTeachingMoment {
-  0% {transform: translateX(0); }
-  25% {transform: translateX(3px) }
-  75% {transform: translateX(-3px) }
-  100% { transform: translateX(0); }
-}
-
-/* HiDPI notification icons */
-@media (min-resolution: 1.1dppx) {
-/*  #notification-popup-box {
-    border-image: url("chrome://browser/skin/urlbar-arrow@2x.png") 0 16 0 0 fill;
-  }
-*/
-  .notification-anchor-icon {
-    list-style-image: url(chrome://global/skin/icons/information-32.png);
-  }
-
-  .webRTC-shareDevices-notification-icon,
-  #webRTC-shareDevices-notification-icon {
-    list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16@2x.png);
-  }
-
-  .webRTC-sharingDevices-notification-icon,
-  #webRTC-sharingDevices-notification-icon {
-    list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16@2x.png);
-  }
-
-  .webRTC-shareMicrophone-notification-icon,
-  #webRTC-shareMicrophone-notification-icon {
-    list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16@2x.png);
-  }
-
-  .webRTC-sharingMicrophone-notification-icon,
-  #webRTC-sharingMicrophone-notification-icon {
-    list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16@2x.png);
-  }
-
-  .webRTC-shareScreen-notification-icon,
-  #webRTC-shareScreen-notification-icon {
-    list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16@2x.png);
-  }
-
-  .webRTC-sharingScreen-notification-icon,
-  #webRTC-sharingScreen-notification-icon {
-    list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16@2x.png);
-  }
-
-  .popup-notification-icon[popupid="webRTC-sharingDevices"],
-  .popup-notification-icon[popupid="webRTC-shareDevices"] {
-    list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64@2x.png);
-  }
-
-  .popup-notification-icon[popupid="webRTC-sharingMicrophone"],
-  .popup-notification-icon[popupid="webRTC-shareMicrophone"] {
-    list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-64@2x.png);
-  }
-
-  .popup-notification-icon[popupid="webRTC-sharingScreen"],
-  .popup-notification-icon[popupid="webRTC-shareScreen"] {
-    list-style-image: url(chrome://browser/skin/webRTC-shareScreen-64@2x.png);
-  }
-}
-
 /* === END notification-icons.inc.css === */
 
 .popup-notification-body[popupid="addon-progress"],
@@ -3783,21 +3765,13 @@ notification[value="translation"] {
   -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;
 }
@@ -3810,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 {
@@ -3843,33 +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-start-panel-title {
-  font-size: 120%;
-  font-weight: bold;
-  margin-bottom: 5px;
-}
-
-#sync-start-panel-subtitle {
-  margin-bottom: 0;
-}
-
 /* Status panel */
 
 .statuspanel-label {
@@ -3904,7 +3852,7 @@ notification[value="translation"] {
 
 /* === BEGIN fullscreen/warning.inc.css === */
 
-html|*#fullscreen-warning {
+html|*.pointerlockfswarning {
   align-items: center;
   background: rgba(0, 0, 0, 0.9);
   border: 2px solid #A09090;
@@ -3914,34 +3862,34 @@ html|*#fullscreen-warning {
   font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
 }
 
-html|*#fullscreen-warning::before {
+html|*.pointerlockfswarning::before {
   margin: 0;
   width: 24px; height: 24px;
 }
 
-html|*#fullscreen-warning.verifiedIdentity::before,
-html|*#fullscreen-warning.verifiedDomain::before {
+html|*.pointerlockfswarning[data-identity="verifiedIdentity"]::before,
+html|*.pointerlockfswarning[data-identity="verifiedDomain"]::before {
   content: url("chrome://browser/skin/fullscreen/secure.svg");
 }
 
-html|*#fullscreen-warning.unknownIdentity::before {
+html|*.pointerlockfswarning[data-identity="unknownIdentity"]::before {
   content: url("chrome://browser/skin/fullscreen/insecure.svg");
 }
 
-html|*#fullscreen-domain-text,
-html|*#fullscreen-generic-text {
+html|*.pointerlockfswarning-domain-text,
+html|*.pointerlockfswarning-generic-text {
   font-size: 21px;
   font-weight: lighter;
   color: #A09090;
   margin: 0 16px;
 }
 
-html|*#fullscreen-domain {
+html|*.pointerlockfswarning-domain {
   font-weight: bold;
   margin: 0;
 }
 
-html|*#fullscreen-exit-button {
+html|*.pointerlockfswarning-exit-button {
   padding: 5px 30px;
   font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
   font-size: 14px;
@@ -3970,6 +3918,8 @@ html|*#fullscreen-exit-button {
   --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 */
@@ -4091,19 +4041,11 @@ html|*#gcli-output-frame {
   width: 16px;
   height: 16px;
   margin: 0 2px;
-  background-image: url("chrome://devtools/skin/images/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://devtools/skin/images/commandline-icon@2x.png");
-  }
+  background-image: var(--command-line-image-focus);
 }
 
 .gclitoolbar-input-node:not([focused="true"]) {
@@ -4187,7 +4129,7 @@ html|*#gcli-output-frame {
   color: #fff;
   border: 1px solid #111;
   border-radius: 2px;
-  padding: 5px;*/
+  padding: 0 5px;*/
   width: 200px;
   margin: 0;
 }
@@ -4532,45 +4474,6 @@ html|*#gcli-output-frame {
   margin-inline-end: 5px;
 }
 
-/* Social toolbar item */
-
-#social-notification-icon-mentions {
-  background-color: #000000;
-  border-radius: 3px;
-  margin-inline-start: 2px;
-}
-
-#social-notification-icon-mentions:hover {
-  background-color: #FFCF00;
-}
-
-#social-notification-icon-mentions[open="true"] {
-  background-color: #FF9F00;
-}
-
-#social-sidebar-splitter {
-  border: 0;
-}
-
-#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;
-}
-
 /* social toolbar provider menu */
 .social-statusarea-popup {
   margin-top: 0;
@@ -4929,7 +4832,9 @@ window > 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 */
@@ -4937,7 +4842,9 @@ 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 === */
@@ -5028,6 +4935,10 @@ notification.pluginVulnerable .messageImage {
 
 /* Customization mode */
 
+:root {
+  --drag-drop-transition-duration: .3s;
+}
+
 #main-window:-moz-any([customize-entering],[customize-entered]) #browser-bottombox {
   margin-bottom: 1em;
 }
@@ -5269,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 {
@@ -5281,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"],
@@ -5292,7 +5207,7 @@ toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon,
 toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon,
 toolbarpaletteitem > toolbaritem.panel-wide-item,
 toolbarpaletteitem > toolbarbutton[type="menu-button"] {
-  transition: transform .3s cubic-bezier(.6, 2, .75, 1.5) !important;
+  transition: transform  var(--drag-drop-transition-duration) cubic-bezier(.6, 2, .75, 1.5) !important;
 }
 
 toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon,
@@ -5320,11 +5235,22 @@ toolbarpaletteitem[place="toolbar"] {
 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;
-  outline-offset: -5px;
   -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,
@@ -5667,17 +5593,18 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 }
 
 #UITourTooltipBody {
-  margin-inline-end: 14px;
-  margin-inline-start: 14px;
-  margin-top: -16px;
-  margin-bottom: 8px;
+  -moz-box-align: start;
+}
+
+#UITourTooltipTitleContainer {
+  -moz-box-align: start;
+  margin-bottom: 10px;
 }
 
 #UITourTooltipIcon {
   width: 48px;
   height: 48px;
-  margin-inline-start: 14px;
-  margin-inline-end: 14px;
+  margin-inline-end: 10px;
 }
 
 #UITourTooltipTitle,
@@ -5688,11 +5615,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 #UITourTooltipTitle {
   font-size: 1.45rem;
   font-weight: bold;
-  margin-inline-start: 0;
-  /* Avoid the title overlapping the close button */
-  margin-inline-end: 14px;
-  margin-top: 0;
-  margin-bottom: 9px;
+  margin: 0;
 }
 
 #UITourTooltipDescription {
@@ -5722,7 +5645,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   background-color: rgba(0,0,0,.2);
   border-top: 1px solid rgba(0,0,0,.4);
   margin: 10px -16px -16px;
-  padding: 2em 15px;
+  padding: 16px;
 }
 
 #UITourTooltipButtons > label,
@@ -5735,6 +5658,11 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   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;
@@ -6073,77 +6001,3 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
   padding: 0;
   overflow: hidden;
 }
-
-/* === BEGIN usercontext.inc.css === */
-
-/* User Context UI browser styles */
-
-#menu_newUserContextTabPersonal {
-  list-style-image: url("chrome://browser/skin/usercontext/personal.svg");
-}
-
-#menu_newUserContextTabWork {
-  list-style-image: url("chrome://browser/skin/usercontext/work.svg");
-}
-
-#menu_newUserContextTabBanking {
-  list-style-image: url("chrome://browser/skin/usercontext/banking.svg");
-}
-
-#menu_newUserContextTabShopping {
-  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg");
-}
-
-/* URL Bar Decoration */
-
-#userContext-indicator {
-  height: 16px;
-  width: 16px;
-}
-
-#userContext-label {
-  margin-inline-end: 3px;
-  color: #A09090;
-}
-
-#userContext-icons:not([usercontextid]) {
-  display: none;
-}
-
-#userContext-icons {
-  -moz-box-align: center;
-}
-
-/* Personal User Context */
-#userContext-icons[usercontextid="1"] > #userContext-label {
-  color: #9C9CFF;
-}
-#userContext-icons[usercontextid="1"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/personal.svg");
-}
-
-/* Work User Context */
-#userContext-icons[usercontextid="2"] > #userContext-label {
-  color: #FF9F00;
-}
-#userContext-icons[usercontextid="2"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/work.svg");
-}
-
-/* Banking User Context */
-#userContext-icons[usercontextid="3"] > #userContext-label {
-  color: #008484;
-}
-#userContext-icons[usercontextid="3"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/banking.svg");
-}
-
-/* Shopping User Context */
-#userContext-icons[usercontextid="4"] > #userContext-label {
-  color: #E7ADE7;
-}
-#userContext-icons[usercontextid="4"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg");
-}
-
-/* === END usercontext.inc.css === */