X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=8c3d6969bddcf8a7e713bfa1550374d90fd1185e;hp=ba7c7eab712daae42363f737c0c5764726c9834c;hb=d0a8de80597f65fb17a8508078deae45f0ae80d4;hpb=f91d15f91d7b10bc5547886bf9915247909add95

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index ba7c7eab..8c3d6969 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -39,6 +39,11 @@ menubar {
 :root {
   /*--backbutton-urlbar-overlap: 5px;*/
 
+  /* icon width + border + horizontal padding (includes the overlap from backbutton-urlbar-overlap) */
+  --forwardbutton-width: 27px;
+  /* icon width + border + horizontal padding (without the overlap from backbutton-urlbar-overlap) /
+  --forwardbutton-width: 25px;*/
+
   --identity-box-verified-background-color: #000000;
 
   --panel-separator-color: #A09090;
@@ -84,13 +89,6 @@ menubar {
 /*  margin-top: var(--space-above-tabbar);*/
 }
 
-@media (-moz-mac-graphite-theme: 0) and (-moz-mac-lion-theme: 0) {
-  /* This is a hackish workaround to exclude most of Mac OS until bug 1060941 gets fixed. */
-  #toolbar-menubar:not([autohide="true"]) {
-    -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
-  }
-}
-
 @media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
   /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
   #main-window[tabsintitlebar]:not([inFullscreen="true"]) #TabsToolbar {
@@ -512,15 +510,10 @@ 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, #loop-button,
-          #pocket-button),
+          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button),
 #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
 }
-toolbar[brighttext] #pocket-button,
-#pocket-button {
-  list-style-image: url("chrome://browser/skin/ToolbarFx.png") !important; /* override pocket.css */
-}
 
 #back-button {
   -moz-image-region: rect(0, 36px, 18px, 18px);
@@ -651,25 +644,12 @@ toolbar[brighttext] #pocket-button,
 }
 
 #sync-button[cui-areatype="toolbar"] {
-  -moz-image-region: rect(0, 270px, 18px, 252px);
+  -moz-image-region: rect(0, 792px, 18px, 774px);
 }
 
 #sync-button[cui-areatype="toolbar"]:hover {
-  -moz-image-region: rect(18px, 270px, 36px, 252px);
-}
-
-#sync-button[cui-areatype="toolbar"][status="active"],
-#sync-button[cui-areatype="toolbar"][status="active"]:hover:active:not([disabled="true"]) {
-  list-style-image: url("chrome://browser/skin/syncProgress-toolbar.png");
-  -moz-image-region: rect(0, 18px, 18px, 0px);
-}
-
-/*
-#sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext,
-#sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext:hover:active:not([disabled="true"]) {
-  list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png");
+  -moz-image-region: rect(18px, 792px, 36px, 774px);
 }
-*/
 
 #feed-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 288px, 18px, 270px);
@@ -910,44 +890,6 @@ toolbar[brighttext] #pocket-button,
   transform: scaleX(-1);
 }
 
-#loop-button,
-#loop-button > .toolbarbutton-badge-stack {
-  list-style-image: url("chrome://browser/skin/loop/toolbarfx.png");
-  -moz-image-region: rect(0, 18px, 18px, 0);
-}
-
-#loop-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]),
-#loop-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-stack {
-  -moz-image-region: rect(0, 90px, 18px, 72px);
-}
-
-#loop-button[state="disabled"],
-#loop-button[disabled="true"],
-#loop-button[state="disabled"] > .toolbarbutton-badge-stack,
-#loop-button[disabled="true"] > .toolbarbutton-badge-stack {
-  -moz-image-region: rect(0, 36px, 18px, 18px);
-}
-
-#loop-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]),
-#loop-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-stack {
-  -moz-image-region: rect(0, 126px, 18px, 108px);
-}
-
-#loop-button:not([disabled="true"])[state="error"],
-#loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-stack {
-  -moz-image-region: rect(0, 54px, 18px, 36px);
-}
-
-#loop-button:not([disabled="true"])[state="action"],
-#loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-stack {
-  -moz-image-region: rect(0, 72px, 18px, 54px);
-}
-
-#loop-button:not([disabled="true"])[state="active"],
-#loop-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-stack {
-  -moz-image-region: rect(0, 108px, 18px, 90px);
-}
-
 #webide-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 738px, 18px, 720px);
 }
@@ -956,15 +898,6 @@ toolbar[brighttext] #pocket-button,
   -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 === */
@@ -984,16 +917,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, #loop-button,
-          #pocket-button)[cui-areatype="menu-panel"],
+          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-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,
           #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, #loop-button,
-                                                #pocket-button) {
+          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button) {
   list-style-image: var(--menupanel-list-style-image);
 }
 
@@ -1077,17 +1008,12 @@ toolbarpaletteitem[place="palette"] > #save-page-button:hover {
 
 #sync-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #sync-button {
-  -moz-image-region: rect(0px, 384px, 32px, 352px);
+  -moz-image-region: rect(0px, 1024px, 32px, 992px);
 }
 
 #sync-button[cui-areatype="menu-panel"]:hover,
 toolbarpaletteitem[place="palette"] > #sync-button:hover {
-  -moz-image-region: rect(32px, 384px, 64px, 352px);
-}
-
-#sync-button[cui-areatype="menu-panel"][status="active"] {
-  list-style-image: url("chrome://browser/skin/syncProgress-menuPanel.png");
-  -moz-image-region: rect(0px, 32px, 32px, 0px);
+  -moz-image-region: rect(32px, 1024px, 64px, 992px);
 }
 
 #feed-button[cui-areatype="menu-panel"],
@@ -1290,55 +1216,10 @@ toolbarpaletteitem[place="palette"] > #webide-button:hover {
   -moz-image-region: rect(32px, 960px, 64px, 928px);
 }
 
-#pocket-button[cui-areatype="menu-panel"],
-toolbarpaletteitem[place="palette"] > #pocket-button {
-  -moz-image-region: rect(0px, 992px, 32px, 960px);
-}
-
-#pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-  -moz-image-region: rect(32px, 992px, 64px, 960px);
-}
-
 toolbaritem[sdkstylewidget="true"] > toolbarbutton {
   -moz-image-region: rect(0, 832px, 32px, 800px);
 }
 
-#loop-button[cui-areatype="menu-panel"],
-toolbarpaletteitem[place="palette"] > #loop-button {
-  list-style-image: url("chrome://browser/skin/loop/menuPanel.png");
-  -moz-image-region: rect(0, 32px, 32px, 0);
-}
-
-/* Make sure that the state icons are not shown in the customization palette. */
-toolbarpaletteitem[place="palette"] > #loop-button {
-  -moz-image-region: rect(0, 32px, 32px, 0) !important;
-}
-
-#loop-button[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) {
-  -moz-image-region: rect(0, 160px, 32px, 128px);
-}
-
-#loop-button[cui-areatype="menu-panel"][state="disabled"],
-#loop-button[cui-areatype="menu-panel"][disabled="true"] {
-  -moz-image-region: rect(0, 64px, 32px, 32px);
-}
-
-#loop-button[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]) {
-  -moz-image-region: rect(0, 224px, 32px, 192px);
-}
-
-#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] {
-  -moz-image-region: rect(0, 96px, 32px, 64px);
-}
-
-#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] {
-  -moz-image-region: rect(0, 128px, 32px, 96px);
-}
-
-#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] {
-  -moz-image-region: rect(0, 192px, 32px, 160px);
-}
-
 /* Wide panel control icons */
 
 #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
@@ -1647,6 +1528,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button:not([ope
   margin-top: 3px;
   margin-bottom: 3px;
   border-radius: 0 10000px 10000px 0;
+/*  max-width: calc(var(--forwardbutton-width) + var(--backbutton-urlbar-overlap)) !important; */
 }
 
 #forward-button:-moz-locale-dir(rtl) {
@@ -1658,7 +1540,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not([switchingtabs]) > #fo
 }
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] {
-  margin-left: -27px !important;
+  margin-left: calc(0px - var(--forwardbutton-width)/* - var(--backbutton-urlbar-overlap)*/);
 }
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs]) > #forward-button[disabled] {
@@ -1668,7 +1550,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs])
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] {
   /* when not hovered anymore, trigger a new transition to hide the forward button immediately */
-  margin-left: -27.01px !important;
+  margin-left: calc(-0.01px - var(--forwardbutton-width)/* - var(--backbutton-urlbar-overlap)*/);
 }
 
 #back-button {
@@ -1854,11 +1736,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
   color: #FFBFFF;
 }
 
-/* overlap the urlbar's border */
-#PopupAutoCompleteRichResult {
-  margin-top: -1px;
-}
-
 #urlbar:-moz-lwtheme,
 .searchbar-textbox:-moz-lwtheme {
   /* background-color: rgba(255,255,255,.8);
@@ -2038,7 +1915,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 /* identity box */
 
 #identity-box.verifiedIdentity:not(:-moz-lwtheme):not(:hover):not([open=true]) {
-  var(--identity-box-verified-background-color);
+  background-color: var(--identity-box-verified-background-color);
 }
 
 #identity-box:-moz-focusring {
@@ -2065,7 +1942,11 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   transition: opacity 0.15s ease;
 }
 
-#navigator-toolbox:not(:hover) .urlbar-history-dropmarker {
+#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker {
+  transition: none;
+}
+
+#navigator-toolbox:not(:hover) #urlbar:not([focused]) > .urlbar-textbox-container > .urlbar-history-dropmarker {
   opacity: 0;
 }
 
@@ -2081,11 +1962,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 --urlbar-separator-color);
+  border-inline-end: 1px solid var(--urlbar-separator-color);
   font-size: .9em;
   border-radius: 2px;
   padding: 3px 5px;
@@ -2111,21 +1994,34 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   -moz-border-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);
   -moz-border-end: 1px solid var(--identity-box-verified-color);
 }
 
+#identity-icon-labels:-moz-locale-dir(ltr) {
+  padding-left: 2px;
+}
+
+#identity-icon-labels:-moz-locale-dir(rtl) {
+  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; */
-  -moz-padding-start: 2px;
-  -moz-padding-end: 2px;
-  -moz-margin-end: 1px;
+/*   border-radius: 0;
+  padding-inline-start: 2px; */
+  padding-inline-end: 2px;
+  margin-inline-end: 1px;
 }
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar >
@@ -2240,6 +2136,11 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
   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 {
@@ -2290,6 +2191,85 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   max-width: 36px;
 }
 
+/*
+.autocomplete-richlistbox {
+  padding: 4px;
+}
+
+.autocomplete-richlistitem {
+  height: 30px;
+  min-height: 30px;
+  font: message-box;
+  border-radius: 2px;
+  border: 1px solid transparent;
+}
+
+.autocomplete-richlistitem[selected=true] {
+  background-color: hsl(210, 80%, 52%);
+}
+*/
+.ac-title {
+  font-size: 14px;
+/*  color: hsl(0, 0%, 0%);*/
+}
+
+.ac-tags {
+  font-size: 12px;
+}
+/*
+html|span.ac-tag {
+  background-color: hsl(216, 0%, 88%);
+  color: hsl(0, 0%, 0%);
+  border-radius: 2px;
+  border: 1px solid transparent;
+  padding: 0 1px;
+}
+*/
+
+.ac-separator,
+.ac-url,
+.ac-action {
+  font-size: 12px;
+}
+
+.ac-separator {
+/*  color: hsl(0, 0%, 50%);*/
+}
+
+.ac-url {
+  color: #9C9CFF;
+}
+
+.ac-action {
+  color: #9C9CFF;
+}
+
+.ac-title[selected=true],
+.ac-separator[selected],
+.ac-url[selected=true],
+.ac-action[selected=true] {
+  color: #000000;
+}
+
+.ac-tags-text[selected] > html|span.ac-tag {
+  background-color: #A09090;
+  color: #000000;
+}
+
+html|span.ac-emphasize-text-title,
+html|span.ac-emphasize-text-tag,
+html|span.ac-emphasize-text-url {
+  font-weight: 600;
+}
+
+.ac-type-icon[type=bookmark] {
+  list-style-image: url("chrome://browser/skin/urlbar-star.svg#star");
+}
+
+.ac-type-icon[type=bookmark][selected][current] {
+/*  list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted");*/
+}
+
 .ac-result-type-bookmark,
 .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
   list-style-image: url("chrome://browser/skin/places/bookmark.png");
@@ -2303,19 +2283,17 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-
 /*  -moz-image-region: rect(0px 48px 16px 32px);*/
 }
 
-.ac-result-type-keyword,
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage),
-richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-site-icon {
+.ac-type-icon[type=keyword],
+.ac-site-icon[type=searchengine],
+.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
   list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon");
-  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-type-icon[type=keyword][selected],
+.ac-site-icon[type=searchengine][selected],
+.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) {
+  list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted");
+}
 
 .ac-result-type-tag,
 .autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
@@ -2324,50 +2302,14 @@ richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-si
   height: 16px;
 }
 
-.ac-comment,
-#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description,
-#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button {
-  font-size: 1.05em;
-}
-
-.ac-extra > .ac-comment,
-.ac-url-text,
-.ac-action-text {
-  font-size: 1em;
-}
-
-.ac-url-text,
-.ac-action-text {
-  color: #9C9CFF;
+.ac-type-icon[type=switchtab],
+.ac-type-icon[type=remotetab] {
+  list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab");
 }
 
-richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon {
-  list-style-image: url("chrome://browser/skin/actionicon-tab.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-  padding: 0 3px;
-  width: 22px;
-  height: 16px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon {
-    list-style-image: url("chrome://browser/skin/actionicon-tab@2x.png");
-    -moz-image-region: rect(0, 32px, 32px, 0);
-  }
-}
-
-richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-box > .ac-action-icon {
-  -moz-image-region: rect(16px, 16px, 32px, 0);
-}
-
-.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
-  color: #8050B0;
-}
-
-.ac-comment[selected="true"],
-.ac-url-text[selected="true"],
-.ac-action-text[selected="true"] {
-  color: inherit !important;
+.ac-type-icon[type=switchtab][selected],
+.ac-type-icon[type=remotetab][selected] {
+  list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab-inverted");
 }
 
 .autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment),
@@ -2794,13 +2736,17 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 }
 
 .tabs-newtab-button,
-#TabsToolbar > #new-tab-button {
+#TabsToolbar > #new-tab-button,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button[cui-areatype="toolbar"] {
   border-radius: 8px 8px 0px 0px;
   -moz-margin-start: 0;
 }
 
 .tabs-newtab-button:not(:hover),
-#TabsToolbar > #new-tab-button:not(:hover) {
+#TabsToolbar > #new-tab-button:not(:hover),
+#TabsToolbar > toolbarpaletteitem > #new-tab-button,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button[cui-areatype="toolbar"] {
   background-color: #C09070;
 }
 
@@ -2841,6 +2787,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   height: 16px;
   margin-top: -8px;
   -moz-margin-start: -15px;
+  margin-inline-end: -1px;
   position: relative;
 }
 
@@ -2884,6 +2831,16 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.png");
 }
 
+@media (min-resolution: 1.1dppx) {
+  .tab-throbber[busy] {
+    list-style-image: url("chrome://communicator/skin/brand/throbber-anim-connect.png");
+  }
+
+  .tab-throbber[progress] {
+    list-style-image: url("chrome://communicator/skin/brand/throbber-anim.png");
+  }
+}
+
 .tab-throbber[pinned],
 .tab-icon-image[pinned] {
   -moz-margin-start: 2px;
@@ -3223,15 +3180,14 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 #TabsToolbar > #new-tab-button,
 #TabsToolbar > toolbarpaletteitem > #new-tab-button,
 #TabsToolbar > toolbarpaletteitem > #new-tab-button[cui-areatype="toolbar"] {
-  list-style-image: url("chrome://browser/skin/tabbrowser/newtabFx.png");
-  -moz-image-region: rect(0, 16px, 18px, 0);
+  list-style-image: url("chrome://browser/skin/tabbrowser/newtab.svg");
+  -moz-image-region: auto;
 }
 
 .tabs-newtab-button,
 .tabs-newtab-button:hover,
 #TabsToolbar > #new-tab-button,
 #TabsToolbar > #new-tab-button:hover {
-  -moz-image-region: rect(0, 32px, 18px, 16px);
 }
 
 #main-window[tabsintitlebar]:not([inFullscreen]) .tabs-newtab-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
@@ -3279,7 +3235,13 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 }
 
 .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
-  list-style-image: url("chrome://global/skin/icons/loading.gif");
+  list-style-image: url("chrome://global/skin/icons/loading.png");
+}
+
+@media (min-resolution: 1.1dppx) {
+  .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
+    list-style-image: url("chrome://global/skin/icons/loading@2x.png");
+  }
 }
 
 .alltabs-item[tabIsVisible]:not([_moz-menuactive="true"]) {
@@ -3321,10 +3283,17 @@ toolbarbutton.chevron > .toolbarbutton-icon {
 }
 
 #sidebar-throbber[loading="true"] {
-  list-style-image: url("chrome://global/skin/icons/loading.gif");
+  list-style-image: url("chrome://global/skin/icons/loading.png");
   -moz-margin-end: 4px;
 }
 
+@media (min-resolution: 1.1dppx) {
+  #sidebar-throbber[loading="true"] {
+    list-style-image: url("chrome://global/skin/icons/loading@2x.png");
+    width: 16px;
+  }
+}
+
 /* Bookmarks toolbar */
 #PlacesToolbarDropIndicator {
   list-style-image: url("chrome://communicator/skin/bookmarks/toolbarDropMarker.png");
@@ -3410,11 +3379,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png");
 }
 
-.popup-notification-icon[popupid="webapps-install-progress"],
-.popup-notification-icon[popupid="webapps-install"] {
-  list-style-image: url("chrome://global/skin/icons/webapps-64.png");
-}
-
 .popup-notification-icon[popupid="webRTC-sharingDevices"],
 .popup-notification-icon[popupid="webRTC-shareDevices"] {
   list-style-image: url("chrome://browser/skin/webRTC-shareDevice-64.png");
@@ -3481,11 +3445,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   outline: 1px dotted #008484;
 }
 
-.identity-notification-icon,
-#identity-notification-icon {
-  list-style-image: url("chrome://mozapps/skin/profile/profileicon.png");
-}
-
 .geo-notification-icon,
 #geo-notification-icon {
   list-style-image: url("chrome://browser/skin/Geolocation-16.png");
@@ -3518,10 +3477,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   transform: scaleX(-1);
 }
 
-#webapps-notification-icon {
-  list-style-image: url("chrome://gobal/skin/icons/webapps-16.png");
-}
-
 #plugins-notification-icon {
   list-style-image: url("chrome://browser/skin/notification-pluginNormal.png");
 }
@@ -3809,23 +3764,9 @@ notification[value="translation"] {
   -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,
-#BMB_subscribeToPageMenuitem:not([disabled]),
-#BMB_subscribeToPageMenupopup {
+#subscribeToPageMenupopup {
   list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
 }
 
@@ -3842,12 +3783,6 @@ notification[value="loop-sharing-notification"] .messageImage {
   -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 {
@@ -4008,7 +3943,7 @@ html|*#fullscreen-domain {
 
 html|*#fullscreen-exit-button {
   padding: 5px 30px;
-  font: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+  font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
   font-size: 14px;
   font-weight: lighter;
   margin: 0;
@@ -4085,7 +4020,7 @@ html|*#fullscreen-exit-button {
 }
 
 #developer-toolbar-toolbox-button {
-  list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png");
+  list-style-image: url("chrome://devtools/skin/toggle-tools.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
@@ -4101,7 +4036,7 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 2dppx) {
   #developer-toolbar-toolbox-button {
-    list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png");
+    list-style-image: url("chrome://devtools/skin/toggle-tools@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px);
   }
 
@@ -4113,7 +4048,7 @@ html|*#fullscreen-exit-button {
 }
 
 #developer-toolbar-closebutton {
-  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  list-style-image: url("chrome://devtools/skin/close.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
   min-width: 16px;
   width: 16px;
@@ -4133,7 +4068,7 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 2dppx) {
   #developer-toolbar-closebutton {
-    list-style-image: url("chrome://browser/skin/devtools/close@2x.png");
+    list-style-image: url("chrome://devtools/skin/close@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px);
   }
 
@@ -4186,7 +4121,7 @@ html|*#gcli-output-frame {
   width: 16px;
   height: 16px;
   margin: 0 2px;
-  background-image: url("chrome://browser/skin/devtools/commandline-icon.png");
+  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
   background-position: 0 center;
   background-size: 32px 16px;
 }
@@ -4197,7 +4132,7 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 2dppx) {
   .gclitoolbar-input-node::before {
-    background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png");
+    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png");
   }
 }
 
@@ -4349,7 +4284,7 @@ html|*#gcli-output-frame {
 .devtools-responsiveui-menulist > .menulist-dropmarker {
 /*  display: -moz-box;
   background-color: transparent;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/dropmarker.svg");
   -moz-box-align: center;
   border-width: 0;
   min-width: 16px;*/
@@ -4373,7 +4308,7 @@ html|*#gcli-output-frame {
 
 .devtools-responsiveui-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
-/*  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
+/*  list-style-image: url("chrome://devtools/skin/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px;*/
 }
@@ -4384,7 +4319,7 @@ html|*#gcli-output-frame {
 }
 
 .devtools-responsiveui-close {
-  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  list-style-image: url("chrome://devtools/skin/close.png");
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
@@ -4393,7 +4328,7 @@ html|*#gcli-output-frame {
 }
 
 .devtools-responsiveui-rotate {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png");
+  list-style-image: url("chrome://devtools/skin/responsiveui-rotate.png");
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
@@ -4403,7 +4338,7 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 2dppx) {
   .devtools-responsiveui-close {
-    list-style-image: url("chrome://browser/skin/devtools/close@2x.png");
+    list-style-image: url("chrome://devtools/skin/close@2x.png");
   }
 
   .devtools-responsiveui-close:hover {
@@ -4411,7 +4346,7 @@ html|*#gcli-output-frame {
   }
 
   .devtools-responsiveui-rotate {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate@2x.png");
+    list-style-image: url("chrome://devtools/skin/responsiveui-rotate@2x.png");
   }
 
   .devtools-responsiveui-rotate:hover {
@@ -4420,7 +4355,7 @@ html|*#gcli-output-frame {
 }
 
 .devtools-responsiveui-touch {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png");
+  list-style-image: url("chrome://devtools/skin/responsiveui-touch.png");
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
@@ -4432,7 +4367,7 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 2dppx) {
   .devtools-responsiveui-touch {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png");
+    list-style-image: url("chrome://devtools/skin/responsiveui-touch@2x.png");
     -moz-image-region: rect(0px,32px,32px,0px);
   }
 
@@ -4444,7 +4379,7 @@ html|*#gcli-output-frame {
 }
 
 .devtools-responsiveui-screenshot {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png");
+  list-style-image: url("chrome://devtools/skin/responsiveui-screenshot.png");
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
@@ -4454,7 +4389,7 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 2dppx) {
   .devtools-responsiveui-screenshot {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png");
+    list-style-image: url("chrome://devtools/skin/responsiveui-screenshot@2x.png");
   }
 
   .devtools-responsiveui-screenshot:hover {
@@ -4468,7 +4403,7 @@ html|*#gcli-output-frame {
   cursor: ew-resize;
   transform: translate(12px, -12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png");
+  background-image: url("chrome://devtools/skin/responsive-vertical-resizer.png");
 }
 
 .devtools-responsiveui-resizebarH {
@@ -4477,7 +4412,7 @@ html|*#gcli-output-frame {
   cursor: ns-resize;
   transform: translate(-12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer.png");
+  background-image: url("chrome://devtools/skin/responsive-horizontal-resizer.png");
 }
 
 .devtools-responsiveui-resizehandle {
@@ -4486,7 +4421,7 @@ html|*#gcli-output-frame {
   cursor: se-resize;
   transform: translate(12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png");
+  background-image: url("chrome://devtools/skin/responsive-se-resizer.png");
 }
 
 /* FxOS custom mode with additional buttons and phone look'n feel */
@@ -4534,7 +4469,7 @@ html|*#gcli-output-frame {
   -moz-user-focus: ignore;
   width: 40px;
   height: 30px;
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png");
+  list-style-image: url("chrome://devtools/skin/responsiveui-home.png");
 }
 
 .devtools-responsiveui-sleep-button {
@@ -4593,15 +4528,15 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 2dppx) {
   .devtools-responsiveui-resizebarV {
-    background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png");
+    background-image: url("chrome://devtools/skin/responsive-vertical-resizer@2x.png");
   }
 
   .devtools-responsiveui-resizebarH {
-    background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer@2x.png");
+    background-image: url("chrome://devtools/skin/responsive-horizontal-resizer@2x.png");
   }
 
   .devtools-responsiveui-resizehandle {
-    background-image: url("chrome://browser/skin/devtools/responsive-se-resizer@2x.png");
+    background-image: url("chrome://devtools/skin/responsive-se-resizer@2x.png");
   }
 }
 
@@ -4736,7 +4671,7 @@ html|*#gcli-output-frame {
 }
 
 #social-sidebar-button[loading="true"] {
-  list-style-image: url("chrome://global/skin/icons/loading.gif");
+  list-style-image: url("chrome://global/skin/icons/loading.png");
 }
 
 #social-sidebar-favico {
@@ -4810,42 +4745,12 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   transform: none;
 }
 
-chatbox[src^="about:loopconversation#"] .chat-minimize-button {
-  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-white");
-}
-
-chatbox[src^="about:loopconversation#"] .chat-swap-button {
-  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-white");
-}
-
-.chat-loop-hangup {
-  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white");
-  background-color: #FF0000;
-  border: 1px solid #FFC000;
-  border-top-right-radius: 4px;
-  width: 32px;
-  height: 26px;
-  margin-top: -6px;
-  margin-bottom: -5px;
-  -moz-margin-start: 6px;
-  -moz-margin-end: -5px;
-}
-
-.chat-toolbarbutton.chat-loop-hangup:-moz-any(:hover,:hover:active) {
-  background-color: #FFCF00;
-  border-color: #FF0000;
-}
-
 .chat-title {
   color: #000000;
   text-shadow: none;
   cursor: inherit;
 }
 
-chatbox[src^="about:loopconversation#"] .chat-title {
-/*  color: white;*/
-}
-
 .chat-titlebar {
   background-color: #9C9CFF;
   color: #000000;
@@ -4866,11 +4771,6 @@ chatbox[src^="about:loopconversation#"] .chat-title {
   background-color: #008484;
 }
 
-chatbox[src^="about:loopconversation#"] > .chat-titlebar {
-  background-color: #008484;
-  border-color: #008484;
-}
-
 .chat-titlebar > .notification-anchor-icon {
   margin-left: 2px;
   margin-right: 2px;
@@ -5440,6 +5340,14 @@ toolbarpaletteitem[place="toolbar"] {
   margin-bottom: 25px;
 }
 
+toolbarpaletteitem[place="palette"]:-moz-focusring,
+toolbarpaletteitem[place="panel"]:-moz-focusring,
+toolbarpaletteitem[place="toolbar"]:-moz-focusring {
+  outline: 1px dotted #A09090;
+  outline-offset: -5px;
+  -moz-outline-radius: 2.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,
@@ -5783,21 +5691,16 @@ toolbarpaletteitem[place="toolbar"] {
 
 #UITourTooltipBody {
   -moz-margin-end: 14px;
-}
-
-#UITourTooltipBody > vbox {
-  padding-top: 4px;
-}
-
-#UITourTooltipIconContainer {
-  -moz-margin-start: -16px;
+  -moz-margin-start: 14px;
+  margin-top: -16px;
+  margin-bottom: 8px;
 }
 
 #UITourTooltipIcon {
   width: 48px;
   height: 48px;
-  -moz-margin-start: 28px;
-  -moz-margin-end: 28px;
+  -moz-margin-start: 14px;
+  -moz-margin-end: 14px;
 }
 
 #UITourTooltipTitle,
@@ -5809,8 +5712,10 @@ toolbarpaletteitem[place="toolbar"] {
   font-size: 1.45rem;
   font-weight: bold;
   -moz-margin-start: 0;
-  -moz-margin-end: 0;
-  margin: 0 0 9px 0;
+  /* Avoid the title overlapping the close button */
+  -moz-margin-end: 14px;
+  margin-top: 0;
+  margin-bottom: 9px;
 }
 
 #UITourTooltipDescription {
@@ -5822,6 +5727,7 @@ toolbarpaletteitem[place="toolbar"] {
 }
 
 #UITourTooltipClose {
+  position: relative;
   -moz-appearance: none;
   border: none;
   background-color: transparent;
@@ -5838,7 +5744,7 @@ toolbarpaletteitem[place="toolbar"] {
   -moz-box-pack: end;
   background-color: rgba(0,0,0,.2);
   border-top: 1px solid rgba(0,0,0,.4);
-  margin: 24px -16px -16px;
+  margin: 10px -16px -16px;
   padding: 2em 15px;
 }