update to 49.0rc4

107 files changed, 1966 insertions, 2064 deletions

diff --git a/arc-firefox-theme/chrome/browser/Toolbar-inverted.png b/arc-firefox-theme/chrome/browser/Toolbar-inverted.png
index 99d7481..50a3d34 100644
--- a/arc-firefox-theme/chrome/browser/Toolbar-inverted.png
+++ b/arc-firefox-theme/chrome/browser/Toolbar-inverted.png
diff --git a/arc-firefox-theme/chrome/browser/Toolbar.png b/arc-firefox-theme/chrome/browser/Toolbar.png
index b8151d1..cdd100a 100644
--- a/arc-firefox-theme/chrome/browser/Toolbar.png
+++ b/arc-firefox-theme/chrome/browser/Toolbar.png
diff --git a/arc-firefox-theme/chrome/browser/aboutNetError.css b/arc-firefox-theme/chrome/browser/aboutNetError.css
index 627c69e..7c3a6d0 100644
--- a/arc-firefox-theme/chrome/browser/aboutNetError.css
+++ b/arc-firefox-theme/chrome/browser/aboutNetError.css
@@ -31,6 +31,10 @@ button:disabled {
   cursor: pointer;
 }
 
+#prefChangeContainer {
+  display: none;
+}
+
 #learnMoreContainer {
   display: none;
 }
diff --git a/arc-firefox-theme/chrome/browser/aboutProviderDirectory.css b/arc-firefox-theme/chrome/browser/aboutProviderDirectory.css
index 737f484..e3adfbd 100644
--- a/arc-firefox-theme/chrome/browser/aboutProviderDirectory.css
+++ b/arc-firefox-theme/chrome/browser/aboutProviderDirectory.css
@@ -7,7 +7,7 @@
 #errorTitle {
   background: url("chrome://global/skin/icons/info.svg") left 0 no-repeat;
   background-size: 2em;
-  -moz-padding-start: 3em;
+  padding-inline-start: 3em;
 }
 
 #button-box {
@@ -30,7 +30,7 @@ button {
   }
   #errorTitle {
     background: none;
-    -moz-padding-start: 0 !important;
+    padding-inline-start: 0 !important;
   }
   button {
     width: auto !important;
@@ -47,7 +47,7 @@ body {
 #message-box {
   margin-top: 2em;
   background: url('chrome://global/skin/icons/information-24.png') no-repeat left 4px;
-  -moz-padding-start: 30px;
+  padding-inline-start: 30px;
 }
 
 #activation-frame {
diff --git a/arc-firefox-theme/chrome/browser/aboutSocialError.css b/arc-firefox-theme/chrome/browser/aboutSocialError.css
index fffc18d..f5a922f 100644
--- a/arc-firefox-theme/chrome/browser/aboutSocialError.css
+++ b/arc-firefox-theme/chrome/browser/aboutSocialError.css
@@ -7,7 +7,7 @@
 #errorTitle {
   background: url("chrome://global/skin/icons/info.svg") left 0 no-repeat;
   background-size: 2em;
-  -moz-padding-start: 3em;
+  padding-inline-start: 3em;
 }
 
 #button-box {
@@ -30,7 +30,7 @@ button {
   }
   #errorTitle {
     background: none;
-    -moz-padding-start: 0 !important;
+    padding-inline-start: 0 !important;
   }
   button {
     width: auto !important;
diff --git a/arc-firefox-theme/chrome/browser/aboutSyncTabs.css b/arc-firefox-theme/chrome/browser/aboutSyncTabs.css
index 4f21a9d..4cedad6 100644
--- a/arc-firefox-theme/chrome/browser/aboutSyncTabs.css
+++ b/arc-firefox-theme/chrome/browser/aboutSyncTabs.css
@@ -22,18 +22,18 @@
   margin-top: 4px;
   width: 45em;
   height: 32px;
-  -moz-margin-start: 2em;
-  -moz-margin-end: 2em;
+  margin-inline-start: 2em;
+  margin-inline-end: 2em;
 }
 
 #tabsListHeading {
   font-size: 140%;
   font-weight: bold;
-  -moz-margin-start: 40px;
+  margin-inline-start: 40px;
 }
 
 richlistitem {
-  -moz-margin-end: 2em;
+  margin-inline-end: 2em;
 }
 
 richlistitem[selected="true"],
@@ -46,7 +46,7 @@ richlistitem[type="tab"] {
   border: #999999 1px solid !important;
   padding: 2px 5px;
   margin-bottom: 4px;
-  -moz-margin-start: 4em;
+  margin-inline-start: 4em;
   border-radius: 6px;
   background-color: menu;
   width: 44em;
@@ -64,7 +64,7 @@ richlistitem[type="tab"][selected="true"] {
 richlistitem[type="client"] {
   min-height: 2em;
   color: #000000;
-  -moz-margin-start: 2em;
+  margin-inline-start: 2em;
   margin-top: 2px;
   margin-bottom: 3px;
   width: 42em;
@@ -73,10 +73,10 @@ richlistitem[type="client"] {
   -moz-user-focus: ignore !important;
 }
 richlistitem.mobile[type="client"] {
-  list-style-image: url("chrome://browser/skin/sync-mobileIcon.png");
+  list-style-image: url("chrome://browser/skin/sync-mobileIcon.svg#icon");
 }
 richlistitem.desktop[type="client"] {
-  list-style-image: url("chrome://browser/skin/sync-desktopIcon.png");
+  list-style-image: url("chrome://browser/skin/sync-desktopIcon.svg#icon");
 }
 
 .title,
@@ -96,6 +96,6 @@ richlistitem.desktop[type="client"] {
 }
 
 .tabIcon {
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
   padding-top: 2px;
 }
diff --git a/arc-firefox-theme/chrome/browser/browser.css b/arc-firefox-theme/chrome/browser/browser.css
index 16e6109..c9adcae 100644
--- a/arc-firefox-theme/chrome/browser/browser.css
+++ b/arc-firefox-theme/chrome/browser/browser.css
@@ -218,7 +218,7 @@ menuitem.bookmark-item {
   margin-bottom: 0; }
 
 .bookmark-item > .menu-iconic-left > .menu-iconic-icon {
-  -moz-padding-start: 0px; }
+  padding-inline-start: 0px; }
 
 /* Bookmark drag and drop styles */
 .bookmark-item[dragover-into="true"] {
@@ -235,7 +235,7 @@ menuitem.bookmark-item {
 .menupopup-drop-indicator {
   list-style-image: none;
   height: 2px;
-  -moz-margin-end: -4em;
+  margin-inline-end: -4em;
   background-color: Highlight; }
 
 /* Bookmarks toolbar */
@@ -297,6 +297,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #placesContext_openContainer\:tabs,
 #menu_newNavigatorTab,
 #context-openlinkintab,
+#context-openlinkincontainertab,
 #context-openframeintab {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
   -moz-image-region: rect(0px 64px 16px 48px); }
@@ -436,6 +437,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #panelMenu_bookmarksToolbar {
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); }
 
+#menu_unsortedBookmarks,
 #BMB_unsortedBookmarks,
 #panelMenu_unsortedBookmarks {
   list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); }
@@ -476,8 +478,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
   max-width: 16px; }
 
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
 #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   max-width: 18px; }
 
@@ -495,16 +497,16 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-badge-stack,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
   padding: 2px 6px;
   border: 1px solid transparent;
   border-radius: 2px;
   transition-property: background-color, border-color;
   transition-duration: 150ms; }
 
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-badge-stack,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-badge-stack,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   padding: 3px 7px; }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon,
@@ -514,8 +516,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   max-width: 32px !important; }
 
 #nav-bar #PanelUI-menu-button {
-  -moz-padding-start: 5px;
-  -moz-padding-end: 5px; }
+  padding-inline-start: 5px;
+  padding-inline-end: 5px; }
 
 #nav-bar #PanelUI-button,
 #nav-bar[brighttext] #PanelUI-button {
@@ -592,7 +594,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   display: -moz-box;
   width: 1px;
   height: 18px;
-  -moz-margin-end: -1px;
+  margin-inline-end: -1px;
   background-position: center;
   background-repeat: no-repeat;
   background-size: 1px 18px; }
@@ -606,7 +608,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   background: rgba(82, 93, 118, 0.15); }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  -moz-margin-start: -4px; }
+  margin-inline-start: -4px; }
 
 #back-button > menupopup {
   margin-top: -1px; }
@@ -636,14 +638,14 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu") !important; }
 
 /* Menu panel buttons */
-:-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, #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),
+:-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, #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, #containers-panelmenu),
 #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   list-style-image: url("chrome://browser/skin/custom_images/light/toolbar-icons.svg"); }
-  #TabsToolbar :-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, #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), #TabsToolbar
+  #TabsToolbar :-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, #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, #containers-panelmenu), #TabsToolbar
   #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
     list-style-image: url("chrome://browser/skin/custom_images/light/tabbar-icons.svg"); }
 
-#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) {
+#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #containers-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #containers-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active) {
   list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.svg"); }
 
 #nav-bar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .dropmarker-icon,
@@ -688,6 +690,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #sync-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 792px, 18px, 774px); }
 
+#containers-panelmenu[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 810px, 18px, 792px); }
+
 #feed-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 288px, 18px, 270px); }
 
@@ -778,8 +783,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 
 @media not all and (min-resolution: 1.1dppx) {
   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, #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)[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, #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) {
+  :-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, #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, #containers-panelmenu)[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu) {
     list-style-image: var(--menupanel-list-style-image); }
 
   #home-button[cui-areatype="menu-panel"],
@@ -823,6 +828,13 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
     -moz-image-region: rect(32px, 1024px, 64px, 992px); }
 
+  #containers-panelmenu[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > #containers-panelmenu {
+    -moz-image-region: rect(0px, 1056px, 32px, 1024px); }
+
+  #containers-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+    -moz-image-region: rect(32px, 1056px, 64px, 1024px); }
+
   #feed-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #feed-button {
     -moz-image-region: rect(0px, 416px, 32px, 384px); }
@@ -938,8 +950,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 /* Menu panel and palette styles */
 @media (min-resolution: 1.1dppx) {
   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, #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)[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, #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) {
+  :-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, #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, #containers-panelmenu)[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu) {
     list-style-image: var(--menupanel-list-style-image-2x); }
 
   #home-button[cui-areatype="menu-panel"],
@@ -983,6 +995,13 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
     -moz-image-region: rect(64px, 2048px, 128px, 1984px); }
 
+  #containers-panelmenu[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > #containers-panelmenu {
+    -moz-image-region: rect(0px, 2112px, 64px, 2048px); }
+
+  #containers-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+    -moz-image-region: rect(64px, 2112px, 128px, 2048px); }
+
   #feed-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #feed-button {
     -moz-image-region: rect(0px, 832px, 64px, 768px); }
@@ -1065,6 +1084,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   toolbaritem[sdkstylewidget="true"] > toolbarbutton {
     -moz-image-region: rect(0, 1664px, 64px, 1600px); }
 
+  #add-share-provider {
+    list-style-image: url(chrome://browser/skin/menuPanel-small@2x.png);
+    -moz-image-region: rect(0px, 192px, 32px, 160px); }
+
   /* Footer and wide panel control icons */
   #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
   #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
@@ -1140,9 +1163,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
-  padding: 2px 3px;
+  padding: 0 3px;
   border-radius: 3px;
   margin: 0 3px;
+  min-height: 28px;
   color: #5c616c;
   background-color: #ffffff;
   border: 1px solid #cfd6e6; }
@@ -1167,10 +1191,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 
 .urlbar-textbox-container {
   -moz-appearance: none;
-  -moz-box-align: center; }
+  -moz-box-align: stretch; }
 
 .urlbar-input-box {
-  -moz-margin-start: 0; }
+  margin-inline-start: 0; }
 
 .urlbar-history-dropmarker {
   -moz-appearance: toolbarbutton-dropdown;
@@ -1220,21 +1244,21 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #urlbar-display-box {
   margin-top: -1px;
   margin-bottom: -1px;
-  -moz-border-end: 1px solid #AAA;
-  -moz-margin-end: 3px; }
+  border-inline-end: 1px solid #AAA;
+  margin-inline-end: 3px; }
 
 .urlbar-display {
   margin-top: 0;
   margin-bottom: 0;
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
   color: GrayText; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] {
   border-bottom: 1px solid rgba(24, 26, 27, 0.14);
   background-color: rgba(24, 26, 27, 0.07);
   padding: 6px 0;
-  -moz-padding-start: 44px;
-  -moz-padding-end: 6px;
+  padding-inline-start: 44px;
+  padding-inline-end: 6px;
   background-image: url("chrome://browser/skin/info.svg");
   background-clip: padding-box;
   background-position: 20px center;
@@ -1249,7 +1273,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   padding: 0; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description > label.text-link {
-  -moz-margin-start: 0; }
+  margin-inline-start: 0; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button {
   -moz-appearance: none;
@@ -1257,7 +1281,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   border-radius: 3px;
   padding: 4px 16px;
   margin: 0;
-  -moz-margin-start: 10px; }
+  margin-inline-start: 10px; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"] {
   color: #616161;
@@ -1297,12 +1321,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #identity-box {
   --identity-box-verified-color: #479900;
   --identity-box-chrome-color: #e57300;
-  border-inline-end: 1px solid var(--urlbar-separator-color);
-  border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
-  border-image-slice: 1;
+  border-inline-end: 1px solid rgba(207, 214, 230, 0.5);
   font-size: .9em;
-  padding: 3px 5px 3px 3px;
-  margin-inline-end: 4px;
+  padding: 3px 9px 3px 7px;
+  margin-inline-end: 5px;
   overflow: hidden; }
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
@@ -1406,7 +1428,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .popup-notification-icon {
   width: 64px;
   height: 64px;
-  -moz-margin-end: 10px; }
+  margin-inline-end: 10px; }
 
 .popup-notification-icon[popupid="geolocation"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png); }
@@ -1463,6 +1485,9 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .popup-notification-icon[popupid="pointerLock"] {
   list-style-image: url(chrome://browser/skin/pointerLock-64.png); }
 
+.popup-notification-icon[popupid="servicesInstall"] {
+  list-style-image: url(chrome://browser/skin/social/services-64.png); }
+
 /* Notification icon box */
 #notification-popup-box {
   position: relative;
@@ -1484,53 +1509,56 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .notification-anchor-icon.chat-toolbarbutton:-moz-locale-dir(rtl) {
   transform: none; }
 
+/* This class can be used alone or in combination with the class defining the
+   type of icon displayed. This rule must be defined before the others in order
+   for its list-style-image to be overridden. */
 .notification-anchor-icon {
   list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16);
   width: 16px;
   height: 16px;
   margin: 0 2px; }
 
-.geo-notification-icon,
-#geo-notification-icon {
+@media (min-resolution: 1.1dppx) {
+  .notification-anchor-icon {
+    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); } }
+.geo-icon {
   list-style-image: url(chrome://browser/skin/Geolocation-16.png); }
 
-#addons-notification-icon {
+.install-icon {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); }
 
-#addons-notification-icon:hover {
+.install-icon:hover {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#hover); }
 
-#addons-notification-icon:hover:active {
+.install-icon:hover:active {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#active); }
 
-.indexedDB-notification-icon,
-#indexedDB-notification-icon {
+.indexedDB-icon {
   list-style-image: url(chrome://global/skin/icons/question-16.png); }
 
-#password-notification-icon {
+.login-icon {
   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);
+  /* Temporary solution until the capture and fill doorhangers are unified. */
   transform: scaleX(-1); }
 
-#plugins-notification-icon {
+.plugin-icon {
   list-style-image: url(chrome://browser/skin/notification-pluginNormal.png); }
 
-#plugins-notification-icon.plugin-hidden {
+.plugin-icon.plugin-hidden {
   list-style-image: url(chrome://browser/skin/notification-pluginAlert.png); }
 
-#plugins-notification-icon.plugin-blocked {
+.plugin-icon.plugin-blocked {
   list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png); }
 
-#plugins-notification-icon {
+.plugin-icon {
   -moz-image-region: rect(0, 16px, 16px, 0); }
 
-#plugins-notification-icon:hover {
+.plugin-icon:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px); }
 
-#plugins-notification-icon:active {
+.plugin-icon:active {
   -moz-image-region: rect(0, 48px, 16px, 32px); }
 
 #notification-popup-box[hidden] {
@@ -1547,69 +1575,57 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
     opacity: 0; }
   to {
     opacity: 1; } }
-.webRTC-shareDevices-notification-icon,
-#webRTC-shareDevices-notification-icon {
+.camera-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png); }
 
+/* The first selector is used by socialchat.xml (bug 1275558). */
 .webRTC-sharingDevices-notification-icon,
-#webRTC-sharingDevices-notification-icon {
+.camera-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16.png); }
 
-.webRTC-shareMicrophone-notification-icon,
-#webRTC-shareMicrophone-notification-icon {
+.microphone-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16.png); }
 
+/* The first selector is used by socialchat.xml (bug 1275558). */
 .webRTC-sharingMicrophone-notification-icon,
-#webRTC-sharingMicrophone-notification-icon {
+.microphone-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16.png); }
 
-.webRTC-shareScreen-notification-icon,
-#webRTC-shareScreen-notification-icon {
+.screen-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); }
 
-.webRTC-sharingScreen-notification-icon,
-#webRTC-sharingScreen-notification-icon {
+.screen-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png); }
 
-.web-notifications-notification-icon,
-#web-notifications-notification-icon {
+.web-notifications-icon {
   list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
   -moz-image-region: rect(0, 16px, 16px, 0); }
 
-.web-notifications-notification-icon:hover,
-#web-notifications-notification-icon:hover {
+.web-notifications-icon:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px); }
 
-.web-notifications-notification-icon:hover:active,
-#web-notifications-notification-icon:hover:active {
+.web-notifications-icon:hover:active {
   -moz-image-region: rect(0, 48px, 16px, 32px); }
 
-.pointerLock-notification-icon,
-#pointerLock-notification-icon {
+.pointer-icon {
   list-style-image: url(chrome://browser/skin/pointerLock-16.png); }
 
-.translate-notification-icon,
-#translate-notification-icon {
+.service-icon {
+  list-style-image: url(chrome://browser/skin/social/services-16.png); }
+
+.translation-icon {
   list-style-image: url(chrome://browser/skin/translation-16.png);
   -moz-image-region: rect(0px, 16px, 16px, 0px); }
 
-.translated-notification-icon,
-#translated-notification-icon {
-  list-style-image: url(chrome://browser/skin/translation-16.png);
+.translation-icon.in-use {
   -moz-image-region: rect(0px, 32px, 16px, 16px); }
 
-.popup-notification-icon[popupid="servicesInstall"] {
-  list-style-image: url(chrome://browser/skin/social/services-64.png); }
-
-#servicesInstall-notification-icon {
-  list-style-image: url(chrome://browser/skin/social/services-16.png); }
-
 /* EME notifications */
 .popup-notification-icon[popupid="drmContentPlaying"],
-#eme-notification-icon {
+.drm-icon {
   list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); }
 
-#eme-notification-icon:hover:active {
+.drm-icon:hover:active {
   list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed"); }
 
 #eme-notification-icon[firstplay=true] {
@@ -1626,31 +1642,22 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
     transform: translateX(0); } }
 /* HiDPI notification icons */
 @media (min-resolution: 1.1dppx) {
-  .notification-anchor-icon {
-    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); }
-
-  .webRTC-shareDevices-notification-icon,
-  #webRTC-shareDevices-notification-icon {
+  .camera-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16@2x.png); }
 
-  .webRTC-sharingDevices-notification-icon,
-  #webRTC-sharingDevices-notification-icon {
+  .camera-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16@2x.png); }
 
-  .webRTC-shareMicrophone-notification-icon,
-  #webRTC-shareMicrophone-notification-icon {
+  .microphone-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16@2x.png); }
 
-  .webRTC-sharingMicrophone-notification-icon,
-  #webRTC-sharingMicrophone-notification-icon {
+  .microphone-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16@2x.png); }
 
-  .webRTC-shareScreen-notification-icon,
-  #webRTC-shareScreen-notification-icon {
+  .screen-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16@2x.png); }
 
-  .webRTC-sharingScreen-notification-icon,
-  #webRTC-sharingScreen-notification-icon {
+  .screen-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16@2x.png); }
 
   .popup-notification-icon[popupid="webRTC-sharingDevices"],
@@ -1679,8 +1686,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .notification-anchor-icon:-moz-focusring {
   outline: 1px dotted -moz-DialogText; }
 
-.indexedDB-notification-icon,
-#indexedDB-notification-icon {
+.indexedDB-icon {
   list-style-image: url(moz-icon://stock/gtk-dialog-question?size=16); }
 
 /* Translation infobar */
@@ -1745,7 +1751,7 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   -moz-image-region: rect(0, 64px, 32px, 32px); }
 
 .translation-welcome-content {
-  -moz-margin-start: 16px; }
+  margin-inline-start: 16px; }
 
 .translation-welcome-headline {
   font-size: larger;
@@ -1769,7 +1775,7 @@ notification[value="translation"] {
 
 notification[value="translation"] button,
 notification[value="translation"] menulist {
-  -moz-padding-end: 1ch; }
+  padding-inline-end: 1ch; }
 
 notification[value="translation"] menulist {
   border: 1px solid #C1C1C1;
@@ -1782,8 +1788,8 @@ notification[value="translation"] button {
 notification[value="translation"] button,
 notification[value="translation"] menulist,
 notification[value="translation"] menulist > .menulist-label-box {
-  -moz-margin-start: 1ch;
-  -moz-margin-end: 1ch; }
+  margin-inline-start: 1ch;
+  margin-inline-end: 1ch; }
 
 notification[value="translation"] button:hover,
 notification[value="translation"] button:active,
@@ -1804,10 +1810,10 @@ notification[value="translation"] button[anonid="translate"]:active {
 notification[value="translation"] button > .button-box,
 notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker {
   padding: 0;
-  -moz-margin-start: 3ch; }
+  margin-inline-start: 3ch; }
 
 notification[value="translation"] button:not([type="menu"]) > .button-box {
-  -moz-margin-end: 3ch; }
+  margin-inline-end: 3ch; }
 
 notification[value="translation"] menulist > .menulist-dropmarker {
   display: block; }
@@ -1815,10 +1821,6 @@ notification[value="translation"] menulist > .menulist-dropmarker {
 #treecolAutoCompleteImage {
   max-width: 36px; }
 
-#PopupAutoCompleteRichResult {
-  /* The awesomebar popup should open just below the navbar bottom border. */
-  margin-top: 1px; }
-
 .autocomplete-richlistbox {
   padding: 4px; }
 
@@ -1833,10 +1835,10 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   background-color: Highlight; }
 
 .ac-title {
-  font-size: 14px; }
+  font-size: 1.05em; }
 
 .ac-tags {
-  font-size: 12px; }
+  font-size: 0.9em; }
 
 html|span.ac-tag {
   background-color: MenuText;
@@ -1848,7 +1850,7 @@ html|span.ac-tag {
 .ac-separator,
 .ac-url,
 .ac-action {
-  font-size: 12px;
+  font-size: 0.9em;
   color: -moz-nativehyperlinktext; }
 
 .ac-title[selected=true],
@@ -1917,11 +1919,9 @@ html|span.ac-emphasize-text-url {
 #urlbar-stop-button {
   -moz-appearance: none;
   list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  padding: 0 4px 0 6px;
-  margin-inline-start: 2px;
-  border-inline-start: 1px solid var(--urlbar-separator-color);
-  border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
-  border-image-slice: 1; }
+  padding: 0 7px 0 10px;
+  margin-inline-start: 5px;
+  border-inline-start: 1px solid rgba(207, 214, 230, 0.5); }
 
 #urlbar-reload-button {
   -moz-image-region: rect(0, 14px, 14px, 0); }
@@ -2221,11 +2221,11 @@ html|span.ac-emphasize-text-url {
   margin: 0 -15px; }
 
 .tab-content {
-  -moz-padding-end: 9px;
-  -moz-padding-start: 9px; }
+  padding-inline-end: 9px;
+  padding-inline-start: 9px; }
 
 .tab-content[pinned] {
-  -moz-padding-end: 3px; }
+  padding-inline-end: 3px; }
 
 .tab-throbber,
 .tab-icon-image,
@@ -2237,7 +2237,7 @@ html|span.ac-emphasize-text-url {
 .tab-icon-image {
   height: 16px;
   width: 16px;
-  -moz-margin-end: 6px; }
+  margin-inline-end: 6px; }
 
 .tab-icon-image {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); }
@@ -2246,7 +2246,7 @@ html|span.ac-emphasize-text-url {
   width: 16px;
   height: 16px;
   margin-top: -12px;
-  -moz-margin-start: -16px;
+  margin-inline-start: -16px;
   position: relative; }
 
 .tab-icon-overlay[crashed] {
@@ -2273,16 +2273,16 @@ html|span.ac-emphasize-text-url {
   list-style-image: url("chrome://browser/skin/custom_images/loading.png"); }
 
 .tab-label {
-  -moz-margin-end: 0;
-  -moz-margin-start: 0; }
+  margin-inline-end: 0;
+  margin-inline-start: 0; }
 
 .tab-close-button {
-  -moz-margin-start: 4px;
-  -moz-margin-end: -2px;
+  margin-inline-start: 4px;
+  margin-inline-end: -2px;
   padding: 0; }
 
 .tab-icon-sound {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   width: 16px;
   height: 16px;
   padding: 0; }
@@ -2305,33 +2305,39 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound[muted]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); }
 
+.tab-icon-sound:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying] {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio"); }
 
+.tab-icon-sound:hover:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying]:hover {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-hover"); }
 
+.tab-icon-sound:hover:active:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-pressed"); }
 
+.tab-icon-sound[muted]:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted] {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted"); }
 
+.tab-icon-sound[muted]:hover:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted]:hover {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted-hover"); }
 
+.tab-icon-sound[muted]:hover:active:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted-pressed"); }
 
 .tab-background,
 .tabs-newtab-button {
   /* overlap the tab curves */
-  -moz-margin-end: -14px;
-  -moz-margin-start: -14px; }
+  margin-inline-end: -14px;
+  margin-inline-start: -14px; }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
-  -moz-padding-end: 15px;
-  -moz-padding-start: 5px; }
+  padding-inline-end: 15px;
+  padding-inline-start: 5px; }
 
 /* Tab Overflow */
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]),
@@ -2350,12 +2356,12 @@ html|span.ac-emphasize-text-url {
   transform: scaleX(-1); }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]) {
-  -moz-margin-start: -2px;
-  -moz-margin-end: -12px; }
+  margin-inline-start: -2px;
+  margin-inline-end: -12px; }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) {
-  -moz-margin-start: -12px;
-  -moz-margin-end: -2px; }
+  margin-inline-start: -12px;
+  margin-inline-end: -2px; }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator[collapsed],
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator[collapsed] {
@@ -2394,7 +2400,7 @@ html|span.ac-emphasize-text-url {
 .tab-background-start[visuallyselected=true]::after,
 .tab-background-end[visuallyselected=true]::after {
   /* position ::after on top of its parent */
-  -moz-margin-start: -30px;
+  margin-inline-start: -30px;
   background-size: 100% 100%;
   content: "";
   display: -moz-box;
@@ -2464,29 +2470,6 @@ lwtHeader;*/
   background-repeat: no-repeat;
   background-size: 30px 100%, calc(100% - (2 * 30px)) 100%, 30px 100%; }
 
-/* User Context UI - change tab decoration depending on userContextId.
-   Defaults to gray for unknown usercontextids. */
-.tabbrowser-tab[usercontextid] {
-  background-image: linear-gradient(to right, transparent 20%, #909090 30%, #909090 70%, transparent 80%);
-  background-size: auto 2px;
-  background-repeat: no-repeat; }
-
-/* Personal User Context */
-.tabbrowser-tab[usercontextid="1"] {
-  background-image: linear-gradient(to right, transparent 20%, #00a7e0 30%, #00a7e0 70%, transparent 80%); }
-
-/* Work User Context */
-.tabbrowser-tab[usercontextid="2"] {
-  background-image: linear-gradient(to right, transparent 20%, #f89c24 30%, #f89c24 70%, transparent 80%); }
-
-/* Banking User Context */
-.tabbrowser-tab[usercontextid="3"] {
-  background-image: linear-gradient(to right, transparent 20%, #7dc14c 30%, #7dc14c 70%, transparent 80%); }
-
-/* Shopping User Context */
-.tabbrowser-tab[usercontextid="4"] {
-  background-image: linear-gradient(to right, transparent 20%, #ee5195 30%, #ee5195 70%, transparent 80%); }
-
 /* Tab pointer-events */
 .tabbrowser-tab {
   pointer-events: none; }
@@ -2662,7 +2645,7 @@ menuitem:hover > hbox > .alltabs-endimage[soundplaying] {
 /* Sidebar */
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading.png");
-  -moz-margin-end: 4px; }
+  margin-inline-end: 4px; }
 
 toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important; }
@@ -2709,27 +2692,6 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   padding: 0 3px;
   margin-top: 10px; }
 
-/* Sync Panel */
-.sync-panel-icon {
-  height: 32px;
-  width: 32px;
-  background: url("chrome://browser/content/abouthome/sync.png") top left no-repeat; }
-
-.sync-panel-inner {
-  width: 0;
-  padding-left: 10px; }
-
-.sync-panel-button-box {
-  margin-top: 1em; }
-
-#sync-start-panel-title {
-  font-size: 120%;
-  font-weight: bold;
-  margin-bottom: 5px; }
-
-#sync-start-panel-subtitle {
-  margin-bottom: 0; }
-
 /* Status panel */
 .statuspanel-label {
   margin: 0;
@@ -2919,7 +2881,7 @@ html|*#fullscreen-exit-button {
   -moz-appearance: none;
   color: inherit;
   border-width: 0;
-  -moz-border-end: 1px solid rgba(12, 13, 14, 0.45);
+  border-inline-end: 1px solid rgba(12, 13, 14, 0.45);
   box-shadow: -1px 0 0 rgba(184, 194, 204, 0.15) inset, 1px 0 0 rgba(184, 194, 204, 0.15); }
 
 .devtools-responsiveui-toolbarbutton[type=menu-button]:-moz-locale-dir(rtl) > .toolbarbutton-menubutton-button {
@@ -3098,23 +3060,31 @@ html|*#fullscreen-exit-button {
   --selection-background: #4c9ed9;
   /* --theme-selection-background */
   --selection-color: #f5f7fa;
-  /* --theme-selection-color */ }
+  /* --theme-selection-color */
+  --command-line-image: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme);
+  /* --theme-command-line-image */
+  --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme-focus);
+  /* --theme-command-line-image-focus */ }
 
 :root[devtoolstheme="dark"] #developer-toolbar {
-  --gcli-background-color: #343c45;
+  --gcli-background-color: #272b35;
   /* --theme-toolbar-background */
-  --gcli-input-background: rgba(37, 44, 51, 0.6);
+  --gcli-input-background: #272b35;
   /* --theme-tab-toolbar-background */
-  --gcli-input-focused-background: #252c33;
+  --gcli-input-focused-background: #272b35;
   /* --theme-tab-toolbar-background */
   --gcli-input-color: #b6babf;
   /* --theme-body-color-alt */
-  --gcli-border-color: black;
+  --gcli-border-color: #454d5d;
   /* --theme-splitter-color */
-  --selection-background: #1d4f73;
+  --selection-background: #5675b9;
   /* --theme-selection-background */
   --selection-color: #f5f7fa;
-  /* --theme-selection-color */ }
+  /* --theme-selection-color */
+  --command-line-image: url(chrome://devtools/skin/images/commandline-icon.svg#dark-theme);
+  /* --theme-command-line-image */
+  --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#dark-theme-focus);
+  /* --theme-command-line-image-focus */ }
 
 #developer-toolbar {
   -moz-appearance: none;
@@ -3222,16 +3192,11 @@ html|*#gcli-output-frame {
   width: 16px;
   height: 16px;
   margin: 0 2px;
-  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
-  background-position: 0 center;
-  background-size: 32px 16px; }
+  background-image: var(--command-line-image); }
 
 .gclitoolbar-input-node[focused="true"]::before {
-  background-position: -16px center; }
+  background-image: var(--command-line-image-focus); }
 
-@media (min-resolution: 1.1dppx) {
-  .gclitoolbar-input-node::before {
-    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png"); } }
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
   background-color: var(--selection-background);
   color: var(--selection-color);
@@ -3280,7 +3245,7 @@ html|*#gcli-output-frame {
   background-color: rgba(0, 0, 0, 0.1); }
 
 .center-item-label {
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
   margin-bottom: 0;
   text-overflow: ellipsis; }
 
@@ -3289,7 +3254,7 @@ html|*#gcli-output-frame {
   background-repeat: no-repeat;
   width: 16px;
   height: 15px;
-  -moz-margin-start: 6px; }
+  margin-inline-start: 6px; }
 
 .click-to-play-plugins-notification-button-container {
   background-color: rgba(24, 26, 27, 0.07);
@@ -3388,7 +3353,7 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:h
   background-clip: padding-box;
   border-left: 1px solid rgba(24, 26, 27, 0.3);
   box-shadow: 0 3px 5px rgba(24, 26, 27, 0.1), 0 0 7px rgba(24, 26, 27, 0.1);
-  -moz-margin-start: 38px; }
+  margin-inline-start: 38px; }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -3554,7 +3519,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   background-image: linear-gradient(#505050, #575757);
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.6) rgba(0, 0, 0, 0.4) rgba(0, 0, 0, 0.4);
-  -moz-border-start: none;
+  border-inline-start: none;
   border-radius: 0 2px 2px 0; }
 
 #downloads-button[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
@@ -3576,7 +3541,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
-  -moz-margin-end: 2px; }
+  margin-inline-end: 2px; }
 
 /* Social toolbar item */
 .social-activation-icon {
@@ -3776,10 +3741,10 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   overflow: hidden; }
 
 chatbar {
-  -moz-margin-end: 20px; }
+  margin-inline-end: 20px; }
 
 chatbox {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   background-color: transparent; }
 
 chatbar > chatbox {
@@ -3790,10 +3755,10 @@ chatbar > chatbox {
   box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
   /* Offset the chatbox the same amount as the box-shadows' spread, to make it
      visible. */
-  -moz-margin-end: 5px; }
+  margin-inline-end: 5px; }
 
 window > chatbox {
-  -moz-margin-start: 0px;
+  margin-inline-start: 0px;
   margin: 0px;
   border: none;
   padding: 0px;
@@ -3934,7 +3899,7 @@ window > chatbox {
 #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: 6px !important; }
+  margin-inline-start: 6px !important; }
 
 #customization-lwtheme-button > .box-inherit > .box-inherit > .button-icon {
   width: 20px;
@@ -4050,7 +4015,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   min-height: 48px; }
 
 #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
-  -moz-margin-end: 5px; }
+  margin-inline-end: 5px; }
 
 #customization-palette > toolbarpaletteitem > label {
   text-align: center;
@@ -4072,9 +4037,9 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   border: 1px solid transparent;
   margin: 0 -5px 5px;
   padding-top: 0;
-  -moz-padding-end: 5px;
+  padding-inline-end: 5px;
   padding-bottom: 0;
-  -moz-padding-start: 0; }
+  padding-inline-start: 0; }
 
 .customization-lwtheme-menu-theme[defaulttheme] {
   list-style-image: url(chrome://browser/skin/theme-switcher-icon.png); }
@@ -4133,7 +4098,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   background: linear-gradient(rgba(24, 26, 27, 0.08) 40%, transparent) padding-box; }
 
 .customization-lwtheme-menu-footeritem:first-child {
-  -moz-border-end: 1px solid rgba(24, 26, 27, 0.15); }
+  border-inline-end: 1px solid rgba(24, 26, 27, 0.15); }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -4195,7 +4160,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 .customization-tipPanel-closeBox > .close-icon {
   -moz-appearance: none;
   border: 0;
-  -moz-margin-end: -25px; }
+  margin-inline-end: -25px; }
 
 #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"],
 #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] {
@@ -4271,14 +4236,14 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 #UITourTooltipBody {
   -moz-box-align: start; }
 
-#UITourtooltipTitleContainer {
+#UITourTooltipTitleContainer {
   -moz-box-align: start;
   margin-bottom: 10px; }
 
 #UITourTooltipIcon {
   width: 48px;
   height: 48px;
-  -moz-margin-end: 10px; }
+  margin-inline-end: 10px; }
 
 #UITourTooltipTitle,
 #UITourTooltipDescription {
@@ -4290,8 +4255,8 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   margin: 0; }
 
 #UITourTooltipDescription {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
   font-size: 1.15rem;
   line-height: 1.8rem;
   margin-bottom: 0;
@@ -4303,7 +4268,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   border: none;
   background-color: transparent;
   min-width: 0;
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   margin-top: -2px; }
 
 #UITourTooltipClose > .toolbarbutton-text {
@@ -4322,7 +4287,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 
 #UITourTooltipButtons > label:first-child,
 #UITourTooltipButtons > button:first-child {
-  -moz-margin-start: 0; }
+  margin-inline-start: 0; }
 
 #UITourTooltipButtons > label:last-child,
 #UITourTooltipButtons > button:last-child {
@@ -4331,7 +4296,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 #UITourTooltipButtons > button[image] > .button-box > .button-icon {
   width: 16px;
   height: 16px;
-  -moz-margin-end: 5px; }
+  margin-inline-end: 5px; }
 
 #UITourTooltipButtons > label,
 #UITourTooltipButtons > button .button-text {
@@ -4407,15 +4372,15 @@ notification.heartbeat {
 .messageText.heartbeat {
   color: #333333;
   text-shadow: none;
-  -moz-margin-start: 0px;
+  margin-inline-start: 0px;
   /* The !important is required to override OSX default style. */
-  -moz-margin-end: 12px !important; }
+  margin-inline-end: 12px !important; }
 
 .messageImage.heartbeat {
   width: 24px;
   height: 24px;
-  -moz-margin-start: 8px;
-  -moz-margin-end: 8px; }
+  margin-inline-start: 8px;
+  margin-inline-end: 8px; }
 
 .messageImage.heartbeat.pulse-onshow {
   animation-name: pulse-onshow;
@@ -4432,7 +4397,7 @@ notification.heartbeat {
 /* Learn More link styles */
 .heartbeat > .text-link {
   color: #0095DD;
-  -moz-margin-start: 0px; }
+  margin-inline-start: 0px; }
 
 .heartbeat > .text-link:hover {
   color: #008ACB;
@@ -4461,8 +4426,8 @@ notification.heartbeat {
 .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;
+  /* Overrides the margin-inline-end for all platforms defined in the .plain class */
+  margin-inline-end: 4px !important;
   width: 16px;
   height: 16px; }
 
@@ -4486,7 +4451,7 @@ notification.heartbeat {
   font-size: 1.05rem; }
 
 #UITourTooltipClose {
-  -moz-margin-end: -4px;
+  margin-inline-end: -4px;
   height: 16px;
   width: 16px; }
 
@@ -4576,68 +4541,18 @@ notification.heartbeat {
 #context-navigation > .menuitem-iconic > .menu-iconic-left {
   visibility: visible;
   /* override toolkit/themes/linux/global/menu.css */
-  -moz-padding-end: 0 !important;
-  -moz-margin-end: 0 !important; }
+  padding-inline-end: 0 !important;
+  margin-inline-end: 0 !important; }
 
 .browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
   padding: 0;
   overflow: hidden; }
 
-/* User Context UI browser styles */
-#menu_newUserContextTabPersonal {
-  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
-
-#menu_newUserContextTabWork {
-  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
-
-#menu_newUserContextTabBanking {
-  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
+.webextension-popup-browser {
+  border-radius: inherit; }
 
-#menu_newUserContextTabShopping {
-  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
-
-/* URL Bar Decoration */
-#userContext-indicator {
-  height: 16px;
-  width: 16px; }
-
-#userContext-label {
-  margin-inline-end: 3px;
-  color: #909090; }
-
-#userContext-icons:not([usercontextid]) {
-  display: none; }
-
-#userContext-icons {
-  -moz-box-align: center; }
-
-/* Personal User Context */
-#userContext-icons[usercontextid="1"] > #userContext-label {
-  color: #00a7e0; }
-
-#userContext-icons[usercontextid="1"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
-
-/* Work User Context */
-#userContext-icons[usercontextid="2"] > #userContext-label {
-  color: #f89c24; }
-
-#userContext-icons[usercontextid="2"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
-
-/* Banking User Context */
-#userContext-icons[usercontextid="3"] > #userContext-label {
-  color: #7dc14c; }
-
-#userContext-icons[usercontextid="3"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
-
-/* Shopping User Context */
-#userContext-icons[usercontextid="4"] > #userContext-label {
-  color: #ee5195; }
-
-#userContext-icons[usercontextid="4"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
+.menuitem-iconic[command="Browser:NewUserContextTab"] > .menu-iconic-left > .menu-iconic-icon {
+  visibility: visible; }
 
 #nav-bar #loop-button, #nav-bar
 toolbar[brighttext] #loop-button {
diff --git a/arc-firefox-theme/chrome/browser/controlcenter/panel.css b/arc-firefox-theme/chrome/browser/controlcenter/panel.css
index 6972df3..58942fe 100644
--- a/arc-firefox-theme/chrome/browser/controlcenter/panel.css
+++ b/arc-firefox-theme/chrome/browser/controlcenter/panel.css
@@ -103,8 +103,8 @@
 #tracking-protection-content {
   padding: 0.5em 0 1em;
   /* .identity-popup-headline.host depends on this width */
-  -moz-padding-start: calc(2em + 24px);
-  -moz-padding-end: 1em;
+  padding-inline-start: calc(2em + 24px);
+  padding-inline-end: 1em;
 }
 
 #identity-popup-securityView:-moz-locale-dir(rtl),
@@ -189,12 +189,12 @@
 }
 
 .identity-popup-warning-gray {
-  -moz-padding-start: 24px;
+  padding-inline-start: 24px;
   background: url(chrome://browser/skin/controlcenter/warning-gray.svg) no-repeat 0 50%;
 }
 
 .identity-popup-warning-yellow {
-  -moz-padding-start: 24px;
+  padding-inline-start: 24px;
   background: url(chrome://browser/skin/controlcenter/warning-yellow.svg) no-repeat 0 50%;
 }
 
@@ -259,8 +259,8 @@
 
 #identity-popup-securityView-header,
 #identity-popup-securityView-body {
-  -moz-margin-start: calc(2em + 24px);
-  -moz-margin-end: 1em;
+  margin-inline-start: calc(2em + 24px);
+  margin-inline-end: 1em;
 }
 
 #identity-popup-securityView-header {
@@ -270,7 +270,7 @@
 }
 
 #identity-popup-securityView-body {
-  -moz-padding-end: 1em;
+  padding-inline-end: 1em;
 }
 
 #identity-popup-securityView-footer {
@@ -361,7 +361,7 @@ description#identity-popup-content-verifier,
 }
 
 .identity-popup-permission-label {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
   word-wrap: break-word;
 }
 
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabbar-icons.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabbar-icons.svg
index e00d95b..68385a0 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabbar-icons.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabbar-icons.svg
@@ -12,9 +12,9 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
-   width="792"
+   width="810"
    height="36"
-   viewBox="0 0 792 36"
+   viewBox="0 0 810 36"
    sodipodi:docname="tabbar-icons.svg">
   <metadata
      id="metadata8">
@@ -55,8 +55,8 @@
      showguides="false"
      inkscape:guide-bbox="true"
      inkscape:zoom="16"
-     inkscape:cx="781.75853"
-     inkscape:cy="18.070693"
+     inkscape:cx="795.60228"
+     inkscape:cy="25.012258"
      inkscape:current-layer="layer2"
      inkscape:object-paths="true"
      inkscape:snap-intersection-paths="true"
@@ -1469,5 +1469,21 @@
        style="display:inline;opacity:1;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.26666667"
        d="m 779,3 c -0.554,0 -1,0.446 -1,1 l 0,7 -1,0 c -0.554,0 -1,0.446 -1,1 l 0,2 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-7 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="rect4403" />
+    <path
+       style="display:inline;opacity:1;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 795,2 0,13 12,0 0,-13 z m 1,1 10,0 0,11 -10,0 z"
+       id="rect4404"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="display:inline;opacity:1;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 797,4 0,4 8,0 0,-4 -8,0 z m 3,2 2,0 0,1 -2,0 0,-1 z"
+       id="rect4409" />
+    <path
+       inkscape:connector-curvature="0"
+       style="display:inline;opacity:1;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 797,9 0,4 8,0 0,-4 -8,0 z m 3,2 2,0 0,1 -2,0 0,-1 z"
+       id="rect4411" />
   </g>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/toolbar-icons.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/toolbar-icons.svg
index 4a90b76..418168f 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/toolbar-icons.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/toolbar-icons.svg
@@ -12,9 +12,9 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
-   width="792"
+   width="810"
    height="36"
-   viewBox="0 0 792 36"
+   viewBox="0 0 810 36"
    sodipodi:docname="toolbar-icons.svg">
   <metadata
      id="metadata8">
@@ -55,8 +55,8 @@
      showguides="false"
      inkscape:guide-bbox="true"
      inkscape:zoom="22.627417"
-     inkscape:cx="781.96918"
-     inkscape:cy="24.96189"
+     inkscape:cx="797.06149"
+     inkscape:cy="26.641269"
      inkscape:current-layer="layer2"
      inkscape:object-paths="true"
      inkscape:snap-intersection-paths="true"
@@ -1462,5 +1462,21 @@
        style="display:inline;opacity:1;fill:#d3dae3;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.26666667"
        d="m 779,3 c -0.554,0 -1,0.446 -1,1 l 0,7 -1,0 c -0.554,0 -1,0.446 -1,1 l 0,2 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-7 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="rect4403" />
+    <path
+       style="display:inline;opacity:1;fill:#d3dae3;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 794,2 0,13 12,0 0,-13 z m 1,1 10,0 0,11 -10,0 z"
+       id="rect4404"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="display:inline;opacity:1;fill:#d3dae3;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 796,4 0,4 8,0 0,-4 -8,0 z m 3,2 2,0 0,1 -2,0 0,-1 z"
+       id="rect4409" />
+    <path
+       inkscape:connector-curvature="0"
+       style="display:inline;opacity:1;fill:#d3dae3;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 796,9 0,4 8,0 0,-4 -8,0 z m 3,2 2,0 0,1 -2,0 0,-1 z"
+       id="rect4411" />
   </g>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/tabbar-icons.svg b/arc-firefox-theme/chrome/browser/custom_images/light/tabbar-icons.svg
index b206c94..d04370c 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/tabbar-icons.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/tabbar-icons.svg
@@ -12,9 +12,9 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
-   width="792"
+   width="810"
    height="36"
-   viewBox="0 0 792 36"
+   viewBox="0 0 810 36"
    sodipodi:docname="tabbar-icons.svg">
   <metadata
      id="metadata8">
@@ -55,8 +55,8 @@
      showguides="false"
      inkscape:guide-bbox="true"
      inkscape:zoom="15.999999"
-     inkscape:cx="778.45947"
-     inkscape:cy="25.866874"
+     inkscape:cx="797.30322"
+     inkscape:cy="20.741874"
      inkscape:current-layer="layer2"
      inkscape:object-paths="true"
      inkscape:snap-intersection-paths="true"
@@ -1469,5 +1469,21 @@
        style="display:inline;opacity:1;fill:#70788d;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.26666667"
        d="m 779,3 c -0.554,0 -1,0.446 -1,1 l 0,7 -1,0 c -0.554,0 -1,0.446 -1,1 l 0,2 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-7 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="rect4403" />
+    <path
+       style="display:inline;opacity:1;fill:#70788d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 795,2 0,13 12,0 0,-13 z m 1,1 10,0 0,11 -10,0 z"
+       id="rect4404"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="display:inline;opacity:1;fill:#70788d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 797,4 0,4 8,0 0,-4 -8,0 z m 3,2 2,0 0,1 -2,0 0,-1 z"
+       id="rect4409" />
+    <path
+       inkscape:connector-curvature="0"
+       style="display:inline;opacity:1;fill:#70788d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 797,9 0,4 8,0 0,-4 -8,0 z m 3,2 2,0 0,1 -2,0 0,-1 z"
+       id="rect4411" />
   </g>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/toolbar-icons.svg b/arc-firefox-theme/chrome/browser/custom_images/light/toolbar-icons.svg
index 74d2f6b..075a712 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/toolbar-icons.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/toolbar-icons.svg
@@ -12,9 +12,9 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
-   width="792"
+   width="810"
    height="36"
-   viewBox="0 0 792 36"
+   viewBox="0 0 810 36"
    sodipodi:docname="toolbar-icons.svg">
   <metadata
      id="metadata8">
@@ -54,9 +54,9 @@
      inkscape:snap-bbox-edge-midpoints="true"
      showguides="false"
      inkscape:guide-bbox="true"
-     inkscape:zoom="11.313708"
-     inkscape:cx="770.98611"
-     inkscape:cy="24.666931"
+     inkscape:zoom="22.627416"
+     inkscape:cx="797.98405"
+     inkscape:cy="24.564899"
      inkscape:current-layer="layer2"
      inkscape:object-paths="true"
      inkscape:snap-intersection-paths="true"
@@ -1433,5 +1433,21 @@
        style="display:inline;opacity:1;fill:#5c616c;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.26666667"
        d="m 779,3 c -0.554,0 -1,0.446 -1,1 l 0,7 -1,0 c -0.554,0 -1,0.446 -1,1 l 0,2 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-7 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="rect4403" />
+    <path
+       style="display:inline;opacity:1;fill:#5c616c;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 795,2 0,13 12,0 0,-13 z m 1,1 10,0 0,11 -10,0 z"
+       id="rect4404"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="display:inline;opacity:1;fill:#5c616c;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 797,4 0,4 8,0 0,-4 -8,0 z m 3,2 2,0 0,1 -2,0 0,-1 z"
+       id="rect4409" />
+    <path
+       inkscape:connector-curvature="0"
+       style="display:inline;opacity:1;fill:#5c616c;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 797,9 0,4 8,0 0,-4 -8,0 z m 3,2 2,0 0,1 -2,0 0,-1 z"
+       id="rect4411" />
   </g>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/toolbar-icons-active.svg b/arc-firefox-theme/chrome/browser/custom_images/toolbar-icons-active.svg
index d7c0520..142887c 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/toolbar-icons-active.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/toolbar-icons-active.svg
@@ -12,9 +12,9 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
-   width="792"
+   width="810"
    height="36"
-   viewBox="0 0 792 36"
+   viewBox="0 0 810 36"
    sodipodi:docname="toolbar-icons-active.svg">
   <metadata
      id="metadata8">
@@ -54,9 +54,9 @@
      inkscape:snap-bbox-edge-midpoints="true"
      showguides="false"
      inkscape:guide-bbox="true"
-     inkscape:zoom="22.627417"
-     inkscape:cx="778.29154"
-     inkscape:cy="30.486221"
+     inkscape:zoom="8"
+     inkscape:cx="785.26759"
+     inkscape:cy="33.462992"
      inkscape:current-layer="layer2"
      inkscape:object-paths="true"
      inkscape:snap-intersection-paths="true"
@@ -1459,7 +1459,22 @@
     </g>
     <path
        style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.26666667"
-       d="M 779 3 C 778.446 3 778 3.446 778 4 L 778 11 L 777 11 C 776.446 11 776 11.446 776 12 L 776 14 C 776 14.554 776.446 15 777 15 L 789 15 C 789.554 15 790 14.554 790 14 L 790 12 C 790 11.446 789.554 11 789 11 L 788 11 L 788 4 C 788 3.446 787.554 3 787 3 L 779 3 z "
-       id="rect4403" />
+       d="m 779,3 c -0.554,0 -1,0.446 -1,1 l 0,7 -1,0 c -0.554,0 -1,0.446 -1,1 l 0,2 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-7 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
+       id="rect4403"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 795,2 0,13 12,0 0,-13 z m 1,1 10,0 0,11 -10,0 z"
+       id="rect4404"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 797 4 L 797 8 L 805 8 L 805 4 L 797 4 z M 800 6 L 802 6 L 802 7 L 800 7 L 800 6 z "
+       id="rect4409" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 797 9 L 797 13 L 805 13 L 805 9 L 797 9 z M 800 11 L 802 11 L 802 12 L 800 12 L 800 11 z "
+       id="rect4411" />
   </g>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css b/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css
index 689ccaa..d24d47e 100644
--- a/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css
+++ b/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css
@@ -139,7 +139,7 @@
   border-left: 1px solid hsla(210,4%,10%,.3);
   box-shadow: 0 3px 5px hsla(210,4%,10%,.1),
               0 0 7px hsla(210,4%,10%,.1);
-  -moz-margin-start: var(--panel-ui-exit-subview-gutter-width);
+  margin-inline-start: var(--panel-ui-exit-subview-gutter-width);
 }
 
 .panel-viewstack[viewtype="main"] > .panel-subviews {
@@ -244,7 +244,7 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan
 
 #wrapper-edit-controls:-moz-any([place="palette"],[place="panel"]) > #edit-controls,
 #wrapper-zoom-controls:-moz-any([place="palette"],[place="panel"]) > #zoom-controls {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #PanelUI-contents {
@@ -265,10 +265,6 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan
   padding: 0;
 }
 
-.cui-widget-panelview[id^=PanelUI-webext-] {
-  border-radius: 3.5px;
-}
-
 panelview:not([mainview]) .toolbarbutton-text,
 .cui-widget-panel toolbarbutton > .toolbarbutton-text {
   text-align: start;
@@ -378,7 +374,7 @@ toolbarpaletteitem:-moz-any([place="palette"], [place="panel"]) > toolbaritem[sd
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   -moz-box-align: center;
   width: 16px;
-  -moz-margin-start: -16px;
+  margin-inline-start: -16px;
   height: 51px;
   margin-bottom: 2.2em;
   padding: 0;
@@ -493,7 +489,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
 }
 
 #personal-bookmarks[cui-areatype="toolbar"][overflowedItem=true] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
-  -moz-margin-end: 2px;
+  margin-inline-end: 2px;
 }
 
 #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #copy-button,
@@ -646,30 +642,30 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
 #PanelUI-customize > .toolbarbutton-icon,
 #PanelUI-help > .toolbarbutton-icon,
 #PanelUI-quit > .toolbarbutton-icon {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 #PanelUI-fxa-icon {
-  -moz-padding-start: 15px;
-  -moz-padding-end: 15px;
+  padding-inline-start: 15px;
+  padding-inline-end: 15px;
 }
 
 #PanelUI-fxa-label,
 #PanelUI-customize {
   flex: 1;
-  -moz-padding-start: 15px;
-  -moz-border-start-style: none;
+  padding-inline-start: 15px;
+  border-inline-start-style: none;
 }
 
 #PanelUI-footer-fxa[fxaprofileimage="set"] > #PanelUI-fxa-status > #PanelUI-fxa-label,
 #PanelUI-footer-fxa[fxaprofileimage="enabled"]:not([fxastatus="error"]) > #PanelUI-fxa-status > #PanelUI-fxa-label {
-  -moz-padding-start: 0px;
+  padding-inline-start: 0px;
 }
 
 #PanelUI-update-status {
   width: calc(22.35em + 30px);
-  -moz-padding-start: 15px;
-  -moz-border-start-style: none;
+  padding-inline-start: 15px;
+  border-inline-start-style: none;
 }
 
 #PanelUI-update-status {
@@ -813,7 +809,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
 }
 
 #PanelUI-quit {
-  -moz-border-end-style: none;
+  border-inline-end-style: none;
   list-style-image: url(chrome://browser/skin/menuPanel-exit.png);
 }
 
@@ -854,7 +850,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
   margin: 0px 7px;
   padding: 0px;
   border: 0px none;
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 #PanelUI-footer-fxa[fxaprofileimage="enabled"] > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
@@ -1010,9 +1006,9 @@ panelview .toolbarbutton-1,
 
 .subviewbutton.panel-subview-footer > .menu-text {
   -moz-appearance: none;
-  -moz-margin-start: 0px !important;
-  -moz-padding-start: 6px;
-  -moz-padding-end: 6px;
+  margin-inline-start: 0px !important;
+  padding-inline-start: 6px;
+  padding-inline-end: 6px;
   -moz-box-flex: 0;
   text-align: center;
 }
@@ -1027,7 +1023,7 @@ panelview .toolbarbutton-1,
 }
 
 .subviewbutton.panel-subview-footer > .menu-accel-container {
-  -moz-padding-start: 6px;
+  padding-inline-start: 6px;
 }
 
 .subviewbutton:not(.panel-subview-footer) {
@@ -1048,7 +1044,7 @@ panelview .toolbarbutton-1,
 }
 
 .PanelUI-subView.cui-widget-panelview .subviewbutton[shortcut]::after {
-  -moz-margin-start: 10px;
+  margin-inline-start: 10px;
 }
 
 /* This is a <label> but it should fit in with the menu font- and colorwise. */
@@ -1063,8 +1059,8 @@ panelview .toolbarbutton-1,
 }
 
 panelview .toolbarbutton-1,
-.widget-overflow-list .toolbarbutton-1:not(:first-child),
-.widget-overflow-list .toolbaritem-combined-buttons:not(:first-child) {
+.widget-overflow-list > .toolbarbutton-1:not(:first-child),
+.widget-overflow-list > toolbaritem:not(:first-child) {
   margin-top: 6px;
 }
 
@@ -1168,8 +1164,8 @@ menuitem.panel-subview-footer:not([disabled])[_moz-menuactive]:active,
 
 .PanelUI-subView menuseparator,
 .PanelUI-subView toolbarseparator {
-  -moz-margin-start: -5px;
-  -moz-margin-end: -4px;
+  margin-inline-start: -5px;
+  margin-inline-end: -4px;
 }
 
 .PanelUI-subView menuseparator.small-separator,
@@ -1185,8 +1181,8 @@ menuitem.panel-subview-footer:not([disabled])[_moz-menuactive]:active,
 
 .subviewbutton > .menu-accel-container {
   -moz-box-pack: start;
-  -moz-margin-start: 10px;
-  -moz-margin-end: auto;
+  margin-inline-start: 10px;
+  margin-inline-end: auto;
   color: GrayText;
 }
 
@@ -1400,7 +1396,7 @@ toolbaritem[overflowedItem=true],
 .widget-overflow-list .toolbarbutton-1:not(.toolbarbutton-combined) > .toolbarbutton-text,
 .widget-overflow-list .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-text {
   text-align: start;
-  -moz-padding-start: .5em;
+  padding-inline-start: .5em;
 }
 
 #widget-overflow-list > .toolbaritem-combined-buttons {
@@ -1412,7 +1408,7 @@ toolbaritem[overflowedItem=true],
   display: -moz-box;
   width: 1px;
   height: 18px;
-  -moz-margin-end: -1px;
+  margin-inline-end: -1px;
   background-image: linear-gradient(hsla(210,54%,20%,.2) 0, hsla(210,54%,20%,.2) 18px);
   background-clip: padding-box;
   background-position: center;
@@ -1431,13 +1427,18 @@ toolbaritem[overflowedItem=true],
 
 .subviewbutton > .menu-iconic-left {
   -moz-appearance: none;
-  -moz-margin-end: 3px;
+  margin-inline-end: 3px;
 }
 
 menuitem[checked="true"].subviewbutton > .menu-iconic-left {
   visibility: hidden;
 }
 
+#PanelUI-containersItems > .subviewbutton > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
 .panel-mainview[panelid=customizationui-widget-panel],
 #customizationui-widget-multiview > .panel-viewcontainer,
 #customizationui-widget-multiview > .panel-viewcontainer > .panel-viewstack,
@@ -1459,7 +1460,7 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
 #PanelUI-panic-timeframe-icon,
 #PanelUI-panic-timeframe-icon-small {
   background-color: transparent;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
 }
 
 #panic-button-success-icon,
@@ -1550,7 +1551,7 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
 }
 
 .PanelUI-panic-actionlist {
-  -moz-padding-start: 20px;
+  padding-inline-start: 20px;
   padding-top: 2px;
   padding-bottom: 2px;
   background-size: 16px 16px;
@@ -1768,19 +1769,19 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
 .widget-overflow-list .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-appearance: none;
   border: 0;
-  -moz-margin-start: 3px;
+  margin-inline-start: 3px;
 }
 
 .widget-overflow-list .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 .subviewbutton > .toolbarbutton-text {
-  -moz-padding-start: 16px;
+  padding-inline-start: 16px;
 }
 
 .subviewbutton:-moz-any([image],[targetURI],.cui-withicon, .restoreallitem, .bookmark-item) > .toolbarbutton-text {
-  -moz-padding-start: 0;
+  padding-inline-start: 0;
 }
 
 /* subviewbutton entries for social sidebars have images that come from external
@@ -1816,7 +1817,7 @@ menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) {
 }
 
 .subviewbutton > .toolbarbutton-icon {
-  -moz-margin-end: 5px !important;
+  margin-inline-end: 5px !important;
 }
 
 .subviewbutton > .menu-right,
diff --git a/arc-firefox-theme/chrome/browser/devedition.css b/arc-firefox-theme/chrome/browser/devedition.css
index cd107a2..6bc7d37 100644
--- a/arc-firefox-theme/chrome/browser/devedition.css
+++ b/arc-firefox-theme/chrome/browser/devedition.css
@@ -14,26 +14,24 @@
 
 :root[devtoolstheme="dark"] {
   /* Chrome */
-  --chrome-background-color: #1C2126;
+  --chrome-background-color: #272b35;
   --chrome-color: #F5F7FA;
-  --chrome-secondary-background-color: #39424D;
+  --chrome-secondary-background-color: #393F4C;
   --chrome-navigator-toolbox-separator-color: rgba(0,0,0,.2);
   --chrome-nav-bar-separator-color: rgba(0,0,0,.2);
   --chrome-nav-buttons-background: #252C33;
   --chrome-nav-buttons-hover-background: #1B2127;
   --chrome-nav-bar-controls-border-color: #1D2328;
   --chrome-selection-color: #fff;
-  --chrome-selection-background-color: #074D75;
+  --chrome-selection-background-color: #5675B9;
 
   /* Tabs */
   --tabs-toolbar-color: #F5F7FA;
-  --tab-background-color: #1C2126;
+  --tab-background-color: #272b35;
   --tab-hover-background-color: #07090a;
   --tab-selection-color: #f5f7fa;
-  --tab-selection-background-color: #1a4666;
-  --tab-selection-box-shadow: 0 2px 0 #D7F1FF inset,
-                              0 -2px 0 rgba(0,0,0,.05) inset,
-                              0 -1px 0 rgba(0,0,0,.3) inset;
+  --tab-selection-background-color: #5675B9;
+  --tab-selection-box-shadow: none;
   --pinned-tab-glow: radial-gradient(22px at center calc(100% - 2px), rgba(76,158,217,0.9) 13%, rgba(0,0,0,0.4) 16%, transparent 70%);
 
   /* Toolbar buttons */
@@ -43,7 +41,7 @@
   --toolbarbutton-active-background: rgba(25,33,38,1) linear-gradient(rgba(25,33,38,1), rgba(25,33,38,1)) border-box;
   --toolbarbutton-active-boxshadow: none;
   --toolbarbutton-active-bordercolor: rgba(25,33,38,.8);
-  --toolbarbutton-checkedhover-backgroundcolor: #1D4F73;
+  --toolbarbutton-checkedhover-backgroundcolor: #3C5283;
 
   /* Url and search bars */
   --url-and-searchbar-background-color: #171B1F;
@@ -112,13 +110,13 @@
 
 .tab-background,
 .tabs-newtab-button {
-  -moz-margin-end: 0;
-  -moz-margin-start: 0;
+  margin-inline-end: 0;
+  margin-inline-start: 0;
 }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
-  -moz-padding-end: 0;
-  -moz-padding-start: 0;
+  padding-inline-end: 0;
+  padding-inline-start: 0;
 }
 
 .tab-background-start[visuallyselected=true]::after,
@@ -132,7 +130,7 @@
 
 .tab-background-start[visuallyselected=true]::after,
 .tab-background-end[visuallyselected=true]::after {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 /* End override @tabCurveHalfWidth@ and @tabCurveWidth@ */
 
@@ -199,14 +197,14 @@ toolbar[brighttext] #downloads-indicator-counter {
 }
 
 #urlbar {
-  -moz-border-start: none !important;
+  border-inline-start: none !important;
   opacity: 1 !important;
 }
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
   overflow: -moz-hidden-unscrollable;
   clip-path: none;
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 /* Swap out the white arrow with a dark one for the dark theme */
@@ -291,7 +289,30 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
 .tabbrowser-tab[visuallyselected] {
   color: var(--tab-selection-color) !important; /* Override color: inherit */
   background-color: var(--tab-selection-background-color);
-  box-shadow: var(--tab-selection-box-shadow);
+}
+
+.tab-icon-sound[visuallyselected=true][soundplaying] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-white");
+}
+
+.tab-icon-sound[visuallyselected=true][soundplaying]:hover {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-white-hover");
+}
+
+.tab-icon-sound[visuallyselected=true][soundplaying]:hover:active {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-white-pressed");
+}
+
+.tab-icon-sound[visuallyselected=true][muted] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted-white");
+}
+
+.tab-icon-sound[visuallyselected=true][muted]:hover {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted-white-hover");
+}
+
+.tab-icon-sound[visuallyselected=true][muted]:hover:active {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted-white-pressed");
 }
 
 /* Don't need space for the tab curves (66px - 30px) */
@@ -355,7 +376,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
 }
 
 #forward-button > .toolbarbutton-icon {
-  -moz-border-start: none;
+  border-inline-start: none;
 }
 
 /* Override a box shadow for disabled back button */
@@ -403,5 +424,5 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
 .ac-type-icon {
   /* Left-align the type icon in awesomebar popup results with the icon in the
      urlbar. */
-  -moz-margin-start: 11px;
+  margin-inline-start: 11px;
 }
diff --git a/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css b/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css
index f7acb5f..c9af0bf 100644
--- a/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css
+++ b/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css
@@ -27,7 +27,7 @@
 }
 
 .downloadTypeIcon {
-  -moz-margin-end: 8px;
+  margin-inline-end: 8px;
   width: 32px;
   height: 32px;
 }
diff --git a/arc-firefox-theme/chrome/browser/downloads/downloads.css b/arc-firefox-theme/chrome/browser/downloads/downloads.css
index f30d2c7..b08d909 100644
--- a/arc-firefox-theme/chrome/browser/downloads/downloads.css
+++ b/arc-firefox-theme/chrome/browser/downloads/downloads.css
@@ -62,7 +62,7 @@
 #downloadsSummary,
 richlistitem[type="download"] {
   height: var(--downloads-item-height);
-  -moz-padding-end: 0;
+  padding-inline-end: 0;
   color: inherit;
 }
 
@@ -83,7 +83,7 @@ richlistitem[type="download"]:last-child {
 }
 
 .downloadTypeIcon {
-  -moz-margin-end: 8px;
+  margin-inline-end: 8px;
   /* Prevent flickering when changing states. */
   height: 32px;
   width: 32px;
diff --git a/arc-firefox-theme/chrome/browser/error-pages.css b/arc-firefox-theme/chrome/browser/error-pages.css
index ac9edac..e66e531 100644
--- a/arc-firefox-theme/chrome/browser/error-pages.css
+++ b/arc-firefox-theme/chrome/browser/error-pages.css
@@ -28,8 +28,8 @@ body {
 
   .title {
     background-image: none !important;
-    -moz-padding-start: 0;
-    -moz-margin-start: 0;
+    padding-inline-start: 0;
+    margin-inline-start: 0;
   }
 
   .title-text {
diff --git a/arc-firefox-theme/chrome/browser/favicon-search-16.svg b/arc-firefox-theme/chrome/browser/favicon-search-16.svg
new file mode 100644
index 0000000..e839cc8
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/favicon-search-16.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <circle cx="8" cy="8" r="8" fill="#58bf43"/>
+  <circle cx="8" cy="8" r="7.5" stroke="#41a833" stroke-width="1" fill="none"/>
+  <path d="M12.879,12L12,12.879,9.015,9.9A4.276,4.276,0,1,1,9.9,9.015ZM6.5,3.536A2.964,2.964,0,1,0,9.464,6.5,2.964,2.964,0,0,0,6.5,3.536Z" stroke="#41a833" stroke-width="2" fill="none"/>
+  <path d="M12.879,12L12,12.879,9.015,9.9A4.276,4.276,0,1,1,9.9,9.015ZM6.5,3.536A2.964,2.964,0,1,0,9.464,6.5,2.964,2.964,0,0,0,6.5,3.536Z" fill="#fff"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/browser/feeds/subscribe.css b/arc-firefox-theme/chrome/browser/feeds/subscribe.css
index 8389c30..a9b59d2 100644
--- a/arc-firefox-theme/chrome/browser/feeds/subscribe.css
+++ b/arc-firefox-theme/chrome/browser/feeds/subscribe.css
@@ -24,7 +24,7 @@ html {
 #feedBody {
   border: 1px solid THreeDShadow;
   padding: 3em;
-  -moz-padding-start: 30px;
+  padding-inline-start: 30px;
   margin: 2em auto;
   background: -moz-Field;
 }
@@ -45,9 +45,9 @@ html {
 #feedHeader {
   margin-top: 4.9em;
   margin-bottom: 1em;
-  -moz-margin-start: 1.4em;
-  -moz-margin-end: 1em;
-  -moz-padding-start: 2.9em;
+  margin-inline-start: 1.4em;
+  margin-inline-end: 1em;
+  padding-inline-start: 2.9em;
   font-size: 110%;
   color: -moz-gtk-info-bar-text;
 }
@@ -74,12 +74,12 @@ html {
 
 #feedHeader[firstrun="true"] #feedIntroText {
   padding-top: 0.1em;
-  -moz-padding-start: 0.6em;
+  padding-inline-start: 0.6em;
   display: block;
 }
 
 #feedHeader[firstrun="true"] > #feedSubscribeLine {
-  -moz-padding-start: 1.8em;
+  padding-inline-start: 1.8em;
 }
 
 #feedSubscribeLine {
@@ -116,8 +116,8 @@ h2 {
 
 #feedTitleLink {
   float: right;
-  -moz-margin-start: .6em;
-  -moz-margin-end: 0;
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
   margin-top: 0;
   margin-bottom: 0;
 }
@@ -127,15 +127,15 @@ a[href] img {
 }
 
 #feedTitleContainer {
-  -moz-margin-start: 0;
-  -moz-margin-end: .6em;
+  margin-inline-start: 0;
+  margin-inline-end: .6em;
   margin-top: 0;
   margin-bottom: 0;
 }
 
 #feedTitleImage {
-  -moz-margin-start: .6em;
-  -moz-margin-end: 0;
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
   margin-top: 0;
   margin-bottom: 0;
   max-width: 300px;
diff --git a/arc-firefox-theme/chrome/browser/icon-search-64.svg b/arc-firefox-theme/chrome/browser/icon-search-64.svg
new file mode 100644
index 0000000..56ba96f
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/icon-search-64.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
+  <ellipse cx="32" cy="34" rx="29.5" ry="30" fill="#000" fill-opacity=".1"/>
+  <circle cx="32" cy="32" r="30" fill="#58bf43"/>
+  <circle cx="32" cy="32" r="29.5" stroke="#41a833" stroke-width="1" fill="none"/>
+  <path d="M50,47.131L47.131,50,36.776,39.647a16.038,16.038,0,1,1,2.871-2.871ZM27,15A12,12,0,1,0,39,27,12,12,0,0,0,27,15Z" stroke="#41a833" stroke-width="2" fill="none"/>
+  <path d="M50,47.131L47.131,50,36.776,39.647a16.038,16.038,0,1,1,2.871-2.871ZM27,15A12,12,0,1,0,39,27,12,12,0,0,0,27,15Z" fill="#fff"/>
+  <circle cx="27" cy="27" r="13" fill="#fff" fill-opacity=".2"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/browser/menuPanel.png b/arc-firefox-theme/chrome/browser/menuPanel.png
index 036e2a1..1ef5f9a 100644
--- a/arc-firefox-theme/chrome/browser/menuPanel.png
+++ b/arc-firefox-theme/chrome/browser/menuPanel.png
diff --git a/arc-firefox-theme/chrome/browser/menuPanel@2x.png b/arc-firefox-theme/chrome/browser/menuPanel@2x.png
index 093bfea..e29fe55 100644
--- a/arc-firefox-theme/chrome/browser/menuPanel@2x.png
+++ b/arc-firefox-theme/chrome/browser/menuPanel@2x.png
diff --git a/arc-firefox-theme/chrome/browser/newtab/newTab.css b/arc-firefox-theme/chrome/browser/newtab/newTab.css
index 4cab8c4..c0c7b77 100644
--- a/arc-firefox-theme/chrome/browser/newtab/newTab.css
+++ b/arc-firefox-theme/chrome/browser/newtab/newTab.css
@@ -184,7 +184,7 @@
 }
 
 .newtab-site[pinned] .newtab-title {
-  -moz-padding-start: 24px;
+  padding-inline-start: 24px;
 }
 
 .newtab-site[pinned] .newtab-title::before {
@@ -199,7 +199,7 @@
   margin-top: 6px;
 }
 
-.newtab-site[pinned] .newtab-title:-moz-dir(rtl)::before {
+.newtab-site[pinned] .newtab-title:dir(rtl)::before {
   left: auto;
   right: 0;
 }
diff --git a/arc-firefox-theme/chrome/browser/pageInfo.css b/arc-firefox-theme/chrome/browser/pageInfo.css
index a7822e8..8f56b34 100644
--- a/arc-firefox-theme/chrome/browser/pageInfo.css
+++ b/arc-firefox-theme/chrome/browser/pageInfo.css
@@ -70,7 +70,7 @@ textbox {
 }
 
 textbox.header {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 .iframe {
@@ -89,7 +89,7 @@ textbox[disabled] {
 
 /* General Tab */
 #generalPanel > #titletext {
-  -moz-margin-start: 5px;
+  margin-inline-start: 5px;
 }
 
 groupbox.collapsable caption .caption-icon {
@@ -97,8 +97,8 @@ groupbox.collapsable caption .caption-icon {
   height: 9px;
   background-repeat: no-repeat;
   background-position: center;
-  -moz-margin-start: 1px;
-  -moz-margin-end: 3px;
+  margin-inline-start: 1px;
+  margin-inline-end: 3px;
   background-image: url("chrome://global/skin/tree/twisty-open.png");
 }
 
@@ -116,13 +116,13 @@ groupbox tree {
 }
 
 groupbox.treebox .groupbox-body {
-  -moz-margin-start: 5px;
-  -moz-margin-end: 1px;
+  margin-inline-start: 5px;
+  margin-inline-end: 1px;
   padding-top: 0;
 }
 
 #securityBox description {
-  -moz-margin-start: 10px;
+  margin-inline-start: 10px;
 }
 
 #general-security-identity {
@@ -177,8 +177,8 @@ treechildren::-moz-tree-cell-text(broken) {
 #feedListbox richlistitem {
   padding-top: 6px;
   padding-bottom: 6px;
-  -moz-padding-start: 7px;
-  -moz-padding-end: 7px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
   min-height: 25px;
   border-bottom: 1px dotted #C0C0C0;
   color: -moz-FieldText;
@@ -224,8 +224,8 @@ treechildren::-moz-tree-cell-text(broken) {
 .permission {
   padding-top: 6px;
   padding-bottom: 6px;
-  -moz-padding-start: 7px;
-  -moz-padding-end: 7px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
   min-height: 25px;
   border-bottom: 1px dotted #C0C0C0;
 }
diff --git a/arc-firefox-theme/chrome/browser/places/editBookmarkOverlay.css b/arc-firefox-theme/chrome/browser/places/editBookmarkOverlay.css
index 465cacd..7ec1854 100644
--- a/arc-firefox-theme/chrome/browser/places/editBookmarkOverlay.css
+++ b/arc-firefox-theme/chrome/browser/places/editBookmarkOverlay.css
@@ -19,7 +19,7 @@
 .expander-down {
   min-width: 0;
   padding: 2px 0;
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
 }
 
 .expander-up > .button-box {
diff --git a/arc-firefox-theme/chrome/browser/places/organizer.css b/arc-firefox-theme/chrome/browser/places/organizer.css
index 09a3579..9d9a040 100644
--- a/arc-firefox-theme/chrome/browser/places/organizer.css
+++ b/arc-firefox-theme/chrome/browser/places/organizer.css
@@ -47,7 +47,7 @@
 }
 
 #placesMenu > menu {
-  -moz-padding-start: 4px;
+  padding-inline-start: 4px;
   -moz-binding: url("chrome://browser/skin/places/organizer.xml#toolbarbutton-dropdown");
   -moz-appearance: toolbarbutton;
   color: -moz-DialogText;
@@ -74,7 +74,7 @@
 }
 
 #infoBoxExpanderLabel {
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
 }
 
 /**** menuitem stock icons ****/
diff --git a/arc-firefox-theme/chrome/browser/preferences/applications.css b/arc-firefox-theme/chrome/browser/preferences/applications.css
index 345fe75..5080763 100644
--- a/arc-firefox-theme/chrome/browser/preferences/applications.css
+++ b/arc-firefox-theme/chrome/browser/preferences/applications.css
@@ -11,18 +11,18 @@
 .actionsMenu {
   margin-top: -1px;
   margin-bottom: -1px;
-  -moz-margin-start: -1px;
-  -moz-margin-end: 0;
+  margin-inline-start: -1px;
+  margin-inline-end: 0;
 }
 
 .typeIcon,
 .actionIcon {
-  -moz-margin-start: 3px;
-  -moz-margin-end: 3px;
+  margin-inline-start: 3px;
+  margin-inline-end: 3px;
 }
 
 #handlersView > richlistitem label {
-  -moz-margin-start: 1px;
+  margin-inline-start: 1px;
   margin-top: 2px;
 }
 
@@ -51,16 +51,16 @@ menuitem[appHandlerIcon="plugin"] {
 }
 
 .actionsMenu .menulist-icon {
-  -moz-margin-end: 1px;
+  margin-inline-end: 1px;
   height: 16px;
   width: 16px;
 }
 
 .actionsMenu > menupopup > menuitem > .menu-iconic-left {
-  -moz-padding-start: 0;
-  -moz-padding-end: 4px !important;
+  padding-inline-start: 0;
+  padding-inline-end: 4px !important;
 }
 
 .actionsMenu > menupopup > menuitem {
-  -moz-padding-start: 3px;
+  padding-inline-start: 3px;
 }
diff --git a/arc-firefox-theme/chrome/browser/preferences/in-content/dialog.css b/arc-firefox-theme/chrome/browser/preferences/in-content/dialog.css
index aa59e64..c5eb833 100644
--- a/arc-firefox-theme/chrome/browser/preferences/in-content/dialog.css
+++ b/arc-firefox-theme/chrome/browser/preferences/in-content/dialog.css
@@ -45,7 +45,7 @@ tree:not(#rejectsTree) {
 }
 
 caption {
-  -moz-padding-start: 0;
+  padding-inline-start: 0;
 }
 
 groupbox {
diff --git a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
index b193768..8c3d396 100644
--- a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
+++ b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
@@ -148,7 +148,7 @@ treecol {
 
 #useFirefoxSync  {
   font-size: 90%;
-  -moz-margin-end: 8px !important;
+  margin-inline-end: 8px !important;
 }
 
 #getStarted {
@@ -160,7 +160,7 @@ treecol {
 }
 
 #downloadFolder {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 /* Content pane */
@@ -171,12 +171,12 @@ treecol {
 }
 
 #notificationsPolicyLearnMore {
-  -moz-margin-start: 1.5em !important;
+  margin-inline-start: 1.5em !important;
 }
 
 #defaultFontSizeLabel {
   /* !important needed to override common !important rule */
-  -moz-margin-start: 4px !important;
+  margin-inline-start: 4px !important;
 }
 
 /* Applications Pane Styles */
@@ -186,7 +186,7 @@ treecol {
 }
 
 #filter {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #handlersView {
@@ -198,13 +198,13 @@ treecol {
 }
 
 .typeIcon {
-  -moz-margin-start: 10px !important;
-  -moz-margin-end: 9px !important;
+  margin-inline-start: 10px !important;
+  margin-inline-end: 9px !important;
 }
 
 .actionIcon {
-  -moz-margin-start: 11px !important;
-  -moz-margin-end: 8px !important;
+  margin-inline-start: 11px !important;
+  margin-inline-end: 8px !important;
 }
 
 .actionsMenu {
@@ -212,23 +212,33 @@ treecol {
 }
 
 .actionsMenu > menupopup > menuitem {
-  -moz-padding-start: 10px !important;
+  padding-inline-start: 10px !important;
 }
 
 .actionsMenu > menupopup > menuitem > .menu-iconic-left {
-  -moz-margin-end: 8px !important;
+  margin-inline-end: 8px !important;
 }
 
 /* Privacy pane */
 
-.doNotTrackLearnMore,
 #trackingProtectionPBMLearnMore,
 #trackingProtectionLearnMore {
-  -moz-margin-start: 1.5em !important;
+  margin-inline-start: 1.5em !important;
   margin-top: 0;
   font-weight: normal;
 }
 
+.doNotTrackLearnMore {
+  margin-inline-start: calc(1em + 30px);
+  margin-bottom: 1em;
+  font-weight: normal;
+}
+
+.doNotTrackLearnMore > label {
+  font-size: 1em !important;
+  margin-left: 0;
+}
+
 /* Collapse the non-active vboxes in decks to use only the height the
    active vbox needs */
 #historyPane:not([selectedIndex="1"]) > #historyDontRememberPane,
@@ -255,12 +265,12 @@ description > html|a {
 #weavePrefsDeck > #needsUpdate > hbox > #loginError,
 #weavePrefsDeck > #hasFxaAccount > vbox > label,
 #weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-normal) > label {
-  /* no margin-start for elements at the begin of a line */
-  -moz-margin-start: 0;
+  /* no margin-inline-start for elements at the beginning of a line */
+  margin-inline-start: 0;
 }
 
 #tabsElement {
-  -moz-margin-end: 4px; /* add the 4px end-margin of other elements */
+  margin-inline-end: 4px; /* add the 4px end-margin of other elements */
 }
 
 #telemetryLearnMore,
@@ -268,16 +278,16 @@ description > html|a {
 #crashReporterLearnMore {
   /* provide some margin between the links and the label text */
   /* !important is needed to override the rules defined in common.css */
-  -moz-margin-start: 20px !important;
+  margin-inline-start: 20px !important;
   /* center the links */
   margin-top: 8px;
   margin-bottom: 8px;
 }
 
 .indent {
-  /* !important needed to override -moz-margin-start:0 !important; rule
+  /* !important needed to override margin-inline-start:0 !important; rule
      define in common.css for labels */
-  -moz-margin-start: 33px !important;
+  margin-inline-start: 33px !important;
 }
 
 .text-link {
@@ -285,7 +295,7 @@ description > html|a {
 }
 
 #showUpdateHistory {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 /**
@@ -425,61 +435,6 @@ description > html|a {
   -moz-box-align: start;
 }
 
-#syncStatusMessage {
-  visibility: collapse;
-  opacity: 0;
-  transition: opacity 1s linear;
-  padding: 14px 8px 14px 14px;
-  border-radius: 2px;
-}
-
-#syncStatusMessage[message-type] {
-  visibility: visible;
-  opacity: 1;
-}
-
-#syncStatusMessage[message-type="verify-success"] {
-  background-color: #74BF43;
-}
-
-#syncStatusMessage[message-type="verify-error"] {
-  background-color: #D74345;
-}
-
-#syncStatusMessage[message-type="migration"] {
-  background-color: #FF9500;
-}
-
-#syncStatusMessageWrapper {
-  -moz-box-flex: 1;
-  padding-right: 5px;
-}
-
-#syncStatusMessageTitle, #syncStatusMessageDescription {
-  color: #FBFBFB;
-}
-
-#syncStatusMessage[message-type="migration"] #syncStatusMessageTitle {
-  display: none;
-}
-
-#syncStatusMessageTitle {
-  font-weight: bold !important;
-  font-size: 16px;
-  line-height: 157%;
-  margin: 0 0 20px;
-}
-
-#syncStatusMessageDescription {
-  font-size: 14px;
-  line-height: 158%;
-  margin: 0 !important;
-}
-
-#syncStatusMessageClose {
-  margin: 0px;
-}
-
 #fxaSyncEngines > vbox:first-child {
   margin-right: 80px;
 }
@@ -636,8 +591,8 @@ description > html|a {
 
 .actionsMenu > .menulist-label-box > .menulist-icon {
   margin-top: 1px;
-  -moz-margin-start: 1px;
-  -moz-margin-end: 6px;
+  margin-inline-start: 1px;
+  margin-inline-end: 6px;
 }
 
 .actionsMenu > .menulist-label-box > .menulist-label {
@@ -655,7 +610,7 @@ menulist.actionsMenu > .menulist-dropmarker {
 
 textbox + button,
 filefield + button {
-  -moz-margin-start: -4px;
+  margin-inline-start: -4px;
 }
 
 /**
diff --git a/arc-firefox-theme/chrome/browser/preferences/in-content/search.css b/arc-firefox-theme/chrome/browser/preferences/in-content/search.css
index db9fd3a..f3c206b 100644
--- a/arc-firefox-theme/chrome/browser/preferences/in-content/search.css
+++ b/arc-firefox-theme/chrome/browser/preferences/in-content/search.css
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
  #defaultEngine {
-   -moz-margin-start: 0;
+   margin-inline-start: 0;
  }
 
 #defaultEngine > .menulist-label-box > .menulist-icon {
@@ -20,8 +20,8 @@
 }
 
 #engineList treechildren::-moz-tree-image(engineName) {
-  -moz-margin-end: 10px;
-  -moz-margin-start: 1px;
+  margin-inline-end: 10px;
+  margin-inline-start: 1px;
   width: 16px;
   height: 16px;
 }
@@ -31,7 +31,7 @@
   width: 10000px; /* 100% doesn't work; 10k is hopefully larger than any window
                      we may have, overflow isn't visible. */
   height: 2px;
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #engineShown {
diff --git a/arc-firefox-theme/chrome/browser/preferences/preferences.css b/arc-firefox-theme/chrome/browser/preferences/preferences.css
index 95820e2..76cf63c 100644
--- a/arc-firefox-theme/chrome/browser/preferences/preferences.css
+++ b/arc-firefox-theme/chrome/browser/preferences/preferences.css
@@ -84,18 +84,6 @@ label.small {
   -moz-box-flex: 1;
 }
 
-/* Privacy Pane */
-
-/* styles for the link elements copied from .text-link in global.css */
-.inline-link {
-  color: -moz-nativehyperlinktext;
-  text-decoration: none;
-}
-
-.inline-link:hover {
-  text-decoration: underline;
-}
-
 /* Modeless Window Dialogs */
 .windowDialog,
 .windowDialog prefpane {
diff --git a/arc-firefox-theme/chrome/browser/preferences/search.css b/arc-firefox-theme/chrome/browser/preferences/search.css
deleted file mode 100644
index 921bc29..0000000
--- a/arc-firefox-theme/chrome/browser/preferences/search.css
+++ /dev/null
@@ -1,45 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#defaultEngine > .menulist-label-box > .menulist-icon {
-  height: 16px;
-}
-
-/* Reserve space so that localized labels can wrap without hiding the
-   'add more engines' link at the bottom. See bug 1112688. */
-#oneClickSearchProvidersGroup {
-  margin-bottom: 3em;
-}
-
-/* work around a display: none in Linux's menu.css, see bug 1112310 */
-.searchengine-menuitem > .menu-iconic-left {
-  display: -moz-box;
-}
-
-#engineList {
-  margin: .5em 6px;
-}
-
-#engineList treechildren::-moz-tree-checkbox(checked) {
-  list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
-}
-
-#engineList treechildren::-moz-tree-image(engineName) {
-  -moz-margin-end: 4px;
-  -moz-margin-start: 0;
-  width: 16px;
-  height: 16px;
-}
-
-#engineList treechildren::-moz-tree-row {
-  min-height: 20px;
-}
-
-#engineList treechildren::-moz-tree-drop-feedback {
-  background-color: Highlight;
-  width: 10000px; /* 100% doesn't work; 10k is hopefully larger than any window
-                     we may have, overflow isn't visible. */
-  height: 2px;
-  -moz-margin-start: 0;
-}
diff --git a/arc-firefox-theme/chrome/browser/privatebrowsing/aboutPrivateBrowsing.css b/arc-firefox-theme/chrome/browser/privatebrowsing/aboutPrivateBrowsing.css
index abc85fa..e0e023c 100644
--- a/arc-firefox-theme/chrome/browser/privatebrowsing/aboutPrivateBrowsing.css
+++ b/arc-firefox-theme/chrome/browser/privatebrowsing/aboutPrivateBrowsing.css
@@ -49,8 +49,8 @@ a:visited {
 
 .section-main {
   margin-bottom: 48px;
-  -moz-margin-start: var(--icon-margin);
-  -moz-padding-start: 24px;
+  margin-inline-start: var(--icon-margin);
+  padding-inline-start: 24px;
 }
 
 .section-main:last-child {
@@ -69,11 +69,11 @@ p {
   float: left;
   width: 220px;
   line-height: 1.5em;
-  -moz-margin-start: 1em;
+  margin-inline-start: 1em;
   margin-bottom: 0;
 }
 
-.list-row > ul > li:-moz-dir(rtl) {
+.list-row > ul > li:dir(rtl) {
   float: right;
 }
 
@@ -84,11 +84,11 @@ p {
   font-weight: lighter;
   line-height: 1.5em;
   min-height: 64px;
-  -moz-margin-start: 0;
-  -moz-padding-start: calc(var(--icon-margin) + 24px);
+  margin-inline-start: 0;
+  padding-inline-start: calc(var(--icon-margin) + 24px);
 }
 
-.title:-moz-dir(rtl) {
+.title:dir(rtl) {
   background-position: right, center;
 }
 
@@ -101,11 +101,11 @@ p {
   background-image: url("chrome://browser/skin/privatebrowsing/tracking-protection.svg");
   background-repeat: no-repeat;
   background-size: 32px;
-  -moz-margin-start: calc(var(--icon-margin) - 32px);
-  -moz-padding-start: 56px;
+  margin-inline-start: calc(var(--icon-margin) - 32px);
+  padding-inline-start: 56px;
 }
 
-.about-subheader:-moz-dir(rtl) {
+.about-subheader:dir(rtl) {
   background-position: right;
 }
 
@@ -174,13 +174,13 @@ a.button {
   background-image: url("chrome://browser/skin/privatebrowsing/check.svg");
 }
 
-.toggle + .toggle-btn:-moz-dir(rtl)::after {
+.toggle + .toggle-btn:dir(rtl)::after {
   left: auto;
   right: 0;
   transition-property: right;
 }
 
-.toggle + .toggle-btn:-moz-dir(rtl)::before {
+.toggle + .toggle-btn:dir(rtl)::before {
   float: right;
   left: auto;
   right: 9px;
@@ -195,7 +195,7 @@ a.button {
   left: 35px;
 }
 
-.toggle:checked + .toggle-btn:-moz-dir(rtl)::after {
+.toggle:checked + .toggle-btn:dir(rtl)::after {
   right: 35px;
 }
 
diff --git a/arc-firefox-theme/chrome/browser/sanitizeDialog.css b/arc-firefox-theme/chrome/browser/sanitizeDialog.css
index 96cf3bc..28d4e7e 100644
--- a/arc-firefox-theme/chrome/browser/sanitizeDialog.css
+++ b/arc-firefox-theme/chrome/browser/sanitizeDialog.css
@@ -3,12 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #sanitizeDurationChoice {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 /* Align the duration label with the warning box and item list */
 #sanitizeDurationLabel {
-  -moz-margin-start: 3px;
+  margin-inline-start: 3px;
 }
 
 
@@ -56,15 +56,15 @@
   padding: 0;
   margin-top: 6px;
   margin-bottom: 6px;
-  -moz-margin-start: -6px;
-  -moz-margin-end: 0;
+  margin-inline-start: -6px;
+  margin-inline-end: 0;
 }
 
 .expander-up,
 .expander-down {
   min-width: 0;
   padding: 2px 0;
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
 }
 
 .expander-up {
@@ -86,8 +86,8 @@
 
 /* Make the item list the same width as the warning box */
 #itemList {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
 }
 
 /* Without this a useless scrollbar appears in the listbox when its rows
@@ -100,8 +100,8 @@
 
 /* Align the last dialog button with the end of the warning box */
 .prefWindow-dlgbuttons {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 .dialog-button[dlgtype="accept"] {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
diff --git a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
index 554a051..ed381f5 100644
--- a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
+++ b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
@@ -280,7 +280,7 @@ menuitem.bookmark-item {
 }
 
 .bookmark-item > .menu-iconic-left > .menu-iconic-icon {
-  -moz-padding-start: 0px;
+  padding-inline-start: 0px;
 }
 
 /* Bookmark drag and drop styles */
@@ -300,7 +300,7 @@ menuitem.bookmark-item {
 .menupopup-drop-indicator {
   list-style-image: none;
   height: 2px;
-  -moz-margin-end: -4em;
+  margin-inline-end: -4em;
   background-color: Highlight;
 }
 
@@ -378,6 +378,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #placesContext_openContainer\:tabs,
 #menu_newNavigatorTab,
 #context-openlinkintab,
+#context-openlinkincontainertab,
 #context-openframeintab {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
   -moz-image-region: rect(0px 64px 16px 48px);
@@ -550,6 +551,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
 }
 
+#menu_unsortedBookmarks,
 #BMB_unsortedBookmarks,
 #panelMenu_unsortedBookmarks {
   list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
@@ -602,8 +604,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   max-width: 16px;
 }
 
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
 #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   max-width: 18px;
 }
@@ -624,7 +626,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-badge-stack,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
   padding: 2px 6px;
   border: 1px solid transparent;
   border-radius: 2px;
@@ -632,9 +634,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   transition-duration: 150ms;
 }
 
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-badge-stack,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-badge-stack,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   padding: 3px 7px;
 }
 
@@ -646,8 +648,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 }
 
 #nav-bar #PanelUI-menu-button {
-  -moz-padding-start: 5px;
-  -moz-padding-end: 5px;
+  padding-inline-start: 5px;
+  padding-inline-end: 5px;
 }
 
 #nav-bar #PanelUI-button,
@@ -737,7 +739,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   display: -moz-box;
   width: 1px;
   height: 18px;
-  -moz-margin-end: -1px;
+  margin-inline-end: -1px;
   background-position: center;
   background-repeat: no-repeat;
   background-size: 1px 18px;
@@ -760,7 +762,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 //}
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  -moz-margin-start: -4px;
+  margin-inline-start: -4px;
   //margin-top: 3px;
   //margin-bottom: 3px;
 }
@@ -857,7 +859,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 
 /* Menu panel buttons */
 
-:-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, #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),
+:-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, #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, #containers-panelmenu),
 #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/toolbar-icons.svg");
 
@@ -865,7 +867,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 }
 
 
-#back-button, #forward-button, #home-button, #print-button, #downloads-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-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 {
+#back-button, #forward-button, #home-button, #print-button, #downloads-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-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, #containers-panelmenu {
 
   #nav-bar &:not([disabled=true]):-moz-any([open],[checked],:hover:active),
   #TabsToolbar &:not([disabled=true]):-moz-any([open],[checked],:hover:active) {
@@ -882,7 +884,7 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
 
 }
 
-//toolbar[brighttext] :-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, #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, #pocket-button),
+//toolbar[brighttext] :-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, #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, #containers-panelmenu),
 //toolbar[brighttext] #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
 //  list-style-image: url(chrome://browser/skin/Toolbar-inverted.png);
 //}
@@ -935,6 +937,10 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
   -moz-image-region: rect(0, 792px, 18px, 774px);
 }
 
+#containers-panelmenu[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 810px, 18px, 792px);
+}
+
 #feed-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 288px, 18px, 270px);
 }
@@ -1055,8 +1061,8 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
 @media not all and (min-resolution: 1.1dppx) {
 
   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, #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)[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, #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) {
+  :-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, #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, #containers-panelmenu)[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu) {
     list-style-image: var(--menupanel-list-style-image);
   }
 
@@ -1112,6 +1118,15 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
     -moz-image-region: rect(32px, 1024px, 64px, 992px);
   }
 
+  #containers-panelmenu[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > #containers-panelmenu {
+    -moz-image-region: rect(0px, 1056px, 32px, 1024px);
+  }
+
+  #containers-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+    -moz-image-region: rect(32px, 1056px, 64px, 1024px);
+  }
+
   #feed-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #feed-button {
     -moz-image-region: rect(0px, 416px, 32px, 384px);
@@ -1259,8 +1274,8 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
 /* Menu panel and palette styles */
 @media (min-resolution: 1.1dppx) {
   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, #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)[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, #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) {
+  :-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, #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, #containers-panelmenu)[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu) {
     list-style-image: var(--menupanel-list-style-image-2x);
   }
 
@@ -1316,6 +1331,15 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
     -moz-image-region: rect(64px, 2048px, 128px, 1984px);
   }
 
+  #containers-panelmenu[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > #containers-panelmenu {
+    -moz-image-region: rect(0px, 2112px, 64px, 2048px);
+  }
+
+  #containers-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+    -moz-image-region: rect(64px, 2112px, 128px, 2048px);
+  }
+
   #feed-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #feed-button {
     -moz-image-region: rect(0px, 832px, 64px, 768px);
@@ -1420,6 +1444,11 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
     -moz-image-region: rect(0, 1664px, 64px, 1600px);
   }
 
+  #add-share-provider {
+    list-style-image: url(chrome://browser/skin/menuPanel-small@2x.png);
+    -moz-image-region: rect(0px, 192px, 32px, 160px);
+  }
+
   /* Footer and wide panel control icons */
   #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
   #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
@@ -1515,9 +1544,10 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
-  padding: 2px 3px;
+  padding: 0 3px;
   border-radius: 3px;
   margin: 0 3px;
+  min-height: 28px;
   @include entry(normal);
 }
 
@@ -1545,11 +1575,11 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
 
 .urlbar-textbox-container {
   -moz-appearance: none;
-  -moz-box-align: center;
+  -moz-box-align: stretch;
 }
 
 .urlbar-input-box {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 .urlbar-history-dropmarker {
@@ -1636,24 +1666,24 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
 #urlbar-search-splitter {
   -moz-appearance: none;
   width: 8px;
-  //-moz-margin-start: -4px;
+  //margin-inline-start: -4px;
 }
 
 //#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
-//  -moz-margin-start: 0;
+//  margin-inline-start: 0;
 //}
 
 #urlbar-display-box {
   margin-top: -1px;
   margin-bottom: -1px;
-  -moz-border-end: 1px solid #AAA;
-  -moz-margin-end: 3px;
+  border-inline-end: 1px solid #AAA;
+  margin-inline-end: 3px;
 }
 
 .urlbar-display {
   margin-top: 0;
   margin-bottom: 0;
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
   color: GrayText;
 }
 
@@ -1661,8 +1691,8 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
   border-bottom: 1px solid hsla(210, 4%, 10%, 0.14);
   background-color: hsla(210, 4%, 10%, 0.07);
   padding: 6px 0;
-  -moz-padding-start: 44px;
-  -moz-padding-end: 6px;
+  padding-inline-start: 44px;
+  padding-inline-end: 6px;
   background-image: url("chrome://browser/skin/info.svg");
   background-clip: padding-box;
   background-position: 20px center;
@@ -1680,7 +1710,7 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
 }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description > label.text-link {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button {
@@ -1689,7 +1719,7 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
   border-radius: 3px;
   padding: 4px 16px;
   margin: 0;
-  -moz-margin-start: 10px;
+  margin-inline-start: 10px;
 }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"] {
@@ -1744,15 +1774,10 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.
   --identity-box-verified-color: hsl(92,100%,30%);
   --identity-box-chrome-color: rgb(229,115,0);
 
-  border-inline-end: 1px solid var(--urlbar-separator-color);
-  border-image: linear-gradient(transparent 15%,
-                                var(--urlbar-separator-color) 15%,
-                                var(--urlbar-separator-color) 85%,
-                                transparent 85%);
-  border-image-slice: 1;
+  border-inline-end: 1px solid transparentize($entry_border, 0.5);
   font-size: .9em;
-  padding: 3px 5px 3px 3px;
-  margin-inline-end: 4px;
+  padding: 3px 9px 3px 7px;
+  margin-inline-end: 5px;
   overflow: hidden;
 //  /* The latter two properties have a transition to handle the delayed hiding of
 //     the forward button when hovered. */
@@ -1916,7 +1941,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .popup-notification-icon {
   width: 64px;
   height: 64px;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
 }
 
 .popup-notification-icon[popupid="geolocation"] {
@@ -1990,6 +2015,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   list-style-image: url(chrome://browser/skin/pointerLock-64.png);
 }
 
+.popup-notification-icon[popupid="servicesInstall"] {
+  list-style-image: url(chrome://browser/skin/social/services-64.png);
+}
+
 /* Notification icon box */
 #notification-popup-box {
   position: relative;
@@ -2022,6 +2051,9 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   transform: none;
 }
 
+/* This class can be used alone or in combination with the class defining the
+   type of icon displayed. This rule must be defined before the others in order
+   for its list-style-image to be overridden. */
 .notification-anchor-icon {
   list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16);
   width: 16px;
@@ -2029,59 +2061,62 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   margin: 0 2px;
 }
 
-.geo-notification-icon,
-#geo-notification-icon {
+@media (min-resolution: 1.1dppx) {
+  .notification-anchor-icon {
+    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog);
+  }
+}
+
+.geo-icon {
   list-style-image: url(chrome://browser/skin/Geolocation-16.png);
 }
 
-#addons-notification-icon {
+.install-icon {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default);
 }
 
-#addons-notification-icon:hover {
+.install-icon:hover {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#hover);
 }
 
-#addons-notification-icon:hover:active {
+.install-icon:hover:active {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#active);
 }
 
-.indexedDB-notification-icon,
-#indexedDB-notification-icon {
+.indexedDB-icon {
   list-style-image: url(chrome://global/skin/icons/question-16.png);
 }
 
-#password-notification-icon {
+.login-icon {
   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);
+  /* Temporary solution until the capture and fill doorhangers are unified. */
   transform: scaleX(-1);
 }
 
-#plugins-notification-icon {
+.plugin-icon {
   list-style-image: url(chrome://browser/skin/notification-pluginNormal.png);
 }
 
-#plugins-notification-icon.plugin-hidden {
+.plugin-icon.plugin-hidden {
   list-style-image: url(chrome://browser/skin/notification-pluginAlert.png);
 }
 
-#plugins-notification-icon.plugin-blocked {
+.plugin-icon.plugin-blocked {
   list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png);
 }
 
-#plugins-notification-icon {
+.plugin-icon {
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-#plugins-notification-icon:hover {
+.plugin-icon:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
-#plugins-notification-icon:active {
+.plugin-icon:active {
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
@@ -2105,84 +2140,72 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   }
 }
 
-.webRTC-shareDevices-notification-icon,
-#webRTC-shareDevices-notification-icon {
+.camera-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png);
 }
 
+/* The first selector is used by socialchat.xml (bug 1275558). */
 .webRTC-sharingDevices-notification-icon,
-#webRTC-sharingDevices-notification-icon {
+.camera-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16.png);
 }
 
-.webRTC-shareMicrophone-notification-icon,
-#webRTC-shareMicrophone-notification-icon {
+.microphone-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16.png);
 }
 
+/* The first selector is used by socialchat.xml (bug 1275558). */
 .webRTC-sharingMicrophone-notification-icon,
-#webRTC-sharingMicrophone-notification-icon {
+.microphone-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16.png);
 }
 
-.webRTC-shareScreen-notification-icon,
-#webRTC-shareScreen-notification-icon {
+.screen-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png);
 }
 
-.webRTC-sharingScreen-notification-icon,
-#webRTC-sharingScreen-notification-icon {
+.screen-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png);
 }
 
-.web-notifications-notification-icon,
-#web-notifications-notification-icon {
+.web-notifications-icon {
   list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-.web-notifications-notification-icon:hover,
-#web-notifications-notification-icon:hover {
+.web-notifications-icon:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
-.web-notifications-notification-icon:hover:active,
-#web-notifications-notification-icon:hover:active {
+.web-notifications-icon:hover:active {
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
-.pointerLock-notification-icon,
-#pointerLock-notification-icon {
+.pointer-icon {
   list-style-image: url(chrome://browser/skin/pointerLock-16.png);
 }
 
-.translate-notification-icon,
-#translate-notification-icon {
-  list-style-image: url(chrome://browser/skin/translation-16.png);
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+.service-icon {
+  list-style-image: url(chrome://browser/skin/social/services-16.png);
 }
 
-.translated-notification-icon,
-#translated-notification-icon {
+.translation-icon {
   list-style-image: url(chrome://browser/skin/translation-16.png);
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
-.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);
+.translation-icon.in-use {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
 /* EME notifications */
 
 .popup-notification-icon[popupid="drmContentPlaying"],
-#eme-notification-icon {
+.drm-icon {
   list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
 }
 
-#eme-notification-icon:hover:active {
+.drm-icon:hover:active {
   list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed");
 }
 
@@ -2203,37 +2226,27 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
     //border-image: url("chrome://browser/skin/urlbar-arrow@2x.png") 0 16 0 0 fill;
   }
 
-  .notification-anchor-icon {
-    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog);
-  }
-
-  .webRTC-shareDevices-notification-icon,
-  #webRTC-shareDevices-notification-icon {
+  .camera-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16@2x.png);
   }
 
-  .webRTC-sharingDevices-notification-icon,
-  #webRTC-sharingDevices-notification-icon {
+  .camera-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16@2x.png);
   }
 
-  .webRTC-shareMicrophone-notification-icon,
-  #webRTC-shareMicrophone-notification-icon {
+  .microphone-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16@2x.png);
   }
 
-  .webRTC-sharingMicrophone-notification-icon,
-  #webRTC-sharingMicrophone-notification-icon {
+  .microphone-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16@2x.png);
   }
 
-  .webRTC-shareScreen-notification-icon,
-  #webRTC-shareScreen-notification-icon {
+  .screen-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16@2x.png);
   }
 
-  .webRTC-sharingScreen-notification-icon,
-  #webRTC-sharingScreen-notification-icon {
+  .screen-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16@2x.png);
   }
 
@@ -2273,8 +2286,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   outline: 1px dotted -moz-DialogText;
 }
 
-.indexedDB-notification-icon,
-#indexedDB-notification-icon {
+.indexedDB-icon {
   list-style-image: url(moz-icon://stock/gtk-dialog-question?size=16);
 }
 
@@ -2358,7 +2370,7 @@ notification[value="translation"] menulist > .menulist-dropmarker {
 }
 
 .translation-welcome-content {
-  -moz-margin-start: 16px;
+  margin-inline-start: 16px;
 }
 
 .translation-welcome-headline {
@@ -2388,7 +2400,7 @@ notification[value="translation"] {
 
 notification[value="translation"] button,
 notification[value="translation"] menulist {
-  -moz-padding-end: 1ch;
+  padding-inline-end: 1ch;
 }
 
 notification[value="translation"] menulist {
@@ -2404,8 +2416,8 @@ notification[value="translation"] button {
 notification[value="translation"] button,
 notification[value="translation"] menulist,
 notification[value="translation"] menulist > .menulist-label-box {
-  -moz-margin-start: 1ch;
-  -moz-margin-end: 1ch;
+  margin-inline-start: 1ch;
+  margin-inline-end: 1ch;
 }
 
 notification[value="translation"] button:hover,
@@ -2430,11 +2442,11 @@ notification[value="translation"] button[anonid="translate"]:active {
 notification[value="translation"] button > .button-box,
 notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker {
   padding: 0;
-  -moz-margin-start: 3ch;
+  margin-inline-start: 3ch;
 }
 
 notification[value="translation"] button:not([type="menu"]) > .button-box {
-  -moz-margin-end: 3ch;
+  margin-inline-end: 3ch;
 }
 
 notification[value="translation"] menulist > .menulist-dropmarker {
@@ -2445,11 +2457,6 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   max-width : 36px;
 }
 
-#PopupAutoCompleteRichResult {
-  /* The awesomebar popup should open just below the navbar bottom border. */
-  margin-top: 1px;
-}
-
 .autocomplete-richlistbox {
   padding: 4px;
 }
@@ -2467,11 +2474,11 @@ notification[value="translation"] menulist > .menulist-dropmarker {
 }
 
 .ac-title {
-  font-size: 14px;
+  font-size: 1.05em;
 }
 
 .ac-tags {
-  font-size: 12px;
+  font-size: 0.9em;
 }
 
 html|span.ac-tag {
@@ -2485,7 +2492,7 @@ html|span.ac-tag {
 .ac-separator,
 .ac-url,
 .ac-action {
-  font-size: 12px;
+  font-size: 0.9em;
   color: -moz-nativehyperlinktext;
 }
 
@@ -2570,14 +2577,9 @@ html|span.ac-emphasize-text-url {
 #urlbar-stop-button {
   -moz-appearance: none;
   list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  padding: 0 4px 0 6px;
-  margin-inline-start: 2px;
-  border-inline-start: 1px solid var(--urlbar-separator-color);
-  border-image: linear-gradient(transparent 15%,
-                                var(--urlbar-separator-color) 15%,
-                                var(--urlbar-separator-color) 85%,
-                                transparent 85%);
-  border-image-slice: 1;
+  padding: 0 7px 0 10px;
+  margin-inline-start: 5px;
+  border-inline-start: 1px solid transparentize($entry_border, 0.5);
 }
 
 #urlbar-reload-button {
@@ -2975,12 +2977,12 @@ html|span.ac-emphasize-text-url {
 }
 
 .tab-content {
-  -moz-padding-end: 9px;
-  -moz-padding-start: 9px;
+  padding-inline-end: 9px;
+  padding-inline-start: 9px;
 }
 
 .tab-content[pinned] {
-  -moz-padding-end: 3px;
+  padding-inline-end: 3px;
 }
 
 .tab-throbber,
@@ -2994,7 +2996,7 @@ html|span.ac-emphasize-text-url {
 .tab-icon-image {
   height: 16px;
   width: 16px;
-  -moz-margin-end: 6px;
+  margin-inline-end: 6px;
 }
 
 .tab-icon-image {
@@ -3005,7 +3007,7 @@ html|span.ac-emphasize-text-url {
   width: 16px;
   height: 16px;
   margin-top: -12px;
-  -moz-margin-start: -16px;
+  margin-inline-start: -16px;
   position: relative;
 }
 
@@ -3048,18 +3050,18 @@ html|span.ac-emphasize-text-url {
 }
 
 .tab-label {
-  -moz-margin-end: 0;
-  -moz-margin-start: 0;
+  margin-inline-end: 0;
+  margin-inline-start: 0;
 }
 
 .tab-close-button {
-  -moz-margin-start: 4px;
-  -moz-margin-end: -2px;
+  margin-inline-start: 4px;
+  margin-inline-end: -2px;
   padding: 0;
 }
 
 .tab-icon-sound {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   width: 16px;
   height: 16px;
   padding: 0;
@@ -3089,26 +3091,32 @@ html|span.ac-emphasize-text-url {
   list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed");
 }
 
+.tab-icon-sound:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying] {
   list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio.svg#tab-audio");
 }
 
+.tab-icon-sound:hover:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying]:hover {
   list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio.svg#tab-audio-hover");
 }
 
+.tab-icon-sound:hover:active:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio.svg#tab-audio-pressed");
 }
 
+.tab-icon-sound[muted]:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted] {
   list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio.svg#tab-audio-muted");
 }
 
+.tab-icon-sound[muted]:hover:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted]:hover {
   list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio.svg#tab-audio-muted-hover");
 }
 
+.tab-icon-sound[muted]:hover:active:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio.svg#tab-audio-muted-pressed");
 }
@@ -3140,13 +3148,13 @@ html|span.ac-emphasize-text-url {
 .tab-background,
 .tabs-newtab-button {
   /* overlap the tab curves */
-  -moz-margin-end: -14px;
-  -moz-margin-start: -14px;
+  margin-inline-end: -14px;
+  margin-inline-start: -14px;
 }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
-  -moz-padding-end: 15px;
-  -moz-padding-start: 5px;
+  padding-inline-end: 15px;
+  padding-inline-start: 5px;
 }
 
 /* Tab Overflow */
@@ -3167,13 +3175,13 @@ html|span.ac-emphasize-text-url {
 }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]) {
-  -moz-margin-start: -2px;
-  -moz-margin-end: -12px;
+  margin-inline-start: -2px;
+  margin-inline-end: -12px;
 }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) {
-  -moz-margin-start: -12px;
-  -moz-margin-end: -2px;
+  margin-inline-start: -12px;
+  margin-inline-end: -2px;
 }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator[collapsed],
@@ -3221,7 +3229,7 @@ html|span.ac-emphasize-text-url {
 .tab-background-start[visuallyselected=true]::after,
 .tab-background-end[visuallyselected=true]::after {
   /* position ::after on top of its parent */
-  -moz-margin-start: -30px;
+  margin-inline-start: -30px;
   background-size: 100% 100%;
   content: "";
   display: -moz-box;
@@ -3315,31 +3323,6 @@ html|span.ac-emphasize-text-url {
   background-size: 30px 100%, calc(100% - (2 * 30px)) 100%, 30px 100%;
 }
 
-/* User Context UI - change tab decoration depending on userContextId.
-   Defaults to gray for unknown usercontextids. */
-.tabbrowser-tab[usercontextid] {
-  background-image: linear-gradient(to right, transparent 20%, #909090 30%, #909090 70%, transparent 80%);
-  background-size: auto 2px;
-  background-repeat: no-repeat;
-}
-
-/* Personal User Context */
-.tabbrowser-tab[usercontextid="1"] {
-  background-image: linear-gradient(to right, transparent 20%, #00a7e0 30%, #00a7e0 70%, transparent 80%);
-}
-/* Work User Context */
-.tabbrowser-tab[usercontextid="2"] {
-  background-image: linear-gradient(to right, transparent 20%, #f89c24 30%, #f89c24 70%, transparent 80%);
-}
-/* Banking User Context */
-.tabbrowser-tab[usercontextid="3"] {
-  background-image: linear-gradient(to right, transparent 20%, #7dc14c 30%, #7dc14c 70%, transparent 80%);
-}
-/* Shopping User Context */
-.tabbrowser-tab[usercontextid="4"] {
-  background-image: linear-gradient(to right, transparent 20%, #ee5195 30%, #ee5195 70%, transparent 80%);
-}
-
 /* Tab pointer-events */
 .tabbrowser-tab {
   pointer-events: none;
@@ -3602,7 +3585,7 @@ menuitem:hover > hbox > .alltabs-endimage[soundplaying] {
 /* Sidebar */
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading.png");
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
 }
 
 toolbarbutton.chevron {
@@ -3663,33 +3646,6 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   margin-top: 10px;
 }
 
-/* Sync Panel */
-
-.sync-panel-icon {
-  height:32px;
-  width: 32px;
-  background: url("chrome://browser/content/abouthome/sync.png") top left no-repeat;
-}
-
-.sync-panel-inner {
-  width: 0;
-  padding-left: 10px;
-}
-
-.sync-panel-button-box {
-  margin-top: 1em;
-}
-
-#sync-start-panel-title {
-  font-size: 120%;
-  font-weight: bold;
-  margin-bottom: 5px;
-}
-
-#sync-start-panel-subtitle {
-  margin-bottom: 0;
-}
-
 /* Status panel */
 
 .statuspanel-label {
@@ -3905,7 +3861,7 @@ html|*#fullscreen-exit-button {
   -moz-appearance: none;
   color: inherit;
   border-width: 0;
-  -moz-border-end: 1px solid hsla(210,8%,5%,.45);
+  border-inline-end: 1px solid hsla(210,8%,5%,.45);
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15) inset, 1px 0 0 hsla(210,16%,76%,.15);
 }
 
@@ -4131,16 +4087,20 @@ html|*#fullscreen-exit-button {
   --gcli-border-color: #dde1e4; /* --theme-splitter-color */
   --selection-background: #4c9ed9; /* --theme-selection-background */
   --selection-color: #f5f7fa; /* --theme-selection-color */
+  --command-line-image: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme); /* --theme-command-line-image */
+  --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme-focus); /* --theme-command-line-image-focus */
 }
 
 :root[devtoolstheme="dark"] #developer-toolbar {
-  --gcli-background-color: #343c45; /* --theme-toolbar-background */
-  --gcli-input-background: rgba(37, 44, 51, .6); /* --theme-tab-toolbar-background */
-  --gcli-input-focused-background: #252c33; /* --theme-tab-toolbar-background */
+  --gcli-background-color: #272b35; /* --theme-toolbar-background */
+  --gcli-input-background: #272b35; /* --theme-tab-toolbar-background */
+  --gcli-input-focused-background: #272b35; /* --theme-tab-toolbar-background */
   --gcli-input-color: #b6babf; /* --theme-body-color-alt */
-  --gcli-border-color: black; /* --theme-splitter-color */
-  --selection-background: #1d4f73; /* --theme-selection-background */
+  --gcli-border-color: #454d5d; /* --theme-splitter-color */
+  --selection-background: #5675b9; /* --theme-selection-background */
   --selection-color: #f5f7fa; /* --theme-selection-color */
+  --command-line-image: url(chrome://devtools/skin/images/commandline-icon.svg#dark-theme); /* --theme-command-line-image */
+  --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#dark-theme-focus); /* --theme-command-line-image-focus */
 }
 
 #developer-toolbar {
@@ -4274,19 +4234,11 @@ html|*#gcli-output-frame {
   width: 16px;
   height: 16px;
   margin: 0 2px;
-  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
-  background-position: 0 center;
-  background-size: 32px 16px;
+  background-image: var(--command-line-image);
 }
 
 .gclitoolbar-input-node[focused="true"]::before {
-  background-position: -16px center;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .gclitoolbar-input-node::before {
-    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png");
-  }
+  background-image: var(--command-line-image-focus);
 }
 
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
@@ -4348,7 +4300,7 @@ html|*#gcli-output-frame {
 }
 
 .center-item-label {
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
   margin-bottom: 0;
   text-overflow: ellipsis;
 }
@@ -4358,7 +4310,7 @@ html|*#gcli-output-frame {
   background-repeat: no-repeat;
   width: 16px;
   height: 15px;
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
 }
 
 .click-to-play-plugins-notification-button-container {
@@ -4482,7 +4434,7 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:h
   border-left: 1px solid hsla(210,4%,10%,.3);
   box-shadow: 0 3px 5px hsla(210,4%,10%,.1),
               0 0 7px hsla(210,4%,10%,.1);
-  -moz-margin-start: 38px;
+  margin-inline-start: 38px;
 }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -4686,7 +4638,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   background-image: linear-gradient(#505050, #575757);
   border: 1px solid;
   border-color: hsla(0,0%,0%,.6) hsla(0,0%,0%,.4) hsla(0,0%,0%,.4);
-  -moz-border-start: none;
+  border-inline-start: none;
   border-radius: 0 2px 2px 0;
 }
 
@@ -4714,7 +4666,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
-  -moz-margin-end: 2px;
+  margin-inline-end: 2px;
 }
 
 /* Social toolbar item */
@@ -4963,11 +4915,11 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
 }
 
 chatbar {
-  -moz-margin-end: 20px;
+  margin-inline-end: 20px;
 }
 
 chatbox {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   background-color: transparent;
 }
 
@@ -4979,11 +4931,11 @@ chatbar > chatbox {
   box-shadow: 0 0 5px rgba(0,0,0,.3);
   /* Offset the chatbox the same amount as the box-shadows' spread, to make it
      visible. */
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 
 window > chatbox {
-  -moz-margin-start: 0px;
+  margin-inline-start: 0px;
   margin: 0px;
   border: none;
   padding: 0px;
@@ -5155,7 +5107,7 @@ window > chatbox {
 #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: 6px !important;
+  margin-inline-start: 6px !important;
 }
 
 #customization-lwtheme-button > .box-inherit > .box-inherit > .button-icon {
@@ -5301,7 +5253,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 }
 
 #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 
 #customization-palette > toolbarpaletteitem > label {
@@ -5327,9 +5279,9 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   border: 1px solid transparent;
   margin: 0 -5px 5px;
   padding-top: 0;
-  -moz-padding-end: 5px;
+  padding-inline-end: 5px;
   padding-bottom: 0;
-  -moz-padding-start: 0;
+  padding-inline-start: 0;
 }
 
 .customization-lwtheme-menu-theme[defaulttheme] {
@@ -5401,7 +5353,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 }
 
 .customization-lwtheme-menu-footeritem:first-child {
-  -moz-border-end: 1px solid hsla(210,4%,10%,.15);
+  border-inline-end: 1px solid hsla(210,4%,10%,.15);
 }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -5474,7 +5426,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 .customization-tipPanel-closeBox > .close-icon {
   -moz-appearance: none;
   border: 0;
-  -moz-margin-end: -25px;
+  margin-inline-end: -25px;
 }
 
 #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"],
@@ -5570,7 +5522,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   -moz-box-align: start;
 }
 
-#UITourtooltipTitleContainer {
+#UITourTooltipTitleContainer {
   -moz-box-align: start;
   margin-bottom: 10px;
 }
@@ -5578,7 +5530,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 #UITourTooltipIcon {
   width: 48px;
   height: 48px;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
 }
 
 #UITourTooltipTitle,
@@ -5593,8 +5545,8 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 }
 
 #UITourTooltipDescription {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
   font-size: 1.15rem;
   line-height: 1.8rem;
   margin-bottom: 0; /* Override global.css */
@@ -5606,7 +5558,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   border: none;
   background-color: transparent;
   min-width: 0;
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   margin-top: -2px;
 }
 
@@ -5629,7 +5581,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 
 #UITourTooltipButtons > label:first-child,
 #UITourTooltipButtons > button:first-child {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #UITourTooltipButtons > label:last-child,
@@ -5640,7 +5592,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 #UITourTooltipButtons > button[image] > .button-box > .button-icon {
   width: 16px;
   height: 16px;
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 
 #UITourTooltipButtons > label,
@@ -5740,16 +5692,16 @@ notification.heartbeat {
 .messageText.heartbeat {
   color: #333333;
   text-shadow: none;
-  -moz-margin-start: 0px;
+  margin-inline-start: 0px;
   /* The !important is required to override OSX default style. */
-  -moz-margin-end: 12px !important;
+  margin-inline-end: 12px !important;
 }
 
 .messageImage.heartbeat {
   width: 24px;
   height: 24px;
-  -moz-margin-start: 8px;
-  -moz-margin-end: 8px;
+  margin-inline-start: 8px;
+  margin-inline-end: 8px;
 }
 
 .messageImage.heartbeat.pulse-onshow {
@@ -5769,7 +5721,7 @@ notification.heartbeat {
 /* Learn More link styles */
 .heartbeat > .text-link {
   color: #0095DD;
-  -moz-margin-start: 0px;
+  margin-inline-start: 0px;
 }
 
 .heartbeat > .text-link:hover {
@@ -5806,8 +5758,8 @@ notification.heartbeat {
 .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;
+  /* Overrides the margin-inline-end for all platforms defined in the .plain class */
+  margin-inline-end: 4px !important;
   width: 16px;
   height: 16px;
 }
@@ -5835,7 +5787,7 @@ notification.heartbeat {
 }
 
 #UITourTooltipClose {
-  -moz-margin-end: -4px;
+  margin-inline-end: -4px;
   height: 16px;
   width: 16px;
 }
@@ -5950,8 +5902,8 @@ notification.heartbeat {
 #context-navigation > .menuitem-iconic > .menu-iconic-left {
   visibility: visible;
   /* override toolkit/themes/linux/global/menu.css */
-  -moz-padding-end: 0 !important;
-  -moz-margin-end: 0 !important;
+  padding-inline-end: 0 !important;
+  margin-inline-end: 0 !important;
 }
 
 .browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
@@ -5959,72 +5911,10 @@ notification.heartbeat {
   overflow: hidden;
 }
 
-/* User Context UI browser styles */
-
-#menu_newUserContextTabPersonal {
-  list-style-image: url("chrome://browser/skin/usercontext/personal.svg");
-}
-
-#menu_newUserContextTabWork {
-  list-style-image: url("chrome://browser/skin/usercontext/work.svg");
+.webextension-popup-browser {
+  border-radius: inherit;
 }
 
-#menu_newUserContextTabBanking {
-  list-style-image: url("chrome://browser/skin/usercontext/banking.svg");
-}
-
-#menu_newUserContextTabShopping {
-  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg");
-}
-
-/* URL Bar Decoration */
-
-#userContext-indicator {
-  height: 16px;
-  width: 16px;
-}
-
-#userContext-label {
-  margin-inline-end: 3px;
-  color: #909090;
-}
-
-#userContext-icons:not([usercontextid]) {
-  display: none;
-}
-
-#userContext-icons {
-  -moz-box-align: center;
-}
-
-/* Personal User Context */
-#userContext-icons[usercontextid="1"] > #userContext-label {
-  color: #00a7e0;
-}
-#userContext-icons[usercontextid="1"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/personal.svg");
-}
-
-/* Work User Context */
-#userContext-icons[usercontextid="2"] > #userContext-label {
-  color: #f89c24;
-}
-#userContext-icons[usercontextid="2"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/work.svg");
-}
-
-/* Banking User Context */
-#userContext-icons[usercontextid="3"] > #userContext-label {
-  color: #7dc14c;
-}
-#userContext-icons[usercontextid="3"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/banking.svg");
-}
-
-/* Shopping User Context */
-#userContext-icons[usercontextid="4"] > #userContext-label {
-  color: #ee5195;
-}
-#userContext-icons[usercontextid="4"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg");
+.menuitem-iconic[command="Browser:NewUserContextTab"] > .menu-iconic-left > .menu-iconic-icon {
+  visibility: visible;
 }
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-dark.css b/arc-firefox-theme/chrome/browser/sass/browser-dark.css
index e860708..3d5b595 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-dark.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-dark.css
@@ -218,7 +218,7 @@ menuitem.bookmark-item {
   margin-bottom: 0; }
 
 .bookmark-item > .menu-iconic-left > .menu-iconic-icon {
-  -moz-padding-start: 0px; }
+  padding-inline-start: 0px; }
 
 /* Bookmark drag and drop styles */
 .bookmark-item[dragover-into="true"] {
@@ -235,7 +235,7 @@ menuitem.bookmark-item {
 .menupopup-drop-indicator {
   list-style-image: none;
   height: 2px;
-  -moz-margin-end: -4em;
+  margin-inline-end: -4em;
   background-color: Highlight; }
 
 /* Bookmarks toolbar */
@@ -297,6 +297,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #placesContext_openContainer\:tabs,
 #menu_newNavigatorTab,
 #context-openlinkintab,
+#context-openlinkincontainertab,
 #context-openframeintab {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
   -moz-image-region: rect(0px 64px 16px 48px); }
@@ -436,6 +437,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #panelMenu_bookmarksToolbar {
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); }
 
+#menu_unsortedBookmarks,
 #BMB_unsortedBookmarks,
 #panelMenu_unsortedBookmarks {
   list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); }
@@ -476,8 +478,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
   max-width: 16px; }
 
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
 #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   max-width: 18px; }
 
@@ -495,16 +497,16 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-badge-stack,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
   padding: 2px 6px;
   border: 1px solid transparent;
   border-radius: 2px;
   transition-property: background-color, border-color;
   transition-duration: 150ms; }
 
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-badge-stack,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-badge-stack,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   padding: 3px 7px; }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon,
@@ -514,8 +516,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   max-width: 32px !important; }
 
 #nav-bar #PanelUI-menu-button {
-  -moz-padding-start: 5px;
-  -moz-padding-end: 5px; }
+  padding-inline-start: 5px;
+  padding-inline-end: 5px; }
 
 #nav-bar #PanelUI-button,
 #nav-bar[brighttext] #PanelUI-button {
@@ -592,7 +594,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   display: -moz-box;
   width: 1px;
   height: 18px;
-  -moz-margin-end: -1px;
+  margin-inline-end: -1px;
   background-position: center;
   background-repeat: no-repeat;
   background-size: 1px 18px; }
@@ -606,7 +608,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   background: rgba(207, 218, 231, 0.15); }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  -moz-margin-start: -4px; }
+  margin-inline-start: -4px; }
 
 #back-button > menupopup {
   margin-top: -1px; }
@@ -636,14 +638,14 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu") !important; }
 
 /* Menu panel buttons */
-:-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, #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),
+:-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, #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, #containers-panelmenu),
 #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   list-style-image: url("chrome://browser/skin/custom_images/dark/toolbar-icons.svg"); }
-  #TabsToolbar :-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, #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), #TabsToolbar
+  #TabsToolbar :-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, #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, #containers-panelmenu), #TabsToolbar
   #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
     list-style-image: url("chrome://browser/skin/custom_images/dark/tabbar-icons.svg"); }
 
-#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) {
+#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #containers-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #containers-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active) {
   list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.svg"); }
 
 #nav-bar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .dropmarker-icon,
@@ -688,6 +690,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #sync-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 792px, 18px, 774px); }
 
+#containers-panelmenu[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 810px, 18px, 792px); }
+
 #feed-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 288px, 18px, 270px); }
 
@@ -778,8 +783,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 
 @media not all and (min-resolution: 1.1dppx) {
   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, #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)[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, #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) {
+  :-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, #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, #containers-panelmenu)[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu) {
     list-style-image: var(--menupanel-list-style-image); }
 
   #home-button[cui-areatype="menu-panel"],
@@ -823,6 +828,13 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
     -moz-image-region: rect(32px, 1024px, 64px, 992px); }
 
+  #containers-panelmenu[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > #containers-panelmenu {
+    -moz-image-region: rect(0px, 1056px, 32px, 1024px); }
+
+  #containers-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+    -moz-image-region: rect(32px, 1056px, 64px, 1024px); }
+
   #feed-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #feed-button {
     -moz-image-region: rect(0px, 416px, 32px, 384px); }
@@ -938,8 +950,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 /* Menu panel and palette styles */
 @media (min-resolution: 1.1dppx) {
   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, #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)[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, #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) {
+  :-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, #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, #containers-panelmenu)[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu) {
     list-style-image: var(--menupanel-list-style-image-2x); }
 
   #home-button[cui-areatype="menu-panel"],
@@ -983,6 +995,13 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
     -moz-image-region: rect(64px, 2048px, 128px, 1984px); }
 
+  #containers-panelmenu[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > #containers-panelmenu {
+    -moz-image-region: rect(0px, 2112px, 64px, 2048px); }
+
+  #containers-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+    -moz-image-region: rect(64px, 2112px, 128px, 2048px); }
+
   #feed-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #feed-button {
     -moz-image-region: rect(0px, 832px, 64px, 768px); }
@@ -1065,6 +1084,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   toolbaritem[sdkstylewidget="true"] > toolbarbutton {
     -moz-image-region: rect(0, 1664px, 64px, 1600px); }
 
+  #add-share-provider {
+    list-style-image: url(chrome://browser/skin/menuPanel-small@2x.png);
+    -moz-image-region: rect(0px, 192px, 32px, 160px); }
+
   /* Footer and wide panel control icons */
   #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
   #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
@@ -1140,9 +1163,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
-  padding: 2px 3px;
+  padding: 0 3px;
   border-radius: 3px;
   margin: 0 3px;
+  min-height: 28px;
   color: #D3DAE3;
   background-color: #404552;
   border: 1px solid #2b2e39; }
@@ -1168,10 +1192,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 
 .urlbar-textbox-container {
   -moz-appearance: none;
-  -moz-box-align: center; }
+  -moz-box-align: stretch; }
 
 .urlbar-input-box {
-  -moz-margin-start: 0; }
+  margin-inline-start: 0; }
 
 .urlbar-history-dropmarker {
   -moz-appearance: toolbarbutton-dropdown;
@@ -1221,21 +1245,21 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #urlbar-display-box {
   margin-top: -1px;
   margin-bottom: -1px;
-  -moz-border-end: 1px solid #AAA;
-  -moz-margin-end: 3px; }
+  border-inline-end: 1px solid #AAA;
+  margin-inline-end: 3px; }
 
 .urlbar-display {
   margin-top: 0;
   margin-bottom: 0;
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
   color: GrayText; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] {
   border-bottom: 1px solid rgba(24, 26, 27, 0.14);
   background-color: rgba(24, 26, 27, 0.07);
   padding: 6px 0;
-  -moz-padding-start: 44px;
-  -moz-padding-end: 6px;
+  padding-inline-start: 44px;
+  padding-inline-end: 6px;
   background-image: url("chrome://browser/skin/info.svg");
   background-clip: padding-box;
   background-position: 20px center;
@@ -1250,7 +1274,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   padding: 0; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description > label.text-link {
-  -moz-margin-start: 0; }
+  margin-inline-start: 0; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button {
   -moz-appearance: none;
@@ -1258,7 +1282,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   border-radius: 3px;
   padding: 4px 16px;
   margin: 0;
-  -moz-margin-start: 10px; }
+  margin-inline-start: 10px; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"] {
   color: #616161;
@@ -1298,12 +1322,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #identity-box {
   --identity-box-verified-color: #479900;
   --identity-box-chrome-color: #e57300;
-  border-inline-end: 1px solid var(--urlbar-separator-color);
-  border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
-  border-image-slice: 1;
+  border-inline-end: 1px solid rgba(43, 46, 57, 0.5);
   font-size: .9em;
-  padding: 3px 5px 3px 3px;
-  margin-inline-end: 4px;
+  padding: 3px 9px 3px 7px;
+  margin-inline-end: 5px;
   overflow: hidden; }
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
@@ -1407,7 +1429,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .popup-notification-icon {
   width: 64px;
   height: 64px;
-  -moz-margin-end: 10px; }
+  margin-inline-end: 10px; }
 
 .popup-notification-icon[popupid="geolocation"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png); }
@@ -1464,6 +1486,9 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .popup-notification-icon[popupid="pointerLock"] {
   list-style-image: url(chrome://browser/skin/pointerLock-64.png); }
 
+.popup-notification-icon[popupid="servicesInstall"] {
+  list-style-image: url(chrome://browser/skin/social/services-64.png); }
+
 /* Notification icon box */
 #notification-popup-box {
   position: relative;
@@ -1485,53 +1510,56 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .notification-anchor-icon.chat-toolbarbutton:-moz-locale-dir(rtl) {
   transform: none; }
 
+/* This class can be used alone or in combination with the class defining the
+   type of icon displayed. This rule must be defined before the others in order
+   for its list-style-image to be overridden. */
 .notification-anchor-icon {
   list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16);
   width: 16px;
   height: 16px;
   margin: 0 2px; }
 
-.geo-notification-icon,
-#geo-notification-icon {
+@media (min-resolution: 1.1dppx) {
+  .notification-anchor-icon {
+    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); } }
+.geo-icon {
   list-style-image: url(chrome://browser/skin/Geolocation-16.png); }
 
-#addons-notification-icon {
+.install-icon {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); }
 
-#addons-notification-icon:hover {
+.install-icon:hover {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#hover); }
 
-#addons-notification-icon:hover:active {
+.install-icon:hover:active {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#active); }
 
-.indexedDB-notification-icon,
-#indexedDB-notification-icon {
+.indexedDB-icon {
   list-style-image: url(chrome://global/skin/icons/question-16.png); }
 
-#password-notification-icon {
+.login-icon {
   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);
+  /* Temporary solution until the capture and fill doorhangers are unified. */
   transform: scaleX(-1); }
 
-#plugins-notification-icon {
+.plugin-icon {
   list-style-image: url(chrome://browser/skin/notification-pluginNormal.png); }
 
-#plugins-notification-icon.plugin-hidden {
+.plugin-icon.plugin-hidden {
   list-style-image: url(chrome://browser/skin/notification-pluginAlert.png); }
 
-#plugins-notification-icon.plugin-blocked {
+.plugin-icon.plugin-blocked {
   list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png); }
 
-#plugins-notification-icon {
+.plugin-icon {
   -moz-image-region: rect(0, 16px, 16px, 0); }
 
-#plugins-notification-icon:hover {
+.plugin-icon:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px); }
 
-#plugins-notification-icon:active {
+.plugin-icon:active {
   -moz-image-region: rect(0, 48px, 16px, 32px); }
 
 #notification-popup-box[hidden] {
@@ -1548,69 +1576,57 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
     opacity: 0; }
   to {
     opacity: 1; } }
-.webRTC-shareDevices-notification-icon,
-#webRTC-shareDevices-notification-icon {
+.camera-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png); }
 
+/* The first selector is used by socialchat.xml (bug 1275558). */
 .webRTC-sharingDevices-notification-icon,
-#webRTC-sharingDevices-notification-icon {
+.camera-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16.png); }
 
-.webRTC-shareMicrophone-notification-icon,
-#webRTC-shareMicrophone-notification-icon {
+.microphone-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16.png); }
 
+/* The first selector is used by socialchat.xml (bug 1275558). */
 .webRTC-sharingMicrophone-notification-icon,
-#webRTC-sharingMicrophone-notification-icon {
+.microphone-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16.png); }
 
-.webRTC-shareScreen-notification-icon,
-#webRTC-shareScreen-notification-icon {
+.screen-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); }
 
-.webRTC-sharingScreen-notification-icon,
-#webRTC-sharingScreen-notification-icon {
+.screen-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png); }
 
-.web-notifications-notification-icon,
-#web-notifications-notification-icon {
+.web-notifications-icon {
   list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
   -moz-image-region: rect(0, 16px, 16px, 0); }
 
-.web-notifications-notification-icon:hover,
-#web-notifications-notification-icon:hover {
+.web-notifications-icon:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px); }
 
-.web-notifications-notification-icon:hover:active,
-#web-notifications-notification-icon:hover:active {
+.web-notifications-icon:hover:active {
   -moz-image-region: rect(0, 48px, 16px, 32px); }
 
-.pointerLock-notification-icon,
-#pointerLock-notification-icon {
+.pointer-icon {
   list-style-image: url(chrome://browser/skin/pointerLock-16.png); }
 
-.translate-notification-icon,
-#translate-notification-icon {
+.service-icon {
+  list-style-image: url(chrome://browser/skin/social/services-16.png); }
+
+.translation-icon {
   list-style-image: url(chrome://browser/skin/translation-16.png);
   -moz-image-region: rect(0px, 16px, 16px, 0px); }
 
-.translated-notification-icon,
-#translated-notification-icon {
-  list-style-image: url(chrome://browser/skin/translation-16.png);
+.translation-icon.in-use {
   -moz-image-region: rect(0px, 32px, 16px, 16px); }
 
-.popup-notification-icon[popupid="servicesInstall"] {
-  list-style-image: url(chrome://browser/skin/social/services-64.png); }
-
-#servicesInstall-notification-icon {
-  list-style-image: url(chrome://browser/skin/social/services-16.png); }
-
 /* EME notifications */
 .popup-notification-icon[popupid="drmContentPlaying"],
-#eme-notification-icon {
+.drm-icon {
   list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); }
 
-#eme-notification-icon:hover:active {
+.drm-icon:hover:active {
   list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed"); }
 
 #eme-notification-icon[firstplay=true] {
@@ -1627,31 +1643,22 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
     transform: translateX(0); } }
 /* HiDPI notification icons */
 @media (min-resolution: 1.1dppx) {
-  .notification-anchor-icon {
-    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); }
-
-  .webRTC-shareDevices-notification-icon,
-  #webRTC-shareDevices-notification-icon {
+  .camera-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16@2x.png); }
 
-  .webRTC-sharingDevices-notification-icon,
-  #webRTC-sharingDevices-notification-icon {
+  .camera-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16@2x.png); }
 
-  .webRTC-shareMicrophone-notification-icon,
-  #webRTC-shareMicrophone-notification-icon {
+  .microphone-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16@2x.png); }
 
-  .webRTC-sharingMicrophone-notification-icon,
-  #webRTC-sharingMicrophone-notification-icon {
+  .microphone-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16@2x.png); }
 
-  .webRTC-shareScreen-notification-icon,
-  #webRTC-shareScreen-notification-icon {
+  .screen-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16@2x.png); }
 
-  .webRTC-sharingScreen-notification-icon,
-  #webRTC-sharingScreen-notification-icon {
+  .screen-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16@2x.png); }
 
   .popup-notification-icon[popupid="webRTC-sharingDevices"],
@@ -1680,8 +1687,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .notification-anchor-icon:-moz-focusring {
   outline: 1px dotted -moz-DialogText; }
 
-.indexedDB-notification-icon,
-#indexedDB-notification-icon {
+.indexedDB-icon {
   list-style-image: url(moz-icon://stock/gtk-dialog-question?size=16); }
 
 /* Translation infobar */
@@ -1746,7 +1752,7 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   -moz-image-region: rect(0, 64px, 32px, 32px); }
 
 .translation-welcome-content {
-  -moz-margin-start: 16px; }
+  margin-inline-start: 16px; }
 
 .translation-welcome-headline {
   font-size: larger;
@@ -1770,7 +1776,7 @@ notification[value="translation"] {
 
 notification[value="translation"] button,
 notification[value="translation"] menulist {
-  -moz-padding-end: 1ch; }
+  padding-inline-end: 1ch; }
 
 notification[value="translation"] menulist {
   border: 1px solid #C1C1C1;
@@ -1783,8 +1789,8 @@ notification[value="translation"] button {
 notification[value="translation"] button,
 notification[value="translation"] menulist,
 notification[value="translation"] menulist > .menulist-label-box {
-  -moz-margin-start: 1ch;
-  -moz-margin-end: 1ch; }
+  margin-inline-start: 1ch;
+  margin-inline-end: 1ch; }
 
 notification[value="translation"] button:hover,
 notification[value="translation"] button:active,
@@ -1805,10 +1811,10 @@ notification[value="translation"] button[anonid="translate"]:active {
 notification[value="translation"] button > .button-box,
 notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker {
   padding: 0;
-  -moz-margin-start: 3ch; }
+  margin-inline-start: 3ch; }
 
 notification[value="translation"] button:not([type="menu"]) > .button-box {
-  -moz-margin-end: 3ch; }
+  margin-inline-end: 3ch; }
 
 notification[value="translation"] menulist > .menulist-dropmarker {
   display: block; }
@@ -1816,10 +1822,6 @@ notification[value="translation"] menulist > .menulist-dropmarker {
 #treecolAutoCompleteImage {
   max-width: 36px; }
 
-#PopupAutoCompleteRichResult {
-  /* The awesomebar popup should open just below the navbar bottom border. */
-  margin-top: 1px; }
-
 .autocomplete-richlistbox {
   padding: 4px; }
 
@@ -1834,10 +1836,10 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   background-color: Highlight; }
 
 .ac-title {
-  font-size: 14px; }
+  font-size: 1.05em; }
 
 .ac-tags {
-  font-size: 12px; }
+  font-size: 0.9em; }
 
 html|span.ac-tag {
   background-color: MenuText;
@@ -1849,7 +1851,7 @@ html|span.ac-tag {
 .ac-separator,
 .ac-url,
 .ac-action {
-  font-size: 12px;
+  font-size: 0.9em;
   color: -moz-nativehyperlinktext; }
 
 .ac-title[selected=true],
@@ -1918,11 +1920,9 @@ html|span.ac-emphasize-text-url {
 #urlbar-stop-button {
   -moz-appearance: none;
   list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  padding: 0 4px 0 6px;
-  margin-inline-start: 2px;
-  border-inline-start: 1px solid var(--urlbar-separator-color);
-  border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
-  border-image-slice: 1; }
+  padding: 0 7px 0 10px;
+  margin-inline-start: 5px;
+  border-inline-start: 1px solid rgba(43, 46, 57, 0.5); }
 
 #urlbar-reload-button {
   -moz-image-region: rect(0, 14px, 14px, 0); }
@@ -2221,11 +2221,11 @@ html|span.ac-emphasize-text-url {
   margin: 0 -15px; }
 
 .tab-content {
-  -moz-padding-end: 9px;
-  -moz-padding-start: 9px; }
+  padding-inline-end: 9px;
+  padding-inline-start: 9px; }
 
 .tab-content[pinned] {
-  -moz-padding-end: 3px; }
+  padding-inline-end: 3px; }
 
 .tab-throbber,
 .tab-icon-image,
@@ -2237,7 +2237,7 @@ html|span.ac-emphasize-text-url {
 .tab-icon-image {
   height: 16px;
   width: 16px;
-  -moz-margin-end: 6px; }
+  margin-inline-end: 6px; }
 
 .tab-icon-image {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); }
@@ -2246,7 +2246,7 @@ html|span.ac-emphasize-text-url {
   width: 16px;
   height: 16px;
   margin-top: -12px;
-  -moz-margin-start: -16px;
+  margin-inline-start: -16px;
   position: relative; }
 
 .tab-icon-overlay[crashed] {
@@ -2273,16 +2273,16 @@ html|span.ac-emphasize-text-url {
   list-style-image: url("chrome://browser/skin/custom_images/loading.png"); }
 
 .tab-label {
-  -moz-margin-end: 0;
-  -moz-margin-start: 0; }
+  margin-inline-end: 0;
+  margin-inline-start: 0; }
 
 .tab-close-button {
-  -moz-margin-start: 4px;
-  -moz-margin-end: -2px;
+  margin-inline-start: 4px;
+  margin-inline-end: -2px;
   padding: 0; }
 
 .tab-icon-sound {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   width: 16px;
   height: 16px;
   padding: 0; }
@@ -2305,33 +2305,39 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound[muted]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); }
 
+.tab-icon-sound:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying] {
   list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio"); }
 
+.tab-icon-sound:hover:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying]:hover {
   list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-hover"); }
 
+.tab-icon-sound:hover:active:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-pressed"); }
 
+.tab-icon-sound[muted]:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted] {
   list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-muted"); }
 
+.tab-icon-sound[muted]:hover:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted]:hover {
   list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-muted-hover"); }
 
+.tab-icon-sound[muted]:hover:active:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-muted-pressed"); }
 
 .tab-background,
 .tabs-newtab-button {
   /* overlap the tab curves */
-  -moz-margin-end: -14px;
-  -moz-margin-start: -14px; }
+  margin-inline-end: -14px;
+  margin-inline-start: -14px; }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
-  -moz-padding-end: 15px;
-  -moz-padding-start: 5px; }
+  padding-inline-end: 15px;
+  padding-inline-start: 5px; }
 
 /* Tab Overflow */
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]),
@@ -2350,12 +2356,12 @@ html|span.ac-emphasize-text-url {
   transform: scaleX(-1); }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]) {
-  -moz-margin-start: -2px;
-  -moz-margin-end: -12px; }
+  margin-inline-start: -2px;
+  margin-inline-end: -12px; }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) {
-  -moz-margin-start: -12px;
-  -moz-margin-end: -2px; }
+  margin-inline-start: -12px;
+  margin-inline-end: -2px; }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator[collapsed],
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator[collapsed] {
@@ -2394,7 +2400,7 @@ html|span.ac-emphasize-text-url {
 .tab-background-start[visuallyselected=true]::after,
 .tab-background-end[visuallyselected=true]::after {
   /* position ::after on top of its parent */
-  -moz-margin-start: -30px;
+  margin-inline-start: -30px;
   background-size: 100% 100%;
   content: "";
   display: -moz-box;
@@ -2464,29 +2470,6 @@ lwtHeader;*/
   background-repeat: no-repeat;
   background-size: 30px 100%, calc(100% - (2 * 30px)) 100%, 30px 100%; }
 
-/* User Context UI - change tab decoration depending on userContextId.
-   Defaults to gray for unknown usercontextids. */
-.tabbrowser-tab[usercontextid] {
-  background-image: linear-gradient(to right, transparent 20%, #909090 30%, #909090 70%, transparent 80%);
-  background-size: auto 2px;
-  background-repeat: no-repeat; }
-
-/* Personal User Context */
-.tabbrowser-tab[usercontextid="1"] {
-  background-image: linear-gradient(to right, transparent 20%, #00a7e0 30%, #00a7e0 70%, transparent 80%); }
-
-/* Work User Context */
-.tabbrowser-tab[usercontextid="2"] {
-  background-image: linear-gradient(to right, transparent 20%, #f89c24 30%, #f89c24 70%, transparent 80%); }
-
-/* Banking User Context */
-.tabbrowser-tab[usercontextid="3"] {
-  background-image: linear-gradient(to right, transparent 20%, #7dc14c 30%, #7dc14c 70%, transparent 80%); }
-
-/* Shopping User Context */
-.tabbrowser-tab[usercontextid="4"] {
-  background-image: linear-gradient(to right, transparent 20%, #ee5195 30%, #ee5195 70%, transparent 80%); }
-
 /* Tab pointer-events */
 .tabbrowser-tab {
   pointer-events: none; }
@@ -2662,7 +2645,7 @@ menuitem:hover > hbox > .alltabs-endimage[soundplaying] {
 /* Sidebar */
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading.png");
-  -moz-margin-end: 4px; }
+  margin-inline-end: 4px; }
 
 toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important; }
@@ -2709,27 +2692,6 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   padding: 0 3px;
   margin-top: 10px; }
 
-/* Sync Panel */
-.sync-panel-icon {
-  height: 32px;
-  width: 32px;
-  background: url("chrome://browser/content/abouthome/sync.png") top left no-repeat; }
-
-.sync-panel-inner {
-  width: 0;
-  padding-left: 10px; }
-
-.sync-panel-button-box {
-  margin-top: 1em; }
-
-#sync-start-panel-title {
-  font-size: 120%;
-  font-weight: bold;
-  margin-bottom: 5px; }
-
-#sync-start-panel-subtitle {
-  margin-bottom: 0; }
-
 /* Status panel */
 .statuspanel-label {
   margin: 0;
@@ -2919,7 +2881,7 @@ html|*#fullscreen-exit-button {
   -moz-appearance: none;
   color: inherit;
   border-width: 0;
-  -moz-border-end: 1px solid rgba(12, 13, 14, 0.45);
+  border-inline-end: 1px solid rgba(12, 13, 14, 0.45);
   box-shadow: -1px 0 0 rgba(184, 194, 204, 0.15) inset, 1px 0 0 rgba(184, 194, 204, 0.15); }
 
 .devtools-responsiveui-toolbarbutton[type=menu-button]:-moz-locale-dir(rtl) > .toolbarbutton-menubutton-button {
@@ -3098,23 +3060,31 @@ html|*#fullscreen-exit-button {
   --selection-background: #4c9ed9;
   /* --theme-selection-background */
   --selection-color: #f5f7fa;
-  /* --theme-selection-color */ }
+  /* --theme-selection-color */
+  --command-line-image: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme);
+  /* --theme-command-line-image */
+  --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme-focus);
+  /* --theme-command-line-image-focus */ }
 
 :root[devtoolstheme="dark"] #developer-toolbar {
-  --gcli-background-color: #343c45;
+  --gcli-background-color: #272b35;
   /* --theme-toolbar-background */
-  --gcli-input-background: rgba(37, 44, 51, 0.6);
+  --gcli-input-background: #272b35;
   /* --theme-tab-toolbar-background */
-  --gcli-input-focused-background: #252c33;
+  --gcli-input-focused-background: #272b35;
   /* --theme-tab-toolbar-background */
   --gcli-input-color: #b6babf;
   /* --theme-body-color-alt */
-  --gcli-border-color: black;
+  --gcli-border-color: #454d5d;
   /* --theme-splitter-color */
-  --selection-background: #1d4f73;
+  --selection-background: #5675b9;
   /* --theme-selection-background */
   --selection-color: #f5f7fa;
-  /* --theme-selection-color */ }
+  /* --theme-selection-color */
+  --command-line-image: url(chrome://devtools/skin/images/commandline-icon.svg#dark-theme);
+  /* --theme-command-line-image */
+  --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#dark-theme-focus);
+  /* --theme-command-line-image-focus */ }
 
 #developer-toolbar {
   -moz-appearance: none;
@@ -3222,16 +3192,11 @@ html|*#gcli-output-frame {
   width: 16px;
   height: 16px;
   margin: 0 2px;
-  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
-  background-position: 0 center;
-  background-size: 32px 16px; }
+  background-image: var(--command-line-image); }
 
 .gclitoolbar-input-node[focused="true"]::before {
-  background-position: -16px center; }
+  background-image: var(--command-line-image-focus); }
 
-@media (min-resolution: 1.1dppx) {
-  .gclitoolbar-input-node::before {
-    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png"); } }
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
   background-color: var(--selection-background);
   color: var(--selection-color);
@@ -3280,7 +3245,7 @@ html|*#gcli-output-frame {
   background-color: rgba(0, 0, 0, 0.1); }
 
 .center-item-label {
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
   margin-bottom: 0;
   text-overflow: ellipsis; }
 
@@ -3289,7 +3254,7 @@ html|*#gcli-output-frame {
   background-repeat: no-repeat;
   width: 16px;
   height: 15px;
-  -moz-margin-start: 6px; }
+  margin-inline-start: 6px; }
 
 .click-to-play-plugins-notification-button-container {
   background-color: rgba(24, 26, 27, 0.07);
@@ -3388,7 +3353,7 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:h
   background-clip: padding-box;
   border-left: 1px solid rgba(24, 26, 27, 0.3);
   box-shadow: 0 3px 5px rgba(24, 26, 27, 0.1), 0 0 7px rgba(24, 26, 27, 0.1);
-  -moz-margin-start: 38px; }
+  margin-inline-start: 38px; }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -3554,7 +3519,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   background-image: linear-gradient(#505050, #575757);
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.6) rgba(0, 0, 0, 0.4) rgba(0, 0, 0, 0.4);
-  -moz-border-start: none;
+  border-inline-start: none;
   border-radius: 0 2px 2px 0; }
 
 #downloads-button[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
@@ -3576,7 +3541,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
-  -moz-margin-end: 2px; }
+  margin-inline-end: 2px; }
 
 /* Social toolbar item */
 .social-activation-icon {
@@ -3776,10 +3741,10 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   overflow: hidden; }
 
 chatbar {
-  -moz-margin-end: 20px; }
+  margin-inline-end: 20px; }
 
 chatbox {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   background-color: transparent; }
 
 chatbar > chatbox {
@@ -3790,10 +3755,10 @@ chatbar > chatbox {
   box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
   /* Offset the chatbox the same amount as the box-shadows' spread, to make it
      visible. */
-  -moz-margin-end: 5px; }
+  margin-inline-end: 5px; }
 
 window > chatbox {
-  -moz-margin-start: 0px;
+  margin-inline-start: 0px;
   margin: 0px;
   border: none;
   padding: 0px;
@@ -3934,7 +3899,7 @@ window > chatbox {
 #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: 6px !important; }
+  margin-inline-start: 6px !important; }
 
 #customization-lwtheme-button > .box-inherit > .box-inherit > .button-icon {
   width: 20px;
@@ -4050,7 +4015,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   min-height: 48px; }
 
 #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
-  -moz-margin-end: 5px; }
+  margin-inline-end: 5px; }
 
 #customization-palette > toolbarpaletteitem > label {
   text-align: center;
@@ -4072,9 +4037,9 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   border: 1px solid transparent;
   margin: 0 -5px 5px;
   padding-top: 0;
-  -moz-padding-end: 5px;
+  padding-inline-end: 5px;
   padding-bottom: 0;
-  -moz-padding-start: 0; }
+  padding-inline-start: 0; }
 
 .customization-lwtheme-menu-theme[defaulttheme] {
   list-style-image: url(chrome://browser/skin/theme-switcher-icon.png); }
@@ -4133,7 +4098,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   background: linear-gradient(rgba(24, 26, 27, 0.08) 40%, transparent) padding-box; }
 
 .customization-lwtheme-menu-footeritem:first-child {
-  -moz-border-end: 1px solid rgba(24, 26, 27, 0.15); }
+  border-inline-end: 1px solid rgba(24, 26, 27, 0.15); }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -4195,7 +4160,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 .customization-tipPanel-closeBox > .close-icon {
   -moz-appearance: none;
   border: 0;
-  -moz-margin-end: -25px; }
+  margin-inline-end: -25px; }
 
 #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"],
 #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] {
@@ -4271,14 +4236,14 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 #UITourTooltipBody {
   -moz-box-align: start; }
 
-#UITourtooltipTitleContainer {
+#UITourTooltipTitleContainer {
   -moz-box-align: start;
   margin-bottom: 10px; }
 
 #UITourTooltipIcon {
   width: 48px;
   height: 48px;
-  -moz-margin-end: 10px; }
+  margin-inline-end: 10px; }
 
 #UITourTooltipTitle,
 #UITourTooltipDescription {
@@ -4290,8 +4255,8 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   margin: 0; }
 
 #UITourTooltipDescription {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
   font-size: 1.15rem;
   line-height: 1.8rem;
   margin-bottom: 0;
@@ -4303,7 +4268,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   border: none;
   background-color: transparent;
   min-width: 0;
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   margin-top: -2px; }
 
 #UITourTooltipClose > .toolbarbutton-text {
@@ -4322,7 +4287,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 
 #UITourTooltipButtons > label:first-child,
 #UITourTooltipButtons > button:first-child {
-  -moz-margin-start: 0; }
+  margin-inline-start: 0; }
 
 #UITourTooltipButtons > label:last-child,
 #UITourTooltipButtons > button:last-child {
@@ -4331,7 +4296,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 #UITourTooltipButtons > button[image] > .button-box > .button-icon {
   width: 16px;
   height: 16px;
-  -moz-margin-end: 5px; }
+  margin-inline-end: 5px; }
 
 #UITourTooltipButtons > label,
 #UITourTooltipButtons > button .button-text {
@@ -4407,15 +4372,15 @@ notification.heartbeat {
 .messageText.heartbeat {
   color: #333333;
   text-shadow: none;
-  -moz-margin-start: 0px;
+  margin-inline-start: 0px;
   /* The !important is required to override OSX default style. */
-  -moz-margin-end: 12px !important; }
+  margin-inline-end: 12px !important; }
 
 .messageImage.heartbeat {
   width: 24px;
   height: 24px;
-  -moz-margin-start: 8px;
-  -moz-margin-end: 8px; }
+  margin-inline-start: 8px;
+  margin-inline-end: 8px; }
 
 .messageImage.heartbeat.pulse-onshow {
   animation-name: pulse-onshow;
@@ -4432,7 +4397,7 @@ notification.heartbeat {
 /* Learn More link styles */
 .heartbeat > .text-link {
   color: #0095DD;
-  -moz-margin-start: 0px; }
+  margin-inline-start: 0px; }
 
 .heartbeat > .text-link:hover {
   color: #008ACB;
@@ -4461,8 +4426,8 @@ notification.heartbeat {
 .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;
+  /* Overrides the margin-inline-end for all platforms defined in the .plain class */
+  margin-inline-end: 4px !important;
   width: 16px;
   height: 16px; }
 
@@ -4486,7 +4451,7 @@ notification.heartbeat {
   font-size: 1.05rem; }
 
 #UITourTooltipClose {
-  -moz-margin-end: -4px;
+  margin-inline-end: -4px;
   height: 16px;
   width: 16px; }
 
@@ -4576,68 +4541,18 @@ notification.heartbeat {
 #context-navigation > .menuitem-iconic > .menu-iconic-left {
   visibility: visible;
   /* override toolkit/themes/linux/global/menu.css */
-  -moz-padding-end: 0 !important;
-  -moz-margin-end: 0 !important; }
+  padding-inline-end: 0 !important;
+  margin-inline-end: 0 !important; }
 
 .browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
   padding: 0;
   overflow: hidden; }
 
-/* User Context UI browser styles */
-#menu_newUserContextTabPersonal {
-  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
-
-#menu_newUserContextTabWork {
-  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
-
-#menu_newUserContextTabBanking {
-  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
+.webextension-popup-browser {
+  border-radius: inherit; }
 
-#menu_newUserContextTabShopping {
-  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
-
-/* URL Bar Decoration */
-#userContext-indicator {
-  height: 16px;
-  width: 16px; }
-
-#userContext-label {
-  margin-inline-end: 3px;
-  color: #909090; }
-
-#userContext-icons:not([usercontextid]) {
-  display: none; }
-
-#userContext-icons {
-  -moz-box-align: center; }
-
-/* Personal User Context */
-#userContext-icons[usercontextid="1"] > #userContext-label {
-  color: #00a7e0; }
-
-#userContext-icons[usercontextid="1"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
-
-/* Work User Context */
-#userContext-icons[usercontextid="2"] > #userContext-label {
-  color: #f89c24; }
-
-#userContext-icons[usercontextid="2"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
-
-/* Banking User Context */
-#userContext-icons[usercontextid="3"] > #userContext-label {
-  color: #7dc14c; }
-
-#userContext-icons[usercontextid="3"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
-
-/* Shopping User Context */
-#userContext-icons[usercontextid="4"] > #userContext-label {
-  color: #ee5195; }
-
-#userContext-icons[usercontextid="4"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
+.menuitem-iconic[command="Browser:NewUserContextTab"] > .menu-iconic-left > .menu-iconic-icon {
+  visibility: visible; }
 
 #nav-bar #loop-button, #nav-bar
 toolbar[brighttext] #loop-button {
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-darker.css b/arc-firefox-theme/chrome/browser/sass/browser-darker.css
index fde2007..ccad16a 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-darker.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-darker.css
@@ -218,7 +218,7 @@ menuitem.bookmark-item {
   margin-bottom: 0; }
 
 .bookmark-item > .menu-iconic-left > .menu-iconic-icon {
-  -moz-padding-start: 0px; }
+  padding-inline-start: 0px; }
 
 /* Bookmark drag and drop styles */
 .bookmark-item[dragover-into="true"] {
@@ -235,7 +235,7 @@ menuitem.bookmark-item {
 .menupopup-drop-indicator {
   list-style-image: none;
   height: 2px;
-  -moz-margin-end: -4em;
+  margin-inline-end: -4em;
   background-color: Highlight; }
 
 /* Bookmarks toolbar */
@@ -297,6 +297,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #placesContext_openContainer\:tabs,
 #menu_newNavigatorTab,
 #context-openlinkintab,
+#context-openlinkincontainertab,
 #context-openframeintab {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
   -moz-image-region: rect(0px 64px 16px 48px); }
@@ -436,6 +437,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #panelMenu_bookmarksToolbar {
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); }
 
+#menu_unsortedBookmarks,
 #BMB_unsortedBookmarks,
 #panelMenu_unsortedBookmarks {
   list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); }
@@ -476,8 +478,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
   max-width: 16px; }
 
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
 #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   max-width: 18px; }
 
@@ -495,16 +497,16 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-badge-stack,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
   padding: 2px 6px;
   border: 1px solid transparent;
   border-radius: 2px;
   transition-property: background-color, border-color;
   transition-duration: 150ms; }
 
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-badge-stack,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-badge-stack,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   padding: 3px 7px; }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon,
@@ -514,8 +516,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   max-width: 32px !important; }
 
 #nav-bar #PanelUI-menu-button {
-  -moz-padding-start: 5px;
-  -moz-padding-end: 5px; }
+  padding-inline-start: 5px;
+  padding-inline-end: 5px; }
 
 #nav-bar #PanelUI-button,
 #nav-bar[brighttext] #PanelUI-button {
@@ -592,7 +594,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   display: -moz-box;
   width: 1px;
   height: 18px;
-  -moz-margin-end: -1px;
+  margin-inline-end: -1px;
   background-position: center;
   background-repeat: no-repeat;
   background-size: 1px 18px; }
@@ -606,7 +608,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   background: rgba(207, 218, 231, 0.15); }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  -moz-margin-start: -4px; }
+  margin-inline-start: -4px; }
 
 #back-button > menupopup {
   margin-top: -1px; }
@@ -636,14 +638,14 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu") !important; }
 
 /* Menu panel buttons */
-:-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, #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),
+:-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, #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, #containers-panelmenu),
 #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   list-style-image: url("chrome://browser/skin/custom_images/light/toolbar-icons.svg"); }
-  #TabsToolbar :-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, #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), #TabsToolbar
+  #TabsToolbar :-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, #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, #containers-panelmenu), #TabsToolbar
   #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
     list-style-image: url("chrome://browser/skin/custom_images/dark/tabbar-icons.svg"); }
 
-#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) {
+#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #containers-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #containers-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active) {
   list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.svg"); }
 
 #nav-bar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .dropmarker-icon,
@@ -688,6 +690,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #sync-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 792px, 18px, 774px); }
 
+#containers-panelmenu[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 810px, 18px, 792px); }
+
 #feed-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 288px, 18px, 270px); }
 
@@ -778,8 +783,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 
 @media not all and (min-resolution: 1.1dppx) {
   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, #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)[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, #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) {
+  :-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, #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, #containers-panelmenu)[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu) {
     list-style-image: var(--menupanel-list-style-image); }
 
   #home-button[cui-areatype="menu-panel"],
@@ -823,6 +828,13 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
     -moz-image-region: rect(32px, 1024px, 64px, 992px); }
 
+  #containers-panelmenu[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > #containers-panelmenu {
+    -moz-image-region: rect(0px, 1056px, 32px, 1024px); }
+
+  #containers-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+    -moz-image-region: rect(32px, 1056px, 64px, 1024px); }
+
   #feed-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #feed-button {
     -moz-image-region: rect(0px, 416px, 32px, 384px); }
@@ -938,8 +950,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 /* Menu panel and palette styles */
 @media (min-resolution: 1.1dppx) {
   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, #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)[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, #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) {
+  :-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, #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, #containers-panelmenu)[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu) {
     list-style-image: var(--menupanel-list-style-image-2x); }
 
   #home-button[cui-areatype="menu-panel"],
@@ -983,6 +995,13 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
     -moz-image-region: rect(64px, 2048px, 128px, 1984px); }
 
+  #containers-panelmenu[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > #containers-panelmenu {
+    -moz-image-region: rect(0px, 2112px, 64px, 2048px); }
+
+  #containers-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+    -moz-image-region: rect(64px, 2112px, 128px, 2048px); }
+
   #feed-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #feed-button {
     -moz-image-region: rect(0px, 832px, 64px, 768px); }
@@ -1065,6 +1084,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   toolbaritem[sdkstylewidget="true"] > toolbarbutton {
     -moz-image-region: rect(0, 1664px, 64px, 1600px); }
 
+  #add-share-provider {
+    list-style-image: url(chrome://browser/skin/menuPanel-small@2x.png);
+    -moz-image-region: rect(0px, 192px, 32px, 160px); }
+
   /* Footer and wide panel control icons */
   #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
   #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
@@ -1140,9 +1163,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
-  padding: 2px 3px;
+  padding: 0 3px;
   border-radius: 3px;
   margin: 0 3px;
+  min-height: 28px;
   color: #5c616c;
   background-color: #ffffff;
   border: 1px solid #cfd6e6; }
@@ -1167,10 +1191,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 
 .urlbar-textbox-container {
   -moz-appearance: none;
-  -moz-box-align: center; }
+  -moz-box-align: stretch; }
 
 .urlbar-input-box {
-  -moz-margin-start: 0; }
+  margin-inline-start: 0; }
 
 .urlbar-history-dropmarker {
   -moz-appearance: toolbarbutton-dropdown;
@@ -1220,21 +1244,21 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #urlbar-display-box {
   margin-top: -1px;
   margin-bottom: -1px;
-  -moz-border-end: 1px solid #AAA;
-  -moz-margin-end: 3px; }
+  border-inline-end: 1px solid #AAA;
+  margin-inline-end: 3px; }
 
 .urlbar-display {
   margin-top: 0;
   margin-bottom: 0;
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
   color: GrayText; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] {
   border-bottom: 1px solid rgba(24, 26, 27, 0.14);
   background-color: rgba(24, 26, 27, 0.07);
   padding: 6px 0;
-  -moz-padding-start: 44px;
-  -moz-padding-end: 6px;
+  padding-inline-start: 44px;
+  padding-inline-end: 6px;
   background-image: url("chrome://browser/skin/info.svg");
   background-clip: padding-box;
   background-position: 20px center;
@@ -1249,7 +1273,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   padding: 0; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description > label.text-link {
-  -moz-margin-start: 0; }
+  margin-inline-start: 0; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button {
   -moz-appearance: none;
@@ -1257,7 +1281,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   border-radius: 3px;
   padding: 4px 16px;
   margin: 0;
-  -moz-margin-start: 10px; }
+  margin-inline-start: 10px; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"] {
   color: #616161;
@@ -1297,12 +1321,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #identity-box {
   --identity-box-verified-color: #479900;
   --identity-box-chrome-color: #e57300;
-  border-inline-end: 1px solid var(--urlbar-separator-color);
-  border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
-  border-image-slice: 1;
+  border-inline-end: 1px solid rgba(207, 214, 230, 0.5);
   font-size: .9em;
-  padding: 3px 5px 3px 3px;
-  margin-inline-end: 4px;
+  padding: 3px 9px 3px 7px;
+  margin-inline-end: 5px;
   overflow: hidden; }
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
@@ -1406,7 +1428,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .popup-notification-icon {
   width: 64px;
   height: 64px;
-  -moz-margin-end: 10px; }
+  margin-inline-end: 10px; }
 
 .popup-notification-icon[popupid="geolocation"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png); }
@@ -1463,6 +1485,9 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .popup-notification-icon[popupid="pointerLock"] {
   list-style-image: url(chrome://browser/skin/pointerLock-64.png); }
 
+.popup-notification-icon[popupid="servicesInstall"] {
+  list-style-image: url(chrome://browser/skin/social/services-64.png); }
+
 /* Notification icon box */
 #notification-popup-box {
   position: relative;
@@ -1484,53 +1509,56 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .notification-anchor-icon.chat-toolbarbutton:-moz-locale-dir(rtl) {
   transform: none; }
 
+/* This class can be used alone or in combination with the class defining the
+   type of icon displayed. This rule must be defined before the others in order
+   for its list-style-image to be overridden. */
 .notification-anchor-icon {
   list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16);
   width: 16px;
   height: 16px;
   margin: 0 2px; }
 
-.geo-notification-icon,
-#geo-notification-icon {
+@media (min-resolution: 1.1dppx) {
+  .notification-anchor-icon {
+    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); } }
+.geo-icon {
   list-style-image: url(chrome://browser/skin/Geolocation-16.png); }
 
-#addons-notification-icon {
+.install-icon {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); }
 
-#addons-notification-icon:hover {
+.install-icon:hover {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#hover); }
 
-#addons-notification-icon:hover:active {
+.install-icon:hover:active {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#active); }
 
-.indexedDB-notification-icon,
-#indexedDB-notification-icon {
+.indexedDB-icon {
   list-style-image: url(chrome://global/skin/icons/question-16.png); }
 
-#password-notification-icon {
+.login-icon {
   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);
+  /* Temporary solution until the capture and fill doorhangers are unified. */
   transform: scaleX(-1); }
 
-#plugins-notification-icon {
+.plugin-icon {
   list-style-image: url(chrome://browser/skin/notification-pluginNormal.png); }
 
-#plugins-notification-icon.plugin-hidden {
+.plugin-icon.plugin-hidden {
   list-style-image: url(chrome://browser/skin/notification-pluginAlert.png); }
 
-#plugins-notification-icon.plugin-blocked {
+.plugin-icon.plugin-blocked {
   list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png); }
 
-#plugins-notification-icon {
+.plugin-icon {
   -moz-image-region: rect(0, 16px, 16px, 0); }
 
-#plugins-notification-icon:hover {
+.plugin-icon:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px); }
 
-#plugins-notification-icon:active {
+.plugin-icon:active {
   -moz-image-region: rect(0, 48px, 16px, 32px); }
 
 #notification-popup-box[hidden] {
@@ -1547,69 +1575,57 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
     opacity: 0; }
   to {
     opacity: 1; } }
-.webRTC-shareDevices-notification-icon,
-#webRTC-shareDevices-notification-icon {
+.camera-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png); }
 
+/* The first selector is used by socialchat.xml (bug 1275558). */
 .webRTC-sharingDevices-notification-icon,
-#webRTC-sharingDevices-notification-icon {
+.camera-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16.png); }
 
-.webRTC-shareMicrophone-notification-icon,
-#webRTC-shareMicrophone-notification-icon {
+.microphone-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16.png); }
 
+/* The first selector is used by socialchat.xml (bug 1275558). */
 .webRTC-sharingMicrophone-notification-icon,
-#webRTC-sharingMicrophone-notification-icon {
+.microphone-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16.png); }
 
-.webRTC-shareScreen-notification-icon,
-#webRTC-shareScreen-notification-icon {
+.screen-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); }
 
-.webRTC-sharingScreen-notification-icon,
-#webRTC-sharingScreen-notification-icon {
+.screen-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png); }
 
-.web-notifications-notification-icon,
-#web-notifications-notification-icon {
+.web-notifications-icon {
   list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
   -moz-image-region: rect(0, 16px, 16px, 0); }
 
-.web-notifications-notification-icon:hover,
-#web-notifications-notification-icon:hover {
+.web-notifications-icon:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px); }
 
-.web-notifications-notification-icon:hover:active,
-#web-notifications-notification-icon:hover:active {
+.web-notifications-icon:hover:active {
   -moz-image-region: rect(0, 48px, 16px, 32px); }
 
-.pointerLock-notification-icon,
-#pointerLock-notification-icon {
+.pointer-icon {
   list-style-image: url(chrome://browser/skin/pointerLock-16.png); }
 
-.translate-notification-icon,
-#translate-notification-icon {
+.service-icon {
+  list-style-image: url(chrome://browser/skin/social/services-16.png); }
+
+.translation-icon {
   list-style-image: url(chrome://browser/skin/translation-16.png);
   -moz-image-region: rect(0px, 16px, 16px, 0px); }
 
-.translated-notification-icon,
-#translated-notification-icon {
-  list-style-image: url(chrome://browser/skin/translation-16.png);
+.translation-icon.in-use {
   -moz-image-region: rect(0px, 32px, 16px, 16px); }
 
-.popup-notification-icon[popupid="servicesInstall"] {
-  list-style-image: url(chrome://browser/skin/social/services-64.png); }
-
-#servicesInstall-notification-icon {
-  list-style-image: url(chrome://browser/skin/social/services-16.png); }
-
 /* EME notifications */
 .popup-notification-icon[popupid="drmContentPlaying"],
-#eme-notification-icon {
+.drm-icon {
   list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); }
 
-#eme-notification-icon:hover:active {
+.drm-icon:hover:active {
   list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed"); }
 
 #eme-notification-icon[firstplay=true] {
@@ -1626,31 +1642,22 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
     transform: translateX(0); } }
 /* HiDPI notification icons */
 @media (min-resolution: 1.1dppx) {
-  .notification-anchor-icon {
-    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); }
-
-  .webRTC-shareDevices-notification-icon,
-  #webRTC-shareDevices-notification-icon {
+  .camera-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16@2x.png); }
 
-  .webRTC-sharingDevices-notification-icon,
-  #webRTC-sharingDevices-notification-icon {
+  .camera-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16@2x.png); }
 
-  .webRTC-shareMicrophone-notification-icon,
-  #webRTC-shareMicrophone-notification-icon {
+  .microphone-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16@2x.png); }
 
-  .webRTC-sharingMicrophone-notification-icon,
-  #webRTC-sharingMicrophone-notification-icon {
+  .microphone-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16@2x.png); }
 
-  .webRTC-shareScreen-notification-icon,
-  #webRTC-shareScreen-notification-icon {
+  .screen-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16@2x.png); }
 
-  .webRTC-sharingScreen-notification-icon,
-  #webRTC-sharingScreen-notification-icon {
+  .screen-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16@2x.png); }
 
   .popup-notification-icon[popupid="webRTC-sharingDevices"],
@@ -1679,8 +1686,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .notification-anchor-icon:-moz-focusring {
   outline: 1px dotted -moz-DialogText; }
 
-.indexedDB-notification-icon,
-#indexedDB-notification-icon {
+.indexedDB-icon {
   list-style-image: url(moz-icon://stock/gtk-dialog-question?size=16); }
 
 /* Translation infobar */
@@ -1745,7 +1751,7 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   -moz-image-region: rect(0, 64px, 32px, 32px); }
 
 .translation-welcome-content {
-  -moz-margin-start: 16px; }
+  margin-inline-start: 16px; }
 
 .translation-welcome-headline {
   font-size: larger;
@@ -1769,7 +1775,7 @@ notification[value="translation"] {
 
 notification[value="translation"] button,
 notification[value="translation"] menulist {
-  -moz-padding-end: 1ch; }
+  padding-inline-end: 1ch; }
 
 notification[value="translation"] menulist {
   border: 1px solid #C1C1C1;
@@ -1782,8 +1788,8 @@ notification[value="translation"] button {
 notification[value="translation"] button,
 notification[value="translation"] menulist,
 notification[value="translation"] menulist > .menulist-label-box {
-  -moz-margin-start: 1ch;
-  -moz-margin-end: 1ch; }
+  margin-inline-start: 1ch;
+  margin-inline-end: 1ch; }
 
 notification[value="translation"] button:hover,
 notification[value="translation"] button:active,
@@ -1804,10 +1810,10 @@ notification[value="translation"] button[anonid="translate"]:active {
 notification[value="translation"] button > .button-box,
 notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker {
   padding: 0;
-  -moz-margin-start: 3ch; }
+  margin-inline-start: 3ch; }
 
 notification[value="translation"] button:not([type="menu"]) > .button-box {
-  -moz-margin-end: 3ch; }
+  margin-inline-end: 3ch; }
 
 notification[value="translation"] menulist > .menulist-dropmarker {
   display: block; }
@@ -1815,10 +1821,6 @@ notification[value="translation"] menulist > .menulist-dropmarker {
 #treecolAutoCompleteImage {
   max-width: 36px; }
 
-#PopupAutoCompleteRichResult {
-  /* The awesomebar popup should open just below the navbar bottom border. */
-  margin-top: 1px; }
-
 .autocomplete-richlistbox {
   padding: 4px; }
 
@@ -1833,10 +1835,10 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   background-color: Highlight; }
 
 .ac-title {
-  font-size: 14px; }
+  font-size: 1.05em; }
 
 .ac-tags {
-  font-size: 12px; }
+  font-size: 0.9em; }
 
 html|span.ac-tag {
   background-color: MenuText;
@@ -1848,7 +1850,7 @@ html|span.ac-tag {
 .ac-separator,
 .ac-url,
 .ac-action {
-  font-size: 12px;
+  font-size: 0.9em;
   color: -moz-nativehyperlinktext; }
 
 .ac-title[selected=true],
@@ -1917,11 +1919,9 @@ html|span.ac-emphasize-text-url {
 #urlbar-stop-button {
   -moz-appearance: none;
   list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  padding: 0 4px 0 6px;
-  margin-inline-start: 2px;
-  border-inline-start: 1px solid var(--urlbar-separator-color);
-  border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
-  border-image-slice: 1; }
+  padding: 0 7px 0 10px;
+  margin-inline-start: 5px;
+  border-inline-start: 1px solid rgba(207, 214, 230, 0.5); }
 
 #urlbar-reload-button {
   -moz-image-region: rect(0, 14px, 14px, 0); }
@@ -2221,11 +2221,11 @@ html|span.ac-emphasize-text-url {
   margin: 0 -15px; }
 
 .tab-content {
-  -moz-padding-end: 9px;
-  -moz-padding-start: 9px; }
+  padding-inline-end: 9px;
+  padding-inline-start: 9px; }
 
 .tab-content[pinned] {
-  -moz-padding-end: 3px; }
+  padding-inline-end: 3px; }
 
 .tab-throbber,
 .tab-icon-image,
@@ -2237,7 +2237,7 @@ html|span.ac-emphasize-text-url {
 .tab-icon-image {
   height: 16px;
   width: 16px;
-  -moz-margin-end: 6px; }
+  margin-inline-end: 6px; }
 
 .tab-icon-image {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); }
@@ -2246,7 +2246,7 @@ html|span.ac-emphasize-text-url {
   width: 16px;
   height: 16px;
   margin-top: -12px;
-  -moz-margin-start: -16px;
+  margin-inline-start: -16px;
   position: relative; }
 
 .tab-icon-overlay[crashed] {
@@ -2273,16 +2273,16 @@ html|span.ac-emphasize-text-url {
   list-style-image: url("chrome://browser/skin/custom_images/loading.png"); }
 
 .tab-label {
-  -moz-margin-end: 0;
-  -moz-margin-start: 0; }
+  margin-inline-end: 0;
+  margin-inline-start: 0; }
 
 .tab-close-button {
-  -moz-margin-start: 4px;
-  -moz-margin-end: -2px;
+  margin-inline-start: 4px;
+  margin-inline-end: -2px;
   padding: 0; }
 
 .tab-icon-sound {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   width: 16px;
   height: 16px;
   padding: 0; }
@@ -2305,33 +2305,39 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound[muted]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); }
 
+.tab-icon-sound:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying] {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio"); }
 
+.tab-icon-sound:hover:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying]:hover {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-hover"); }
 
+.tab-icon-sound:hover:active:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-pressed"); }
 
+.tab-icon-sound[muted]:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted] {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted"); }
 
+.tab-icon-sound[muted]:hover:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted]:hover {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted-hover"); }
 
+.tab-icon-sound[muted]:hover:active:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted-pressed"); }
 
 .tab-background,
 .tabs-newtab-button {
   /* overlap the tab curves */
-  -moz-margin-end: -14px;
-  -moz-margin-start: -14px; }
+  margin-inline-end: -14px;
+  margin-inline-start: -14px; }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
-  -moz-padding-end: 15px;
-  -moz-padding-start: 5px; }
+  padding-inline-end: 15px;
+  padding-inline-start: 5px; }
 
 /* Tab Overflow */
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]),
@@ -2350,12 +2356,12 @@ html|span.ac-emphasize-text-url {
   transform: scaleX(-1); }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]) {
-  -moz-margin-start: -2px;
-  -moz-margin-end: -12px; }
+  margin-inline-start: -2px;
+  margin-inline-end: -12px; }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) {
-  -moz-margin-start: -12px;
-  -moz-margin-end: -2px; }
+  margin-inline-start: -12px;
+  margin-inline-end: -2px; }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator[collapsed],
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator[collapsed] {
@@ -2394,7 +2400,7 @@ html|span.ac-emphasize-text-url {
 .tab-background-start[visuallyselected=true]::after,
 .tab-background-end[visuallyselected=true]::after {
   /* position ::after on top of its parent */
-  -moz-margin-start: -30px;
+  margin-inline-start: -30px;
   background-size: 100% 100%;
   content: "";
   display: -moz-box;
@@ -2464,29 +2470,6 @@ lwtHeader;*/
   background-repeat: no-repeat;
   background-size: 30px 100%, calc(100% - (2 * 30px)) 100%, 30px 100%; }
 
-/* User Context UI - change tab decoration depending on userContextId.
-   Defaults to gray for unknown usercontextids. */
-.tabbrowser-tab[usercontextid] {
-  background-image: linear-gradient(to right, transparent 20%, #909090 30%, #909090 70%, transparent 80%);
-  background-size: auto 2px;
-  background-repeat: no-repeat; }
-
-/* Personal User Context */
-.tabbrowser-tab[usercontextid="1"] {
-  background-image: linear-gradient(to right, transparent 20%, #00a7e0 30%, #00a7e0 70%, transparent 80%); }
-
-/* Work User Context */
-.tabbrowser-tab[usercontextid="2"] {
-  background-image: linear-gradient(to right, transparent 20%, #f89c24 30%, #f89c24 70%, transparent 80%); }
-
-/* Banking User Context */
-.tabbrowser-tab[usercontextid="3"] {
-  background-image: linear-gradient(to right, transparent 20%, #7dc14c 30%, #7dc14c 70%, transparent 80%); }
-
-/* Shopping User Context */
-.tabbrowser-tab[usercontextid="4"] {
-  background-image: linear-gradient(to right, transparent 20%, #ee5195 30%, #ee5195 70%, transparent 80%); }
-
 /* Tab pointer-events */
 .tabbrowser-tab {
   pointer-events: none; }
@@ -2662,7 +2645,7 @@ menuitem:hover > hbox > .alltabs-endimage[soundplaying] {
 /* Sidebar */
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading.png");
-  -moz-margin-end: 4px; }
+  margin-inline-end: 4px; }
 
 toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important; }
@@ -2709,27 +2692,6 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   padding: 0 3px;
   margin-top: 10px; }
 
-/* Sync Panel */
-.sync-panel-icon {
-  height: 32px;
-  width: 32px;
-  background: url("chrome://browser/content/abouthome/sync.png") top left no-repeat; }
-
-.sync-panel-inner {
-  width: 0;
-  padding-left: 10px; }
-
-.sync-panel-button-box {
-  margin-top: 1em; }
-
-#sync-start-panel-title {
-  font-size: 120%;
-  font-weight: bold;
-  margin-bottom: 5px; }
-
-#sync-start-panel-subtitle {
-  margin-bottom: 0; }
-
 /* Status panel */
 .statuspanel-label {
   margin: 0;
@@ -2919,7 +2881,7 @@ html|*#fullscreen-exit-button {
   -moz-appearance: none;
   color: inherit;
   border-width: 0;
-  -moz-border-end: 1px solid rgba(12, 13, 14, 0.45);
+  border-inline-end: 1px solid rgba(12, 13, 14, 0.45);
   box-shadow: -1px 0 0 rgba(184, 194, 204, 0.15) inset, 1px 0 0 rgba(184, 194, 204, 0.15); }
 
 .devtools-responsiveui-toolbarbutton[type=menu-button]:-moz-locale-dir(rtl) > .toolbarbutton-menubutton-button {
@@ -3098,23 +3060,31 @@ html|*#fullscreen-exit-button {
   --selection-background: #4c9ed9;
   /* --theme-selection-background */
   --selection-color: #f5f7fa;
-  /* --theme-selection-color */ }
+  /* --theme-selection-color */
+  --command-line-image: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme);
+  /* --theme-command-line-image */
+  --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme-focus);
+  /* --theme-command-line-image-focus */ }
 
 :root[devtoolstheme="dark"] #developer-toolbar {
-  --gcli-background-color: #343c45;
+  --gcli-background-color: #272b35;
   /* --theme-toolbar-background */
-  --gcli-input-background: rgba(37, 44, 51, 0.6);
+  --gcli-input-background: #272b35;
   /* --theme-tab-toolbar-background */
-  --gcli-input-focused-background: #252c33;
+  --gcli-input-focused-background: #272b35;
   /* --theme-tab-toolbar-background */
   --gcli-input-color: #b6babf;
   /* --theme-body-color-alt */
-  --gcli-border-color: black;
+  --gcli-border-color: #454d5d;
   /* --theme-splitter-color */
-  --selection-background: #1d4f73;
+  --selection-background: #5675b9;
   /* --theme-selection-background */
   --selection-color: #f5f7fa;
-  /* --theme-selection-color */ }
+  /* --theme-selection-color */
+  --command-line-image: url(chrome://devtools/skin/images/commandline-icon.svg#dark-theme);
+  /* --theme-command-line-image */
+  --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#dark-theme-focus);
+  /* --theme-command-line-image-focus */ }
 
 #developer-toolbar {
   -moz-appearance: none;
@@ -3222,16 +3192,11 @@ html|*#gcli-output-frame {
   width: 16px;
   height: 16px;
   margin: 0 2px;
-  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
-  background-position: 0 center;
-  background-size: 32px 16px; }
+  background-image: var(--command-line-image); }
 
 .gclitoolbar-input-node[focused="true"]::before {
-  background-position: -16px center; }
+  background-image: var(--command-line-image-focus); }
 
-@media (min-resolution: 1.1dppx) {
-  .gclitoolbar-input-node::before {
-    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png"); } }
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
   background-color: var(--selection-background);
   color: var(--selection-color);
@@ -3280,7 +3245,7 @@ html|*#gcli-output-frame {
   background-color: rgba(0, 0, 0, 0.1); }
 
 .center-item-label {
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
   margin-bottom: 0;
   text-overflow: ellipsis; }
 
@@ -3289,7 +3254,7 @@ html|*#gcli-output-frame {
   background-repeat: no-repeat;
   width: 16px;
   height: 15px;
-  -moz-margin-start: 6px; }
+  margin-inline-start: 6px; }
 
 .click-to-play-plugins-notification-button-container {
   background-color: rgba(24, 26, 27, 0.07);
@@ -3388,7 +3353,7 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:h
   background-clip: padding-box;
   border-left: 1px solid rgba(24, 26, 27, 0.3);
   box-shadow: 0 3px 5px rgba(24, 26, 27, 0.1), 0 0 7px rgba(24, 26, 27, 0.1);
-  -moz-margin-start: 38px; }
+  margin-inline-start: 38px; }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -3554,7 +3519,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   background-image: linear-gradient(#505050, #575757);
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.6) rgba(0, 0, 0, 0.4) rgba(0, 0, 0, 0.4);
-  -moz-border-start: none;
+  border-inline-start: none;
   border-radius: 0 2px 2px 0; }
 
 #downloads-button[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
@@ -3576,7 +3541,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
-  -moz-margin-end: 2px; }
+  margin-inline-end: 2px; }
 
 /* Social toolbar item */
 .social-activation-icon {
@@ -3776,10 +3741,10 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   overflow: hidden; }
 
 chatbar {
-  -moz-margin-end: 20px; }
+  margin-inline-end: 20px; }
 
 chatbox {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   background-color: transparent; }
 
 chatbar > chatbox {
@@ -3790,10 +3755,10 @@ chatbar > chatbox {
   box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
   /* Offset the chatbox the same amount as the box-shadows' spread, to make it
      visible. */
-  -moz-margin-end: 5px; }
+  margin-inline-end: 5px; }
 
 window > chatbox {
-  -moz-margin-start: 0px;
+  margin-inline-start: 0px;
   margin: 0px;
   border: none;
   padding: 0px;
@@ -3934,7 +3899,7 @@ window > chatbox {
 #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: 6px !important; }
+  margin-inline-start: 6px !important; }
 
 #customization-lwtheme-button > .box-inherit > .box-inherit > .button-icon {
   width: 20px;
@@ -4050,7 +4015,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   min-height: 48px; }
 
 #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
-  -moz-margin-end: 5px; }
+  margin-inline-end: 5px; }
 
 #customization-palette > toolbarpaletteitem > label {
   text-align: center;
@@ -4072,9 +4037,9 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   border: 1px solid transparent;
   margin: 0 -5px 5px;
   padding-top: 0;
-  -moz-padding-end: 5px;
+  padding-inline-end: 5px;
   padding-bottom: 0;
-  -moz-padding-start: 0; }
+  padding-inline-start: 0; }
 
 .customization-lwtheme-menu-theme[defaulttheme] {
   list-style-image: url(chrome://browser/skin/theme-switcher-icon.png); }
@@ -4133,7 +4098,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   background: linear-gradient(rgba(24, 26, 27, 0.08) 40%, transparent) padding-box; }
 
 .customization-lwtheme-menu-footeritem:first-child {
-  -moz-border-end: 1px solid rgba(24, 26, 27, 0.15); }
+  border-inline-end: 1px solid rgba(24, 26, 27, 0.15); }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -4195,7 +4160,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 .customization-tipPanel-closeBox > .close-icon {
   -moz-appearance: none;
   border: 0;
-  -moz-margin-end: -25px; }
+  margin-inline-end: -25px; }
 
 #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"],
 #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] {
@@ -4271,14 +4236,14 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 #UITourTooltipBody {
   -moz-box-align: start; }
 
-#UITourtooltipTitleContainer {
+#UITourTooltipTitleContainer {
   -moz-box-align: start;
   margin-bottom: 10px; }
 
 #UITourTooltipIcon {
   width: 48px;
   height: 48px;
-  -moz-margin-end: 10px; }
+  margin-inline-end: 10px; }
 
 #UITourTooltipTitle,
 #UITourTooltipDescription {
@@ -4290,8 +4255,8 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   margin: 0; }
 
 #UITourTooltipDescription {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
   font-size: 1.15rem;
   line-height: 1.8rem;
   margin-bottom: 0;
@@ -4303,7 +4268,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   border: none;
   background-color: transparent;
   min-width: 0;
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   margin-top: -2px; }
 
 #UITourTooltipClose > .toolbarbutton-text {
@@ -4322,7 +4287,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 
 #UITourTooltipButtons > label:first-child,
 #UITourTooltipButtons > button:first-child {
-  -moz-margin-start: 0; }
+  margin-inline-start: 0; }
 
 #UITourTooltipButtons > label:last-child,
 #UITourTooltipButtons > button:last-child {
@@ -4331,7 +4296,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 #UITourTooltipButtons > button[image] > .button-box > .button-icon {
   width: 16px;
   height: 16px;
-  -moz-margin-end: 5px; }
+  margin-inline-end: 5px; }
 
 #UITourTooltipButtons > label,
 #UITourTooltipButtons > button .button-text {
@@ -4407,15 +4372,15 @@ notification.heartbeat {
 .messageText.heartbeat {
   color: #333333;
   text-shadow: none;
-  -moz-margin-start: 0px;
+  margin-inline-start: 0px;
   /* The !important is required to override OSX default style. */
-  -moz-margin-end: 12px !important; }
+  margin-inline-end: 12px !important; }
 
 .messageImage.heartbeat {
   width: 24px;
   height: 24px;
-  -moz-margin-start: 8px;
-  -moz-margin-end: 8px; }
+  margin-inline-start: 8px;
+  margin-inline-end: 8px; }
 
 .messageImage.heartbeat.pulse-onshow {
   animation-name: pulse-onshow;
@@ -4432,7 +4397,7 @@ notification.heartbeat {
 /* Learn More link styles */
 .heartbeat > .text-link {
   color: #0095DD;
-  -moz-margin-start: 0px; }
+  margin-inline-start: 0px; }
 
 .heartbeat > .text-link:hover {
   color: #008ACB;
@@ -4461,8 +4426,8 @@ notification.heartbeat {
 .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;
+  /* Overrides the margin-inline-end for all platforms defined in the .plain class */
+  margin-inline-end: 4px !important;
   width: 16px;
   height: 16px; }
 
@@ -4486,7 +4451,7 @@ notification.heartbeat {
   font-size: 1.05rem; }
 
 #UITourTooltipClose {
-  -moz-margin-end: -4px;
+  margin-inline-end: -4px;
   height: 16px;
   width: 16px; }
 
@@ -4576,68 +4541,18 @@ notification.heartbeat {
 #context-navigation > .menuitem-iconic > .menu-iconic-left {
   visibility: visible;
   /* override toolkit/themes/linux/global/menu.css */
-  -moz-padding-end: 0 !important;
-  -moz-margin-end: 0 !important; }
+  padding-inline-end: 0 !important;
+  margin-inline-end: 0 !important; }
 
 .browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
   padding: 0;
   overflow: hidden; }
 
-/* User Context UI browser styles */
-#menu_newUserContextTabPersonal {
-  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
-
-#menu_newUserContextTabWork {
-  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
-
-#menu_newUserContextTabBanking {
-  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
+.webextension-popup-browser {
+  border-radius: inherit; }
 
-#menu_newUserContextTabShopping {
-  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
-
-/* URL Bar Decoration */
-#userContext-indicator {
-  height: 16px;
-  width: 16px; }
-
-#userContext-label {
-  margin-inline-end: 3px;
-  color: #909090; }
-
-#userContext-icons:not([usercontextid]) {
-  display: none; }
-
-#userContext-icons {
-  -moz-box-align: center; }
-
-/* Personal User Context */
-#userContext-icons[usercontextid="1"] > #userContext-label {
-  color: #00a7e0; }
-
-#userContext-icons[usercontextid="1"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
-
-/* Work User Context */
-#userContext-icons[usercontextid="2"] > #userContext-label {
-  color: #f89c24; }
-
-#userContext-icons[usercontextid="2"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
-
-/* Banking User Context */
-#userContext-icons[usercontextid="3"] > #userContext-label {
-  color: #7dc14c; }
-
-#userContext-icons[usercontextid="3"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
-
-/* Shopping User Context */
-#userContext-icons[usercontextid="4"] > #userContext-label {
-  color: #ee5195; }
-
-#userContext-icons[usercontextid="4"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
+.menuitem-iconic[command="Browser:NewUserContextTab"] > .menu-iconic-left > .menu-iconic-icon {
+  visibility: visible; }
 
 #nav-bar #loop-button, #nav-bar
 toolbar[brighttext] #loop-button {
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-light.css b/arc-firefox-theme/chrome/browser/sass/browser-light.css
index 16e6109..c9adcae 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-light.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-light.css
@@ -218,7 +218,7 @@ menuitem.bookmark-item {
   margin-bottom: 0; }
 
 .bookmark-item > .menu-iconic-left > .menu-iconic-icon {
-  -moz-padding-start: 0px; }
+  padding-inline-start: 0px; }
 
 /* Bookmark drag and drop styles */
 .bookmark-item[dragover-into="true"] {
@@ -235,7 +235,7 @@ menuitem.bookmark-item {
 .menupopup-drop-indicator {
   list-style-image: none;
   height: 2px;
-  -moz-margin-end: -4em;
+  margin-inline-end: -4em;
   background-color: Highlight; }
 
 /* Bookmarks toolbar */
@@ -297,6 +297,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #placesContext_openContainer\:tabs,
 #menu_newNavigatorTab,
 #context-openlinkintab,
+#context-openlinkincontainertab,
 #context-openframeintab {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
   -moz-image-region: rect(0px 64px 16px 48px); }
@@ -436,6 +437,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #panelMenu_bookmarksToolbar {
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); }
 
+#menu_unsortedBookmarks,
 #BMB_unsortedBookmarks,
 #panelMenu_unsortedBookmarks {
   list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); }
@@ -476,8 +478,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
   max-width: 16px; }
 
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
 #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   max-width: 18px; }
 
@@ -495,16 +497,16 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-badge-stack,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
   padding: 2px 6px;
   border: 1px solid transparent;
   border-radius: 2px;
   transition-property: background-color, border-color;
   transition-duration: 150ms; }
 
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-badge-stack,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, .toolbarbutton-legacy-addon)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-badge-stack,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #containers-panelmenu, .toolbarbutton-legacy-addon)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   padding: 3px 7px; }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon,
@@ -514,8 +516,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   max-width: 32px !important; }
 
 #nav-bar #PanelUI-menu-button {
-  -moz-padding-start: 5px;
-  -moz-padding-end: 5px; }
+  padding-inline-start: 5px;
+  padding-inline-end: 5px; }
 
 #nav-bar #PanelUI-button,
 #nav-bar[brighttext] #PanelUI-button {
@@ -592,7 +594,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   display: -moz-box;
   width: 1px;
   height: 18px;
-  -moz-margin-end: -1px;
+  margin-inline-end: -1px;
   background-position: center;
   background-repeat: no-repeat;
   background-size: 1px 18px; }
@@ -606,7 +608,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   background: rgba(82, 93, 118, 0.15); }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  -moz-margin-start: -4px; }
+  margin-inline-start: -4px; }
 
 #back-button > menupopup {
   margin-top: -1px; }
@@ -636,14 +638,14 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu") !important; }
 
 /* Menu panel buttons */
-:-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, #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),
+:-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, #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, #containers-panelmenu),
 #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   list-style-image: url("chrome://browser/skin/custom_images/light/toolbar-icons.svg"); }
-  #TabsToolbar :-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, #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), #TabsToolbar
+  #TabsToolbar :-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, #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, #containers-panelmenu), #TabsToolbar
   #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
     list-style-image: url("chrome://browser/skin/custom_images/light/tabbar-icons.svg"); }
 
-#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) {
+#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #containers-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #containers-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active) {
   list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.svg"); }
 
 #nav-bar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .dropmarker-icon,
@@ -688,6 +690,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #sync-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 792px, 18px, 774px); }
 
+#containers-panelmenu[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 810px, 18px, 792px); }
+
 #feed-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 288px, 18px, 270px); }
 
@@ -778,8 +783,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 
 @media not all and (min-resolution: 1.1dppx) {
   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, #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)[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, #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) {
+  :-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, #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, #containers-panelmenu)[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu) {
     list-style-image: var(--menupanel-list-style-image); }
 
   #home-button[cui-areatype="menu-panel"],
@@ -823,6 +828,13 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
     -moz-image-region: rect(32px, 1024px, 64px, 992px); }
 
+  #containers-panelmenu[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > #containers-panelmenu {
+    -moz-image-region: rect(0px, 1056px, 32px, 1024px); }
+
+  #containers-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+    -moz-image-region: rect(32px, 1056px, 64px, 1024px); }
+
   #feed-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #feed-button {
     -moz-image-region: rect(0px, 416px, 32px, 384px); }
@@ -938,8 +950,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 /* Menu panel and palette styles */
 @media (min-resolution: 1.1dppx) {
   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, #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)[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, #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) {
+  :-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, #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, #containers-panelmenu)[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu) {
     list-style-image: var(--menupanel-list-style-image-2x); }
 
   #home-button[cui-areatype="menu-panel"],
@@ -983,6 +995,13 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
     -moz-image-region: rect(64px, 2048px, 128px, 1984px); }
 
+  #containers-panelmenu[cui-areatype="menu-panel"],
+  toolbarpaletteitem[place="palette"] > #containers-panelmenu {
+    -moz-image-region: rect(0px, 2112px, 64px, 2048px); }
+
+  #containers-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+    -moz-image-region: rect(64px, 2112px, 128px, 2048px); }
+
   #feed-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #feed-button {
     -moz-image-region: rect(0px, 832px, 64px, 768px); }
@@ -1065,6 +1084,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   toolbaritem[sdkstylewidget="true"] > toolbarbutton {
     -moz-image-region: rect(0, 1664px, 64px, 1600px); }
 
+  #add-share-provider {
+    list-style-image: url(chrome://browser/skin/menuPanel-small@2x.png);
+    -moz-image-region: rect(0px, 192px, 32px, 160px); }
+
   /* Footer and wide panel control icons */
   #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
   #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton,
@@ -1140,9 +1163,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
-  padding: 2px 3px;
+  padding: 0 3px;
   border-radius: 3px;
   margin: 0 3px;
+  min-height: 28px;
   color: #5c616c;
   background-color: #ffffff;
   border: 1px solid #cfd6e6; }
@@ -1167,10 +1191,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 
 .urlbar-textbox-container {
   -moz-appearance: none;
-  -moz-box-align: center; }
+  -moz-box-align: stretch; }
 
 .urlbar-input-box {
-  -moz-margin-start: 0; }
+  margin-inline-start: 0; }
 
 .urlbar-history-dropmarker {
   -moz-appearance: toolbarbutton-dropdown;
@@ -1220,21 +1244,21 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #urlbar-display-box {
   margin-top: -1px;
   margin-bottom: -1px;
-  -moz-border-end: 1px solid #AAA;
-  -moz-margin-end: 3px; }
+  border-inline-end: 1px solid #AAA;
+  margin-inline-end: 3px; }
 
 .urlbar-display {
   margin-top: 0;
   margin-bottom: 0;
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
   color: GrayText; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] {
   border-bottom: 1px solid rgba(24, 26, 27, 0.14);
   background-color: rgba(24, 26, 27, 0.07);
   padding: 6px 0;
-  -moz-padding-start: 44px;
-  -moz-padding-end: 6px;
+  padding-inline-start: 44px;
+  padding-inline-end: 6px;
   background-image: url("chrome://browser/skin/info.svg");
   background-clip: padding-box;
   background-position: 20px center;
@@ -1249,7 +1273,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   padding: 0; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description > label.text-link {
-  -moz-margin-start: 0; }
+  margin-inline-start: 0; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button {
   -moz-appearance: none;
@@ -1257,7 +1281,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   border-radius: 3px;
   padding: 4px 16px;
   margin: 0;
-  -moz-margin-start: 10px; }
+  margin-inline-start: 10px; }
 
 #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"] {
   color: #616161;
@@ -1297,12 +1321,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 #identity-box {
   --identity-box-verified-color: #479900;
   --identity-box-chrome-color: #e57300;
-  border-inline-end: 1px solid var(--urlbar-separator-color);
-  border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
-  border-image-slice: 1;
+  border-inline-end: 1px solid rgba(207, 214, 230, 0.5);
   font-size: .9em;
-  padding: 3px 5px 3px 3px;
-  margin-inline-end: 4px;
+  padding: 3px 9px 3px 7px;
+  margin-inline-end: 5px;
   overflow: hidden; }
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
@@ -1406,7 +1428,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .popup-notification-icon {
   width: 64px;
   height: 64px;
-  -moz-margin-end: 10px; }
+  margin-inline-end: 10px; }
 
 .popup-notification-icon[popupid="geolocation"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png); }
@@ -1463,6 +1485,9 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .popup-notification-icon[popupid="pointerLock"] {
   list-style-image: url(chrome://browser/skin/pointerLock-64.png); }
 
+.popup-notification-icon[popupid="servicesInstall"] {
+  list-style-image: url(chrome://browser/skin/social/services-64.png); }
+
 /* Notification icon box */
 #notification-popup-box {
   position: relative;
@@ -1484,53 +1509,56 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .notification-anchor-icon.chat-toolbarbutton:-moz-locale-dir(rtl) {
   transform: none; }
 
+/* This class can be used alone or in combination with the class defining the
+   type of icon displayed. This rule must be defined before the others in order
+   for its list-style-image to be overridden. */
 .notification-anchor-icon {
   list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16);
   width: 16px;
   height: 16px;
   margin: 0 2px; }
 
-.geo-notification-icon,
-#geo-notification-icon {
+@media (min-resolution: 1.1dppx) {
+  .notification-anchor-icon {
+    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); } }
+.geo-icon {
   list-style-image: url(chrome://browser/skin/Geolocation-16.png); }
 
-#addons-notification-icon {
+.install-icon {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); }
 
-#addons-notification-icon:hover {
+.install-icon:hover {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#hover); }
 
-#addons-notification-icon:hover:active {
+.install-icon:hover:active {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#active); }
 
-.indexedDB-notification-icon,
-#indexedDB-notification-icon {
+.indexedDB-icon {
   list-style-image: url(chrome://global/skin/icons/question-16.png); }
 
-#password-notification-icon {
+.login-icon {
   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);
+  /* Temporary solution until the capture and fill doorhangers are unified. */
   transform: scaleX(-1); }
 
-#plugins-notification-icon {
+.plugin-icon {
   list-style-image: url(chrome://browser/skin/notification-pluginNormal.png); }
 
-#plugins-notification-icon.plugin-hidden {
+.plugin-icon.plugin-hidden {
   list-style-image: url(chrome://browser/skin/notification-pluginAlert.png); }
 
-#plugins-notification-icon.plugin-blocked {
+.plugin-icon.plugin-blocked {
   list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png); }
 
-#plugins-notification-icon {
+.plugin-icon {
   -moz-image-region: rect(0, 16px, 16px, 0); }
 
-#plugins-notification-icon:hover {
+.plugin-icon:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px); }
 
-#plugins-notification-icon:active {
+.plugin-icon:active {
   -moz-image-region: rect(0, 48px, 16px, 32px); }
 
 #notification-popup-box[hidden] {
@@ -1547,69 +1575,57 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
     opacity: 0; }
   to {
     opacity: 1; } }
-.webRTC-shareDevices-notification-icon,
-#webRTC-shareDevices-notification-icon {
+.camera-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png); }
 
+/* The first selector is used by socialchat.xml (bug 1275558). */
 .webRTC-sharingDevices-notification-icon,
-#webRTC-sharingDevices-notification-icon {
+.camera-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16.png); }
 
-.webRTC-shareMicrophone-notification-icon,
-#webRTC-shareMicrophone-notification-icon {
+.microphone-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16.png); }
 
+/* The first selector is used by socialchat.xml (bug 1275558). */
 .webRTC-sharingMicrophone-notification-icon,
-#webRTC-sharingMicrophone-notification-icon {
+.microphone-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16.png); }
 
-.webRTC-shareScreen-notification-icon,
-#webRTC-shareScreen-notification-icon {
+.screen-icon {
   list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); }
 
-.webRTC-sharingScreen-notification-icon,
-#webRTC-sharingScreen-notification-icon {
+.screen-icon.in-use {
   list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png); }
 
-.web-notifications-notification-icon,
-#web-notifications-notification-icon {
+.web-notifications-icon {
   list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
   -moz-image-region: rect(0, 16px, 16px, 0); }
 
-.web-notifications-notification-icon:hover,
-#web-notifications-notification-icon:hover {
+.web-notifications-icon:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px); }
 
-.web-notifications-notification-icon:hover:active,
-#web-notifications-notification-icon:hover:active {
+.web-notifications-icon:hover:active {
   -moz-image-region: rect(0, 48px, 16px, 32px); }
 
-.pointerLock-notification-icon,
-#pointerLock-notification-icon {
+.pointer-icon {
   list-style-image: url(chrome://browser/skin/pointerLock-16.png); }
 
-.translate-notification-icon,
-#translate-notification-icon {
+.service-icon {
+  list-style-image: url(chrome://browser/skin/social/services-16.png); }
+
+.translation-icon {
   list-style-image: url(chrome://browser/skin/translation-16.png);
   -moz-image-region: rect(0px, 16px, 16px, 0px); }
 
-.translated-notification-icon,
-#translated-notification-icon {
-  list-style-image: url(chrome://browser/skin/translation-16.png);
+.translation-icon.in-use {
   -moz-image-region: rect(0px, 32px, 16px, 16px); }
 
-.popup-notification-icon[popupid="servicesInstall"] {
-  list-style-image: url(chrome://browser/skin/social/services-64.png); }
-
-#servicesInstall-notification-icon {
-  list-style-image: url(chrome://browser/skin/social/services-16.png); }
-
 /* EME notifications */
 .popup-notification-icon[popupid="drmContentPlaying"],
-#eme-notification-icon {
+.drm-icon {
   list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); }
 
-#eme-notification-icon:hover:active {
+.drm-icon:hover:active {
   list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed"); }
 
 #eme-notification-icon[firstplay=true] {
@@ -1626,31 +1642,22 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
     transform: translateX(0); } }
 /* HiDPI notification icons */
 @media (min-resolution: 1.1dppx) {
-  .notification-anchor-icon {
-    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); }
-
-  .webRTC-shareDevices-notification-icon,
-  #webRTC-shareDevices-notification-icon {
+  .camera-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16@2x.png); }
 
-  .webRTC-sharingDevices-notification-icon,
-  #webRTC-sharingDevices-notification-icon {
+  .camera-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16@2x.png); }
 
-  .webRTC-shareMicrophone-notification-icon,
-  #webRTC-shareMicrophone-notification-icon {
+  .microphone-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16@2x.png); }
 
-  .webRTC-sharingMicrophone-notification-icon,
-  #webRTC-sharingMicrophone-notification-icon {
+  .microphone-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16@2x.png); }
 
-  .webRTC-shareScreen-notification-icon,
-  #webRTC-shareScreen-notification-icon {
+  .screen-icon {
     list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16@2x.png); }
 
-  .webRTC-sharingScreen-notification-icon,
-  #webRTC-sharingScreen-notification-icon {
+  .screen-icon.in-use {
     list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16@2x.png); }
 
   .popup-notification-icon[popupid="webRTC-sharingDevices"],
@@ -1679,8 +1686,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .notification-anchor-icon:-moz-focusring {
   outline: 1px dotted -moz-DialogText; }
 
-.indexedDB-notification-icon,
-#indexedDB-notification-icon {
+.indexedDB-icon {
   list-style-image: url(moz-icon://stock/gtk-dialog-question?size=16); }
 
 /* Translation infobar */
@@ -1745,7 +1751,7 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   -moz-image-region: rect(0, 64px, 32px, 32px); }
 
 .translation-welcome-content {
-  -moz-margin-start: 16px; }
+  margin-inline-start: 16px; }
 
 .translation-welcome-headline {
   font-size: larger;
@@ -1769,7 +1775,7 @@ notification[value="translation"] {
 
 notification[value="translation"] button,
 notification[value="translation"] menulist {
-  -moz-padding-end: 1ch; }
+  padding-inline-end: 1ch; }
 
 notification[value="translation"] menulist {
   border: 1px solid #C1C1C1;
@@ -1782,8 +1788,8 @@ notification[value="translation"] button {
 notification[value="translation"] button,
 notification[value="translation"] menulist,
 notification[value="translation"] menulist > .menulist-label-box {
-  -moz-margin-start: 1ch;
-  -moz-margin-end: 1ch; }
+  margin-inline-start: 1ch;
+  margin-inline-end: 1ch; }
 
 notification[value="translation"] button:hover,
 notification[value="translation"] button:active,
@@ -1804,10 +1810,10 @@ notification[value="translation"] button[anonid="translate"]:active {
 notification[value="translation"] button > .button-box,
 notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker {
   padding: 0;
-  -moz-margin-start: 3ch; }
+  margin-inline-start: 3ch; }
 
 notification[value="translation"] button:not([type="menu"]) > .button-box {
-  -moz-margin-end: 3ch; }
+  margin-inline-end: 3ch; }
 
 notification[value="translation"] menulist > .menulist-dropmarker {
   display: block; }
@@ -1815,10 +1821,6 @@ notification[value="translation"] menulist > .menulist-dropmarker {
 #treecolAutoCompleteImage {
   max-width: 36px; }
 
-#PopupAutoCompleteRichResult {
-  /* The awesomebar popup should open just below the navbar bottom border. */
-  margin-top: 1px; }
-
 .autocomplete-richlistbox {
   padding: 4px; }
 
@@ -1833,10 +1835,10 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   background-color: Highlight; }
 
 .ac-title {
-  font-size: 14px; }
+  font-size: 1.05em; }
 
 .ac-tags {
-  font-size: 12px; }
+  font-size: 0.9em; }
 
 html|span.ac-tag {
   background-color: MenuText;
@@ -1848,7 +1850,7 @@ html|span.ac-tag {
 .ac-separator,
 .ac-url,
 .ac-action {
-  font-size: 12px;
+  font-size: 0.9em;
   color: -moz-nativehyperlinktext; }
 
 .ac-title[selected=true],
@@ -1917,11 +1919,9 @@ html|span.ac-emphasize-text-url {
 #urlbar-stop-button {
   -moz-appearance: none;
   list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  padding: 0 4px 0 6px;
-  margin-inline-start: 2px;
-  border-inline-start: 1px solid var(--urlbar-separator-color);
-  border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
-  border-image-slice: 1; }
+  padding: 0 7px 0 10px;
+  margin-inline-start: 5px;
+  border-inline-start: 1px solid rgba(207, 214, 230, 0.5); }
 
 #urlbar-reload-button {
   -moz-image-region: rect(0, 14px, 14px, 0); }
@@ -2221,11 +2221,11 @@ html|span.ac-emphasize-text-url {
   margin: 0 -15px; }
 
 .tab-content {
-  -moz-padding-end: 9px;
-  -moz-padding-start: 9px; }
+  padding-inline-end: 9px;
+  padding-inline-start: 9px; }
 
 .tab-content[pinned] {
-  -moz-padding-end: 3px; }
+  padding-inline-end: 3px; }
 
 .tab-throbber,
 .tab-icon-image,
@@ -2237,7 +2237,7 @@ html|span.ac-emphasize-text-url {
 .tab-icon-image {
   height: 16px;
   width: 16px;
-  -moz-margin-end: 6px; }
+  margin-inline-end: 6px; }
 
 .tab-icon-image {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); }
@@ -2246,7 +2246,7 @@ html|span.ac-emphasize-text-url {
   width: 16px;
   height: 16px;
   margin-top: -12px;
-  -moz-margin-start: -16px;
+  margin-inline-start: -16px;
   position: relative; }
 
 .tab-icon-overlay[crashed] {
@@ -2273,16 +2273,16 @@ html|span.ac-emphasize-text-url {
   list-style-image: url("chrome://browser/skin/custom_images/loading.png"); }
 
 .tab-label {
-  -moz-margin-end: 0;
-  -moz-margin-start: 0; }
+  margin-inline-end: 0;
+  margin-inline-start: 0; }
 
 .tab-close-button {
-  -moz-margin-start: 4px;
-  -moz-margin-end: -2px;
+  margin-inline-start: 4px;
+  margin-inline-end: -2px;
   padding: 0; }
 
 .tab-icon-sound {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   width: 16px;
   height: 16px;
   padding: 0; }
@@ -2305,33 +2305,39 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound[muted]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); }
 
+.tab-icon-sound:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying] {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio"); }
 
+.tab-icon-sound:hover:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying]:hover {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-hover"); }
 
+.tab-icon-sound:hover:active:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][soundplaying]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-pressed"); }
 
+.tab-icon-sound[muted]:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted] {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted"); }
 
+.tab-icon-sound[muted]:hover:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted]:hover {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted-hover"); }
 
+.tab-icon-sound[muted]:hover:active:-moz-lwtheme,
 .tab-icon-sound[visuallyselected=true][muted]:hover:active {
   list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted-pressed"); }
 
 .tab-background,
 .tabs-newtab-button {
   /* overlap the tab curves */
-  -moz-margin-end: -14px;
-  -moz-margin-start: -14px; }
+  margin-inline-end: -14px;
+  margin-inline-start: -14px; }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
-  -moz-padding-end: 15px;
-  -moz-padding-start: 5px; }
+  padding-inline-end: 15px;
+  padding-inline-start: 5px; }
 
 /* Tab Overflow */
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]),
@@ -2350,12 +2356,12 @@ html|span.ac-emphasize-text-url {
   transform: scaleX(-1); }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]) {
-  -moz-margin-start: -2px;
-  -moz-margin-end: -12px; }
+  margin-inline-start: -2px;
+  margin-inline-end: -12px; }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) {
-  -moz-margin-start: -12px;
-  -moz-margin-end: -2px; }
+  margin-inline-start: -12px;
+  margin-inline-end: -2px; }
 
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator[collapsed],
 .tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator[collapsed] {
@@ -2394,7 +2400,7 @@ html|span.ac-emphasize-text-url {
 .tab-background-start[visuallyselected=true]::after,
 .tab-background-end[visuallyselected=true]::after {
   /* position ::after on top of its parent */
-  -moz-margin-start: -30px;
+  margin-inline-start: -30px;
   background-size: 100% 100%;
   content: "";
   display: -moz-box;
@@ -2464,29 +2470,6 @@ lwtHeader;*/
   background-repeat: no-repeat;
   background-size: 30px 100%, calc(100% - (2 * 30px)) 100%, 30px 100%; }
 
-/* User Context UI - change tab decoration depending on userContextId.
-   Defaults to gray for unknown usercontextids. */
-.tabbrowser-tab[usercontextid] {
-  background-image: linear-gradient(to right, transparent 20%, #909090 30%, #909090 70%, transparent 80%);
-  background-size: auto 2px;
-  background-repeat: no-repeat; }
-
-/* Personal User Context */
-.tabbrowser-tab[usercontextid="1"] {
-  background-image: linear-gradient(to right, transparent 20%, #00a7e0 30%, #00a7e0 70%, transparent 80%); }
-
-/* Work User Context */
-.tabbrowser-tab[usercontextid="2"] {
-  background-image: linear-gradient(to right, transparent 20%, #f89c24 30%, #f89c24 70%, transparent 80%); }
-
-/* Banking User Context */
-.tabbrowser-tab[usercontextid="3"] {
-  background-image: linear-gradient(to right, transparent 20%, #7dc14c 30%, #7dc14c 70%, transparent 80%); }
-
-/* Shopping User Context */
-.tabbrowser-tab[usercontextid="4"] {
-  background-image: linear-gradient(to right, transparent 20%, #ee5195 30%, #ee5195 70%, transparent 80%); }
-
 /* Tab pointer-events */
 .tabbrowser-tab {
   pointer-events: none; }
@@ -2662,7 +2645,7 @@ menuitem:hover > hbox > .alltabs-endimage[soundplaying] {
 /* Sidebar */
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading.png");
-  -moz-margin-end: 4px; }
+  margin-inline-end: 4px; }
 
 toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important; }
@@ -2709,27 +2692,6 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   padding: 0 3px;
   margin-top: 10px; }
 
-/* Sync Panel */
-.sync-panel-icon {
-  height: 32px;
-  width: 32px;
-  background: url("chrome://browser/content/abouthome/sync.png") top left no-repeat; }
-
-.sync-panel-inner {
-  width: 0;
-  padding-left: 10px; }
-
-.sync-panel-button-box {
-  margin-top: 1em; }
-
-#sync-start-panel-title {
-  font-size: 120%;
-  font-weight: bold;
-  margin-bottom: 5px; }
-
-#sync-start-panel-subtitle {
-  margin-bottom: 0; }
-
 /* Status panel */
 .statuspanel-label {
   margin: 0;
@@ -2919,7 +2881,7 @@ html|*#fullscreen-exit-button {
   -moz-appearance: none;
   color: inherit;
   border-width: 0;
-  -moz-border-end: 1px solid rgba(12, 13, 14, 0.45);
+  border-inline-end: 1px solid rgba(12, 13, 14, 0.45);
   box-shadow: -1px 0 0 rgba(184, 194, 204, 0.15) inset, 1px 0 0 rgba(184, 194, 204, 0.15); }
 
 .devtools-responsiveui-toolbarbutton[type=menu-button]:-moz-locale-dir(rtl) > .toolbarbutton-menubutton-button {
@@ -3098,23 +3060,31 @@ html|*#fullscreen-exit-button {
   --selection-background: #4c9ed9;
   /* --theme-selection-background */
   --selection-color: #f5f7fa;
-  /* --theme-selection-color */ }
+  /* --theme-selection-color */
+  --command-line-image: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme);
+  /* --theme-command-line-image */
+  --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme-focus);
+  /* --theme-command-line-image-focus */ }
 
 :root[devtoolstheme="dark"] #developer-toolbar {
-  --gcli-background-color: #343c45;
+  --gcli-background-color: #272b35;
   /* --theme-toolbar-background */
-  --gcli-input-background: rgba(37, 44, 51, 0.6);
+  --gcli-input-background: #272b35;
   /* --theme-tab-toolbar-background */
-  --gcli-input-focused-background: #252c33;
+  --gcli-input-focused-background: #272b35;
   /* --theme-tab-toolbar-background */
   --gcli-input-color: #b6babf;
   /* --theme-body-color-alt */
-  --gcli-border-color: black;
+  --gcli-border-color: #454d5d;
   /* --theme-splitter-color */
-  --selection-background: #1d4f73;
+  --selection-background: #5675b9;
   /* --theme-selection-background */
   --selection-color: #f5f7fa;
-  /* --theme-selection-color */ }
+  /* --theme-selection-color */
+  --command-line-image: url(chrome://devtools/skin/images/commandline-icon.svg#dark-theme);
+  /* --theme-command-line-image */
+  --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#dark-theme-focus);
+  /* --theme-command-line-image-focus */ }
 
 #developer-toolbar {
   -moz-appearance: none;
@@ -3222,16 +3192,11 @@ html|*#gcli-output-frame {
   width: 16px;
   height: 16px;
   margin: 0 2px;
-  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
-  background-position: 0 center;
-  background-size: 32px 16px; }
+  background-image: var(--command-line-image); }
 
 .gclitoolbar-input-node[focused="true"]::before {
-  background-position: -16px center; }
+  background-image: var(--command-line-image-focus); }
 
-@media (min-resolution: 1.1dppx) {
-  .gclitoolbar-input-node::before {
-    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png"); } }
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
   background-color: var(--selection-background);
   color: var(--selection-color);
@@ -3280,7 +3245,7 @@ html|*#gcli-output-frame {
   background-color: rgba(0, 0, 0, 0.1); }
 
 .center-item-label {
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
   margin-bottom: 0;
   text-overflow: ellipsis; }
 
@@ -3289,7 +3254,7 @@ html|*#gcli-output-frame {
   background-repeat: no-repeat;
   width: 16px;
   height: 15px;
-  -moz-margin-start: 6px; }
+  margin-inline-start: 6px; }
 
 .click-to-play-plugins-notification-button-container {
   background-color: rgba(24, 26, 27, 0.07);
@@ -3388,7 +3353,7 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:h
   background-clip: padding-box;
   border-left: 1px solid rgba(24, 26, 27, 0.3);
   box-shadow: 0 3px 5px rgba(24, 26, 27, 0.1), 0 0 7px rgba(24, 26, 27, 0.1);
-  -moz-margin-start: 38px; }
+  margin-inline-start: 38px; }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -3554,7 +3519,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   background-image: linear-gradient(#505050, #575757);
   border: 1px solid;
   border-color: rgba(0, 0, 0, 0.6) rgba(0, 0, 0, 0.4) rgba(0, 0, 0, 0.4);
-  -moz-border-start: none;
+  border-inline-start: none;
   border-radius: 0 2px 2px 0; }
 
 #downloads-button[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
@@ -3576,7 +3541,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
-  -moz-margin-end: 2px; }
+  margin-inline-end: 2px; }
 
 /* Social toolbar item */
 .social-activation-icon {
@@ -3776,10 +3741,10 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   overflow: hidden; }
 
 chatbar {
-  -moz-margin-end: 20px; }
+  margin-inline-end: 20px; }
 
 chatbox {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   background-color: transparent; }
 
 chatbar > chatbox {
@@ -3790,10 +3755,10 @@ chatbar > chatbox {
   box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
   /* Offset the chatbox the same amount as the box-shadows' spread, to make it
      visible. */
-  -moz-margin-end: 5px; }
+  margin-inline-end: 5px; }
 
 window > chatbox {
-  -moz-margin-start: 0px;
+  margin-inline-start: 0px;
   margin: 0px;
   border: none;
   padding: 0px;
@@ -3934,7 +3899,7 @@ window > chatbox {
 #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: 6px !important; }
+  margin-inline-start: 6px !important; }
 
 #customization-lwtheme-button > .box-inherit > .box-inherit > .button-icon {
   width: 20px;
@@ -4050,7 +4015,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   min-height: 48px; }
 
 #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
-  -moz-margin-end: 5px; }
+  margin-inline-end: 5px; }
 
 #customization-palette > toolbarpaletteitem > label {
   text-align: center;
@@ -4072,9 +4037,9 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   border: 1px solid transparent;
   margin: 0 -5px 5px;
   padding-top: 0;
-  -moz-padding-end: 5px;
+  padding-inline-end: 5px;
   padding-bottom: 0;
-  -moz-padding-start: 0; }
+  padding-inline-start: 0; }
 
 .customization-lwtheme-menu-theme[defaulttheme] {
   list-style-image: url(chrome://browser/skin/theme-switcher-icon.png); }
@@ -4133,7 +4098,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   background: linear-gradient(rgba(24, 26, 27, 0.08) 40%, transparent) padding-box; }
 
 .customization-lwtheme-menu-footeritem:first-child {
-  -moz-border-end: 1px solid rgba(24, 26, 27, 0.15); }
+  border-inline-end: 1px solid rgba(24, 26, 27, 0.15); }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -4195,7 +4160,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 .customization-tipPanel-closeBox > .close-icon {
   -moz-appearance: none;
   border: 0;
-  -moz-margin-end: -25px; }
+  margin-inline-end: -25px; }
 
 #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"],
 #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] {
@@ -4271,14 +4236,14 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 #UITourTooltipBody {
   -moz-box-align: start; }
 
-#UITourtooltipTitleContainer {
+#UITourTooltipTitleContainer {
   -moz-box-align: start;
   margin-bottom: 10px; }
 
 #UITourTooltipIcon {
   width: 48px;
   height: 48px;
-  -moz-margin-end: 10px; }
+  margin-inline-end: 10px; }
 
 #UITourTooltipTitle,
 #UITourTooltipDescription {
@@ -4290,8 +4255,8 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   margin: 0; }
 
 #UITourTooltipDescription {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
   font-size: 1.15rem;
   line-height: 1.8rem;
   margin-bottom: 0;
@@ -4303,7 +4268,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
   border: none;
   background-color: transparent;
   min-width: 0;
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   margin-top: -2px; }
 
 #UITourTooltipClose > .toolbarbutton-text {
@@ -4322,7 +4287,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 
 #UITourTooltipButtons > label:first-child,
 #UITourTooltipButtons > button:first-child {
-  -moz-margin-start: 0; }
+  margin-inline-start: 0; }
 
 #UITourTooltipButtons > label:last-child,
 #UITourTooltipButtons > button:last-child {
@@ -4331,7 +4296,7 @@ toolbarpaletteitem[place="toolbar"]:-moz-focusring {
 #UITourTooltipButtons > button[image] > .button-box > .button-icon {
   width: 16px;
   height: 16px;
-  -moz-margin-end: 5px; }
+  margin-inline-end: 5px; }
 
 #UITourTooltipButtons > label,
 #UITourTooltipButtons > button .button-text {
@@ -4407,15 +4372,15 @@ notification.heartbeat {
 .messageText.heartbeat {
   color: #333333;
   text-shadow: none;
-  -moz-margin-start: 0px;
+  margin-inline-start: 0px;
   /* The !important is required to override OSX default style. */
-  -moz-margin-end: 12px !important; }
+  margin-inline-end: 12px !important; }
 
 .messageImage.heartbeat {
   width: 24px;
   height: 24px;
-  -moz-margin-start: 8px;
-  -moz-margin-end: 8px; }
+  margin-inline-start: 8px;
+  margin-inline-end: 8px; }
 
 .messageImage.heartbeat.pulse-onshow {
   animation-name: pulse-onshow;
@@ -4432,7 +4397,7 @@ notification.heartbeat {
 /* Learn More link styles */
 .heartbeat > .text-link {
   color: #0095DD;
-  -moz-margin-start: 0px; }
+  margin-inline-start: 0px; }
 
 .heartbeat > .text-link:hover {
   color: #008ACB;
@@ -4461,8 +4426,8 @@ notification.heartbeat {
 .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;
+  /* Overrides the margin-inline-end for all platforms defined in the .plain class */
+  margin-inline-end: 4px !important;
   width: 16px;
   height: 16px; }
 
@@ -4486,7 +4451,7 @@ notification.heartbeat {
   font-size: 1.05rem; }
 
 #UITourTooltipClose {
-  -moz-margin-end: -4px;
+  margin-inline-end: -4px;
   height: 16px;
   width: 16px; }
 
@@ -4576,68 +4541,18 @@ notification.heartbeat {
 #context-navigation > .menuitem-iconic > .menu-iconic-left {
   visibility: visible;
   /* override toolkit/themes/linux/global/menu.css */
-  -moz-padding-end: 0 !important;
-  -moz-margin-end: 0 !important; }
+  padding-inline-end: 0 !important;
+  margin-inline-end: 0 !important; }
 
 .browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
   padding: 0;
   overflow: hidden; }
 
-/* User Context UI browser styles */
-#menu_newUserContextTabPersonal {
-  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
-
-#menu_newUserContextTabWork {
-  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
-
-#menu_newUserContextTabBanking {
-  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
+.webextension-popup-browser {
+  border-radius: inherit; }
 
-#menu_newUserContextTabShopping {
-  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
-
-/* URL Bar Decoration */
-#userContext-indicator {
-  height: 16px;
-  width: 16px; }
-
-#userContext-label {
-  margin-inline-end: 3px;
-  color: #909090; }
-
-#userContext-icons:not([usercontextid]) {
-  display: none; }
-
-#userContext-icons {
-  -moz-box-align: center; }
-
-/* Personal User Context */
-#userContext-icons[usercontextid="1"] > #userContext-label {
-  color: #00a7e0; }
-
-#userContext-icons[usercontextid="1"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
-
-/* Work User Context */
-#userContext-icons[usercontextid="2"] > #userContext-label {
-  color: #f89c24; }
-
-#userContext-icons[usercontextid="2"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
-
-/* Banking User Context */
-#userContext-icons[usercontextid="3"] > #userContext-label {
-  color: #7dc14c; }
-
-#userContext-icons[usercontextid="3"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
-
-/* Shopping User Context */
-#userContext-icons[usercontextid="4"] > #userContext-label {
-  color: #ee5195; }
-
-#userContext-icons[usercontextid="4"] > #userContext-indicator {
-  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
+.menuitem-iconic[command="Browser:NewUserContextTab"] > .menu-iconic-left > .menu-iconic-icon {
+  visibility: visible; }
 
 #nav-bar #loop-button, #nav-bar
 toolbar[brighttext] #loop-button {
diff --git a/arc-firefox-theme/chrome/browser/searchReset.css b/arc-firefox-theme/chrome/browser/searchReset.css
new file mode 100644
index 0000000..3573d7d
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/searchReset.css
@@ -0,0 +1,22 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+body {
+  align-items: center;
+}
+
+.title {
+  background-image: url("chrome://browser/skin/icon-search-64.svg");
+}
+
+#defaultEngine {
+  padding-inline-start: 26px;
+  background-repeat: no-repeat;
+  background-position: 5px center;
+  background-size: 16px, 16px;
+}
+
+#defaultEngine:-moz-dir(rtl) {
+  background-position: calc(100% - 5px) center;
+}
diff --git a/arc-firefox-theme/chrome/browser/searchbar.css b/arc-firefox-theme/chrome/browser/searchbar.css
index 3b2c2df..a79bc5e 100644
--- a/arc-firefox-theme/chrome/browser/searchbar.css
+++ b/arc-firefox-theme/chrome/browser/searchbar.css
@@ -3,8 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #PopupSearchAutoComplete {
-  -moz-margin-start: -24px;
-  padding: 1px;
+  margin-inline-start: -24px;
 }
 
 .autocomplete-textbox-container {
@@ -20,7 +19,7 @@
   height: 16px;
   width: 16px;
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-  -moz-margin-start: -1px;
+  margin-inline-start: -1px;
 }
 
 /* Search go button */
@@ -63,7 +62,7 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
   -moz-image-region: rect(0, 20px, 20px, 0);
   margin-top: 1px;
   margin-bottom: 1px;
-  -moz-margin-start: 2px;
+  margin-inline-start: 2px;
 }
 
 .searchbar-search-button[addengines="true"] {
@@ -113,7 +112,7 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 }
 
 .search-panel-one-offs {
-  margin: 0 -1px !important;
+  margin: 0 !important;
   border-top: 1px solid rgba(0, 0, 0, 0.2);
 }
 
@@ -156,7 +155,7 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 
 .searchbar-engine-one-off-item > .button-box > .button-icon {
   display: -moz-box;
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
   width: 16px;
   height: 16px;
 }
@@ -198,7 +197,7 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 .addengine-item > .button-box > .button-text {
   -moz-box-flex: 1;
   text-align: start;
-  -moz-padding-start: 10px;
+  padding-inline-start: 10px;
 }
 
 .addengine-item:not([image]) {
@@ -210,11 +209,11 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 }
 
 .search-panel-tree > .autocomplete-treebody::-moz-tree-cell-text {
-  -moz-padding-start: 4px;
+  padding-inline-start: 4px;
 }
 
 .search-panel-tree > .autocomplete-treebody::-moz-tree-image {
-  -moz-padding-start: 5px;
+  padding-inline-start: 5px;
   width: 14px;
   height: 14px;
 }
diff --git a/arc-firefox-theme/chrome/browser/sync-desktopIcon.png b/arc-firefox-theme/chrome/browser/sync-desktopIcon.png
deleted file mode 100644
index d3d1e27..0000000
--- a/arc-firefox-theme/chrome/browser/sync-desktopIcon.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/sync-desktopIcon.svg b/arc-firefox-theme/chrome/browser/sync-desktopIcon.svg
new file mode 100644
index 0000000..d3279a9
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/sync-desktopIcon.svg
@@ -0,0 +1,22 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <style>
+    g:not(:target) { display: none; }
+
+    .glyph { fill: #4d4d4d; }
+    .glyph.translucent { fill-opacity: .15; }
+
+    .inverted .glyph { fill: #fff; }
+    .inverted .glyph.translucent { fill-opacity: .15; }
+  </style>
+  <g id="icon">
+    <path class="glyph" d="M15,14H1a1,1,0,0,1-1-1V12.526H16V13A1,1,0,0,1,15,14ZM1,4A1,1,0,0,1,2,3H14a1,1,0,0,1,1,1v8H1V4Zm1,7H14V4H2v7Z"/>
+    <rect class="glyph translucent" x="2" y="4" width="12" height="7"/>
+  </g>
+  <g id="icon-inverted" class="inverted">
+    <path class="glyph" d="M15,14H1a1,1,0,0,1-1-1V12.526H16V13A1,1,0,0,1,15,14ZM1,4A1,1,0,0,1,2,3H14a1,1,0,0,1,1,1v8H1V4Zm1,7H14V4H2v7Z"/>
+    <rect class="glyph translucent" x="2" y="4" width="12" height="7"/>
+  </g>
+</svg>
diff --git a/arc-firefox-theme/chrome/browser/sync-mobileIcon.png b/arc-firefox-theme/chrome/browser/sync-mobileIcon.png
deleted file mode 100644
index a3bda57..0000000
--- a/arc-firefox-theme/chrome/browser/sync-mobileIcon.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/sync-mobileIcon.svg b/arc-firefox-theme/chrome/browser/sync-mobileIcon.svg
new file mode 100644
index 0000000..df19994
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/sync-mobileIcon.svg
@@ -0,0 +1,22 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <style>
+    g:not(:target) { display: none; }
+
+    .glyph { fill: #4d4d4d; }
+    .glyph.translucent { fill-opacity: .15; }
+
+    .inverted .glyph { fill: #fff; }
+    .inverted .glyph.translucent { fill-opacity: .15; }
+  </style>
+  <g id="icon">
+    <path class="glyph" d="M12,16H4a1,1,0,0,1-1-1V1A1,1,0,0,1,4,0h8a1,1,0,0,1,1,1V15A1,1,0,0,1,12,16Zm-4-.684a0.785,0.785,0,1,0-.785-0.785A0.785,0.785,0,0,0,8,15.316ZM12,2H4V13h8V2Z"/>
+    <rect class="glyph translucent" x="4" y="2" width="8" height="11"/>
+  </g>
+  <g id="icon-inverted" class="inverted">
+    <path class="glyph" d="M12,16H4a1,1,0,0,1-1-1V1A1,1,0,0,1,4,0h8a1,1,0,0,1,1,1V15A1,1,0,0,1,12,16Zm-4-.684a0.785,0.785,0,1,0-.785-0.785A0.785,0.785,0,0,0,8,15.316ZM12,2H4V13h8V2Z"/>
+    <rect class="glyph translucent" x="4" y="2" width="8" height="11"/>
+  </g>
+</svg>
diff --git a/arc-firefox-theme/chrome/browser/syncCommon.css b/arc-firefox-theme/chrome/browser/syncCommon.css
index 0449a59..1378c9c 100644
--- a/arc-firefox-theme/chrome/browser/syncCommon.css
+++ b/arc-firefox-theme/chrome/browser/syncCommon.css
@@ -8,7 +8,7 @@
 }
 
 .statusIcon {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   max-height: 16px;
   max-width: 16px;
 }
diff --git a/arc-firefox-theme/chrome/browser/syncSetup.css b/arc-firefox-theme/chrome/browser/syncSetup.css
index 3370718..1c79e2f 100644
--- a/arc-firefox-theme/chrome/browser/syncSetup.css
+++ b/arc-firefox-theme/chrome/browser/syncSetup.css
@@ -99,7 +99,7 @@ description > .text-link:focus {
 }
 
 .inputColumn {
-  -moz-margin-end: 2px
+  margin-inline-end: 2px
 }
 
 .pin {
diff --git a/arc-firefox-theme/chrome/browser/syncedtabs/sidebar.css b/arc-firefox-theme/chrome/browser/syncedtabs/sidebar.css
index 63d5b64..acfb2b9 100644
--- a/arc-firefox-theme/chrome/browser/syncedtabs/sidebar.css
+++ b/arc-firefox-theme/chrome/browser/syncedtabs/sidebar.css
@@ -90,6 +90,24 @@ body {
   padding-inline-start: 20px;
 }
 
+.item.client.device-image-desktop.selected > .item-title-container > .item-icon-container {
+  background-image: url("chrome://browser/skin/sync-desktopIcon.svg#icon-inverted");
+}
+
+.item.client.device-image-desktop:not(.selected) > .item-title-container > .item-icon-container,
+.item.client.device-image-desktop.selected > .item-title-container > .item-icon-container:-moz-window-inactive {
+  background-image: url("chrome://browser/skin/sync-desktopIcon.svg#icon");
+}
+
+.item.client.device-image-mobile.selected > .item-title-container > .item-icon-container {
+  background-image: url("chrome://browser/skin/sync-mobileIcon.svg#icon-inverted");
+}
+
+.item.client.device-image-mobile:not(.selected) > .item-title-container > .item-icon-container,
+.item.client.device-image-mobile.selected > .item-title-container > .item-icon-container:-moz-window-inactive {
+  background-image: url("chrome://browser/skin/sync-mobileIcon.svg#icon");
+}
+
 .item.tab > .item-title-container > .item-icon-container {
   background-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
@@ -127,6 +145,7 @@ body {
   text-overflow: ellipsis;
   margin: 0px;
   line-height: 1.3;
+  cursor: default;
 }
 
 .item[hidden] {
@@ -227,12 +246,12 @@ html {
 }
 
 .item {
-  -moz-padding-end: 0;
+  padding-inline-end: 0;
 }
 
 .item-title {
   margin: 1px 0 0;
-  -moz-margin-end: 6px;
+  margin-inline-end: 6px;
 }
 
 
@@ -246,7 +265,7 @@ html {
   -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
   padding: 2px 2px 3px;
-  -moz-padding-start: 4px;
+  padding-inline-start: 4px;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
@@ -274,6 +293,7 @@ html {
 .item.client .item-twisty-container {
   -moz-appearance: treetwistyopen;
   margin-top: 3px;
+  margin-left: 2px;
 }
 
 .item.client.closed .item-twisty-container {
diff --git a/arc-firefox-theme/chrome/global/about.css b/arc-firefox-theme/chrome/global/about.css
index 75b378c..25f5299 100644
--- a/arc-firefox-theme/chrome/global/about.css
+++ b/arc-firefox-theme/chrome/global/about.css
@@ -17,7 +17,7 @@ body {
   border: 1px solid ThreeDShadow;
   border-radius: 10px;
   padding: 3em;
-  -moz-padding-start: 30px;
+  padding-inline-start: 30px;
   background: -moz-Field;
 }
 
@@ -43,7 +43,7 @@ img {
 
 ul {
   margin: 0;
-  -moz-margin-start: 1.5em;
+  margin-inline-start: 1.5em;
   padding: 0;
   list-style: square;
 }
diff --git a/arc-firefox-theme/chrome/global/aboutReader.css b/arc-firefox-theme/chrome/global/aboutReader.css
index 8121e5f..84a4657 100644
--- a/arc-firefox-theme/chrome/global/aboutReader.css
+++ b/arc-firefox-theme/chrome/global/aboutReader.css
@@ -9,9 +9,22 @@ body {
 @media (max-width: 785px) {
   body {
     padding-top: 64px;
-    -moz-padding-end: 0;
+    padding-inline-end: 0;
     padding-bottom: 64px;
-    -moz-padding-start: 51px;
+    padding-inline-start: 51px;
+  }
+}
+
+@media print {
+  #container {
+    max-width: 100% !important;
+    font-size: 14px !important;
+    font-family: Georgia, "Times New Roman", serif !important;
+  }
+
+  body {
+    padding-top: 0px;
+    padding-bottom: 0px;
   }
 }
 
@@ -93,6 +106,42 @@ body.serif .remove-button  {
   font-size: 28px;
 }
 
+#container.content-width1 {
+  max-width: 20em;
+}
+
+#container.content-width2 {
+  max-width: 25em;
+}
+
+#container.content-width3 {
+  max-width: 30em;
+}
+
+#container.content-width4  {
+  max-width: 35em;
+}
+
+#container.content-width5 {
+  max-width: 40em;
+}
+
+#container.content-width6 {
+  max-width: 45em;
+}
+
+#container.content-width7 {
+  max-width: 50em;
+}
+
+#container.content-width8 {
+  max-width: 55em;
+}
+
+#container.content-width9 {
+  max-width: 60em;
+}
+
 /* Override some controls and content styles based on color scheme */
 
 body.light > .container > .header > .domain {
@@ -112,13 +161,27 @@ body.sepia > .container > .footer {
 }
 
 body.light blockquote {
-  -moz-border-start: 2px solid #333333 !important;
+  border-inline-start: 2px solid #333333 !important;
 }
 
 body.sepia blockquote {
-  -moz-border-start: 2px solid #5b4636 !important;
+  border-inline-start: 2px solid #5b4636 !important;
 }
 
 body.dark blockquote {
-  -moz-border-start: 2px solid #eeeeee !important;
+  border-inline-start: 2px solid #eeeeee !important;
+}
+
+/* Add toolbar transition base on loaded class  */
+
+body.loaded .toolbar {
+  transition: transform 0.3s ease-out;
+}
+
+body:not(.loaded) .toolbar:-moz-locale-dir(ltr) {
+  transform: translateX(-100%);
+}
+
+body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
+  transform: translateX(100%);
 }
diff --git a/arc-firefox-theme/chrome/global/aboutReaderContent.css b/arc-firefox-theme/chrome/global/aboutReaderContent.css
index 94972c5..9c70c08 100644
--- a/arc-firefox-theme/chrome/global/aboutReaderContent.css
+++ b/arc-firefox-theme/chrome/global/aboutReaderContent.css
@@ -8,6 +8,56 @@
   line-height: 1.6em;
 }
 
+#moz-reader-content.line-height1 {
+  line-height: 1em;
+}
+
+#moz-reader-content.line-height2 {
+  line-height: 1.2em;
+}
+
+#moz-reader-content.line-height3 {
+  line-height: 1.4em;
+}
+
+#moz-reader-content.line-height4 {
+  line-height: 1.6em;
+}
+
+#moz-reader-content.line-height5 {
+  line-height: 1.8em;
+}
+
+#moz-reader-content.line-height6 {
+  line-height: 2.0em;
+}
+
+#moz-reader-content.line-height7 {
+  line-height: 2.2em;
+}
+
+#moz-reader-content.line-height8 {
+  line-height: 2.4em;
+}
+
+#moz-reader-content.line-height9 {
+  line-height: 2.6em;
+}
+
+@media print {
+  p,
+  code,
+  pre,
+  blockquote,
+  ul,
+  ol,
+  li,
+  figure,
+  .wp-caption {
+    margin: 0 0 10px 0 !important;
+  }
+}
+
 h1,
 h2,
 h3 {
@@ -87,7 +137,7 @@ pre {
 
 blockquote {
   padding: 0;
-  -moz-padding-start: 16px;
+  padding-inline-start: 16px;
 }
 
 ul,
@@ -96,12 +146,12 @@ ol {
 }
 
 ul {
-  -moz-padding-start: 30px;
+  padding-inline-start: 30px;
   list-style: disc;
 }
 
 ol {
-  -moz-padding-start: 30px;
+  padding-inline-start: 30px;
   list-style: decimal;
 }
 
diff --git a/arc-firefox-theme/chrome/global/aboutReaderControls.css b/arc-firefox-theme/chrome/global/aboutReaderControls.css
index b640e3c..09f8bdc 100644
--- a/arc-firefox-theme/chrome/global/aboutReaderControls.css
+++ b/arc-firefox-theme/chrome/global/aboutReaderControls.css
@@ -162,7 +162,9 @@
 
 #font-type-buttons,
 #font-size-buttons,
-#color-scheme-buttons {
+#color-scheme-buttons,
+#content-width-buttons,
+#line-height-buttons {
   display: flex;
   flex-direction: row;
 }
@@ -182,13 +184,17 @@
 
 #font-type-buttons > button,
 #font-size-buttons > button,
-#color-scheme-buttons > button {
+#color-scheme-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
   text-align: center;
   border: 0;
 }
 
 #font-type-buttons > button,
-#font-size-buttons > button {
+#font-size-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
   width: 50%;
   background-color: transparent;
   border-left: 1px solid #B5B5B5;
@@ -206,7 +212,9 @@
 }
 
 #font-type-buttons > button:first-child,
-#font-size-buttons > button:first-child {
+#font-size-buttons > button:first-child,
+#content-width-buttons > button:first-child,
+#line-height-buttons > button:first-child {
   border-left: 0;
 }
 
@@ -217,7 +225,9 @@
 }
 
 #font-size-buttons > button,
-#color-scheme-buttons > button {
+#color-scheme-buttons > button,
+#content-width-buttons > button,
+#line-height-buttons > button {
   height: 60px;
 }
 
@@ -255,14 +265,20 @@
 
 .button:hover,
 #font-size-buttons > button:hover,
-#font-type-buttons > button:hover {
+#font-type-buttons > button:hover,
+#content-width-buttons > button:hover,
+#line-height-buttons > button:hover {
   background-color: #ebebeb;
 }
 
 .dropdown.open,
 .button:active,
 #font-size-buttons > button:active,
-#font-size-buttons > button.selected {
+#font-size-buttons > button.selected,
+#content-width-buttons > button:active,
+#content-width-buttons > button.selected,
+#line-height-buttons > button:active,
+#line-height-buttons > button.selected {
   background-color: #dadada;
 }
 
@@ -272,7 +288,11 @@
 }
 
 .minus-button,
-.plus-button {
+.plus-button,
+.content-width-minus-button,
+.content-width-plus-button,
+.line-height-minus-button,
+.line-height-plus-button {
   background-color: transparent;
   border: 0;
   background-size: 18px 18px;
@@ -314,6 +334,26 @@
   background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg");
 }
 
+.content-width-minus-button {
+  background-size: 42px 16px;
+  background-image: url("chrome://global/skin/reader/RM-Content-Width-Minus-42x16.svg");
+}
+
+.content-width-plus-button {
+  background-size: 44px 16px;
+  background-image: url("chrome://global/skin/reader/RM-Content-Width-Plus-44x16.svg");
+}
+
+.line-height-minus-button {
+  background-size: 34px 14px;
+  background-image: url("chrome://global/skin/reader/RM-Line-Height-Minus-38x14.svg");
+}
+
+.line-height-plus-button {
+  background-size: 34px 24px;
+  background-image: url("chrome://global/skin/reader/RM-Line-Height-Plus-38x24.svg");
+}
+
 @media print {
   .toolbar {
     display: none !important;
diff --git a/arc-firefox-theme/chrome/global/aboutSupport.css b/arc-firefox-theme/chrome/global/aboutSupport.css
index 590c190..d26cd3c 100644
--- a/arc-firefox-theme/chrome/global/aboutSupport.css
+++ b/arc-firefox-theme/chrome/global/aboutSupport.css
@@ -24,8 +24,8 @@ body {
 }
 
 button {
-  -moz-margin-start: 0;
-  -moz-margin-end: 8px;
+  margin-inline-start: 0;
+  margin-inline-end: 8px;
 }
 
 table {
@@ -93,8 +93,8 @@ td {
   float: right;
   margin-top: 2em;
   margin-bottom: 20px;
-  -moz-margin-start: 20px;
-  -moz-margin-end: 0;
+  margin-inline-start: 20px;
+  margin-inline-end: 0;
   padding: 16px;
   width: 30%;
 }
@@ -105,7 +105,7 @@ td {
   display: none;
 }
 
-#action-box:-moz-dir(rtl) {
+#action-box:dir(rtl) {
   float: left;
 }
 
@@ -117,6 +117,11 @@ td {
   display: block;
 }
 
+#verify-place-result {
+  max-height: 200px;
+  overflow: auto;
+}
+
 .block {
   display: block;
 }
diff --git a/arc-firefox-theme/chrome/global/autocomplete.css b/arc-firefox-theme/chrome/global/autocomplete.css
index 9d1616b..0b4536c 100644
--- a/arc-firefox-theme/chrome/global/autocomplete.css
+++ b/arc-firefox-theme/chrome/global/autocomplete.css
@@ -48,11 +48,7 @@ textbox:not(.padded) .textbox-input-box {
 panel[type="autocomplete"],
 panel[type="autocomplete-richlistbox"],
 .autocomplete-history-popup {
-  border-width: 1px;
-  -moz-border-top-colors: ThreeDDarkShadow;
-  -moz-border-right-colors: ThreeDDarkShadow;
-  -moz-border-bottom-colors: ThreeDDarkShadow;
-  -moz-border-left-colors: ThreeDDarkShadow;
+  border: 1px solid ThreeDShadow;
   padding: 0;
   color: -moz-FieldText;
   background-color: -moz-Field;
@@ -84,7 +80,7 @@ panel[type="autocomplete-richlistbox"],
 }
 
 .autocomplete-treebody::-moz-tree-cell-text {
-  -moz-padding-start: 8px;
+  padding-inline-start: 8px;
 }
 
 treechildren.autocomplete-treebody::-moz-tree-row(selected) {
@@ -117,8 +113,8 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
   height: 16px;
   max-width: 16px;
   max-height: 16px;
-  -moz-margin-start: 13px;
-  -moz-margin-end: 6px;
+  margin-inline-start: 13px;
+  margin-inline-end: 6px;
 }
 
 .ac-site-icon {
@@ -126,8 +122,8 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
   height: 16px;
   max-width: 16px;
   max-height: 16px;
-  -moz-margin-start: 0;
-  -moz-margin-end: 11px;
+  margin-inline-start: 0;
+  margin-inline-end: 11px;
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
@@ -145,23 +141,23 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
 }
 
 .ac-title {
-  -moz-margin-start: 0;
-  -moz-margin-end: 6px;
+  margin-inline-start: 0;
+  margin-inline-end: 6px;
 }
 
 html|span.ac-tag {
-  -moz-margin-start: 0;
-  -moz-margin-end: 2px;
+  margin-inline-start: 0;
+  margin-inline-end: 2px;
 }
 
 .ac-tags {
-  -moz-margin-start: 0;
-  -moz-margin-end: 4px;
+  margin-inline-start: 0;
+  margin-inline-end: 4px;
 }
 
 .ac-separator {
-  -moz-margin-start: 0;
-  -moz-margin-end: 6px;
+  margin-inline-start: 0;
+  margin-inline-end: 6px;
 }
 
 /* Better align the URL/action with the title. */
diff --git a/arc-firefox-theme/chrome/global/button.css b/arc-firefox-theme/chrome/global/button.css
index dc051f4..8b5f331 100644
--- a/arc-firefox-theme/chrome/global/button.css
+++ b/arc-firefox-theme/chrome/global/button.css
@@ -29,12 +29,12 @@ button {
   border: 1px solid transparent;
   padding-top: 1px;
   padding-bottom: 2px;
-  -moz-padding-start: 3px;
-  -moz-padding-end: 4px;
+  padding-inline-start: 3px;
+  padding-inline-end: 4px;
 }
 
 .button-icon {
-  -moz-margin-end: 2px;
+  margin-inline-end: 2px;
 }
 
 .button-text {
@@ -88,8 +88,8 @@ button[open="true"] > .button-box,
 button[checked="true"] > .button-box {
   padding-top: 2px;
   padding-bottom: 1px;
-  -moz-padding-start: 4px;
-  -moz-padding-end: 3px;
+  padding-inline-start: 4px;
+  padding-inline-end: 3px;
 }
 
 /* .......... disabled state .......... */
@@ -106,8 +106,8 @@ button[disabled="true"]:hover:active {
 button[disabled="true"] > .button-box {
   padding-top: 1px !important;
   padding-bottom: 2px !important;
-  -moz-padding-start: 3px !important;
-  -moz-padding-end: 4px !important;
+  padding-inline-start: 3px !important;
+  padding-inline-end: 4px !important;
 }
 
 /* ::::: menu/menu-button buttons ::::: */
@@ -126,7 +126,7 @@ button[type="menu-button"] {
 }
 
 .button-menubutton-dropmarker {
-  -moz-margin-end: 3px;
+  margin-inline-end: 3px;
 }
 
 /* ::::: plain buttons ::::: */
diff --git a/arc-firefox-theme/chrome/global/checkbox.css b/arc-firefox-theme/chrome/global/checkbox.css
index de2e93c..a4e0744 100644
--- a/arc-firefox-theme/chrome/global/checkbox.css
+++ b/arc-firefox-theme/chrome/global/checkbox.css
@@ -42,7 +42,7 @@ checkbox {
 }
 
 .checkbox-icon[src] {
-  -moz-margin-end: 2px;
+  margin-inline-end: 2px;
 }
 
 .checkbox-label {
diff --git a/arc-firefox-theme/chrome/global/commonDialog.css b/arc-firefox-theme/chrome/global/commonDialog.css
index 6d95081..f5c5af7 100644
--- a/arc-firefox-theme/chrome/global/commonDialog.css
+++ b/arc-firefox-theme/chrome/global/commonDialog.css
@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #filler {
-  -moz-margin-start: -8px;
-  -moz-margin-end: -10px;
+  margin-inline-start: -8px;
+  margin-inline-end: -10px;
 }
 
 #iconContainer {
diff --git a/arc-firefox-theme/chrome/global/config.css b/arc-firefox-theme/chrome/global/config.css
index f1c7396..8e8d23a 100644
--- a/arc-firefox-theme/chrome/global/config.css
+++ b/arc-firefox-theme/chrome/global/config.css
@@ -6,8 +6,8 @@
   font-size: 15px;
   padding-top: 0;
   padding-bottom: 0;
-  -moz-padding-start: calc(48px + 4.6em);
-  -moz-padding-end: 48px;
+  padding-inline-start: calc(48px + 4.6em);
+  padding-inline-end: 48px;
 }
 
 .title {
@@ -32,7 +32,7 @@
 
 #filterRow {
   margin-top: 4px;
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
 }
 
 #configTree {
diff --git a/arc-firefox-theme/chrome/global/console/console.css b/arc-firefox-theme/chrome/global/console/console.css
index 7c90037..adb17fc 100644
--- a/arc-firefox-theme/chrome/global/console/console.css
+++ b/arc-firefox-theme/chrome/global/console/console.css
@@ -22,7 +22,7 @@
 
 .console-row-icon {
   padding: 4px;
-  -moz-padding-start: 5px;
+  padding-inline-start: 5px;
   -moz-box-align: start !important;
 }
 
@@ -48,8 +48,8 @@
 .console-row-code {
   padding-top: 3px;
   padding-bottom: 3px;
-  -moz-padding-start: 3px;
-  -moz-padding-end: 0px;
+  padding-inline-start: 3px;
+  padding-inline-end: 0px;
   color: #0000BB;
   font-size: larger;
 }
@@ -114,8 +114,8 @@
 #ButtonEval {
   margin-top: 2px !important;
   margin-bottom: 2px !important;
-  -moz-margin-start: 0px !important;
-  -moz-margin-end: 2px !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 2px !important;
 }
 
 /* Toolbar icons */
@@ -145,12 +145,12 @@ toolbar#ToolbarMode toolbarbutton {
 }
 
 toolbar#ToolbarMode .toolbarbutton-text {
-  -moz-padding-end: 4px;
+  padding-inline-end: 4px;
 }
 
 /* ::::: Fix Error Console toolbar button text spacing ::::: */
 
 .toolbarbutton-text {
-  -moz-padding-start: 0px;
-  -moz-padding-end: 5px;
+  padding-inline-start: 0px;
+  padding-inline-end: 5px;
 }
diff --git a/arc-firefox-theme/chrome/global/datetimepicker.css b/arc-firefox-theme/chrome/global/datetimepicker.css
index 7e2c8f7..2552103 100644
--- a/arc-firefox-theme/chrome/global/datetimepicker.css
+++ b/arc-firefox-theme/chrome/global/datetimepicker.css
@@ -20,15 +20,15 @@ datepicker, timepicker {
 .datetimepicker-input-box {
   -moz-appearance: textfield;
   cursor: text;
-  -moz-margin-end: 2px;
+  margin-inline-end: 2px;
   border: 2px solid;
   -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
   -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
   padding: 2px 0 3px 0;
-  -moz-padding-start: 4px;
-  -moz-padding-end: 2px;
+  padding-inline-start: 4px;
+  padding-inline-end: 2px;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
diff --git a/arc-firefox-theme/chrome/global/dialog.css b/arc-firefox-theme/chrome/global/dialog.css
index 044dad6..635425e 100644
--- a/arc-firefox-theme/chrome/global/dialog.css
+++ b/arc-firefox-theme/chrome/global/dialog.css
@@ -13,8 +13,8 @@
 dialog { 
   padding-top: 8px;
   padding-bottom: 10px;
-  -moz-padding-start: 8px;
-  -moz-padding-end: 10px;
+  padding-inline-start: 8px;
+  padding-inline-end: 10px;
 }
 
 /* ::::: dialog buttons ::::: */
@@ -50,16 +50,16 @@ dialogheader {
   -moz-box-orient: vertical;
   margin-top: -8px;
   margin-bottom: 0;
-  -moz-margin-start: -8px;
-  -moz-margin-end: -10px;
+  margin-inline-start: -8px;
+  margin-inline-end: -10px;
   border-left: none;
   border-right: none;
   border-top: none;
   -moz-border-bottom-colors: ThreeDHighlight ThreeDShadow;
   padding-top: 12px;
   padding-bottom: 12px;
-  -moz-padding-start: 25px;
-  -moz-padding-end: 5px;
+  padding-inline-start: 25px;
+  padding-inline-end: 5px;
   background-color: Window;
   color: WindowText;
 }
@@ -70,5 +70,5 @@ dialogheader {
 }
 
 .header-large > .dialogheader-description {
-  -moz-margin-start: 12px !important;
+  margin-inline-start: 12px !important;
 }
diff --git a/arc-firefox-theme/chrome/global/dirListing/dirListing.css b/arc-firefox-theme/chrome/global/dirListing/dirListing.css
index 4fc092d..c44983b 100644
--- a/arc-firefox-theme/chrome/global/dirListing/dirListing.css
+++ b/arc-firefox-theme/chrome/global/dirListing/dirListing.css
@@ -45,7 +45,7 @@ p {
   float: left;
 }
 
-#UI_goUp:-moz-dir(rtl) {
+#UI_goUp:dir(rtl) {
   float: right;
 }
 
@@ -54,7 +54,7 @@ p {
   float: right;
 }
 
-#UI_showHidden:-moz-dir(rtl) {
+#UI_showHidden:dir(rtl) {
   float: left;
 }
 
@@ -89,12 +89,12 @@ td:not(:first-child) {
 
 .up {
   padding: 0 .5em;
-  -moz-margin-start: 20px;
+  margin-inline-start: 20px;
 }
 
 .up::before {
-  -moz-margin-end: 4px;
-  -moz-margin-start: -20px;
+  margin-inline-end: 4px;
+  margin-inline-start: -20px;
   vertical-align: middle;
   content: url(moz-icon://stock/gtk-go-up?size=menu);
 }
diff --git a/arc-firefox-theme/chrome/global/expander.css b/arc-firefox-theme/chrome/global/expander.css
index 6c7d290..92cb18d 100644
--- a/arc-firefox-theme/chrome/global/expander.css
+++ b/arc-firefox-theme/chrome/global/expander.css
@@ -9,6 +9,6 @@
 .settingsContainer {
   padding-top: 3px;
   padding-bottom: 5px;
-  -moz-padding-start: 20px;
-  -moz-padding-end: 5px;
+  padding-inline-start: 20px;
+  padding-inline-end: 5px;
 }
diff --git a/arc-firefox-theme/chrome/global/filefield.css b/arc-firefox-theme/chrome/global/filefield.css
index 11bb836..e22b64e 100644
--- a/arc-firefox-theme/chrome/global/filefield.css
+++ b/arc-firefox-theme/chrome/global/filefield.css
@@ -24,8 +24,8 @@ filefield {
   height: 16px;
   margin-top: 1px;
   margin-bottom: 1px;
-  -moz-margin-start: 1px;
-  -moz-margin-end: 4px;
+  margin-inline-start: 1px;
+  margin-inline-end: 4px;
 }
 
 .fileFieldLabel {
diff --git a/arc-firefox-theme/chrome/global/findBar.css b/arc-firefox-theme/chrome/global/findBar.css
index 82a9ab7..44aa43b 100644
--- a/arc-firefox-theme/chrome/global/findBar.css
+++ b/arc-firefox-theme/chrome/global/findBar.css
@@ -28,7 +28,7 @@ findbar[noanim] {
 }
 
 .findbar-container {
-  -moz-padding-start: 8px;
+  padding-inline-start: 8px;
   padding-top: 4px;
   padding-bottom: 4px;
 }
@@ -83,12 +83,11 @@ findbar[noanim] {
 
 .findbar-find-previous,
 .findbar-find-next {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
   -moz-appearance: none;
   background: linear-gradient(rgba(255,255,255,.9), rgba(255,255,255,.2));
   border: 1px solid ThreeDShadow;
   box-shadow: 0 1px #fff inset;
-  list-style-image: url("chrome://global/skin/icons/find-arrows.png");
   padding: 5px 9px;
   line-height: 1em;
 }
@@ -107,12 +106,12 @@ findbar[noanim] {
 }
 
 .findbar-find-previous {
-  -moz-image-region: rect(0, 12px, 9px, 0);
-  -moz-border-end-width: 0;
+  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-previous);
+  border-inline-end-width: 0;
 }
 
 .findbar-find-next {
-  -moz-image-region: rect(0, 24px, 9px, 12px);
+  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-next);
 }
 
 .findbar-find-previous > .toolbarbutton-icon,
@@ -136,23 +135,23 @@ findbar[noanim] {
 }
 
 .findbar-find-previous:focus + .findbar-find-next {
-  -moz-border-start-width: 0;
+  border-inline-start-width: 0;
 }
 
 .findbar-find-previous:focus {
-  -moz-border-end-width: 1px;
+  border-inline-end-width: 1px;
 }
 
 .findbar-highlight,
 .findbar-case-sensitive {
-  -moz-margin-start: 5px;
+  margin-inline-start: 5px;
 }
 
 .findbar-find-status,
 .findbar-matches {
   color: GrayText;
   margin: 0 !important;
-  -moz-margin-start: 12px !important;
+  margin-inline-start: 12px !important;
 }
 
 .find-status-icon[status="pending"] {
diff --git a/arc-firefox-theme/chrome/global/global.css b/arc-firefox-theme/chrome/global/global.css
index 5ddc664..e424774 100644
--- a/arc-firefox-theme/chrome/global/global.css
+++ b/arc-firefox-theme/chrome/global/global.css
@@ -50,8 +50,8 @@ prefwindow {
 window.dialog {
   padding-top: 8px;
   padding-bottom: 10px;
-  -moz-padding-start: 8px;
-  -moz-padding-end: 10px;
+  padding-inline-start: 8px;
+  padding-inline-end: 10px;
 }
 
 /* ::::: alert icons :::::*/
@@ -132,7 +132,7 @@ sidebarheader {
 }
 
 sidebarheader > label {
-  -moz-padding-start: 4px;
+  padding-inline-start: 4px;
 }
 
 .toolbar-focustarget {
@@ -222,8 +222,8 @@ label {
   cursor: default;
   margin-top: 1px;
   margin-bottom: 2px;
-  -moz-margin-start: 6px;
-  -moz-margin-end: 5px;
+  margin-inline-start: 6px;
+  margin-inline-end: 5px;
 }
 
 description {
@@ -247,7 +247,7 @@ label[disabled="true"] {
 }
 
 .indent {
-  -moz-margin-start: 23px;
+  margin-inline-start: 23px;
 }
 
 .box-padded {
diff --git a/arc-firefox-theme/chrome/global/groupbox.css b/arc-firefox-theme/chrome/global/groupbox.css
index b31aac8..5cf1cb4 100644
--- a/arc-firefox-theme/chrome/global/groupbox.css
+++ b/arc-firefox-theme/chrome/global/groupbox.css
@@ -16,7 +16,7 @@ groupbox {
 }
 
 .groupbox-body {
-  -moz-padding-start: 10px;
+  padding-inline-start: 10px;
 }
 
 caption {
@@ -28,5 +28,5 @@ caption {
 .caption-text {
   margin-top: 0 !important;
   margin-bottom: 0 !important;
-  -moz-margin-start: 1px !important;
+  margin-inline-start: 1px !important;
 }
diff --git a/arc-firefox-theme/chrome/global/icons/find-arrows.png b/arc-firefox-theme/chrome/global/icons/find-arrows.png
deleted file mode 100644
index 1a3a9da..0000000
--- a/arc-firefox-theme/chrome/global/icons/find-arrows.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/icons/find-arrows.svg b/arc-firefox-theme/chrome/global/icons/find-arrows.svg
new file mode 100644
index 0000000..608c0a7
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/icons/find-arrows.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <style>
+    path:not(:target) {
+      display: none;
+    }
+    path {
+      fill: -moz-dialogtext;
+    }
+  </style>
+  <path id="glyph-find-previous" d="M5.407,1.5l-5,4.599L1.65,7.283l3.757-3.387l3.705,3.385l1.296-1.158L5.407,1.5z"/>
+  <path id="glyph-find-next" d="M5.547,8.255L0.538,3.53l1.239-1.265l3.77,3.641l3.719-3.641l1.264,1.188L5.547,8.255z"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css
index 78f429c..1a4bff3 100644
--- a/arc-firefox-theme/chrome/global/in-content/common.css
+++ b/arc-firefox-theme/chrome/global/in-content/common.css
@@ -83,9 +83,9 @@ xul|caption > xul|label {
 
 *|*.main-content {
   padding-top: 40px;
-  -moz-padding-end: 44px; /* compensate the 4px margin of child elements */
+  padding-inline-end: 44px; /* compensate the 4px margin of child elements */
   padding-bottom: 48px;
-  -moz-padding-start: 48px;
+  padding-inline-start: 48px;
   overflow: auto;
 }
 
@@ -99,16 +99,16 @@ xul|groupbox {
   -moz-appearance: none;
   border: none;
   margin: 15px 0 0;
-  -moz-padding-start: 0;
-  -moz-padding-end: 0;
+  padding-inline-start: 0;
+  padding-inline-end: 0;
   font-size: 1.25rem;
 }
 
-xul|groupbox xul|label:not(.menu-accel):not(.menu-text),
+xul|groupbox xul|label:not(.menu-accel):not(.menu-text):not(.indent),
 xul|groupbox xul|description {
   /* !important needed to override toolkit !important rule */
-  -moz-margin-start: 0 !important;
-  -moz-margin-end: 0 !important;
+  margin-inline-start: 0 !important;
+  margin-inline-end: 0 !important;
 }
 
 /* tabpanels and tabs */
@@ -174,6 +174,7 @@ html|button {
 /* xul buttons and menulists */
 
 *|button,
+html|select,
 xul|colorpicker[type="button"],
 xul|menulist {
   -moz-appearance: none;
@@ -189,6 +190,7 @@ xul|menulist {
 }
 
 html|button:enabled:hover,
+html|select:enabled:hover,
 xul|button:not([disabled="true"]):hover,
 xul|colorpicker[type="button"]:not([disabled="true"]):hover,
 xul|menulist:not([disabled="true"]):hover {
@@ -196,6 +198,7 @@ xul|menulist:not([disabled="true"]):hover {
 }
 
 html|button:enabled:hover:active,
+html|select:enabled:hover:active,
 xul|button:not([disabled="true"]):hover:active,
 xul|colorpicker[type="button"]:not([disabled="true"]):hover:active,
 xul|menulist[open="true"]:not([disabled="true"]) {
@@ -203,6 +206,7 @@ xul|menulist[open="true"]:not([disabled="true"]) {
 }
 
 html|button:disabled,
+html|select:disabled,
 xul|button[disabled="true"],
 xul|colorpicker[type="button"][disabled="true"],
 xul|menulist[disabled="true"] {
@@ -237,13 +241,13 @@ xul|menulist > xul|*.menulist-label-box {
 }
 
 xul|menulist > xul|*.menulist-label-box > xul|*.menulist-icon[src] {
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 
 xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
   -moz-appearance: none;
   margin: 1px 0;
-  -moz-margin-start: 10px;
+  margin-inline-start: 10px;
   padding: 0;
   width: 10px;
   height: 16px;
@@ -254,7 +258,7 @@ xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
 
 xul|*.help-button {
   min-width: 16px;
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
   border-width: 0;
   background-image: none;
   box-shadow: none;
@@ -294,8 +298,8 @@ xul|*.help-button > xul|*.button-box > xul|*.button-text {
 
 xul|*.spinbuttons-button {
   min-height: initial;
-  -moz-margin-start: 10px !important;
-  -moz-margin-end: 2px !important;
+  margin-inline-start: 10px !important;
+  margin-inline-end: 2px !important;
 }
 
 xul|*.spinbuttons-up {
@@ -330,7 +334,7 @@ xul|*.spinbuttons-down[disabled="true"] > xul|*.button-box > xul|*.button-icon {
 
 xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker {
   -moz-appearance: none;
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
   padding: 0;
   border: none;
   background-color: transparent;
@@ -363,8 +367,8 @@ xul|button[type="menu"] > xul|menupopup xul|menuitem {
   color: var(--in-content-text-color);
   padding-top: 0.2em;
   padding-bottom: 0.2em;
-  -moz-padding-start: 10px;
-  -moz-padding-end: 30px;
+  padding-inline-start: 10px;
+  padding-inline-end: 30px;
 }
 
 xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
@@ -446,15 +450,13 @@ xul|textbox[disabled="true"] {
 /* Links */
 
 html|a,
-.text-link,
-.inline-link {
+.text-link {
   color: var(--in-content-link-color);
   text-decoration: none;
 }
 
 html|a:hover,
-.text-link:hover,
-.inline-link:hover {
+.text-link:hover {
   color: var(--in-content-link-color-hover);
   text-decoration: underline;
 }
@@ -464,8 +466,7 @@ html|a:visited {
 }
 
 html|a:hover:active,
-.text-link:hover:active,
-.inline-link:hover:active {
+.text-link:hover:active {
   color: var(--in-content-link-color-active);
   text-decoration: none;
 }
@@ -492,7 +493,7 @@ html|input[type="checkbox"] + html|label {
 }
 
 xul|checkbox {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 xul|*.checkbox-check,
@@ -502,7 +503,7 @@ html|input[type="checkbox"] + html|label:before {
   height: 23px;
   border-radius: 2px;
   border: 1px solid var(--in-content-box-border-color);
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
   background-color: #f1f1f1;
   /* !important needed to override toolkit checked !important rule */
   background-image: linear-gradient(#fff, rgba(255,255,255,0.8)) !important;
@@ -530,8 +531,8 @@ html|input[type="checkbox"]:disabled + html|label {
 }
 
 xul|*.checkbox-label-box {
-  -moz-margin-start: -1px; /* negative margin for the transparent border */
-  -moz-padding-start: 0;
+  margin-inline-start: -1px; /* negative margin for the transparent border */
+  padding-inline-start: 0;
 }
 
 xul|richlistitem > xul|*.checkbox-check {
@@ -539,7 +540,7 @@ xul|richlistitem > xul|*.checkbox-check {
 }
 
 xul|radio {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 xul|*.radio-check {
@@ -548,7 +549,7 @@ xul|*.radio-check {
   height: 23px;
   border: 1px solid var(--in-content-box-border-color);
   border-radius: 50%;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
   background-color: #f1f1f1;
   background-image: linear-gradient(#fff, rgba(255,255,255,0.80));
   box-shadow: 0 1px 1px 0 #fff, inset 0 2px 0 0 rgba(0,0,0,0.03);
@@ -567,9 +568,9 @@ xul|radio[disabled="true"] > xul|*.radio-check {
 }
 
 xul|*.radio-label-box {
-  -moz-margin-start: -1px; /* negative margin for the transparent border */
-  -moz-margin-end: 10px;
-  -moz-padding-start: 0;
+  margin-inline-start: -1px; /* negative margin for the transparent border */
+  margin-inline-end: 10px;
+  padding-inline-start: 0;
 }
 
 /* Category List */
@@ -585,9 +586,9 @@ xul|*.radio-label-box {
 *|*.category {
   -moz-appearance: none;
   color: var(--in-content-category-text);
-  -moz-border-end-width: 0;
-  -moz-padding-start: 15px;
-  -moz-padding-end: 21px;
+  border-inline-end-width: 0;
+  padding-inline-start: 15px;
+  padding-inline-end: 21px;
   min-height: 40px;
   transition: background-color 150ms;
 }
@@ -600,8 +601,8 @@ xul|*.radio-label-box {
 *|*.category.selected {
   background-color: var(--in-content-category-background-active);
   color: var(--in-content-category-text-selected);
-  -moz-padding-start: 11px; /* compensate the 4px border */
-  -moz-border-start: solid 4px var(--in-content-border-highlight);
+  padding-inline-start: 11px; /* compensate the 4px border */
+  border-inline-start: solid 4px var(--in-content-border-highlight);
 }
 
 *|*#categories[keyboard-navigation="true"]:-moz-focusring > *|*.category[current] {
@@ -613,7 +614,7 @@ xul|*.radio-label-box {
   line-height: 22px;
   font-size: 1.25rem;
   padding-bottom: 2px;
-  -moz-padding-start: 9px;
+  padding-inline-start: 9px;
   margin: 0;
   -moz-user-select: none;
 }
@@ -627,7 +628,7 @@ xul|*.radio-label-box {
 
 *|*.header {
   border-bottom: 1px solid var(--in-content-header-border-color);
-  -moz-margin-end: 4px; /* add the 4px end-margin of other elements */
+  margin-inline-end: 4px; /* add the 4px end-margin of other elements */
   margin-bottom: 15px;
   padding-bottom: 15px;
   -moz-box-align: baseline;
@@ -655,13 +656,13 @@ xul|*.fileFieldContentBox {
 }
 
 xul|*.fileFieldIcon {
-  -moz-margin-start: 10px;
-  -moz-margin-end: 0;
+  margin-inline-start: 10px;
+  margin-inline-end: 0;
 }
 
 xul|*.fileFieldLabel {
-  -moz-margin-start: -26px;
-  -moz-padding-start: 36px;
+  margin-inline-start: -26px;
+  padding-inline-start: 36px;
 }
 
 xul|textbox:-moz-locale-dir(rtl),
@@ -682,7 +683,7 @@ xul|filefield + xul|button:-moz-locale-dir(rtl) {
 
 xul|textbox + xul|button,
 xul|filefield + xul|button {
-  -moz-border-start: none;
+  border-inline-start: none;
 }
 
 /* List boxes */
@@ -690,7 +691,7 @@ xul|filefield + xul|button {
 xul|richlistbox,
 xul|listbox {
   -moz-appearance: none;
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
   background-color: var(--in-content-box-background);
   border: 1px solid var(--in-content-box-border-color);
   color: var(--in-content-text-color);
@@ -760,8 +761,8 @@ xul|treecolpicker:hover {
 
 xul|treecol:not([hideheader="true"]):not(:first-child),
 xul|treecolpicker {
-  -moz-border-start-width: 1px;
-  -moz-border-start-style: solid;
+  border-inline-start-width: 1px;
+  border-inline-start-style: solid;
   border-image: linear-gradient(transparent 0%, transparent 20%, #c1c1c1 20%, #c1c1c1 80%, transparent 80%, transparent 100%) 1 1;
 }
 
@@ -814,11 +815,11 @@ xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
 }
 
 xul|*.help-button > xul|*.button-box > xul|*.button-icon {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 xul|*.groupbox-body {
-  -moz-padding-start: 0;
+  padding-inline-start: 0;
 }
 
 xul|menulist {
@@ -875,8 +876,7 @@ xul|*.numberbox-input-box {
   border-width: 0;
 }
 
-xul|*.text-link:-moz-focusring,
-xul|*.inline-link:-moz-focusring {
+xul|*.text-link:-moz-focusring {
   border: 1px dotted -moz-DialogText;
 }
 
diff --git a/arc-firefox-theme/chrome/global/in-content/info-pages.css b/arc-firefox-theme/chrome/global/in-content/info-pages.css
index 54b1be8..b75b06a 100644
--- a/arc-firefox-theme/chrome/global/in-content/info-pages.css
+++ b/arc-firefox-theme/chrome/global/in-content/info-pages.css
@@ -8,8 +8,8 @@ body {
   min-height: 100vh;
   padding-top: 0;
   padding-bottom: 0;
-  -moz-padding-start: calc(48px + 4.6em);
-  -moz-padding-end: 48px;
+  padding-inline-start: calc(48px + 4.6em);
+  padding-inline-end: 48px;
   align-items: center;
   justify-content: center;
 }
@@ -32,12 +32,12 @@ body {
   background-position: left 0;
   background-repeat: no-repeat;
   background-size: 1.6em;
-  -moz-margin-start: -2.3em;
-  -moz-padding-start: 2.3em;
+  margin-inline-start: -2.3em;
+  padding-inline-start: 2.3em;
   font-size: 2.5em;
 }
 
-.title:-moz-dir(rtl) {
+.title:dir(rtl) {
   background-position: right 0;
 }
 
@@ -54,8 +54,8 @@ body {
 
   .title {
     background-image: none !important;
-    -moz-padding-start: 0;
-    -moz-margin-start: 0;
+    padding-inline-start: 0;
+    margin-inline-start: 0;
   }
 
   .title-text {
@@ -66,7 +66,7 @@ body {
 ul, ol {
   margin: 0;
   padding: 0;
-  -moz-margin-start: 1em;
+  margin-inline-start: 1em;
 }
 
 ul > li, ol > li {
@@ -87,7 +87,7 @@ ul {
 }
 
 .button-container > button:first-child {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 /* Trees */
diff --git a/arc-firefox-theme/chrome/global/listbox.css b/arc-firefox-theme/chrome/global/listbox.css
index 1e73844..dbce007 100644
--- a/arc-firefox-theme/chrome/global/listbox.css
+++ b/arc-firefox-theme/chrome/global/listbox.css
@@ -79,16 +79,16 @@ listheader[sortable="true"]:hover:active {
   -moz-border-left-colors: ThreeDShadow -moz-Dialog;
   padding-top: 0px;
   padding-bottom: 0px;
-  -moz-padding-start: 3px;
-  -moz-padding-end: 1px;
+  padding-inline-start: 3px;
+  padding-inline-end: 1px;
 }
 
 .listheader-icon {
-  -moz-margin-end: 2px;
+  margin-inline-end: 2px;
 }
 
 .listheader-icon[sortable="true"]:hover:active {
-  -moz-margin-end: 1px;
+  margin-inline-end: 1px;
 }
 
 .listheader-label {
@@ -107,13 +107,13 @@ listheader[sortable="true"]:hover:active {
   margin: 0px !important;
   padding-top: 0px;
   padding-bottom: 1px;
-  -moz-padding-start: 4px;
-  -moz-padding-end: 0px;
+  padding-inline-start: 4px;
+  padding-inline-end: 0px;
   white-space: nowrap;
 }
 
 .listcell-icon {
-  -moz-margin-end: 2px;
+  margin-inline-end: 2px;
 }
 
 .listcell-label[disabled="true"] {
diff --git a/arc-firefox-theme/chrome/global/media/videocontrols.css b/arc-firefox-theme/chrome/global/media/videocontrols.css
index 17101ad..09e9a5f 100644
--- a/arc-firefox-theme/chrome/global/media/videocontrols.css
+++ b/arc-firefox-theme/chrome/global/media/videocontrols.css
@@ -94,7 +94,7 @@
 
 .controlBar[fullscreen-unavailable] > .volumeStack {
   /* This value is duplicated in the videocontrols.xml adjustControlSize function. */
-  -moz-margin-end: 8px;
+  margin-inline-end: 8px;
 }
 
 .volumeControl .scale-thumb {
diff --git a/arc-firefox-theme/chrome/global/menu.css b/arc-firefox-theme/chrome/global/menu.css
index aab929e..58214e3 100644
--- a/arc-firefox-theme/chrome/global/menu.css
+++ b/arc-firefox-theme/chrome/global/menu.css
@@ -84,34 +84,34 @@ menulist > menupopup > menu {
 .menu-iconic-text {
   margin-top: 0px !important;
   margin-bottom: 0px !important;
-  -moz-margin-start: 0px !important;
-  -moz-margin-end: 2px !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 2px !important;
   color: inherit;
 }
 
 .menu-text {
   /* This is (18 + the size of end-padding on .menu-iconic-left)px */
-  -moz-margin-start: 21px !important;
+  margin-inline-start: 21px !important;
   font-weight: inherit;
 }
 
 menucaption > .menu-text,
 menucaption > .menu-iconic-text {
-  -moz-margin-start: 0 !important;
+  margin-inline-start: 0 !important;
   font-weight: bold;
 }
 
 .menu-description {
   font-style: italic;
   color: GrayText;
-  -moz-margin-start: 1ex !important;
+  margin-inline-start: 1ex !important;
 }
 
 .menu-accel,
 .menu-iconic-accel {
   margin-top: 0px !important;
   margin-bottom: 0px !important;
-  -moz-margin-start: 7px !important;
+  margin-inline-start: 7px !important;
   color: inherit;
 }
 
@@ -123,7 +123,7 @@ menucaption > .menu-iconic-text {
 .menu-iconic-right {
   width: 16px;
   /* We can only hardcode this, to make the default GTK icon<->label spacing */
-  -moz-padding-end: 3px !important;
+  padding-inline-end: 3px !important;
 }
 
 .menu-iconic-icon {
@@ -134,8 +134,8 @@ menucaption > .menu-iconic-text {
 .menu-right {
   margin-top: 0px;
   margin-bottom: 0px;
-  -moz-margin-start: 6px;
-  -moz-margin-end: 0px;
+  margin-inline-start: 6px;
+  margin-inline-end: 0px;
   width: 1ex;
   height: 1ex;
   /* These next two rules are needed to prevent inheritance and thus ugliness */
@@ -147,8 +147,8 @@ menucaption > .menu-iconic-text {
 .menubar-left {
   margin-top: 0px;
   margin-bottom: 0px;
-  -moz-margin-start: 0px;
-  -moz-margin-end: 2px;
+  margin-inline-start: 0px;
+  margin-inline-end: 2px;
   color: inherit;
 }
 
@@ -204,7 +204,7 @@ menulist > menupopup > menuseparator {
 /* ::::: tree column picker ::::: */
 
 .treecell-popupcell-menu {
-  -moz-margin-start: -2px;
+  margin-inline-start: -2px;
   list-style-image: url("chrome://global/skin/columnselect.gif");
   -moz-image-region: auto;
 }
diff --git a/arc-firefox-theme/chrome/global/menulist.css b/arc-firefox-theme/chrome/global/menulist.css
index d33c4d2..30e55e1 100644
--- a/arc-firefox-theme/chrome/global/menulist.css
+++ b/arc-firefox-theme/chrome/global/menulist.css
@@ -52,7 +52,7 @@ menulist[disabled="true"]:hover:active {
 .menulist-description {
   font-style: italic;
   color: GrayText;
-  -moz-margin-start: 1ex !important;
+  margin-inline-start: 1ex !important;
 }
 
 /* ::::: editable menulists ::::: */
@@ -66,8 +66,8 @@ menulist[editable="true"] {
   -moz-appearance: menulist-textfield;
   padding-top: 3px;
   padding-bottom: 3px;
-  -moz-padding-start: 2px;
-  -moz-padding-end: 0px;
+  padding-inline-start: 2px;
+  padding-inline-end: 0px;
 }
 
 menulist[editable="true"] > .menulist-dropmarker {
diff --git a/arc-firefox-theme/chrome/global/narrate/narrate.svg b/arc-firefox-theme/chrome/global/narrate/narrate.svg
deleted file mode 100644
index 597b0a6..0000000
--- a/arc-firefox-theme/chrome/global/narrate/narrate.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg id="Icons" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 18.77">
-    <path fill="gray" d="M3.13 13.72a1.57 1.57 0 0 1-3.13 0V5.41a1.57 1.57 0 0 1 3.13 0v8.31zm6.29 3.62a1.57 1.57 0 0 1-3.13 0V1.44a1.57 1.57 0 0 1 3.13 0v15.9zm6.29-2.9a1.57 1.57 0 0 1-3.13 0V4.83a1.57 1.57 0 0 1 3.13 0v9.61zM22 12.62a1.57 1.57 0 0 1-3.13 0V6.15a1.57 1.57 0 0 1 3.13 0v6.47z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/global/narrateControls.css b/arc-firefox-theme/chrome/global/narrateControls.css
index dc24a4c..91d02d8 100644
--- a/arc-firefox-theme/chrome/global/narrateControls.css
+++ b/arc-firefox-theme/chrome/global/narrateControls.css
@@ -2,8 +2,9 @@
   --border-color: #e5e5e5;
 }
 
-#narrate-toggle {
-  background-image: url("chrome://global/skin/narrate/narrate.svg");
+#narrate-toggle > svg {
+  display: block;
+  margin: 0 8px;
 }
 
 .dropdown-popup button {
@@ -64,7 +65,7 @@
   background-image: url("chrome://global/skin/narrate/start.svg");
 }
 
-#narrate-start-stop.speaking {
+#narrate-dropdown.speaking #narrate-start-stop {
   background-image: url("chrome://global/skin/narrate/stop.svg");
 }
 
diff --git a/arc-firefox-theme/chrome/global/netError.css b/arc-firefox-theme/chrome/global/netError.css
index 77e3cea..69e74c5 100644
--- a/arc-firefox-theme/chrome/global/netError.css
+++ b/arc-firefox-theme/chrome/global/netError.css
@@ -29,7 +29,7 @@ h1 {
 
 ul, ol {
   margin: 0;
-  -moz-margin-start: 1.5em;
+  margin-inline-start: 1.5em;
   padding: 0;
 }
 
@@ -49,7 +49,7 @@ ul {
   border: 1px solid ThreeDShadow;
   border-radius: 10px;
   padding: 3em;
-  -moz-padding-start: 30px;
+  padding-inline-start: 30px;
   background: url("moz-icon://stock/gtk-dialog-warning?size=dialog") left 0 no-repeat -moz-Field;
   background-origin: content-box;
 }
@@ -58,16 +58,16 @@ ul {
   background-image: url("chrome://global/skin/icons/sslWarning.png");
 }
 
-#errorPageContainer:-moz-dir(rtl) {
+#errorPageContainer:dir(rtl) {
   background-position: right 0;
 }
 
 #errorTitle {
-  -moz-margin-start: 80px;
+  margin-inline-start: 80px;
 }
 
 #errorLongContent {
-  -moz-margin-start: 80px;
+  margin-inline-start: 80px;
 }
 
 #errorShortDesc > p {
@@ -79,7 +79,7 @@ ul {
 }
 
 #errorLongDesc {
-  -moz-padding-end: 3em;
+  padding-inline-end: 3em;
   font-size: 110%;
 }
 
@@ -88,18 +88,18 @@ ul {
 
 #errorTryAgain {
   margin-top: 2em;
-  -moz-margin-start: 80px;
+  margin-inline-start: 80px;
 }
 
 #brand {
   position: absolute;
   right: 0;
   bottom: -1.5em;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
   opacity: .4;
 }
 
-#brand:-moz-dir(rtl) {
+#brand:dir(rtl) {
   right: auto;
   left: 0;
 }
diff --git a/arc-firefox-theme/chrome/global/notification.css b/arc-firefox-theme/chrome/global/notification.css
index ffa0607..48613f5 100644
--- a/arc-firefox-theme/chrome/global/notification.css
+++ b/arc-firefox-theme/chrome/global/notification.css
@@ -40,8 +40,8 @@ notification[type="critical"] {
 .messageImage {
   width: 16px;
   height: 16px;
-  -moz-margin-start: 6px;
-  -moz-margin-end: 1px;
+  margin-inline-start: 6px;
+  margin-inline-end: 1px;
 }
 
 /* Default icons for notifications */
@@ -87,7 +87,7 @@ notification[type="critical"] {
 }
 
 .popup-notification-closebutton {
-  -moz-margin-end: -10px;
+  margin-inline-end: -10px;
   margin-top: -6px;
 }
 
diff --git a/arc-firefox-theme/chrome/global/passwordmgr.css b/arc-firefox-theme/chrome/global/passwordmgr.css
index 9cb48d1..f95d176 100644
--- a/arc-firefox-theme/chrome/global/passwordmgr.css
+++ b/arc-firefox-theme/chrome/global/passwordmgr.css
@@ -16,7 +16,7 @@ treechildren::-moz-tree-image(siteCol) {
   list-style-image: url(chrome://mozapps/skin/places/defaultFavicon.png);
   width: 16px;
   height: 16px;
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 
 @media (min-resolution: 1.1dppx) {
diff --git a/arc-firefox-theme/chrome/global/preferences.css b/arc-firefox-theme/chrome/global/preferences.css
index d71627c..ef6a622 100644
--- a/arc-firefox-theme/chrome/global/preferences.css
+++ b/arc-firefox-theme/chrome/global/preferences.css
@@ -28,8 +28,8 @@ prefwindow[type="child"] > prefpane {
 
 .prefWindow-dlgbuttons {
   padding-bottom: 8px;
-  -moz-padding-start: 8px;
-  -moz-padding-end: 8px;
+  padding-inline-start: 8px;
+  padding-inline-end: 8px;
 }
 
 prefwindow[type="child"] .prefWindow-dlgbuttons {
diff --git a/arc-firefox-theme/chrome/global/radio.css b/arc-firefox-theme/chrome/global/radio.css
index 23c53b5..5083e82 100644
--- a/arc-firefox-theme/chrome/global/radio.css
+++ b/arc-firefox-theme/chrome/global/radio.css
@@ -42,7 +42,7 @@ radio {
 }
 
 .radio-icon[src] {
-  -moz-margin-end: 2px;
+  margin-inline-end: 2px;
 }
 
 .radio-label {
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Close-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Close-24x24.svg
index e57a475..89fc1eb 100644
--- a/arc-firefox-theme/chrome/global/reader/RM-Close-24x24.svg
+++ b/arc-firefox-theme/chrome/global/reader/RM-Close-24x24.svg
@@ -2,7 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
   <defs>
     <style>
       use:not(:target) {
@@ -15,10 +15,8 @@
         fill: #fff;
       }
     </style>
-    <g id="close-shape">
-      <polygon points="20.477,6.551 20.477,17.449 11.992,17.449 11.992,20 23,20 23,4 11.992,4 11.992,6.551"/>
-      <polygon points="1,11.981 9.698,19.95 9.698,15.13 18.184,15.13 18.184,8.87 9.698,8.87 9.698,4.011"/>
-    </g>
+
+    <path id="close-shape" d="M19,22H6a2,2,0,0,1-2-2V18l2,2H18a1,1,0,0,0,1-1V5a1,1,0,0,0-1-1H6L4,6V4A2,2,0,0,1,6,2H19a2,2,0,0,1,2,2V20A2,2,0,0,1,19,22Zm-6-9H5.4l4.2,4.154L8.186,18.631,1.567,12.017,8.021,5.411,9.5,6.95,5.424,11H13v2Z"/>
   </defs>
   <use id="close" xlink:href="#close-shape"/>
   <use id="close-hover" xlink:href="#close-shape"/>
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Content-Width-Minus-42x16.svg b/arc-firefox-theme/chrome/global/reader/RM-Content-Width-Minus-42x16.svg
new file mode 100644
index 0000000..48bbb9e
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/reader/RM-Content-Width-Minus-42x16.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg version="1.1"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="42"
+     height="16"
+     viewBox="0 0 42 16"
+     fill="#808080">
+
+  <path d="M14.5,7 L8.75,1.25 L10,-1.91791433e-15 L18,8 L17.375,8.625 L10,16 L8.75,14.75 L14.5,9 L1.13686838e-13,9 L1.13686838e-13,7 L14.5,7 Z"/>
+  <path d="M38.5,7 L32.75,1.25 L34,6.58831647e-15 L42,8 L41.375,8.625 L34,16 L32.75,14.75 L38.5,9 L24,9 L24,7 L38.5,7 Z" transform="translate(33.000000, 8.000000) scale(-1, 1) translate(-33.000000, -8.000000)"/>
+
+</svg>
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Content-Width-Plus-44x16.svg b/arc-firefox-theme/chrome/global/reader/RM-Content-Width-Plus-44x16.svg
new file mode 100644
index 0000000..bcdcbe8
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/reader/RM-Content-Width-Plus-44x16.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg version="1.1"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="44"
+     height="16"
+     viewBox="0 0 44 16"
+     fill="#808080">
+
+  <path d="M14.5,7 L8.75,1.25 L10,-1.91791433e-15 L18,8 L17.375,8.625 L10,16 L8.75,14.75 L14.5,9 L1.13686838e-13,9 L1.13686838e-13,7 L14.5,7 Z" transform="translate(9.000000, 8.000000) scale(-1, 1) translate(-9.000000, -8.000000)"/>
+  <path d="M40.5,7 L34.75,1.25 L36,-5.17110888e-16 L44,8 L43.375,8.625 L36,16 L34.75,14.75 L40.5,9 L26,9 L26,7 L40.5,7 Z"/>
+
+</svg>
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Line-Height-Minus-38x14.svg b/arc-firefox-theme/chrome/global/reader/RM-Line-Height-Minus-38x14.svg
new file mode 100644
index 0000000..05d5282
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/reader/RM-Line-Height-Minus-38x14.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg version="1.1"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="38"
+     height="14"
+     viewBox="0 0 38 14"
+     fill="#808080">
+
+  <rect x="0" y="0" width="28" height="2"/>
+  <rect x="0" y="6" width="38" height="2"/>
+  <rect x="0" y="12" width="18" height="2"/>
+
+</svg>
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Line-Height-Plus-38x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Line-Height-Plus-38x24.svg
new file mode 100644
index 0000000..0a5ee0d
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/reader/RM-Line-Height-Plus-38x24.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg version="1.1"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="38"
+     height="24"
+     viewBox="0 0 38 24"
+     fill="#808080">
+
+  <rect x="0" y="0" width="28" height="2"/>
+  <rect x="0" y="11" width="38" height="2"/>
+  <rect x="0" y="22" width="18" height="2"/>
+
+</svg>
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-24x24.svg
index 8a5a212..5f43818 100644
--- a/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-24x24.svg
+++ b/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-24x24.svg
@@ -2,7 +2,6 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public

    - License, v. 2.0. If a copy of the MPL was not distributed with this

    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">

-    <path fill="#808080" d="M8.23,18.748v-1.016l1.182-0.146c0.065-0.013,0.12-0.055,0.166-0.127s0.052-0.143,0.02-0.215L8.513,14.07 H4.236l-1.104,3.096c-0.039,0.104-0.02,0.199,0.059,0.283s0.153,0.13,0.225,0.137l1.123,0.146v1.016H0.232v-1.016l1.123-0.166 L5.837,5.008h2.275l4.443,12.197c0.052,0.124,0.103,0.21,0.151,0.259s0.145,0.089,0.288,0.122l0.762,0.146v1.016H8.23z M6.296,8.084l-1.68,4.805h3.398L6.296,8.084z"/>

-    <path fill="#808080" d="M20.05,18.748l-0.264-0.996c-0.345,0.234-0.706,0.443-1.083,0.625c-0.331,0.156-0.702,0.298-1.112,0.425 c-0.409,0.127-0.835,0.19-1.277,0.19c-0.364,0-0.704-0.06-1.02-0.181s-0.592-0.293-0.829-0.518s-0.424-0.497-0.561-0.815 S13.7,16.801,13.7,16.404c0-0.299,0.024-0.576,0.073-0.83s0.146-0.49,0.293-0.708s0.356-0.426,0.63-0.625s0.637-0.392,1.089-0.581 s1.008-0.377,1.665-0.566s1.445-0.384,2.363-0.586v-0.244c0-0.098,0.003-0.186,0.01-0.264c0-0.091,0.003-0.182,0.01-0.273 c0.007-0.189-0.013-0.392-0.059-0.61s-0.137-0.42-0.273-0.605s-0.329-0.338-0.576-0.459s-0.569-0.181-0.967-0.181 c-0.137,0-0.259,0.003-0.366,0.01s-0.197,0.016-0.269,0.029c-0.085,0.013-0.159,0.026-0.225,0.039v1.895h-2.061 c-0.169,0.013-0.319-0.003-0.449-0.049c-0.11-0.039-0.213-0.107-0.308-0.205s-0.142-0.25-0.142-0.459 c0-0.371,0.132-0.703,0.396-0.996c0.263-0.293,0.607-0.542,1.033-0.747s0.904-0.363,1.435-0.474 c0.529-0.111,1.058-0.166,1.585-0.166c0.572,0,1.096,0.042,1.57,0.127s0.883,0.249,1.224,0.493c0.342,0.244,0.604,0.587,0.79,1.03 s0.278,1.025,0.278,1.748v5.137c0,0.124,0.042,0.229,0.127,0.317s0.188,0.138,0.312,0.151l0.879,0.059v0.938H20.05z M19.793,13.592 c-0.645,0.13-1.177,0.264-1.597,0.4s-0.754,0.293-1.001,0.469s-0.42,0.376-0.518,0.601s-0.146,0.487-0.146,0.786 c0,0.208,0.034,0.402,0.103,0.581s0.166,0.335,0.293,0.469s0.278,0.239,0.454,0.317s0.368,0.117,0.576,0.117 c0.215,0,0.432-0.023,0.649-0.068s0.415-0.094,0.591-0.146c0.208-0.065,0.407-0.14,0.596-0.225V13.592z"/>

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">

+  <path fill="#737373" d="M10.87,18.989h2.144L8.3,3.991H5.724l-4.739,15H3.044l1.115-4.171h5.6ZM4.652,12.91L6.968,5.69l2.294,7.22H4.652ZM22.1,16.515v-5.06c0-2.31-.984-3.713-3.65-3.713a10.236,10.236,0,0,0-3.7.756L15.116,9.9A9.9,9.9,0,0,1,18.1,9.317c1.533,0,1.958.627,1.958,2.223v0.975h-1.35c-3.086,0-4.871,1.125-4.871,3.5a3.217,3.217,0,0,0,3.527,3.338,3.205,3.205,0,0,0,2.945-1.659,2.573,2.573,0,0,0,2.436,1.659l0.441-1.344A1.408,1.408,0,0,1,22.1,16.515ZM17.8,17.9a1.744,1.744,0,0,1-1.911-1.995c0-1.512,1.029-2.111,3.065-2.111h1.1V16.18C19.426,17.334,18.938,17.9,17.8,17.9Z"/>

 </svg>

diff --git a/arc-firefox-theme/chrome/global/tabbox.css b/arc-firefox-theme/chrome/global/tabbox.css
index f575996..e8c3741 100644
--- a/arc-firefox-theme/chrome/global/tabbox.css
+++ b/arc-firefox-theme/chrome/global/tabbox.css
@@ -59,7 +59,7 @@ tab[visuallyselected="true"] {
 }
 
 tab + tab {
-  -moz-margin-start: -2px;
+  margin-inline-start: -2px;
 }
 
 .tab-text {
diff --git a/arc-firefox-theme/chrome/global/textbox.css b/arc-firefox-theme/chrome/global/textbox.css
index d0ce11a..5cf4ece 100644
--- a/arc-firefox-theme/chrome/global/textbox.css
+++ b/arc-firefox-theme/chrome/global/textbox.css
@@ -21,7 +21,7 @@ textbox {
   -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
   padding: 2px 2px 3px;
-  -moz-padding-start: 4px;
+  padding-inline-start: 4px;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
diff --git a/arc-firefox-theme/chrome/global/toolbar.css b/arc-firefox-theme/chrome/global/toolbar.css
index 05a6c2d..2b683da 100644
--- a/arc-firefox-theme/chrome/global/toolbar.css
+++ b/arc-firefox-theme/chrome/global/toolbar.css
@@ -75,8 +75,8 @@ toolbarpaletteitem[place="toolbar"] > toolbarspacer {
 .toolbarpaletteitem-box[type="spring"][place="toolbar"] {
   margin-top: 2px;
   margin-bottom: 2px;
-  -moz-margin-start: 0px;
-  -moz-margin-end: 2px;
+  margin-inline-start: 0px;
+  margin-inline-end: 2px;
 }
 
 .toolbarpaletteitem-box[type="separator"][place="palette"] {
diff --git a/arc-firefox-theme/chrome/global/toolbarbutton.css b/arc-firefox-theme/chrome/global/toolbarbutton.css
index ffaf672..c28d64d 100644
--- a/arc-firefox-theme/chrome/global/toolbarbutton.css
+++ b/arc-firefox-theme/chrome/global/toolbarbutton.css
@@ -25,7 +25,7 @@ toolbarbutton:-moz-lwtheme {
 
 .toolbarbutton-icon[label]:not([label=""]),
 .toolbarbutton-icon[type="menu"] {
-  -moz-margin-end: 2px;
+  margin-inline-end: 2px;
 }
 
 .toolbarbutton-text {
@@ -45,8 +45,8 @@ toolbarbutton:hover:active,
 toolbarbutton[open="true"] {
   padding-top: 4px;
   padding-bottom: 2px;
-  -moz-padding-start: 4px;
-  -moz-padding-end: 2px;
+  padding-inline-start: 4px;
+  padding-inline-end: 2px;
   color: ButtonText;
 }
 
@@ -107,7 +107,7 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
 
 /* ::::: toolbarbutton badged ::::: */
 .toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 .toolbarbutton-badge {
@@ -120,7 +120,7 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
               0 -1px 0 hsla(0, 0%, 0%, .1) inset,
               0 1px 0 hsla(206, 50%, 10%, .2);
   margin: -6px 0 0 !important;
-  -moz-margin-end: -8px !important;
+  margin-inline-end: -8px !important;
   min-width: 14px;
   max-width: 28px;
   line-height: 10px;
diff --git a/arc-firefox-theme/chrome/global/tree.css b/arc-firefox-theme/chrome/global/tree.css
index 24bba1b..1002847 100644
--- a/arc-firefox-theme/chrome/global/tree.css
+++ b/arc-firefox-theme/chrome/global/tree.css
@@ -176,7 +176,7 @@ treechildren::-moz-tree-drop-feedback {
   background-color: Highlight;
   width: 50px;
   height: 2px;
-  -moz-margin-start: 5px;
+  margin-inline-start: 5px;
 }
 
 /* ::::: tree progress meter ::::: */
@@ -249,13 +249,13 @@ treecolpicker:hover:active {
   -moz-border-left-colors: ThreeDShadow -moz-Dialog;
   padding-top: 0px;
   padding-bottom: 0px;
-  -moz-padding-start: 3px;
-  -moz-padding-end: 1px;
+  padding-inline-start: 3px;
+  padding-inline-end: 1px;
 }
 
 .treecol-image:hover:active {
   padding: 0px;
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
 }
 
 treecol:hover:active .treecol-text {
@@ -284,11 +284,11 @@ treecol[insertbefore="true"]:-moz-locale-dir(ltr) {
 }
 
 treechildren::-moz-tree-column(insertbefore) {
-  -moz-border-start: 1px solid ThreeDShadow;
+  border-inline-start: 1px solid ThreeDShadow;
 }
 
 treechildren::-moz-tree-column(insertafter) {
-  -moz-border-end: 1px solid ThreeDShadow;
+  border-inline-end: 1px solid ThreeDShadow;
 }
 
 /* ::::: sort direction indicator :::::  */
@@ -307,7 +307,7 @@ treechildren::-moz-tree-column(insertafter) {
 
 treechildren::-moz-tree-twisty {
   -moz-appearance: treetwisty;
-  -moz-padding-end: 4px;
+  padding-inline-end: 4px;
   padding-top: 1px;
   width: 9px; /* The image's width is 9 pixels */
   list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
@@ -353,6 +353,6 @@ treechildren::-moz-tree-cell-text(selected, editing) {
   -moz-border-left-colors: Highlight;
   -moz-border-right-colors: Highlight;
   margin: 0;
-  -moz-margin-start: -4px;
+  margin-inline-start: -4px;
   padding: 1px;
 }
diff --git a/arc-firefox-theme/chrome/global/wizard.css b/arc-firefox-theme/chrome/global/wizard.css
index 4bf7d51..b46ed7e 100644
--- a/arc-firefox-theme/chrome/global/wizard.css
+++ b/arc-firefox-theme/chrome/global/wizard.css
@@ -19,17 +19,17 @@ wizard[description=""] .wizard-header-description {
 }
 
 .wizard-header-label {
-  -moz-margin-start: 23px;
+  margin-inline-start: 23px;
   font-weight: bold;
 }
 
 .wizard-header-description {
-  -moz-margin-start: 44px;
+  margin-inline-start: 44px;
 }
 
 wizard[branded="true"] .wizard-header-icon {
   list-style-image: url("chrome://branding/content/icon48.png");
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 
 .wizard-page-box {
@@ -46,9 +46,9 @@ wizard[branded="true"] .wizard-header-icon {
 
 .wizard-button[dlgtype="finish"],
 .wizard-button[dlgtype="next"] {
-  -moz-margin-start: 0px !important;
+  margin-inline-start: 0px !important;
 }
 
 .wizard-button[dlgtype="back"] {
-  -moz-margin-end: 0px !important;
+  margin-inline-end: 0px !important;
 }
diff --git a/arc-firefox-theme/chrome/mozapps/aboutProfiles.css b/arc-firefox-theme/chrome/mozapps/aboutProfiles.css
index bb7bb8d..09dc9ea 100644
--- a/arc-firefox-theme/chrome/mozapps/aboutProfiles.css
+++ b/arc-firefox-theme/chrome/mozapps/aboutProfiles.css
@@ -16,8 +16,8 @@ body {
 }
 
 button {
-  -moz-margin-start: 0;
-  -moz-margin-end: 8px;
+  margin-inline-start: 0;
+  margin-inline-end: 8px;
 }
 
 table {
@@ -57,12 +57,12 @@ td {
   float: right;
   margin-top: 2em;
   margin-bottom: 20px;
-  -moz-margin-start: 20px;
-  -moz-margin-end: 0;
+  margin-inline-start: 20px;
+  margin-inline-end: 0;
   padding: 16px;
   width: 30%;
 }
 
-#action-box:-moz-dir(rtl) {
+#action-box:dir(rtl) {
   float: left;
 }
diff --git a/arc-firefox-theme/chrome/mozapps/aboutServiceWorkers.css b/arc-firefox-theme/chrome/mozapps/aboutServiceWorkers.css
index 1158622..1f1f297 100644
--- a/arc-firefox-theme/chrome/mozapps/aboutServiceWorkers.css
+++ b/arc-firefox-theme/chrome/mozapps/aboutServiceWorkers.css
@@ -29,7 +29,7 @@ body {
   border: 1px solid ThreeDShadow;
   border-radius: 10px;
   padding: 3em;
-  -moz-padding-start: 30px;
+  padding-inline-start: 30px;
   background: -moz-Field;
   margin-left: auto;
   text-align: center;
diff --git a/arc-firefox-theme/chrome/mozapps/downloads/unknownContentType.css b/arc-firefox-theme/chrome/mozapps/downloads/unknownContentType.css
index c6dba24..0682146 100644
--- a/arc-firefox-theme/chrome/mozapps/downloads/unknownContentType.css
+++ b/arc-firefox-theme/chrome/mozapps/downloads/unknownContentType.css
@@ -16,16 +16,16 @@
   width: 16px;
   margin-top: 0px;
   margin-bottom: 0px;
-  -moz-margin-start: 0px;
-  -moz-margin-end: 5px;
+  margin-inline-start: 0px;
+  margin-inline-end: 5px;
 }
 
 .small-indent {
-  -moz-margin-start: 15px; 
-  -moz-margin-end: 15px;
+  margin-inline-start: 15px; 
+  margin-inline-end: 15px;
 }
 
 .small-indent label {
-  -moz-margin-start: 0px; 
+  margin-inline-start: 0px; 
 }
 
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/about.css b/arc-firefox-theme/chrome/mozapps/extensions/about.css
index 97a65fc..19eaddc 100644
--- a/arc-firefox-theme/chrome/mozapps/extensions/about.css
+++ b/arc-firefox-theme/chrome/mozapps/extensions/about.css
@@ -34,7 +34,7 @@
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg");
   max-width: 64px;
   max-height: 64px;
-  -moz-margin-end: 6px;
+  margin-inline-end: 6px;
 }
 
 #genericAbout[addontype="theme"] #extensionIcon {
@@ -76,7 +76,7 @@
 }
 
 .boxIndent {
-  -moz-margin-start: 18px;
+  margin-inline-start: 18px;
 }
 
 #extensionCreator, .contributor {
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/blocklist.css b/arc-firefox-theme/chrome/mozapps/extensions/blocklist.css
index da92102..1cdbb35 100644
--- a/arc-firefox-theme/chrome/mozapps/extensions/blocklist.css
+++ b/arc-firefox-theme/chrome/mozapps/extensions/blocklist.css
@@ -5,8 +5,8 @@
 richlistitem {
   padding-top: 6px;
   padding-bottom: 6px;
-  -moz-padding-start: 7px;
-  -moz-padding-end: 7px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
   border-bottom: 1px solid #C0C0C0;
 }
 
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/eula.css b/arc-firefox-theme/chrome/mozapps/extensions/eula.css
index 1011153..05aeb3c 100644
--- a/arc-firefox-theme/chrome/mozapps/extensions/eula.css
+++ b/arc-firefox-theme/chrome/mozapps/extensions/eula.css
@@ -6,7 +6,7 @@
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg");
   max-width: 48px;
   max-height: 48px;
-  -moz-margin-end: 6px;
+  margin-inline-end: 6px;
 }
 
 #eula-dialog[addontype="theme"] #icon {
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/extensions.css b/arc-firefox-theme/chrome/mozapps/extensions/extensions.css
index 226278b..112b088 100644
--- a/arc-firefox-theme/chrome/mozapps/extensions/extensions.css
+++ b/arc-firefox-theme/chrome/mozapps/extensions/extensions.css
@@ -6,7 +6,7 @@
 
 .main-content {
   padding-top: 0;
-  -moz-padding-end: 0;
+  padding-inline-end: 0;
   padding-bottom: 0;
 }
 
@@ -16,7 +16,7 @@
 }
 
 .view-pane > .list > scrollbox {
-  -moz-padding-end: 48px;
+  padding-inline-end: 48px;
 }
 
 
@@ -98,7 +98,7 @@
 
 .alert-container {
   -moz-box-align: center;
-  -moz-margin-end: 48px;
+  margin-inline-end: 48px;
 }
 
 .alert-spacer-before {
@@ -182,7 +182,7 @@ button.warning {
   background-color: #55D4FF;
   padding: 2px 8px;
   margin: 6px 0;
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
   border-radius: 100%;
   color: #FFF;
   font-weight: bold;
@@ -233,7 +233,7 @@ button.warning {
 #header {
   margin-top: 20px;
   margin-bottom: 20px;
-  -moz-margin-end: 48px;
+  margin-inline-end: 48px;
 }
 
 @media (max-width: 600px) {
@@ -244,7 +244,7 @@ button.warning {
 
 .view-header {
   margin: 0;
-  -moz-margin-end: 48px;
+  margin-inline-end: 48px;
   border-bottom: 1px solid #c1c1c1;
 }
 
@@ -333,7 +333,7 @@ button.warning {
 }
 
 .sorter .button-icon {
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
 }
 
 
@@ -351,7 +351,7 @@ button.warning {
 
 .discover-logo {
   list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png");
-  -moz-margin-end: 15px;
+  margin-inline-end: 15px;
 }
 
 .discover-title {
@@ -402,7 +402,7 @@ button.warning {
 .details {
   cursor: pointer;
   margin: 0;
-  -moz-margin-start: 10px;
+  margin-inline-start: 10px;
 }
 
 .icon-container {
@@ -420,7 +420,7 @@ button.warning {
 }
 
 .content-inner-container {
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 
 .addon[active="false"] .icon {
@@ -459,7 +459,7 @@ button.warning {
 }
 
 .description-container {
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
   -moz-box-align: center;
   font-size: 1.25rem;
 }
@@ -471,7 +471,7 @@ button.warning {
 .warning,
 .pending,
 .error {
-  -moz-margin-start: 48px;
+  margin-inline-start: 48px;
   font-weight: bold;
   -moz-box-align: center;
 }
@@ -531,7 +531,7 @@ button.warning {
 
 .addon .relnotes-container {
   -moz-box-align: start;
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
   height: 0;
   overflow: hidden;
   opacity: 0;
@@ -559,7 +559,7 @@ button.warning {
 }
 
 .addon .relnotes-toggle > .button-box > .button-icon {
-  -moz-padding-start: 4px;
+  padding-inline-start: 4px;
 }
 
 .addon-view[notification],
@@ -591,8 +591,8 @@ button.warning {
 .addon[selected] {
   background-color: #fafafa;
   color: #333;
-  -moz-padding-start: 1px; /* compensate the 4px border */
-  -moz-border-start: solid 4px #ff9500;
+  padding-inline-start: 1px; /* compensate the 4px border */
+  border-inline-start: solid 4px #ff9500;
 }
 
 .addon[active="false"] > .content-container > .content-inner-container {
@@ -627,7 +627,7 @@ button.warning {
 
 #search-filter {
   padding: 5px 20px;
-  -moz-margin-end: 48px;
+  margin-inline-end: 48px;
   font-size: 120%;
   border-bottom: 1px solid #c1c1c1;
   overflow-x: hidden;
@@ -636,7 +636,7 @@ button.warning {
 #search-filter-label {
   font-weight: bold;
   color: grey;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
 }
 
 #search-allresults-link {
@@ -648,7 +648,7 @@ button.warning {
 /*** detail view ***/
 
 #detail-view {
-  -moz-margin-end: 48px;
+  margin-inline-end: 48px;
 }
 
 #detail-view .loading {
@@ -662,7 +662,7 @@ button.warning {
 }
 
 .detail-view-container {
-  -moz-padding-end: 2em;
+  padding-inline-end: 2em;
   padding-bottom: 2em;
   font-size: 1.25rem;
   color: #333;
@@ -676,12 +676,12 @@ button.warning {
 #detail-notifications .warning,
 #detail-notifications .pending,
 #detail-notifications .error {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #detail-icon-container {
   width: 64px;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
   margin-top: 6px;
 }
 
@@ -700,7 +700,7 @@ button.warning {
 }
 
 #detail-screenshot-box {
-  -moz-margin-end: 2em;
+  margin-inline-end: 2em;
   background-image: linear-gradient(rgba(255,255,255,.5), transparent);
   background-color: white;
   box-shadow: 0 1px 2px #666;
@@ -734,7 +734,7 @@ button.warning {
 }
 
 #detail-desc, #detail-fulldesc {
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
   /* This is necessary to fix layout issues with multi-line descriptions, see
      bug 592712*/
   outline: solid transparent;
@@ -774,7 +774,7 @@ button.warning {
 }
 
 #detail-contrib-btn .button-icon {
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 
 #detail-contrib-btn:not(:active):hover {
@@ -834,7 +834,7 @@ setting {
   font-size: 90.9%;
   color: graytext;
   margin-top: -2px;
-  -moz-margin-start: 2em;
+  margin-inline-start: 2em;
   white-space: pre-wrap;
 }
 
@@ -850,8 +850,8 @@ setting[type="radio"] > radiogroup {
 /*** creator ***/
 
 .creator > label {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
 }
 
 .creator > .text-link {
@@ -863,7 +863,7 @@ setting[type="radio"] > radiogroup {
 /*** rating ***/
 
 .meta-rating {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
   padding-top: 2px;
 }
 
@@ -1059,7 +1059,7 @@ button.button-link:not([disabled="true"]):active:hover {
 
 #disabled-unsigned-addons-info {
   margin-bottom: 2em;
-  -moz-margin-end: 48px;
+  margin-inline-end: 48px;
 }
 
 #disabled-unsigned-addons-heading {
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css b/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css
index 95d59b3..e28c89d 100644
--- a/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css
+++ b/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css
@@ -36,7 +36,7 @@
 
 #icon {
   margin-top: 8px;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
   max-width: 64px;
   max-height: 64px;
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg");
@@ -80,11 +80,11 @@
   width: 16px;
   height: 16px;
   margin-top: 5px;
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 
 #allow {
-  -moz-margin-start: 84px;
+  margin-inline-start: 84px;
   margin-bottom: 20px;
 }
 
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/update.css b/arc-firefox-theme/chrome/mozapps/extensions/update.css
index bda89ca..f872b43 100644
--- a/arc-firefox-theme/chrome/mozapps/extensions/update.css
+++ b/arc-firefox-theme/chrome/mozapps/extensions/update.css
@@ -12,8 +12,8 @@
   height: 16px;
   margin-top: 5px;
   margin-bottom: 5px;
-  -moz-margin-start: 5px;
-  -moz-margin-end: 2px;
+  margin-inline-start: 5px;
+  margin-inline-end: 2px;
 }
 
 @media (min-resolution: 1.1dppx) {
diff --git a/arc-firefox-theme/chrome/mozapps/handling/handling.css b/arc-firefox-theme/chrome/mozapps/handling/handling.css
index d07bdc9..be14425 100644
--- a/arc-firefox-theme/chrome/mozapps/handling/handling.css
+++ b/arc-firefox-theme/chrome/mozapps/handling/handling.css
@@ -9,7 +9,7 @@
 
 richlistitem[type] {
   min-height: 36px; /* Don't forget to update the richlistbox height! */
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
  }
  
 richlistitem {
diff --git a/arc-firefox-theme/chrome/mozapps/plugins/pluginProblem.css b/arc-firefox-theme/chrome/mozapps/plugins/pluginProblem.css
index 43c9649..6dc8f0a 100644
--- a/arc-firefox-theme/chrome/mozapps/plugins/pluginProblem.css
+++ b/arc-firefox-theme/chrome/mozapps/plugins/pluginProblem.css
@@ -177,8 +177,8 @@ html|a {
   width: 16px;
   height: 16px;
   margin-top: 4px;
-  -moz-margin-start: -20px;
-  -moz-margin-end: 4px;
+  margin-inline-start: -20px;
+  margin-inline-end: 4px;
   border: none;
   background-color: transparent;
   background-image: url("chrome://mozapps/skin/plugins/contentPluginClose.png");
diff --git a/arc-firefox-theme/chrome/mozapps/update/updates.css b/arc-firefox-theme/chrome/mozapps/update/updates.css
index 8663f6c..dbf724e 100644
--- a/arc-firefox-theme/chrome/mozapps/update/updates.css
+++ b/arc-firefox-theme/chrome/mozapps/update/updates.css
@@ -42,8 +42,8 @@ wizardpage {
 }
 
 #licenseContent, #incompatibleListbox {
-  -moz-margin-start: 6px;
-  -moz-margin-end: 6px;
+  margin-inline-start: 6px;
+  margin-inline-end: 6px;
 }
 
 .inline-link {
@@ -57,8 +57,8 @@ wizardpage {
 
 /* Unsupported Page */
 #unsupportedLabel, #unsupportedLinkLabel {
-  -moz-margin-start: 0;
-  -moz-padding-start: 0;
+  margin-inline-start: 0;
+  padding-inline-start: 0;
 }
 
 /* Update Found Basic Page */
@@ -127,8 +127,8 @@ wizardpage {
 #errorReason {
   margin-top: 1px;
   margin-bottom: 2px;
-  -moz-margin-start: 6px !important;
-  -moz-margin-end: 5px;
+  margin-inline-start: 6px !important;
+  margin-inline-end: 5px;
   font-weight: bold;
 }
 
diff --git a/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallConfirm.css b/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallConfirm.css
index 3eabe3d..4936e2d 100644
--- a/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallConfirm.css
+++ b/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallConfirm.css
@@ -20,7 +20,7 @@
 }
 
 #itemWarningIntro {
-  -moz-margin-start: 8px;
+  margin-inline-start: 8px;
 }
 
 #dialogContentBox {
@@ -30,14 +30,14 @@
 installitem {
   padding-top: 5px;
   padding-bottom: 5px;
-  -moz-padding-start: 5px;
-  -moz-padding-end: 0;
+  padding-inline-start: 5px;
+  padding-inline-end: 0;
   border-bottom: 1px dotted #C0C0C0;
   margin-bottom: 5px;
 }
 
 .alert-icon {
-  -moz-margin-end: 20px;
+  margin-inline-end: 20px;
 }
 
 .warning {
@@ -49,7 +49,7 @@ installitem {
 .xpinstallIconContainer {
   width: 32px;
   height: 32px;
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 
 .xpinstallItemName {
@@ -69,8 +69,8 @@ installitem {
   color: -moz-FieldText;
   margin-top: 1px;
   margin-bottom: 1px;
-  -moz-margin-start: 6px;
-  -moz-margin-end: 5px;
+  margin-inline-start: 6px;
+  margin-inline-end: 5px;
 }
 
 .xpinstallItemIcon {