X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=e4070861eea3c2a7f5860c21e5fa61957e4e71d6;hp=dbec1f600e5d18eca8d30ec367f2acd1a8764452;hb=936e60fe1e8ef7a38298736369448d66d0507842;hpb=3d64e0cebebe213f541634b9a0b2c6e7ba84fcfb

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index dbec1f60..e4070861 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -36,6 +36,10 @@ menubar {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#menubar");
 }
 
+:root {
+  --verified-identity-box-backgroundcolor: #000000;
+}
+
 #menubar-items {
   -moz-box-orient: vertical; /* for flex hack */
 }
@@ -110,12 +114,24 @@ menubar {
   height: 1px;
 }
 
-#navigator-toolbox > toolbar:not(:-moz-lwtheme) {
+#navigator-toolbox > toolbar {
 }
 
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) {
 }
 
+#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(#addon-bar) {
+  overflow: -moz-hidden-unscrollable;
+  max-height: 4em;
+  transition: min-height 170ms ease-out, max-height 170ms ease-out;
+}
+
+#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(#addon-bar)[collapsed=true] {
+  min-height: 0.1px;
+  max-height: 0;
+  transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear;
+}
+
 @media (-moz-mac-graphite-theme: 0) and (-moz-mac-lion-theme: 0) {
   /* This is a hackish workaround to exclude most of Mac OS until bug 1060941 gets fixed. */
   /* Indent also due to non-applicable aero rule in original Windows theme. */
@@ -163,6 +179,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; */
 }
@@ -206,7 +230,8 @@ menubar {
  * can swallow those events. It will also place the buttons above the fog on
  * themes with Aero Glass.
  */
-#titlebar-buttonbox {
+#titlebar-buttonbox,
+#main-window[sizemode="maximized"] #titlebar-buttonbox {
   -moz-appearance: none;
   margin-top: 6px;
   margin-top: 4px;
@@ -301,6 +326,10 @@ toolbarbutton.bookmark-item[open="true"] {
 #personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
+  -moz-margin-start: 1px;
+  -moz-margin-end: 2px;
+  margin-top: 1px;
+  margin-bottom: 1px;
 }
 
 /* Force the display of the label for bookmarks */
@@ -315,6 +344,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,
@@ -473,12 +503,12 @@ menuitem.bookmark-item {
 /* Whole section of this included file: */
 :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button,
           #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button,
-          #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button,
-          #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button,
+          #social-share-button, #open-file-button, #find-button, #developer-button,
+          #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button,
           #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button,
           #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
-          #copy-button, #paste-button, #e10s-button),
-
+          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button,
+          #pocket-button),
 #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
 }
@@ -636,6 +666,7 @@ menuitem.bookmark-item {
   -moz-image-region: rect(0, 288px, 18px, 270px);
 }
 
+#feed-button[cui-areatype="menu-panel"][panel-multiview-anchor=true],
 #feed-button[cui-areatype="toolbar"]:hover:not([disabled="true"]) {
   -moz-image-region: rect(18px, 288px, 36px, 270px);
 }
@@ -648,10 +679,15 @@ menuitem.bookmark-item {
   -moz-image-region: rect(0px, 306px, 18px, 288px);
 }
 
-#social-share-button[cui-areatype="toolbar"]:hover {
+#social-share-button[cui-areatype="toolbar"]:hover:not([disabled="true"]),
+#social-share-button[cui-areatype="toolbar"][open="true"] {
   -moz-image-region: rect(18px, 306px, 36px, 288px);
 }
 
+#social-share-button[cui-areatype="toolbar"][disabled="true"] {
+  -moz-image-region: rect(36px, 306px, 54px, 288px);
+}
+
 #characterencoding-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 324px, 18px, 306px);
 }
@@ -811,15 +847,6 @@ menuitem.bookmark-item {
   -moz-image-region: rect(36px, 576px, 54px, 558px);
 }
 
-#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) {
-  -moz-image-region: rect(0, 594px, 18px, 576px);
-}
-
-#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])):hover,
-#webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]))[open="true"] {
-  -moz-image-region: rect(18px, 594px, 36px, 576px);
-}
-
 #nav-bar-overflow-button {
   -moz-image-region: rect(0, 612px, 18px, 594px);
 }
@@ -845,10 +872,14 @@ menuitem.bookmark-item {
   -moz-image-region: rect(0, 666px, 18px, 648px);
 }
 
-#email-button[cui-areatype="toolbar"]:hover {
+#email-button[cui-areatype="toolbar"]:hover:not([disabled="true"]) {
   -moz-image-region: rect(18px, 666px, 36px, 648px);
 }
 
+#email-button[cui-areatype="toolbar"][disabled="true"] {
+  -moz-image-region: rect(36px, 666px, 54px, 648px);
+}
+
 #sidebar-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 684px, 18px, 666px);
 }
@@ -857,57 +888,112 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 684px, 36px, 666px);
 }
 
-#loop-call-button > .toolbarbutton-badge-container {
+#panic-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 702px, 18px, 684px);
+}
+
+#panic-button[cui-areatype="toolbar"]:hover,
+#panic-button[cui-areatype="toolbar"][open] {
+  -moz-image-region: rect(18px, 702px, 36px, 684px);
+}
+
+#panic-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
+}
+
+#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,
+#loop-button > .toolbarbutton-badge-container {
   list-style-image: url("chrome://browser/skin/loop/toolbarfx.png");
   -moz-image-region: rect(0, 18px, 18px, 0);
 }
 
-#loop-call-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
+#loop-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]),
+#loop-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 90px, 18px, 72px);
 }
 
-#loop-call-button[disabled="true"] > .toolbarbutton-badge-container {
+#loop-button[state="disabled"],
+#loop-button[disabled="true"],
+#loop-button[state="disabled"] > .toolbarbutton-badge-container,
+#loop-button[disabled="true"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 36px, 18px, 18px);
 }
 
-#loop-call-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
+#loop-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]),
+#loop-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
-#loop-call-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
+#loop-button:not([disabled="true"])[state="error"],
+#loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
 
-#loop-call-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
+#loop-button:not([disabled="true"])[state="action"],
+#loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
-#loop-call-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container {
+#loop-button:not([disabled="true"])[state="active"],
+#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);
+}
+
+#webide-button[cui-areatype="toolbar"]:hover {
+  -moz-image-region: rect(18px, 738px, 36px, 720px);
+}
+
+#pocket-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 774px, 18px, 756px);
+}
+
+#pocket-button[cui-areatype="toolbar"]:hover,
+#pocket-button[cui-areatype="toolbar"][open] {
+  -moz-image-region: rect(18px, 774px, 36px, 756px);
+}
+
 /* === END toolbarbuttons.inc.css === */
 
 /* === BEGIN menupanel.inc.css === */
 
 /* Menu panel and palette styles */
 
+:root {
+   /* avoid aero overrides with changed filenames */
+  --menupanel-list-style-image: url(chrome://browser/skin/menuPanelFx.png);
+  --menupanel-small-list-style-image: url(chrome://browser/skin/menuPanelFx-small.png);
+}
+
 toolbaritem[sdkstylewidget="true"] > toolbarbutton,
 :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button,
           #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button,
-          #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button,
-          #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button,
+          #social-share-button, #open-file-button, #find-button, #developer-button,
+          #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button,
           #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button,
           #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
-          #copy-button, #paste-button, #e10s-button)[cui-areatype="menu-panel"],
+          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button,
+          #pocket-button)[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button,
           #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button,
-          #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button,
-          #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button,
+          #social-share-button, #open-file-button, #find-button, #developer-button,
+          #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button,
           #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button,
           #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
-          #copy-button, #paste-button, #e10s-button) {
-  list-style-image: url("chrome://browser/skin/menuPanelFx.png"); /* avoid aero overrides with changed filename */
+          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button,
+                                                #pocket-button) {
+  list-style-image: var(--menupanel-list-style-image);
 }
 
 #home-button[cui-areatype="menu-panel"],
@@ -1023,11 +1109,16 @@ toolbarpaletteitem[place="palette"] > #social-share-button {
   -moz-image-region: rect(0px, 448px, 32px, 416px);
 }
 
-#social-share-button[cui-areatype="menu-panel"]:hover,
-toolbarpaletteitem[place="palette"] > #social-share-button:hover {
+#social-share-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]),
+toolbarpaletteitem[place="palette"] > #social-share-button:hover:not([disabled="true"]) {
   -moz-image-region: rect(32px, 448px, 64px, 416px);
 }
 
+#social-share-button[cui-areatype="menu-panel"][disabled="true"],
+toolbarpaletteitem[place="palette"] > #social-share-button[disabled="true"] {
+  -moz-image-region: rect(64px, 448px, 96px, 416px);
+}
+
 #characterencoding-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #characterencoding-button {
   -moz-image-region: rect(0px, 480px, 32px, 448px);
@@ -1156,61 +1247,114 @@ toolbarpaletteitem[place="palette"] > #email-link-button {
   -moz-image-region: rect(0, 800px, 32px, 768px);
 }
 
-#email-link-button[cui-areatype="menu-panel"]:hover,
-toolbarpaletteitem[place="palette"] > #email-link-button:hover {
+#email-link-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]),
+toolbarpaletteitem[place="palette"] > #email-link-button:hover:not([disabled="true"]) {
   -moz-image-region: rect(32px, 800px, 64px, 768px);
 }
 
+#email-link-button[cui-areatype="menu-panel"][disabled="true"],
+toolbarpaletteitem[place="palette"] > #email-link-button[disabled="true"] {
+  -moz-image-region: rect(64px, 800px, 96px, 768px);
+}
+
 #sidebar-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #sidebar-button {
   -moz-image-region: rect(0, 864px, 32px, 832px);
 }
 
 #sidebar-button[cui-areatype="menu-panel"]:hover,
-toolbarpaletteitem[place="palette"] > #sidebar-button:hover {
+toolbarpaletteitem[place="palette"] > #sidebar-button:hover,
+#sidebar-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
   -moz-image-region: rect(32px, 864px, 64px, 832px);
 }
 
-#sidebar-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-  -moz-image-region: rect(32px, 864px, 64px, 832px);
+#panic-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #panic-button {
+  -moz-image-region: rect(0, 896px, 32px, 864px);
+}
+
+#panic-button[cui-areatype="menu-panel"]:hover,
+toolbarpaletteitem[place="palette"] > #panic-button:hover,
+#panic-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+  -moz-image-region: rect(32px, 896px, 64px, 864px);
+}
+
+#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);
+}
+
+#webide-button[cui-areatype="menu-panel"]:hover,
+toolbarpaletteitem[place="palette"] > #webide-button:hover {
+  -moz-image-region: rect(32px, 960px, 64px, 928px);
+}
+
+#pocket-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #pocket-button {
+  -moz-image-region: rect(0px, 992px, 32px, 960px);
+}
+
+#pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+  -moz-image-region: rect(32px, 992px, 64px, 960px);
 }
 
 toolbaritem[sdkstylewidget="true"] > toolbarbutton {
   -moz-image-region: rect(0, 832px, 32px, 800px);
 }
 
-#loop-call-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container,
-toolbarpaletteitem[place="palette"] > #loop-call-button > .toolbarbutton-badge-container {
+#loop-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #loop-button,
+#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-call-button > .toolbarbutton-badge-container {
+toolbarpaletteitem[place="palette"] > #loop-button,
+toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 32px, 32px, 0) !important;
 }
 
-#loop-call-button[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]),
+#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-call-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container {
+#loop-button[cui-areatype="menu-panel"][state="disabled"],
+#loop-button[cui-areatype="menu-panel"][disabled="true"],
+#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-call-button[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]),
+#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-call-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"],
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 96px, 32px, 64px);
 }
 
-#loop-call-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"],
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 128px, 32px, 96px);
 }
 
-#loop-call-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container {
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"],
+#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 192px, 32px, 160px);
 }
 
@@ -1220,7 +1364,7 @@ toolbarpaletteitem[place="palette"] > #loop-call-button > .toolbarbutton-badge-c
 #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
 toolbarpaletteitem[place="palette"] > #edit-controls > toolbarbutton,
 toolbarpaletteitem[place="palette"] > #zoom-controls > toolbarbutton {
-  list-style-image: url("chrome://browser/skin/menuPanelFx-small.png"); /* avoid aero overrides with changed filename */
+  list-style-image: var(--menupanel-small-list-style-image);
 }
 
 #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #cut-button,
@@ -1298,6 +1442,11 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button[disabled=
   -moz-image-region: rect(32px, 96px, 48px, 80px);
 }
 
+#add-share-provider {
+  list-style-image: var(--menupanel-small-list-style-image);
+  -moz-image-region: rect(0px, 96px, 16px, 80px);
+}
+
 /* === END menupanel.inc.css === */
 
 .toolbarbutton-1:not([type="menu-button"]) {
@@ -1345,6 +1494,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-bri
 .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
 }
 
+.findbar-button,
 #nav-bar .toolbarbutton-1,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 }
@@ -1359,7 +1509,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-bri
   -moz-padding-end: 5px;*/
 }
 
-#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button):not(#PanelUI-menu-button) {
+#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) {
 /*  padding-left: 5px;
   padding-right: 5px;*/
 }
@@ -1381,6 +1531,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-bri
   -moz-box-align: center;*/
 }
 
+.findbar-button > .toolbarbutton-text,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-icon,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-text,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container,
@@ -1402,16 +1553,17 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-an
 */
 
 /* 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-container > .toolbarbutton-icon {
   width: 16px;
 }
 
-#nav-bar toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
+#nav-bar toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   /* XXXgijs box models strike again: this is 16px + 2 * 7px padding + 2 * 1px border (from the rules above) */
   width: 32px;
 }
 
-#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button):not(#PanelUI-menu-button) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) > .toolbarbutton-icon,
 #nav-bar .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ {
 /*  -moz-padding-end: 17px;*/
 }
@@ -1449,6 +1601,7 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-any([disabled=true],:not([open]):not([disabled=true]):not(:active)) > .toolbarbutton-icon {
 }
 
+.findbar-button:not(:-moz-any([checked="true"],[disabled="true"])):hover > .toolbarbutton-text,
 #nav-bar .toolbarbutton-1:not([disabled=true]) > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
 #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
@@ -1459,6 +1612,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button:not([ope
 #nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon {
 }
 
+.findbar-button:not([disabled=true]):-moz-any([checked="true"],:hover:active) > .toolbarbutton-text,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open]) > .toolbarbutton-icon,
 #nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon,
 #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon,
@@ -1497,8 +1651,8 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button:not([ope
 
 #forward-button {
   -moz-margin-start: -4px !important;
-  padding-left: 4px;
-  padding-right: 2px;
+  padding-left: 5px;
+  padding-right: 5px;
   margin-top: 3px;
   margin-bottom: 3px;
   border-radius: 0 10000px 10000px 0;
@@ -1611,10 +1765,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
   margin: 0;
 }
 
-/* tabview button & menu item */
+/* tabview menu item */
 
 #menu_tabview {
-  list-style-image: url("chrome://browser/skin/tabview/tabview.png");
+  list-style-image: url("chrome://browser/skin/tabview/tabviewFx.png");
   -moz-image-region: rect(1px, 89px, 17px, 73px);
 }
 
@@ -1634,6 +1788,20 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
   -moz-image-region: rect(1px, 71px, 17px, 55px);
 }
 
+/* undo close tab menu item */
+#alltabs_undoCloseTab {
+  list-style-image: url(chrome://browser/skin/undoCloseTab.png);
+}
+
+@media (min-resolution: 1.25dppx) {
+  #alltabs_undoCloseTab {
+    list-style-image: url(chrome://browser/skin/undoCloseTab@2x.png);
+  }
+  #alltabs_undoCloseTab > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
 /* zoom control text (reset) button special case: */
 
 #nav-bar #zoom-reset-button > .toolbarbutton-text {
@@ -1799,7 +1967,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 #urlbar-display-box {
 }
 
-#urlbar-display {
+.urlbar-display {
   -moz-border-end: 1px solid #9C9CFF;
   -moz-margin-end: 3px;
   margin-top: 0;
@@ -1891,7 +2059,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
 }
 
 #identity-box.verifiedIdentity:not(:-moz-lwtheme) {
-  background-color: #000000;
+  var(--verified-identity-box-backgroundcolor);
 }
 
 #identity-box:-moz-focusring {
@@ -1932,15 +2100,20 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
 
 /* === BEGIN identity-block.inc.css === */
 
-#urlbar[pageproxystate="valid"] > #identity-box.chromeUI {
+:root {
+  --identity-box-verified-color: #008484;
   /* Default theme does different color per channel, we can't as they do it build-time. */
-  color: #9C9CFF;
-  -moz-border-end: 1px solid #9C9CFF;
+  --identity-box-chrome-color: #9C9CFF;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI {
+  color: var(--identity-box-chrome-color);
+  -moz-border-end: 1px solid var(--identity-box-chrome-color);
 }
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
-  color: #008484;
-  -moz-border-end: 1px solid #008484;
+  color: var(--identity-box-verified-color);
+  -moz-border-end: 1px solid var(--identity-box-verified-color);
 }
 
 #urlbar[pageproxystate="valid"] > #identity-box.chromeUI,
@@ -2066,13 +2239,19 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-
 }
 
 .ac-result-type-keyword,
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://global/skin/icons/Search-glass.png");
-  -moz-image-region: rect(0px 32px 16px 16px);
+.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage),
+richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-site-icon {
+  list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon");
   width: 16px;
   height: 16px;
 }
 
+  .ac-result-type-keyword[selected="true"],
+  .autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected),
+  richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-title-box > .ac-site-icon {
+    list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted");
+  }
+
 .ac-result-type-tag,
 .autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
   list-style-image: url("chrome://mozapps/skin/places/tagContainerIcon.png");
@@ -2132,7 +2311,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   padding: 0 2px;
   background-origin: border-box;
   border: none;
-  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+  list-style-image: url("chrome://browser/skin/reload-stop-goFx.png");
   -moz-border-start: 1px solid #9C9CFF;
 }
 
@@ -2201,109 +2380,136 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
+/* === BEGIN readinglist.inc.css === */
+
+/* Reading List button */
+
+#urlbar:not([focused]):not(:hover) #readinglist-addremove-button {
+  opacity: 0;
+  width: 0px;
+}
+
+#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;
+}
+
+#readinglist-addremove-button:hover {
+  list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-hover");
+}
+
+#readinglist-addremove-button:active {
+  list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-active");
+}
+
+#readinglist-addremove-button[already-added="true"] {
+  list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded");
+}
+
+#readinglist-addremove-button[already-added="true"]:hover {
+  list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-hover");
+}
+
+#readinglist-addremove-button[already-added="true"]:active {
+  list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-active");
+}
+
+/* === END readinglist.inc.css === */
+
+/* Reader mode button */
+
+#reader-mode-button {
+  list-style-image: url("chrome://browser/skin/readerMode.svg");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+#reader-mode-button:hover,
+#reader-mode-button[readeractive]:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+#reader-mode-button:hover:active,
+#reader-mode-button[readeractive] {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
 /* social share panel */
 
-#social-share-panel > iframe {
-/*  background: linear-gradient(to bottom, #f0f4f7, #fafbfc);*/
-  width: 300px;
+.social-share-frame {
+  min-width: 756px;
   height: 150px;
 }
 
-.social-share-toolbar {
-  border-right: 1px solid #9C9CFF;
-/*  background-color: #000000; */
+#share-container {
+  min-width: 756px;
+  background-color: white;
+  background-repeat: no-repeat;
+  background-position: center center;
 }
-
-#social-share-provider-buttons {
-  padding: 6px;
+#share-container[loading] {
+  background-image: url(chrome://browser/skin/tabbrowser/pendingpaint.png);
+}
+#share-container > browser {
+  transition: opacity 150ms ease-in-out;
+  opacity: 1;
+}
+#share-container[loading] > browser {
+  opacity: 0;
 }
 
-#social-share-provider-buttons > .share-provider-button {
-  -moz-appearance: none;
-  padding: 5px;
-  margin: 1px;
-  border: none;
-  background: none;
-  border-radius: 2px;
+.social-share-toolbar {
+  border-bottom: 1px solid #9C9CFF;
+  padding: 2px;
 }
 
-#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]),
-#social-share-provider-buttons > .share-provider-button:hover,
-#social-share-provider-buttons > .share-provider-button:active {
-  padding: 4px;
+#social-share-provider-buttons {
+  padding: 0;
+  margin: 0;
 }
 
-#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]) {
+.share-provider-button {
+  padding: 5px;
+  margin: 2px;
 }
 
-#social-share-provider-buttons > .share-provider-button > .toolbarbutton-text {
+.share-provider-button > .toolbarbutton-text {
   display: none;
 }
-#social-share-provider-buttons > .share-provider-button > .toolbarbutton-icon {
+.share-provider-button > .toolbarbutton-icon {
   width: 16px;
   min-height: 16px;
   max-height: 16px;
 }
 
-toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
-  width: auto;
-  height: auto;
-  max-width: 32px;
-  max-height: 24px;
-}
-
 /* fixup corners for share panel */
 .social-panel > .social-panel-frame {
   border-radius: inherit;
 }
 
 #social-share-panel {
-  max-height: 600px;
   min-height: 100px;
-  max-width: 800px;
-  min-width: 300px;
+  min-width: 766px;
 }
 
+#share-container,
 .social-share-frame {
-/*  background: linear-gradient(to bottom, #f0f4f7, #fafbfc); */
-  width: 330px;
-  height: 150px;
-  /* we resize our panels dynamically, make it look nice */
-  transition: height 100ms ease-out, width 100ms ease-out;
-}
-
-.social-share-frame:-moz-locale-dir(ltr) {
   border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  border-top-right-radius: inherit;
-  border-bottom-right-radius: inherit;
-}
-
-.social-share-frame:-moz-locale-dir(rtl) {
-  border-top-left-radius: inherit;
   border-bottom-left-radius: inherit;
   border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
+  border-bottom-right-radius: inherit;
 }
 
-#social-share-panel > .social-share-toolbar:-moz-locale-dir(ltr) {
+#social-share-panel > .social-share-toolbar {
   border-top-left-radius: inherit;
-  border-bottom-left-radius: inherit;
-}
-
-#social-share-panel > .social-share-toolbar:-moz-locale-dir(rtl) {
   border-top-right-radius: inherit;
-  border-bottom-right-radius: inherit;
 }
 
-#social-share-provider-buttons:-moz-locale-dir(ltr) {
+#social-share-provider-buttons {
   border-top-left-radius: inherit;
-  border-bottom-left-radius: inherit;
-}
-
-#social-share-provider-buttons:-moz-locale-dir(rtl) {
   border-top-right-radius: inherit;
-  border-bottom-right-radius: inherit;
 }
 
 /* social recommending panel */
@@ -2400,13 +2606,26 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 .panel-promo-closebutton > .toolbarbutton-text {
   padding: 0;
-  margin: 0;
 }
 
 /* ::::: content area ::::: */
 
+#sidebar-box {
+  background-color: #9C9CFF;
+  color: #000000;
+}
+
 #sidebar {
-  background-color: Window;
+  background-color: #000000;
+}
+
+#sidebar-splitter {
+  -moz-margin-start: 0;
+}
+
+#sidebar-header {
+  color: #000000;
+  padding: 2px;
 }
 
 #sidebar-title {
@@ -2425,6 +2644,16 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
 }
 
+#sidebar-splitter:-moz-locale-dir(ltr),
+#sidebar:-moz-locale-dir(ltr) {
+  border-radius: 0 5px 0 0;
+}
+
+#sidebar-splitter:-moz-locale-dir(rtl),
+#sidebar:-moz-locale-dir(rtl) {
+  border-radius: 5px 0 0 0;
+}
+
 .browserContainer > findbar {
 /*
   background-color: -moz-dialog;
@@ -2451,6 +2680,13 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 /* === BEGIN tabs.inc.css === */
 
+:root {
+  /* --tab-toolbar-navbar-overlap: 1px; */
+  /* --tab-min-height: 31px; */
+  /* --tab-curve-width: 30px; */
+  /* --tab-curve-half-width: 15px; */
+}
+
 .tabbrowser-tab,
 .tabs-newtab-button,
 #TabsToolbar > #new-tab-button {
@@ -2476,12 +2712,8 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   background-color: #C09070;
 }
 
-.tabbrowser-tab[remote] {
-  text-decoration: underline;
-}
-
 /* The selected tab should appear above adjacent tabs, .tabs-newtab-button and the highlight of #nav-bar */
-.tabbrowser-tab[selected=true] {
+.tabbrowser-tab[visuallyselected=true] {
 /*  position: relative;
   z-index: 2;*/
 }
@@ -2492,7 +2724,10 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tab-content {
 }
 
-.tab-/*throbber*/,
+.tab-content[pinned] {
+}
+
+.tab-throbber,
 .tab-icon-image,
 .tab-close-button {
 }
@@ -2501,12 +2736,26 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tab-icon-image {
   height: 16px;
   width: 16px;
+  -moz-margin-end: 3px;
 }
 
 .tab-icon-image {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
+.tab-icon-overlay {
+  width: 16px;
+  height: 16px;
+ /* margin-top: 10px; */
+  -moz-margin-start: -16px;
+  display: none;
+}
+
+.tab-icon-overlay[crashed] {
+  display: -moz-box;
+  list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg");
+}
+
 .tab-throbber[busy] {
   list-style-image: url("chrome://communicator/skin/brand/throbber16-anim-connect.png");
 }
@@ -2515,11 +2764,6 @@ 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;
-}
-
 .tab-throbber[pinned],
 .tab-icon-image[pinned] {
   -moz-margin-start: 2px;
@@ -2546,15 +2790,38 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
 }
 
-.tab-background-start[selected=true]::after,
-.tab-background-start[selected=true]::before,
+/* Tab Overflow */
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]),
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:-moz-locale-dir(rtl),
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:-moz-locale-dir(ltr) {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]) {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator[collapsed],
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator[collapsed] {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator,
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator {
+}
+
+.tab-background-start[visuallyselected=true]::after,
+.tab-background-start[visuallyselected=true]::before,
 .tab-background-start,
 .tab-background-end,
-.tab-background-end[selected=true]::after,
-.tab-background-end[selected=true]::before {
+.tab-background-end[visuallyselected=true]::after,
+.tab-background-end[visuallyselected=true]::before {
 }
 
-.tabbrowser-tab:not([selected=true]),
+.tabbrowser-tab:not([visuallyselected=true]),
 .tabbrowser-tab:-moz-lwtheme {
 }
 
@@ -2565,7 +2832,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 /* Selected tab */
 
-.tabbrowser-tab[selected="true"] {
+.tabbrowser-tab[visuallyselected="true"] {
 }
 
 /* End selected tab */
@@ -2597,6 +2864,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 .tabs-newtab-button {
   width: 28px;
+  /* width: calc(36px + var(--tab-curve-width)); */
 }
 
 /* === END tabs.inc.css === */
@@ -2607,7 +2875,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
  * 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]) {
+#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);*/
 }
 
@@ -2681,7 +2949,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 #TabsToolbar > #new-tab-button,
 #TabsToolbar > toolbarpaletteitem > #new-tab-button,
 #TabsToolbar > toolbarpaletteitem > #new-tab-button[cui-areatype="toolbar"] {
-  list-style-image: url("chrome://browser/skin/tabbrowser/newtab.png");
+  list-style-image: url("chrome://browser/skin/tabbrowser/newtabFx.png");
   -moz-image-region: rect(0, 16px, 18px, 0);
 }
 
@@ -2751,7 +3019,11 @@ toolbarbutton.chevron {
 toolbarbutton.chevron:hover {
   list-style-image: url("chrome://global/skin/toolbar/chevron-hover.gif") !important;
 }
-
+/*
+toolbar[brighttext] toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/toolbar/chevron-inverted.png") !important;
+}
+*/
 toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 toolbarbutton.chevron:-moz-locale-dir(rtl):hover > .toolbarbutton-icon {
   transform: scaleX(-1);
@@ -2905,6 +3177,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   margin-top: 5px;
 }
 
+/* === BEGIN notification-icons.inc.css === */
+
 .popup-notification-icon {
   width: 64px;
   height: 64px;
@@ -2915,69 +3189,54 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://browser/skin/Geolocation-64.png");
 }
 
+.popup-notification-icon[popupid="push"] {
+  list-style-image: url(chrome://browser/skin/Push-64.png);
+}
+
 .popup-notification-icon[popupid="xpinstall-disabled"],
-.popup-notification-icon[popupid="addon-progress"],
-.popup-notification-icon[popupid="addon-install-cancelled"],
-.popup-notification-icon[popupid="addon-install-blocked"],
-.popup-notification-icon[popupid="addon-install-failed"],
-.popup-notification-icon[popupid="addon-install-complete"] {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-  width: 32px;
-  height: 32px;
+.popup-notification-icon[popupid="addon-install-blocked"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-blocked.svg);
 }
 
-.popup-notification-icon[popupid="click-to-play-plugins"] {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked-64.png");
+.popup-notification-icon[popupid="addon-progress"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-downloading.svg);
 }
 
-.popup-notification-icon[popupid="plugins-not-found"] {
-  list-style-image: url("chrome://browser/skin/pluginInstall-64.png");
+.popup-notification-icon[popupid="addon-install-failed"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-error.svg);
 }
 
-.popup-notification-icon[popupid="web-notifications"] {
-  list-style-image: url("chrome://browser/skin/notification-64.png");
+.popup-notification-icon[popupid="addon-install-confirmation"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-confirm.svg);
 }
 
-.addon-progress-description {
-  width: 350px;
-  max-width: 350px;
+#addon-install-confirmation-notification[warning] .popup-notification-icon[popupid="addon-install-confirmation"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-warning.svg);
 }
 
-.popup-progress-label,
-.popup-progress-meter {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+.popup-notification-icon[popupid="addon-install-complete"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-installed.svg);
 }
 
-.popup-progress-cancel {
-  -moz-appearance: none;
-  background: transparent;
-  border: none;
-  padding: 0;
-  margin: 0;
-  min-height: 0;
-  min-width: 0;
-  list-style-image: url("chrome://mozapps/skin/downloads/downloadButtons.png");
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+.popup-notification-icon[popupid="addon-install-restart"] {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-restart.svg);
 }
 
-.popup-progress-cancel:hover {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
+.popup-notification-icon[popupid="click-to-play-plugins"] {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked-64.png");
 }
 
-.popup-progress-cancel:active {
-  -moz-image-region: rect(32px, 32px, 48px, 16px);
+.popup-notification-icon[popupid="web-notifications"] {
+  list-style-image: url("chrome://browser/skin/notification-64.png");
 }
 
 .popup-notification-icon[popupid="indexedDB-permissions-prompt"],
-.popup-notification-icon[popupid="indexedDB-quota-prompt"],
 .popup-notification-icon[popupid*="offline-app-requested"],
 .popup-notification-icon[popupid="offline-app-usage"] {
   list-style-image: url("chrome://global/skin/icons/alert-question.gif");
 }
 
-.popup-notification-icon[popupid="password-save"],
-.popup-notification-icon[popupid="password-change"] {
+.popup-notification-icon[popupid="password"] {
   list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png");
 }
 
@@ -2986,8 +3245,13 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://global/skin/icons/webapps-64.png");
 }
 
-.popup-notification-icon[popupid="mixed-content-blocked"] {
-  list-style-image: url("chrome://browser/skin/mixed-content-blocked-64.png");
+.popup-notification-icon[popupid="bad-content"] {
+  list-style-image: url("chrome://browser/skin/bad-content-blocked-64.png");
+}
+
+.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="webRTC-sharingDevices"],
@@ -3000,6 +3264,11 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-64.png");
 }
 
+.popup-notification-icon[popupid="webRTC-sharingScreen"],
+.popup-notification-icon[popupid="webRTC-shareScreen"] {
+  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-64.png);
+}
+
 .popup-notification-icon[popupid="pointerLock"] {
   list-style-image: url("chrome://browser/skin/pointerLock-64.png");
 }
@@ -3055,8 +3324,20 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   list-style-image: url("chrome://browser/skin/Geolocation-16.png");
 }
 
-#addons-notification-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+#push-notification-icon {
+  list-style-image: url(chrome://browser/skin/Push-16.png);
+}
+
+#addons-notification-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);
+}
+
+#addons-notification-icon:hover:active {
+  list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#active);
 }
 
 .indexedDB-notification-icon,
@@ -3068,6 +3349,12 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   list-style-image: url("chrome://mozapps/skin/passwordmgr/key-16.png");
 }
 
+#login-fill-notification-icon {
+  /* Temporary icon until the capture and fill doorhangers are unified. */
+  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png);
+  transform: scaleX(-1);
+}
+
 #webapps-notification-icon {
   list-style-image: url("chrome://gobal/skin/icons/webapps-16.png");
 }
@@ -3092,10 +3379,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
 /*  -moz-image-region: rect(0, 32px, 16px, 16px);*/
 }
 
-#plugin-install-notification-icon {
-  list-style-image: url("chrome://browser/skin/pluginInstall-16.png");
-}
-
 #notification-popup-box[hidden] {
   /* Override display:none to make the pluginBlockedNotification animation work
      when showing the notification repeatedly. */
@@ -3116,9 +3399,14 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   }
 }
 
-.mixed-content-blocked-notification-icon,
-#mixed-content-blocked-notification-icon {
-  list-style-image: url("chrome://browser/skin/mixed-content-blocked-16.png");
+.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);
 }
 
 .webRTC-shareDevices-notification-icon,
@@ -3141,6 +3429,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   list-style-image: url("chrome://browser/skin/webRTC-sharingMicrophone-16.png");
 }
 
+.webRTC-shareScreen-notification-icon,
+#webRTC-shareScreen-notification-icon {
+  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png);
+}
+
+.webRTC-sharingScreen-notification-icon,
+#webRTC-sharingScreen-notification-icon {
+  list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png);
+}
+
 .web-notifications-notification-icon,
 #web-notifications-notification-icon {
   list-style-image: url("chrome://browser/skin/notification-16.png");
@@ -3149,8 +3447,54 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
 #pointerLock-notification-icon {
   list-style-image: url("chrome://browser/skin/pointerLock-16.png");
 }
-#pointerLock-cancel {
-  margin: 0px;
+
+.translate-notification-icon,
+#translate-notification-icon {
+  list-style-image: url("chrome://browser/skin/translation-16.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.translated-notification-icon,
+#translated-notification-icon {
+  list-style-image: url("chrome://browser/skin/translation-16.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+.popup-notification-icon[popupid="servicesInstall"] {
+  list-style-image: url("chrome://browser/skin/social/services-64.png");
+}
+#servicesInstall-notification-icon {
+  list-style-image: url("chrome://browser/skin/social/services-16.png");
+}
+
+/* EME notifications */
+
+.popup-notification-icon[popupid="drmContentPlaying"],
+#eme-notification-icon {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
+}
+
+#eme-notification-icon:hover:active {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed");
+}
+
+#eme-notification-icon[firstplay=true] {
+  animation: emeTeachingMoment 0.2s linear 0s 5 normal;
+}
+
+@keyframes emeTeachingMoment {
+  0% {transform: translateX(0); }
+  25% {transform: translateX(3px) }
+  75% {transform: translateX(-3px) }
+  100% { transform: translateX(0); }
+}
+
+/* === END notification-icons.inc.css === */
+
+.popup-notification-body[popupid="addon-progress"],
+.popup-notification-body[popupid="addon-install-confirmation"] {
+  width: 28em;
+  max-width: 28em;
 }
 
 /* Translation infobar */
@@ -3158,66 +3502,105 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
 /* === BEGIN infobar.inc.css === */
 
 notification[value="translation"] .messageImage {
-  list-style-image: url(chrome://browser/skin/translation-16.png);
+  list-style-image: url("chrome://browser/skin/translation-16.png");
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 @media (min-resolution: 1.25dppx) {
   notification[value="translation"] .messageImage {
-    list-style-image: url(chrome://browser/skin/translation-16@2x.png);
+    list-style-image: url("chrome://browser/skin/translation-16@2x.png");
     -moz-image-region: rect(0, 64px, 32px, 32px);
   }
 }
 
-notification[value="translation"] {
-  min-height: 40px;
+notification[value="translation"][state="translating"] .messageImage {
+  list-style-image: url("chrome://browser/skin/translating-16.png");
+  -moz-image-region: auto;
+}
+
+@media (min-resolution: 1.25dppx) {
+  notification[value="translation"][state="translating"] .messageImage {
+    list-style-image: url("chrome://browser/skin/translating-16@2x.png");
+  }
+}
+
+notification[value="translation"] hbox[anonid="details"] {
+  overflow: hidden;
 }
 
 notification[value="translation"] button,
 notification[value="translation"] menulist {
   min-width: 0;
-/*  min-height: 30px;
-  -moz-padding-end: 1ch; */
 }
 
-notification[value="translation"] button > .button-box,
-notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker {
-  padding: 0;
-/*  -moz-margin-start: 3ch; */
+notification[value="translation"] menulist > .menulist-dropmarker {
 }
 
-notification[value="translation"] button:not([type="menu"]) > .button-box {
-/*  -moz-margin-end: 3ch; */
+.translation-menupopup arrowscrollbox {
+  padding-bottom: 0;
 }
 
-notification[value="translation"] button,
-notification[value="translation"] menulist,
-notification[value="translation"] menulist > .menulist-label-box {
-/*  -moz-margin-start: 1ch;
-  -moz-margin-end: 1ch; */
+.translation-attribution {
+  cursor: pointer;
+  -moz-box-align: end;
+  font-size: small;
 }
 
-notification[value="translation"] menulist > .menulist-dropmarker {
+.translation-attribution > label {
+  margin-bottom: 0;
 }
 
-/* === END infobar.inc.css === */
+.translation-attribution > image {
+  width: 70px;
+}
 
-.translate-notification-icon,
-#translate-notification-icon {
-  list-style-image: url("chrome://browser/skin/translation-16.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+.translation-welcome-panel {
+  width: 305px;
 }
 
-.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-welcome-logo {
+  height: 32px;
+  width: 32px;
+  list-style-image: url(chrome://browser/skin/translation-16@2x.png);
+  -moz-image-region: rect(0, 64px, 32px, 32px);
+}
+
+.translation-welcome-content {
+  -moz-margin-start: 16px;
+}
+
+.translation-welcome-headline {
+  font-size: larger;
+  font-weight: bold;
+}
+
+.translation-welcome-body {
+  padding: 1em 0;
+  margin: 0 0;
+}
+
+/* === END infobar.inc.css === */
+
+notification[value="translation"] {
+  min-height: 40px;
 }
 
 .translation-menupopup {
   -moz-appearance: none;
 }
 
+/* Loop/ Hello browser styles */
+
+notification[value="loop-sharing-notification"] .button-menubutton-button {
+  min-width: 0;
+  border: 0;
+  margin: 0;
+}
+
+notification[value="loop-sharing-notification"] .messageImage {
+  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png);
+}
+
 /* Bookmarks roots menu-items */
 #subscribeToPageMenuitem:not([disabled]),
 #subscribeToPageMenupopup,
@@ -3239,6 +3622,18 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   -moz-image-region: auto;
 }
 
+#menu_readingList,
+#BMB_readingList {
+  list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg");
+  -moz-image-region: auto;
+}
+
+#panelMenu_pocket,
+#menu_pocket,
+#BMB_pocket {
+  list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16.png");
+}
+
 /* ::::: Keyboard UI Panel ::::: */
 
 .KUI-panel {
@@ -3360,108 +3755,6 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   background-color: transparent !important;
 }
 
-/* === BEGIN highlighter.inc.css === */
-
-/* Box model highlighter */
-svg|g.box-model-container {
-  opacity: 0.4;
-}
-
-svg|polygon.box-model-content {
-  fill: #008484;
-}
-
-svg|polygon.box-model-padding {
-  fill: #9C9CFF;
-}
-
-svg|polygon.box-model-border {
-  fill: #FFCF00;
-}
-
-svg|polygon.box-model-margin {
-  fill: #A09090;
-}
-
-svg|polygon.box-model-content,
-svg|polygon.box-model-padding,
-svg|polygon.box-model-border,
-svg|polygon.box-model-margin {
-  stroke: none;
-}
-
-svg|line.box-model-guide-top,
-svg|line.box-model-guide-right,
-svg|line.box-model-guide-bottom,
-svg|line.box-model-guide-left {
-  stroke: #E7ADE7;
-  stroke-dasharray: 5 3;
-}
-
-/* Highlighter - Node Infobar */
-
-.highlighter-nodeinfobar {
-  color: #FF9F00;
-  border-radius: 3px;
-  background-color: #000000;
-  background-clip: padding-box;
-  border: 1px solid #008484;
-  padding: 5px;
-  /* Avoid cases where the infobar is smaller than the arrow, when the text is
-  short */
-  min-width: 75px;
-}
-
-/* Highlighter - Node Infobar - text */
-
-.highlighter-nodeinfobar-text {
-  text-align: center;
-  /* 100% - size of the buttons and margins */
-  max-width: calc(100% - 2 * (26px + 6px));
-  padding-bottom: 1px;
-}
-
-html|*.highlighter-nodeinfobar-tagname {
-  color: #FFCF00;
-}
-
-html|*.highlighter-nodeinfobar-id {
-  color: #9C9CFF;
-}
-
-html|*.highlighter-nodeinfobar-pseudo-classes {
-  color: #FF9F00;
-}
-
-/* Highlighter - Node Infobar - box & arrow */
-
-.highlighter-nodeinfobar-arrow {
-  width: 14px;
-  height: 14px;
-  -moz-margin-start: calc(50% - 7px);
-  transform: rotate(-45deg);
-  background-clip: padding-box;
-  background-repeat: no-repeat;
-}
-
-.highlighter-nodeinfobar-arrow-top {
-  margin-bottom: -8px;
-  margin-top: 8px;
-  background-image: linear-gradient(to bottom left, transparent 50%, rgb(0, 132, 132) 50%);
-}
-
-.highlighter-nodeinfobar-arrow-bottom {
-  margin-top: -8px;
-  margin-bottom: 8px;
-  background-image: linear-gradient(to top right, transparent 50%, rgb(0, 132, 132) 50%);
-}
-
-.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
-  margin: 7px 0;
-}
-
-/* === END highlighter.inc.css === */
-
 #full-screen-warning-message {
   background-color: #000000;
   color: #FF9F00;
@@ -3490,10 +3783,23 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
 
 /* === 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 */
+}
+
 /* Developer toolbar */
 
 #developer-toolbar {
-  border-top: 3px solid #000000;
+  border-top: 3px solid var(--gcli-background-color);
   border-bottom: none;
 }
 
@@ -3531,6 +3837,12 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   display: none;
 }
 
+.developer-toolbar-button > .toolbarbutton-icon,
+#developer-toolbar-closebutton > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
 #developer-toolbar-toolbox-button {
   list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
@@ -3546,6 +3858,19 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #developer-toolbar-toolbox-button {
+    list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png");
+    -moz-image-region: rect(0px, 32px, 32px, 0px);
+  }
+
+  #developer-toolbar-toolbox-button:hover,
+  #developer-toolbar-toolbox-button:hover:active,
+  #developer-toolbar-toolbox-button[checked=true] {
+    -moz-image-region: rect(0px, 64px, 32px, 32px);
+  }
+}
+
 #developer-toolbar-closebutton {
   list-style-image: url("chrome://browser/skin/devtools/close.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
@@ -3565,6 +3890,18 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #developer-toolbar-closebutton {
+    list-style-image: url("chrome://browser/skin/devtools/close@2x.png");
+    -moz-image-region: rect(0px, 32px, 32px, 0px);
+  }
+
+  #developer-toolbar-closebutton:hover,
+  #developer-toolbar-closebutton:hover:active {
+    -moz-image-region: rect(0px, 64px, 32px, 32px);
+  }
+}
+
 /* GCLI */
 
 html|*#gcli-tooltip-frame,
@@ -3591,17 +3928,36 @@ html|*#gcli-output-frame {
 }
 
 .gclitoolbar-input-node {
-  padding-left: 20px;
 /*  line-height: 32px;
   outline-style: none; */
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 16, 16, 0);
   background-repeat: no-repeat;
-  background-color: rgba(0, 0, 0, .75);
+  background-color: var(--gcli-input-background);
 }
 
 .gclitoolbar-input-node[focused="true"] {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
-  background-color: #000000;
+  background-color: var(--gcli-input-focused-background);
+}
+
+.gclitoolbar-input-node::before {
+  content: "";
+  display: inline-block;
+  -moz-box-ordinal-group: 0;
+  width: 16px;
+  height: 16px;
+  margin: 0 2px;
+  background-image: url("chrome://browser/skin/devtools/commandline-icon.png");
+  background-position: 0 center;
+  background-size: 32px 16px;
+}
+
+.gclitoolbar-input-node[focused="true"]::before {
+  background-position: -16px center;
+}
+
+@media (min-resolution: 2dppx) {
+  .gclitoolbar-input-node::before {
+    background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png");
+  }
 }
 
 .gclitoolbar-input-node:not([focused="true"]) {
@@ -3609,9 +3965,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 {
@@ -3660,7 +4015,7 @@ html|*#gcli-output-frame {
 /* Responsive Mode */
 
 .browserContainer[responsivemode] {
-  background: #221500 url("chrome://browser/skin/devtools/responsive-background.png");
+  background-color: #221500;
   padding: 0 20px 20px 20px;
 }
 
@@ -3688,6 +4043,24 @@ html|*#gcli-output-frame {
 /*  margin: 0 3px; */
 }
 
+.devtools-responsiveui-menulist .menulist-editable-box {
+  background-color: transparent;
+}
+
+.devtools-responsiveui-menulist html|*.menulist-editable-input {
+  color: inherit;
+  text-align: center;
+}
+
+.devtools-responsiveui-menulist html|*.menulist-editable-input::-moz-selection {
+/*  background: hsla(212,7%,57%,.35);*/
+}
+
+.devtools-responsiveui-toolbarbutton > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
 .devtools-responsiveui-toolbarbutton > .toolbarbutton-menubutton-button {
   -moz-box-orient: horizontal;
 }
@@ -3735,7 +4108,7 @@ html|*#gcli-output-frame {
 .devtools-responsiveui-menulist > .menulist-dropmarker {
 /*  display: -moz-box;
   background-color: transparent;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
+  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
   -moz-box-align: center;
   border-width: 0;
   min-width: 16px;*/
@@ -3759,7 +4132,7 @@ html|*#gcli-output-frame {
 
 .devtools-responsiveui-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
-/*  list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
+/*  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px;*/
 }
@@ -3787,6 +4160,24 @@ html|*#gcli-output-frame {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
+@media (min-resolution: 2dppx) {
+  .devtools-responsiveui-close {
+    list-style-image: url("chrome://browser/skin/devtools/close@2x.png");
+  }
+
+  .devtools-responsiveui-close:hover {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+
+  .devtools-responsiveui-rotate {
+    list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate@2x.png");
+  }
+
+  .devtools-responsiveui-rotate:hover {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+}
+
 .devtools-responsiveui-touch {
   list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png");
   -moz-image-region: rect(0px,16px,16px,0px);
@@ -3798,6 +4189,19 @@ html|*#gcli-output-frame {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
+@media (min-resolution: 2dppx) {
+  .devtools-responsiveui-touch {
+    list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png");
+    -moz-image-region: rect(0px,32px,32px,0px);
+  }
+
+  .devtools-responsiveui-touch:hover,
+  .devtools-responsiveui-touch[checked],
+  .devtools-responsiveui-touch[checked]:hover {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+}
+
 .devtools-responsiveui-screenshot {
   list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png");
   -moz-image-region: rect(0px,16px,16px,0px);
@@ -3807,11 +4211,22 @@ html|*#gcli-output-frame {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
+@media (min-resolution: 2dppx) {
+  .devtools-responsiveui-screenshot {
+    list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png");
+  }
+
+  .devtools-responsiveui-screenshot:hover {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+}
+
 .devtools-responsiveui-resizebarV {
   width: 7px;
   height: 24px;
   cursor: ew-resize;
   transform: translate(12px, -12px);
+  background-size: cover;
   background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png");
 }
 
@@ -3820,6 +4235,7 @@ html|*#gcli-output-frame {
   height: 7px;
   cursor: ns-resize;
   transform: translate(-12px, 12px);
+  background-size: cover;
   background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer.png");
 }
 
@@ -3828,87 +4244,140 @@ html|*#gcli-output-frame {
   height: 16px;
   cursor: se-resize;
   transform: translate(12px, 12px);
+  background-size: cover;
   background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png");
 }
 
-/* === END responsivedesign.inc.css === */
+/* FxOS custom mode with additional buttons and phone look'n feel */
 
-/* === including indicator.css is done at the start of the file === */
+/* Hide devtools manual resizer */
+.browserStack[responsivemode].fxos-mode .devtools-responsiveui-resizehandle,
+.browserStack[responsivemode].fxos-mode .devtools-responsiveui-resizebarH,
+.browserStack[responsivemode].fxos-mode .devtools-responsiveui-resizebarV {
+  display: none;
+}
 
-/* Error counter */
+/* Gives responsive mode a phone look'n feel */
+.browserStack[responsivemode].fxos-mode {
+  padding: 60px 15px 0;
 
-#developer-toolbar-toolbox-button[error-count]:before {
-  color: #000000;
-  min-width: 16px;
-  text-shadow: none;
-  background-color: #FF0000;
-  border-radius: 1px;
-  -moz-margin-end: 5px;
+  border-radius: 25px / 20px;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  border: 1px solid #FFFFFF;
+  border-bottom-width: 0;
+
+  background-color: #353535;
+
+  box-shadow: 0 3px 0.7px 1px #777777, 0 5px rgba(0, 0, 0, 0.4) inset;
+
+  background-image: linear-gradient(to right, #111 11%, #333 56%);
+  min-width: 320px;
 }
 
-/* Social toolbar item */
+.devtools-responsiveui-hardware-buttons {
+  -moz-appearance: none;
+  padding: 20px;
 
-#social-provider-button {
-  -moz-image-region: rect(0, 16px, 16px, 0);
-  list-style-image: url("chrome://browser/skin/social/services-16.png");
+  border: 1px solid #FFFFFF;
+  border-bottom-left-radius: 25px;
+  border-bottom-right-radius: 25px;
+  border-top-width: 0;
+
+  box-shadow: 0 3px 0.7px 1px #777777, 0 -7px rgba(0, 0, 0, 0.4) inset;
+
+  background-image: linear-gradient(to right, #111 11%, #333 56%);
 }
 
-#social-provider-button > .toolbarbutton-menu-dropmarker {
-  display: none;
+.devtools-responsiveui-home-button {
+  width: 40px;
+  height: 30px;
+  list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png");
 }
 
-.toolbarbutton-badge-container {
-  margin: 0;
-  padding: 0;
-  position: relative;
+.devtools-responsiveui-sleep-button {
+  -moz-appearance: none;
+  /* compensate browserStack top padding */
+  margin-top: -67px;
+  margin-right: 10px;
+
+  min-width: 10px;
+  width: 50px;
+  height: 5px;
+
+  border: 1px solid #444;
+  border-top-right-radius: 12px;
+  border-top-left-radius: 12px;
+  border-bottom-color: transparent;
+
+  background-image: linear-gradient(to top, #111 11%, #333 56%);
 }
 
-#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container {
-  padding: 2px 2px;
+.devtools-responsiveui-sleep-button:hover:active {
+  background-image: linear-gradient(to top, #aaa 11%, #ddd 56%);
 }
 
-.toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon {
-  position: absolute;
-  top: 2px;
-  right: 2px;
+.devtools-responsiveui-volume-buttons {
+  margin-left: -29px;
 }
 
-.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) {
-  -moz-margin-end: 0;
+.devtools-responsiveui-volume-up-button,
+.devtools-responsiveui-volume-down-button {
+  -moz-appearance: none;
+  border: 1px solid red;
+  min-width: 8px;
+  height: 40px;
+
+  border: 1px solid #444;
+  border-right-color: transparent;
+
+  background-image: linear-gradient(to right, #111 11%, #333 56%);
 }
 
-.toolbarbutton-badge[badge=""] {
-  display: none;
+.devtools-responsiveui-volume-up-button:hover:active,
+.devtools-responsiveui-volume-down-button:hover:active {
+  background-image: linear-gradient(to right, #aaa 11%, #ddd 56%);
 }
-.toolbarbutton-badge[badge]:not([badge=""])::after {
-  /* The |content| property is set in the content stylesheet. */
-  font-size: 9px;
-  font-weight: bold;
-  padding: 0 1px;
-  color: #FF9F00;
-  background-color: #000000;
-  border: 1px solid #9C9CFF;
-  border-radius: 2px;
-  position: absolute;
-  top: 0;
-  right: 0;
+
+.devtools-responsiveui-volume-up-button {
+  border-top-left-radius: 12px;
+}
+
+.devtools-responsiveui-volume-down-button {
+  border-bottom-left-radius: 12px;
 }
 
-#nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
-  top: 1px;
-  right: 1px;
-}
+@media (min-resolution: 2dppx) {
+  .devtools-responsiveui-resizebarV {
+    background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png");
+  }
+
+  .devtools-responsiveui-resizebarH {
+    background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer@2x.png");
+  }
 
-.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
-  left: 0;
-  right: auto;
+  .devtools-responsiveui-resizehandle {
+    background-image: url("chrome://browser/skin/devtools/responsive-se-resizer@2x.png");
+  }
 }
 
-#nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
-  left: 1px;
-  right: auto;
+/* === END responsivedesign.inc.css === */
+
+/* === including indicator.css is done at the start of the file === */
+
+/* Error counter */
+
+#developer-toolbar-toolbox-button[error-count]:before {
+  color: #000000;
+  min-width: 16px;
+  text-shadow: none;
+  background-color: #FF0000;
+  border-radius: 1px;
+  -moz-margin-end: 5px;
 }
 
+/* Social toolbar item */
+
 #social-notification-icon-mentions {
   background-color: #000000;
   border-radius: 3px;
@@ -3927,12 +4396,6 @@ html|*#gcli-output-frame {
   border: 0;
 }
 
-.popup-notification-icon[popupid="servicesInstall"] {
-  list-style-image: url("chrome://browser/skin/social/services-64.png");
-}
-#servicesInstall-notification-icon {
-  list-style-image: url("chrome://browser/skin/social/services-16.png");
-}
 #social-undoactivation-button {
   -moz-margin-start: 0; /* override default label margin to match description margin */
 }
@@ -4005,20 +4468,28 @@ html|*#gcli-output-frame {
   padding: 3px;
 }
 
+#manage-share-providers,
+#social-sidebar-button {
+  list-style-image: url("chrome://browser/skin/ToolbarFx.png");
+  -moz-image-region: rect(0, 468px, 18px, 450px);
+}
+
 #social-sidebar-button {
   -moz-appearance: none;
-  list-style-image: url("chrome://browser/skin/social/gear_default.png");
   border: none;
   padding: 0;
   margin: 2px;
 }
+#manage-share-providers > .toolbarbutton-icon,
 #social-sidebar-button > .toolbarbutton-icon {
-  min-height: 16px;
-  min-width: 16px;
+  min-height: 18px;
+  min-width: 18px;
 }
+#manage-share-providers:hover,
+#manage-share-providers:hover:active,
 #social-sidebar-button:hover,
 #social-sidebar-button:hover:active {
-  list-style-image: url("chrome://browser/skin/social/gear_clicked.png");
+  -moz-image-region: rect(18px, 468px, 36px, 450px);
 }
 #social-sidebar-button > .toolbarbutton-menu-dropmarker {
   display: none;
@@ -4044,10 +4515,17 @@ html|*#gcli-output-frame {
 .chat-toolbarbutton {
   -moz-appearance: none;
   border: none;
-  padding: 0;
+  padding: 0 3px;
   margin: 0;
   background: none;
-  width: 16px;
+}
+
+.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 {
@@ -4055,52 +4533,37 @@ html|*#gcli-output-frame {
 }
 
 .chat-toolbarbutton > .toolbarbutton-icon {
-  width: inherit;
-}
-
-.chat-toolbarbutton.notification-anchor-icon > .toolbarbutton-icon {
-  width: inherit;
-  margin-top: -2px;
+  width: 16px;
+  height: 16px;
 }
 
 .chat-close-button {
-  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
-  -moz-image-region: rect(0, 16px, 16px, 0);
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close");
 }
 
-.chat-close-button:hover,
-.chat-close-button:hover:active {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
+.chat-close-button:-moz-any(:hover,:hover:active) {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-active");
 }
 
 .chat-minimize-button {
-  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
-  -moz-image-region: rect(16px, 16px, 32px, 0);
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize");
 }
 
-.chat-minimize-button:hover:active,
-.chat-minimize-button:hover {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
+.chat-minimize-button:-moz-any(:hover,:hover:active) {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-active");
 }
 
 .chat-swap-button {
-  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
-  -moz-image-region: rect(48px, 16px, 64px, 0);
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand");
+  transform: rotate(180deg);
 }
 
-.chat-swap-button:hover:active,
-.chat-swap-button:hover {
-  -moz-image-region: rect(48px, 32px, 64px, 16px);
+.chat-swap-button:-moz-any(:hover,:hover:active) {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-active");
 }
 
 chatbar > chatbox > .chat-titlebar > .chat-swap-button {
-  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
-  -moz-image-region: rect(32px, 16px, 48px, 0);
-}
-
-chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active,
-chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover {
-  -moz-image-region: rect(32px, 32px, 48px, 16px);
+  transform: none;
 }
 
 .chat-title {
@@ -4113,12 +4576,11 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover {
 .chat-titlebar {
   background-color: #9C9CFF;
   color: #000000;
-  height: 20px;
-  min-height: 16px;
+  height: 30px;
+  min-height: 30px;
   width: 100%;
   margin: 0;
-  padding: 2px;
-  -moz-padding-start: 6px;
+  padding: 7px 6px;
   border: none;
   border-bottom: 1px solid #008484;
   cursor: pointer;
@@ -4141,6 +4603,18 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover {
   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;
@@ -4334,6 +4808,70 @@ notification.pluginVulnerable .messageImage {
 
 /* === END plugin-doorhanger.inc.css === */
 
+/* === BEGIN badcontent-doorhanger.inc.css === */
+
+.popup-notification-item-title[popupid="bad-content"] {
+  font-weight: bold;
+}
+
+.popup-notification-item-message[popupid="bad-content"] {
+  width: 17em;
+}
+
+.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;
+}
+
+.popup-notification-item-message-critical[popupid="bad-content"] {
+  color: #FF0000;
+  font-style: italic;
+}
+
+.popup-notification-footer[popupid="bad-content"] {
+  padding-top: 1em;
+}
+
+/* === END badcontent-doorhanger.inc.css === */
+
+/* === BEGIN login-doorhanger.inc.css === */
+
+#login-fill-testing {
+  color: #FF0000;
+  font-weight: bold;
+}
+
+#login-fill-list {
+  border: 1px solid #9C9CFF;
+  max-height: 20em;
+}
+
+.login-fill-item[disabled] {
+  color: #8050B0;
+  background-color: #000000;
+}
+
+.login-fill-item[disabled][selected] {
+  background-color: #008484;
+}
+
+.login-hostname {
+  margin: 4px;
+  font-weight: bold;
+}
+
+.login-fill-item.different-hostname > .login-hostname {
+  color: #A09090;
+  font-style: italic;
+}
+
+.login-username {
+  margin: 4px;
+  color: #A09090;
+}
+
+/* === END login-doorhanger.inc.css === */
+
 /* === BEGIN customizeMode.inc.css === */
 
 /* Customization mode */
@@ -4422,6 +4960,7 @@ notification.pluginVulnerable .messageImage {
 
 #customization-container {
   background-color: #000000;
+  color: #FF9F00;
 }
 
 #customization-palette,
@@ -4430,12 +4969,13 @@ notification.pluginVulnerable .messageImage {
 }
 
 #customization-header {
-  font-size: 1.5em;
-  line-height: 1.5em;
+  font-size: 1.75em;
+  line-height: 1.75em;
   color: #9C9CFF;
-  font-weight: lighter;
-  margin-bottom: 1em;
-  padding: 15px 15px 0;
+  font-weight: 200;
+  margin: 25px 25px 12px;
+  padding-bottom: 12px;
+  border-bottom: 1px solid #A09090;
 }
 
 #customization-panel-container {
@@ -4449,30 +4989,53 @@ notification.pluginVulnerable .messageImage {
 
 #customization-footer {
   border-top: 1px solid #9C9CFF;
-  padding: 15px;
+  padding: 10px;
 }
 
 .customizationmode-button {
-  margin: 0;
+  margin: 5px;
 }
 
 .customizationmode-button:hover {
 }
 
+#customization-titlebar-visibility-button[checked],
+#customization-devedition-theme-button[checked] {
+  background-color: #008484;
+}
+
+#customization-titlebar-visibility-button[checked]:hover,
+#customization-devedition-theme-button[checked]:hover {
+  background-color: #FFCF00;
+}
+
+#customization-titlebar-visibility-button[checked]:hover:active,
+#customization-devedition-theme-button[checked]:hover:active {
+  background-color: #FF9F00;
+}
+
 .customizationmode-button[disabled="true"] {
 }
 
+.customizationmode-button > .box-inherit > .box-inherit > .button-icon,
+.customizationmode-button > .button-box > .button-icon {
+/*  height: 24px;*/
+}
+
 #customization-titlebar-visibility-button {
   list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
-  padding: 0px 5px;
-  -moz-margin-end: 10px;
 }
 
 #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;
@@ -4483,11 +5046,23 @@ 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;
 }
 
+#customization-lwtheme-button > .box-inherit > .box-inherit > .button-icon {
+  width: 20px;
+  height: 20px;
+  border-radius: 2px;
+  background-size: contain;
+}
+
+#customization-titlebar-visibility-button > .button-box > .button-icon {
+  vertical-align: middle;
+}
+
 #customization-titlebar-visibility-button[checked] {
   -moz-image-region: rect(0, 32px, 16px, 16px);
   background-color: #008484;
@@ -4502,10 +5077,6 @@ notification.pluginVulnerable .messageImage {
   background-color: #FF9F00;
 }
 
-#customization-undo-reset-button {
-  -moz-margin-end: 10px;
-}
-
 #main-window[customize-entered] #customization-panel-container {
   background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
   background-position: left top;
@@ -4612,12 +5183,101 @@ toolbarpaletteitem[place="toolbar"] {
   min-height: 48px;
 }
 
+#personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
+  -moz-margin-end: 5px;
+}
+
 #customization-palette > toolbarpaletteitem > label {
   text-align: center;
   margin-left: 0;
   margin-right: 0;
 }
 
+#customization-lwtheme-menu > .panel-arrowcontainer > .panel-arrowcontent {
+  -moz-box-orient: vertical;
+  /* Make the panel padding uniform across all platforms due to the
+     styling of the section headers and footer. */
+  padding: 10px;
+}
+
+.customization-lwtheme-menu-theme > .toolbarbutton-icon {
+  width: 32px;
+  height: 32px;
+}
+
+.customization-lwtheme-menu-theme {
+  -moz-appearance: none;
+  margin: 0 -5px 5px;
+  padding-top: 0;
+  -moz-padding-end: 5px;
+  padding-bottom: 0;
+  -moz-padding-start: 0;
+}
+
+.customization-lwtheme-menu-theme[defaulttheme] {
+  list-style-image: url(chrome://browser/skin/Fxtheme-switcher-icon.png);
+}
+
+.customization-lwtheme-menu-theme[active="true"] {
+  background-color: #008484;
+}
+
+.customization-lwtheme-menu-theme > .toolbarbutton-icon {
+  margin: 5px;
+}
+
+.customization-lwtheme-menu-theme > .toolbarbutton-text {
+  text-align: start;
+}
+
+#customization-lwtheme-menu-header,
+#customization-lwtheme-menu-recommended {
+  padding: 10px;
+  margin-bottom: 5px;
+}
+
+#customization-lwtheme-menu-header,
+#customization-lwtheme-menu-recommended,
+#customization-lwtheme-menu-footer {
+  background-color: #A09090;
+  color: #000000;
+  margin-right: -10px;
+  margin-left: -10px;
+}
+
+#customization-lwtheme-menu-header {
+  margin-top: -10px;
+  border-top-right-radius: 3px;
+  border-top-left-radius: 3px;
+}
+
+#customization-lwtheme-menu-recommended {
+}
+
+#customization-lwtheme-menu-footer {
+  margin-bottom: -10px;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+
+.customization-lwtheme-menu-footeritem {
+  -moz-appearance: none;
+  -moz-box-flex: 1;
+  background-color: #C09070;
+  color: #000000;
+  border: 1px solid transparent;
+  padding: 10px;
+  margin-left: 0;
+  margin-right: 0;
+}
+
+.customization-lwtheme-menu-footeritem:hover {
+  background-color: #FFCF00;
+}
+
+.customization-lwtheme-menu-footeritem:first-child {
+}
+
 /* === END customizeMode.inc.css === */
 
 /* === BEGIN customizeTip.inc.css === */
@@ -4631,6 +5291,7 @@ toolbarpaletteitem[place="toolbar"] {
   border-radius: 3px;
 /*  background-image: linear-gradient(90deg, #a0dfff 0%, #ceeeff 100%);*/
   border: 1px solid #9C9CFF;
+  color: #FF9F00;
 }
 
 #customization-tipPanel > .panel-arrowcontainer > .panel-arrowcontent:-moz-locale-dir(rtl) {
@@ -4706,9 +5367,25 @@ toolbarpaletteitem[place="toolbar"] {
   transform: perspective(0.01px);
 }
 
-#main-window[customize-entered] {
+#main-window[customize-entered] > #tab-view-deck {
+  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
+  background-attachment: fixed;
+}
+
+#main-window[customization-lwtheme] > #tab-view-deck:-moz-lwtheme {
+  background-repeat: no-repeat;
+  background-position: right top;
+  background-attachment: fixed;
+  /* The image will get set from CustomizeMode.jsm */
+  background-image: none;
+  background-color: transparent;
+}
+
+#main-window[customization-lwtheme]:-moz-lwtheme {
   background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
+  background-repeat: repeat;
   background-attachment: fixed;
+  background-position: left top;
 }
 
 #main-window[customize-entered] #browser-bottombox,
@@ -4932,6 +5609,123 @@ toolbarpaletteitem[place="toolbar"] {
   color: #000000;
 }
 
+/* Notification overrides for Heartbeat UI */
+
+notification.heartbeat {
+  background-color: #A09090;
+/*  height: 40px;*/
+}
+
+@keyframes pulse-onshow {
+ 0% {
+   opacity: 0;
+   transform: scale(1.0);
+ }
+ 25% {
+   opacity: 1;
+   transform: scale(1.1);
+ }
+ 50% {
+   transform: scale(1.0);
+ }
+ 75% {
+   transform: scale(1.1);
+ }
+ 100% {
+   transform: scale(1.0);
+ }
+}
+
+@keyframes pulse-twice {
+ 0% {
+   transform: scale(1.1);
+ }
+ 50% {
+   transform: scale(0.8);
+ }
+ 100% {
+   transform: scale(1);
+ }
+}
+
+.messageText.heartbeat {
+  color: #000000;
+/*  text-shadow: none; */
+  -moz-margin-start: 0px;
+}
+
+.messageImage.heartbeat {
+  width: 24px;
+  height: 24px;
+  -moz-margin-start: 8px;
+  -moz-margin-end: 8px;
+}
+
+.messageImage.heartbeat.pulse-onshow {
+  animation-name: pulse-onshow;
+  animation-duration: 1.5s;
+  animation-iteration-count: 1;
+  animation-timing-function: cubic-bezier(.7,1.8,.9,1.1);
+}
+
+.messageImage.heartbeat.pulse-twice {
+  animation-name: pulse-twice;
+  animation-duration: 1s;
+  animation-iteration-count: 2;
+  animation-timing-function: linear;
+}
+
+/* Learn More link styles */
+.heartbeat > .text-link {
+  color: #3333FF;
+  -moz-margin-start: 0px;
+}
+
+.heartbeat > .text-link:hover {
+  color: #9C9CFF;
+  text-decoration: none;
+}
+
+.heartbeat > .text-link:hover:active {
+  color: #FF9F00;
+}
+
+/* Heartbeat UI Rating Star Classes */
+.heartbeat > #star-rating-container {
+  display: -moz-box;
+/*  margin-bottom: 4px;*/
+}
+
+.heartbeat > #star-rating-container > #star5 {
+  -moz-box-ordinal-group: 5;
+}
+
+.heartbeat > #star-rating-container > #star4 {
+  -moz-box-ordinal-group: 4;
+}
+
+.heartbeat > #star-rating-container > #star3 {
+  -moz-box-ordinal-group: 3;
+}
+
+.heartbeat > #star-rating-container > #star2 {
+  -moz-box-ordinal-group: 2;
+}
+
+.heartbeat > #star-rating-container > .star-x  {
+  background: url("chrome://browser/skin/heartbeat-star-off.svg");
+  cursor: pointer;
+  /* Overrides the -moz-margin-end for all platforms defined in the .plain class */
+  -moz-margin-end: 4px !important;
+  width: 16px;
+  height: 16px;
+}
+
+.heartbeat > #star-rating-container > .star-x:hover,
+.heartbeat > #star-rating-container > .star-x:hover ~ .star-x {
+  background: url("chrome://browser/skin/heartbeat-star-lit.svg");
+}
+
 /* === END UITour.inc.css === */
 
 #UITourTooltipButtons {
@@ -4957,68 +5751,83 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
   -moz-appearance: none;
 }
 
-#context-navigation > #context-back > .menu-iconic-left {
+#context-back > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back"); */
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
 
-#context-navigation > #context-back:not([disabled="true"]):hover > .menu-iconic-left {
+#context-back:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back-active"); */
   -moz-image-region: rect(18px, 54px, 36px, 36px);
 }
 
-#context-navigation > #context-back[disabled="true"] > .menu-iconic-left {
+#context-back[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back-disabled"); */
   -moz-image-region: rect(36px, 54px, 54px, 36px);
 }
 
-#context-navigation > #context-forward > .menu-iconic-left {
+#context-forward > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward"); */
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
-#context-navigation > #context-forward:not([disabled="true"]):hover > .menu-iconic-left {
+#context-forward:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward-active"); */
   -moz-image-region: rect(18px, 72px, 36px, 54px);
 }
 
-#context-navigation > #context-forward[disabled="true"] > .menu-iconic-left {
+#context-forward[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward-disabled"); */
   -moz-image-region: rect(36px, 72px, 54px, 54px);
 }
 
-#context-navigation > #context-reload > .menu-iconic-left {
-  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+#context-reload > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload"); */
+  list-style-image: url("chrome://browser/skin/reload-stop-goFx.png");
   -moz-image-region: rect(0, 14px, 14px, 0);
 }
 
-#context-navigation > #context-reload:not([disabled="true"]):hover > .menu-iconic-left {
+#context-reload:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload-active"); */
   -moz-image-region: rect(14px, 14px, 28px, 0);
 }
 
-#context-navigation > #context-reload[disabled="true"] > .menu-iconic-left {
+#context-reload[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload-disabled"); */
   -moz-image-region: rect(28px, 14px, 42px, 0);
 }
 
-#context-navigation > #context-stop > .menu-iconic-left {
-  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+#context-stop > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop"); */
+  list-style-image: url("chrome://browser/skin/reload-stop-goFx.png");
   -moz-image-region: rect(0, 28px, 14px, 14px);
 }
 
-#context-navigation > #context-stop:not([disabled="true"]):hover > .menu-iconic-left {
+#context-stop:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop-active"); */
   -moz-image-region: rect(14px, 28px, 28px, 14px);
 }
 
-#context-navigation > #context-stop[disabled="true"] > .menu-iconic-left {
+#context-stop[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop-disabled"); */
   -moz-image-region: rect(28px, 28px, 42px, 14px);
 }
 
-#context-navigation > #context-bookmarkpage > .menu-iconic-left {
+#context-bookmarkpage > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark"); */
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
   -moz-image-region: rect(0, 144px, 18px, 126px);
 }
 
-#context-navigation > #context-bookmarkpage:not([disabled="true"]):hover > .menu-iconic-left {
+#context-bookmarkpage:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark-active"); */
   -moz-image-region: rect(18px, 144px, 36px, 126px);
 }
 
-#context-navigation > #context-bookmarkpage[disabled="true"] > .menu-iconic-left {
+#context-bookmarkpage[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark-disabled"); */
   -moz-image-region: rect(36px, 144px, 54px, 126px);
 }
 
@@ -5029,8 +5838,8 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
 }
 
 #context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
-  width: 18px;
-  height: 18px;
+  width: 18px; /*16px;*/
+  height: 18px; /*16px;*/
   margin: 7px;
 }
 
@@ -5041,6 +5850,14 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
   margin: 9px;
 }
 
+#context-media-eme-learnmore {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
+}
+
+#context-media-eme-learnmore {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
+}
+
 /* === END contextmenu.inc.css === */
 
 #context-navigation {