Merge branch 'master' into master

97 files changed, 1579 insertions, 1065 deletions

diff --git a/README.md b/README.md
index 22643d7..0c21892 100644
--- a/README.md
+++ b/README.md
@@ -1,32 +1,24 @@
 # Arc Firefox Theme
-
-Offical [Arc](https://github.com/horst3180/Arc-theme) Firefox theme.
+Offical [Arc](https://github.com/horst3180/arc-theme) Firefox theme.
 
 ##### Arc Firefox
-
 ![alt tag](http://i.imgur.com/UjJabE3.png)
 
 ##### Arc Darker Firefox
-
 ![alt tag](http://i.imgur.com/5fMURDp.png)
 
 ##### Arc Dark Firefox
-
 ![alt tag](http://i.imgur.com/5HuYVUl.png)
 
-
-### Requirements
+## Requirements
 This theme is compatible with Firefox 40+ and Firefox 38 ESR
 
 **Note**: This theme is meant to be used in conjunction with the [Arc GTK theme](https://github.com/horst3180/Arc-theme), don't use it with other GTK themes or it will look broken.
 
-### Installation
-The theme is available on addons.mozilla.org.
-
-[Arc Firefox collection on AMO](https://addons.mozilla.org/en/firefox/collections/horst3180/a/)
-
-#### Manual building and installation
+## Installation
+The theme is available as a collection on [addons.mozilla.org](https://addons.mozilla.org/en/firefox/collections/horst3180/a/).
 
+### Manual building and installation
 These instructions are for testers and package maintainers. They also allow to install the theme globally for all users.
 
 You will need `autoconf` and `automake` for the following.
@@ -55,7 +47,7 @@ Uninstall the theme with
 
     sudo make uninstall
 
-#### Firefox ESR (Debian Stable users see here)
+### Firefox ESR (Debian Stable users see here)
 This repo includes separate Firefox ESR compatible branches. The installation process is mostly identical to the manual installation above
 
     git clone https://github.com/horst3180/arc-firefox-theme && cd arc-firefox-theme
diff --git a/arc-firefox-theme/chrome/browser/Security-broken.png b/arc-firefox-theme/chrome/browser/Security-broken.png
deleted file mode 100644
index 1ec110b..0000000
--- a/arc-firefox-theme/chrome/browser/Security-broken.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/aboutNetError.css b/arc-firefox-theme/chrome/browser/aboutNetError.css
index c0b76aa..3dd6f50 100644
--- a/arc-firefox-theme/chrome/browser/aboutNetError.css
+++ b/arc-firefox-theme/chrome/browser/aboutNetError.css
@@ -126,10 +126,6 @@ span#hostname {
 
 #automaticallyReportInFuture {
   cursor: pointer;
-  display: inline-block;
-  padding-inline-start: 2.3em;
-  text-indent: -2.3em;
-  line-height: 16px
 }
 
 #errorCode:not([href]) {
diff --git a/arc-firefox-theme/chrome/browser/aboutSyncTabs.css b/arc-firefox-theme/chrome/browser/aboutSyncTabs.css
index 4cedad6..18e2154 100644
--- a/arc-firefox-theme/chrome/browser/aboutSyncTabs.css
+++ b/arc-firefox-theme/chrome/browser/aboutSyncTabs.css
@@ -26,6 +26,10 @@
   margin-inline-end: 2em;
 }
 
+#headers:-moz-locale-dir(rtl) {
+  background-position-x: 100%;
+}
+
 #tabsListHeading {
   font-size: 140%;
   font-weight: bold;
diff --git a/arc-firefox-theme/chrome/browser/actionicon-tab.png b/arc-firefox-theme/chrome/browser/actionicon-tab.png
deleted file mode 100644
index 433c25e..0000000
--- a/arc-firefox-theme/chrome/browser/actionicon-tab.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/addons/addon-badge.svg b/arc-firefox-theme/chrome/browser/addons/addon-badge.svg
new file mode 100644
index 0000000..5a62add
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/addons/addon-badge.svg
@@ -0,0 +1,19 @@
+<?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 version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+<style type="text/css">
+path {
+  stroke: #bb3817;
+  fill: #FFFFFF;
+}
+</style>
+<path d="M6.6,9c0.3,0,0.5-0.3,0.6-0.6C7,7.7,7,6.9,7.1,6.2c0.1-0.3,0.3-0.4,0.6-0.4c0.3,0,0.3,0.4,1,0.4
+        c0.3,0,0.8-0.1,0.8-1.1S9,3.9,8.7,3.9c-0.6,0-0.7,0.5-1,0.5c-0.3,0-0.5-0.2-0.6-0.5c0-0.3,0-0.7,0-1c0-0.3-0.2-0.5-0.5-0.6
+        c0,0,0,0-0.1,0c-0.5,0-1,0.1-1.6,0C4.7,2.3,4.5,2.1,4.6,1.8c0-0.4,0.4-0.3,0.4-1C5,0.5,4.9,0,3.8,0S2.7,0.5,2.7,0.8
+        c0,0.6,0.5,0.7,0.5,1c0,0.3-0.2,0.5-0.5,0.5C2.1,2.4,1.6,2.4,1,2.4c-0.3,0-0.5,0.2-0.6,0.5c0,0,0,0,0,0.1v0.7c0,0-0.1,0.8,0.6,0.8
+        C1.5,4.5,1.6,4,2.2,4c0.3,0,0.7,0.7,0.7,1.3S2.4,6.6,2.2,6.6C1.6,6.6,1.5,6,1.1,6C0.4,5.9,0.5,6.7,0.5,6.7v1.7C0.4,8.7,0.7,9,1,9
+        c0,0,0,0,0,0h2.1C3.1,9,4,9,4,8.4c0-0.4-0.7-0.6-0.7-1.2C3.5,6.7,4,6.3,4.5,6.3c0.6,0,1.2,0.6,1.2,0.8c0,0.6-0.6,0.8-0.6,1.2
+        C5.1,9,5.9,9,5.9,9L6.6,9z"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/browser/browser.css b/arc-firefox-theme/chrome/browser/browser.css
index 6ccccc4..e3de08a 100644
--- a/arc-firefox-theme/chrome/browser/browser.css
+++ b/arc-firefox-theme/chrome/browser/browser.css
@@ -760,7 +760,7 @@ toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-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"][panel-multiview-anchor=true] > .toolbarbutton-icon,
 :-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"][panel-multiview-anchor=true] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
 :-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"][panel-multiview-anchor=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 #home-button[cui-areatype="menu-panel"],
@@ -1153,6 +1153,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-secure.svg);
   visibility: visible; }
 
+#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon,
 #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon {
   list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon);
   visibility: visible; }
@@ -1162,12 +1165,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon);
   visibility: visible; }
 
-#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon {
-  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon);
-  visibility: visible; }
-
 #identity-icon:-moz-lwtheme {
   list-style-image: url(chrome://browser/skin/identity-icon.svg#normal-black); }
 
@@ -1197,6 +1194,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-secure.svg);
   visibility: visible; }
 
+#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme,
 #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme {
   list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black);
   visibility: visible; }
@@ -1206,12 +1206,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon-black);
   visibility: visible; }
 
-#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme {
-  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black);
-  visibility: visible; }
-
 #identity-box {
   --identity-box-verified-color: #479900;
   --identity-box-chrome-color: #e57300;
@@ -1280,9 +1274,10 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
 
 #identity-box[sharing] > #identity-icon,
 #sharing-icon {
-  animation: 3s linear pulse infinite; }
+  animation: 3s linear identity-box-sharing-icon-pulse infinite; }
 
-@keyframes pulse {
+/* This should remain identical to tab-sharing-icon-pulse in tabs.inc.css */
+@keyframes identity-box-sharing-icon-pulse {
   0%, 16.66%, 83.33%, 100% {
     opacity: 0; }
   33.33%, 66.66% {
@@ -1330,24 +1325,13 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
    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); }
-
-@media (min-resolution: 1.1dppx) {
-  .notification-anchor-icon {
-    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); } }
-.popup-notification-icon {
-  width: 64px;
-  height: 64px;
-  margin-inline-end: 10px; }
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#default-info); }
 
 .notification-anchor-icon:not(.plugin-blocked):-moz-lwtheme,
 #blocked-permissions-container > .blocked-permission-icon:-moz-lwtheme {
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
-.notification-anchor-icon:not(.plugin-blocked):not(:hover) {
-  opacity: .8; }
-
 /* INDIVIDUAL NOTIFICATIONS */
 .popup-notification-icon[popupid="web-notifications"],
 .desktop-notification-icon {
@@ -1535,6 +1519,25 @@ html|*#webRTC-previewVideo {
 .addon-install-confirmation-name {
   font-weight: bold; }
 
+.addon-webext-perm-header {
+  font-size: 1.3em; }
+
+.addon-webext-name {
+  font-weight: bold;
+  margin: 0; }
+
+.addon-addon-icon {
+  width: 14px;
+  height: 14px;
+  list-style-image: url("chrome://browser/skin/menuPanel.svg");
+  -moz-image-region: rect(0px, 288px, 32px, 256px); }
+
+.addon-toolbar-icon {
+  width: 14px;
+  height: 14px;
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  -moz-image-region: rect(0, 486px, 18px, 468px); }
+
 /* Notification icon box */
 .notification-anchor-icon:-moz-focusring {
   outline: 1px dotted -moz-DialogText; }
@@ -1732,12 +1735,12 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   border-radius: 2px;
   border: 1px solid transparent; }
 
-.autocomplete-richlistitem[selected=true] {
-  background-color: Highlight; }
-
 .ac-title {
   font-size: 1.05em; }
 
+.ac-separator,
+.ac-url,
+.ac-action,
 .ac-tags {
   font-size: 0.9em; }
 
@@ -1748,18 +1751,11 @@ html|span.ac-tag {
   border: 1px solid transparent;
   padding: 0 1px; }
 
-.ac-separator,
-.ac-url,
-.ac-action {
-  font-size: 0.9em;
+.ac-separator:not([selected=true]),
+.ac-url:not([selected=true]),
+.ac-action:not([selected=true]) {
   color: -moz-nativehyperlinktext; }
 
-.ac-title[selected=true],
-.ac-separator[selected],
-.ac-url[selected=true],
-.ac-action[selected=true] {
-  color: inherit !important; }
-
 .ac-tags-text[selected] > html|span.ac-tag {
   background-color: HighlightText;
   color: Highlight; }
@@ -1775,26 +1771,14 @@ html|span.ac-emphasize-text-url {
 .ac-type-icon[type=bookmark][selected][current] {
   list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted"); }
 
-.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/autocomplete-star.png");
-  width: 16px;
-  height: 16px; }
-
 .ac-type-icon[type=keyword],
-.ac-site-icon[type=searchengine],
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
+.ac-site-icon[type=searchengine] {
   list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); }
 
 .ac-type-icon[type=keyword][selected],
-.ac-site-icon[type=searchengine][selected],
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) {
+.ac-site-icon[type=searchengine][selected] {
   list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted); }
 
-.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/tag.png");
-  width: 16px;
-  height: 16px; }
-
 .ac-type-icon[type=switchtab],
 .ac-type-icon[type=remotetab] {
   list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab"); }
@@ -2158,9 +2142,10 @@ html|span.ac-emphasize-text-url {
 
 .tab-icon-image[sharing]:not([selected]),
 .tab-sharing-icon-overlay {
-  animation: 3s linear pulse infinite; }
+  animation: 3s linear tab-sharing-icon-pulse infinite; }
 
-@keyframes pulse {
+/* This should remain identical to identity-box-sharing-icon-pulse in identity-block.inc.css */
+@keyframes tab-sharing-icon-pulse {
   0%, 16.66%, 83.33%, 100% {
     opacity: 0; }
   33.33%, 66.66% {
@@ -2236,7 +2221,7 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound[muted],
 .tab-icon-sound[blocked] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 .tab-icon-sound[muted] {
@@ -2248,12 +2233,12 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound:-moz-lwtheme-darktext[soundplaying],
 .tab-icon-sound:-moz-lwtheme-darktext[muted],
 .tab-icon-sound:-moz-lwtheme-darktext[blocked] {
-  filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); }
+  filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); }
 
 .tab-icon-sound:-moz-lwtheme-brighttext[soundplaying],
 .tab-icon-sound:-moz-lwtheme-brighttext[muted],
 .tab-icon-sound:-moz-lwtheme-brighttext[blocked] {
-  filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); }
+  filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); }
 
 .tab-icon-sound[soundplaying]:not(:hover),
 .tab-icon-sound[muted]:not(:hover),
@@ -2454,7 +2439,7 @@ lwtHeader;*/
 .alltabs-endimage[muted],
 .alltabs-endimage[blocked] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 .alltabs-endimage[muted] {
@@ -2987,7 +2972,7 @@ html|*.pointerlockfswarning-exit-button {
 /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
    We are copy/pasting variables from light-theme and dark-theme,
    since they aren't loaded in this context (within browser.css). */
-:root[devtoolstheme="light"] #developer-toolbar {
+#browser-bottombox[devtoolstheme="light"] #developer-toolbar {
   --gcli-background-color: #fcfcfc;
   /* --theme-tab-toolbar-background */
   --gcli-input-background: #fcfcfc;
@@ -3007,7 +2992,7 @@ html|*.pointerlockfswarning-exit-button {
   --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 {
+#browser-bottombox[devtoolstheme="dark"] #developer-toolbar {
   --gcli-background-color: #272b35;
   /* --theme-toolbar-background */
   --gcli-input-background: #272b35;
@@ -3045,8 +3030,8 @@ html|*.pointerlockfswarning-exit-button {
 .developer-toolbar-button > image {
   margin: auto 10px; }
 
-:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image,
-:root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before {
+#browser-bottombox[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image,
+#browser-bottombox[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before {
   filter: invert(1); }
 
 .developer-toolbar-button > .toolbarbutton-icon {
@@ -3054,7 +3039,7 @@ html|*.pointerlockfswarning-exit-button {
   height: 16px; }
 
 /* The toolkit close button is low contrast in the dark theme so invert it. */
-:root[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image {
+#browser-bottombox[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image {
   filter: invert(1); }
 
 #developer-toolbar-toolbox-button {
@@ -3534,7 +3519,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   width: 20px;
   height: 20px;
   border-radius: 2px;
-  background-image: url("chrome://browser/skin/theme-switcher-icon.png");
+  background-image: url("chrome://browser/content/default-theme-icon.svg");
   background-size: contain; }
 
 #main-window[customize-entered] #customization-panel-container {
@@ -3671,7 +3656,7 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring {
   padding-inline-start: 0; }
 
 .customization-lwtheme-menu-theme[defaulttheme] {
-  list-style-image: url(chrome://browser/skin/theme-switcher-icon.png); }
+  list-style-image: url(chrome://browser/content/default-theme-icon.svg); }
 
 .customization-lwtheme-menu-theme[active="true"],
 .customization-lwtheme-menu-theme:hover {
@@ -4086,7 +4071,7 @@ notification.heartbeat {
   width: 16px; }
 
 /**
- * Override the --panel-arrowcontent-padding so the background extends
+ * Override the --arrowpanel-padding so the background extends
  * to the sides and bottom of the panel.
  */
 #UITourTooltipButtons {
@@ -4105,7 +4090,7 @@ notification.heartbeat {
   width: 16px;
   height: 16px;
   margin: 7px;
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 #context-back {
diff --git a/arc-firefox-theme/chrome/browser/devedition.css b/arc-firefox-theme/chrome/browser/compacttheme.css
index 43603c1..12789d0 100644
--- a/arc-firefox-theme/chrome/browser/devedition.css
+++ b/arc-firefox-theme/chrome/browser/compacttheme.css
@@ -1,8 +1,8 @@
 
 
-/* devedition.css is loaded in browser.xul after browser.css when it is
+/* compacttheme.css is loaded in browser.xul after browser.css when it is
    preffed on.  The bulk of the styling is here in the shared file, but
-   there are overrides for each platform in their devedition.css files. */
+   there are overrides for each platform in their compacttheme.css files. */
 
 :root {
   --tab-toolbar-navbar-overlap: 0px;
@@ -12,7 +12,7 @@
   --backbutton-urlbar-overlap: 0px;
 }
 
-:root[devtoolstheme="dark"] {
+:root:-moz-lwtheme-brighttext {
   /* Chrome */
   --chrome-background-color: #272b35;
   --chrome-color: #F5F7FA;
@@ -48,8 +48,8 @@
 }
 
 /* Override the lwtheme-specific styling for toolbar buttons */
-:root[devtoolstheme="dark"],
-:root[devtoolstheme="dark"] toolbar:-moz-lwtheme {
+:root:-moz-lwtheme-brighttext,
+toolbar:-moz-lwtheme-brighttext  {
   --toolbarbutton-hover-background: rgba(25,33, 38,.6) linear-gradient(rgba(25,33,38,.6), rgba(25,33,38,.6)) padding-box;
   --toolbarbutton-hover-boxshadow: none;
   --toolbarbutton-hover-bordercolor: rgba(25,33,38,.6);
@@ -60,7 +60,7 @@
 
 }
 
-:root[devtoolstheme="light"] {
+:root:-moz-lwtheme-darktext {
   --url-and-searchbar-background-color: #fff;
 
   --chrome-background-color: #E3E4E6;
@@ -83,8 +83,8 @@
 }
 
 /* Override the lwtheme-specific styling for toolbar buttons */
-:root[devtoolstheme="light"],
-:root[devtoolstheme="light"] toolbar:-moz-lwtheme {
+:root:-moz-lwtheme-darktext,
+toolbar:-moz-lwtheme-darktext {
   --toolbarbutton-hover-background: #eaeaea;
   --toolbarbutton-hover-boxshadow: none;
   --toolbarbutton-hover-bordercolor: rgba(0,0,0,0.1);
@@ -195,63 +195,59 @@ toolbar[brighttext] #downloads-indicator-counter {
 }
 
 
-:root[devtoolstheme="dark"] #identity-icon:-moz-lwtheme {
+#identity-icon:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://browser/skin/identity-icon.svg#normal-white);
 }
 
-:root[devtoolstheme="dark"] #identity-box:hover > #identity-icon:not(.no-hover):-moz-lwtheme,
-:root[devtoolstheme="dark"] #identity-box[open=true] > #identity-icon:-moz-lwtheme {
+#identity-box:hover > #identity-icon:not(.no-hover):-moz-lwtheme-brighttext,
+#identity-box[open=true] > #identity-icon:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://browser/skin/identity-icon.svg#hover-white);
 }
 
-:root[devtoolstheme="dark"] #identity-box.grantedPermissions > #identity-icon:-moz-lwtheme {
+#identity-box.grantedPermissions > #identity-icon:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://browser/skin/identity-icon.svg#notice-white);
 }
 
-:root[devtoolstheme="dark"] #identity-box.grantedPermissions:hover > #identity-icon:not(.no-hover):-moz-lwtheme,
-:root[devtoolstheme="dark"] #identity-box.grantedPermissions[open=true] > #identity-icon:-moz-lwtheme {
+#identity-box.grantedPermissions:hover > #identity-icon:not(.no-hover):-moz-lwtheme-brighttext,
+#identity-box.grantedPermissions[open=true] > #identity-icon:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://browser/skin/identity-icon.svg#notice-hover-white);
 }
 
-:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon:-moz-lwtheme {
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://branding/content/identity-icons-brand.svg);
 }
 
 
-:root[devtoolstheme="dark"] #tracking-protection-icon:-moz-lwtheme {
+#tracking-protection-icon:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://browser/skin/tracking-protection-16.svg#enabled-white);
 }
 
-:root[devtoolstheme="dark"] #tracking-protection-icon[state="loaded-tracking-content"]:-moz-lwtheme {
+#tracking-protection-icon[state="loaded-tracking-content"]:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://browser/skin/tracking-protection-16.svg#disabled-white);
 }
 
 
-:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon:-moz-lwtheme,
-:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon:-moz-lwtheme,
-:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon:-moz-lwtheme {
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon:-moz-lwtheme-brighttext,
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon:-moz-lwtheme-brighttext,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://browser/skin/connection-secure.svg);
   visibility: visible;
 }
 
-:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme {
+#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme-brighttext,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme-brighttext,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme-brighttext,
+#urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-white);
   visibility: visible;
 }
 
-:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.insecureLoginForms > #connection-icon:-moz-lwtheme,
-:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.mixedActiveContent > #connection-icon:-moz-lwtheme {
+#urlbar[pageproxystate="valid"] > #identity-box.insecureLoginForms > #connection-icon:-moz-lwtheme-brighttext,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveContent > #connection-icon:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon-white);
   visibility: visible;
 }
 
-:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme,
-:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme,
-:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme {
-  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-white);
-  visibility: visible;
-}
-
 #urlbar {
   border-inline-start: none !important;
   opacity: 1 !important;
@@ -263,11 +259,20 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
   margin-inline-start: 0;
 }
 
-:root[devtoolstheme="dark"] #urlbar-zoom-button:hover {
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper:-moz-locale-dir(rtl),
+window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
+  /* Resolves text blurring issue when hovering, see bug 1340206 */
+  transform: none;
+  /* For some reason, this property must be specified here, even though the same
+     value is set in the previous rule set. o_O */
+  margin-inline-start: 0;
+}
+
+#urlbar-zoom-button:-moz-lwtheme-brighttext:hover {
   background-color: rgba(255,255,255,.2);
 }
 
-:root[devtoolstheme="dark"] #urlbar-zoom-button:hover:active {
+#urlbar-zoom-button:-moz-lwtheme-brighttext:hover:active {
   background-color: rgba(255,255,255,.3);
 }
 
@@ -281,7 +286,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
 }
 
 /* No extra vertical padding for nav bar */
-#nav-bar-customization-target,
 #nav-bar {
   padding-top: 0;
   padding-bottom: 0;
@@ -344,9 +348,19 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
   background-color: var(--tab-selection-background-color);
 }
 
+.tab-throbber[selected][progress] {
+  list-style-image: url("chrome://browser/skin/compacttheme/loading-inverted.png");
+}
+
+@media (min-resolution: 1.1dppx) {
+  .tab-throbber[selected][progress] {
+    list-style-image: url("chrome://browser/skin/compacttheme/loading-inverted@2x.png");
+  }
+}
+
 .tab-icon-sound[soundplaying],
 .tab-icon-sound[muted] {
-  filter: url(chrome://browser/skin/filters.svg#fill) !important; /* removes drop-shadow filter */
+  filter: url(chrome://global/skin/filters.svg#fill) !important; /* removes drop-shadow filter */
 }
 
 /* Don't need space for the tab curves (66px - 30px) */
@@ -364,7 +378,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
   --forwardbutton-width: 29px;
 }
 
-:root[devtoolstheme="light"] {
+:root:-moz-lwtheme-darktext {
   --urlbar-dropmarker-url: url("chrome://browser/skin/devedition/urlbar-history-dropmarker.svg");
   --urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px);
   --urlbar-dropmarker-hover-region: rect(0, 22px, 14px, 11px);
@@ -375,8 +389,8 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
   --urlbar-dropmarker-active-2x-region: rect(0px, 33px, 14px, 22px);
 }
 
-:root[devtoolstheme="dark"] .findbar-closebutton:not(:hover),
-:root[devtoolstheme="dark"] #sidebar-header > .close-icon:not(:hover),
+.findbar-closebutton:-moz-lwtheme-brighttext:not(:hover),
+#sidebar-header > .close-icon:-moz-lwtheme-brighttext:not(:hover),
 .tab-close-button[selected]:not(:hover) {
   background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 80, 16, 64);
 }
diff --git a/arc-firefox-theme/chrome/browser/compacttheme/loading-inverted.png b/arc-firefox-theme/chrome/browser/compacttheme/loading-inverted.png
new file mode 100644
index 0000000..b9ee1a7
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/compacttheme/loading-inverted.png
diff --git a/arc-firefox-theme/chrome/browser/compacttheme/loading-inverted@2x.png b/arc-firefox-theme/chrome/browser/compacttheme/loading-inverted@2x.png
new file mode 100644
index 0000000..852c4ee
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/compacttheme/loading-inverted@2x.png
diff --git a/arc-firefox-theme/chrome/browser/controlcenter/panel.css b/arc-firefox-theme/chrome/browser/controlcenter/panel.css
index 0488442..4d8f112 100644
--- a/arc-firefox-theme/chrome/browser/controlcenter/panel.css
+++ b/arc-firefox-theme/chrome/browser/controlcenter/panel.css
@@ -102,7 +102,7 @@
 #identity-popup-permissions-content,
 #tracking-protection-content {
   padding: 0.5em 0 1em;
-  /* .identity-popup-headline.host depends on this width */
+  /* .identity-popup-host depends on this width */
   padding-inline-start: calc(2em + 24px);
   padding-inline-end: 1em;
 }
@@ -181,7 +181,7 @@
   font-size: 150%;
 }
 
-.identity-popup-headline.host {
+.identity-popup-host {
   word-wrap: break-word;
   /* 1em + 2em + 24px is #identity-popup-security-content padding
    * 30em is .panel-mainview:not([panelid="PanelUI-popup"]) width */
@@ -422,7 +422,7 @@ description#identity-popup-content-verifier,
   width: 16px;
   height: 16px;
   list-style-image: url(chrome://browser/skin/panel-icons.svg#cancel);
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: graytext;
 }
 
diff --git a/arc-firefox-theme/chrome/browser/customizableui/panelUI.css b/arc-firefox-theme/chrome/browser/customizableui/panelUI.css
index 17faf34..6555340 100644
--- a/arc-firefox-theme/chrome/browser/customizableui/panelUI.css
+++ b/arc-firefox-theme/chrome/browser/customizableui/panelUI.css
@@ -147,6 +147,11 @@
   filter: none;
 }
 
+#PanelUI-menu-button[badge-status="addon-alert"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
+  height: 13px;
+  background: transparent url(chrome://browser/skin/addons/addon-badge.svg) no-repeat center;
+}
+
 .panel-subviews {
   padding: 4px;
   background-clip: padding-box;
@@ -553,7 +558,8 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
   top: 25%;
 }
 
-#PanelUI-update-status[update-status]::after {
+#PanelUI-update-status[update-status]::after,
+#PanelUI-footer-addons > toolbarbutton::after {
   content: "";
   width: 14px;
   height: 14px;
@@ -574,6 +580,24 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
   background-color: #D90000;
 }
 
+#PanelUI-footer-addons > toolbarbutton {
+  background-color: #C7F5FF;
+  display: flex;
+  flex: 1 1 0%;
+  width: calc(22.35em + 30px);
+  padding-inline-start: 15px;
+  border-inline-start-style: none;
+}
+
+#PanelUI-footer-addons > toolbarbutton > .toolbarbutton-icon {
+  width: 14px;
+  height: 14px;
+}
+
+#PanelUI-footer-addons > toolbarbutton::after {
+  background-image: url(chrome://browser/skin/addons/addon-badge.svg);
+}
+
 #PanelUI-fxa-status {
   display: flex;
   flex: 1 1 0%;
@@ -608,6 +632,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
 #PanelUI-help,
 #PanelUI-fxa-label,
 #PanelUI-fxa-icon,
+#PanelUI-footer-addons > toolbarbutton,
 #PanelUI-customize,
 #PanelUI-quit {
   margin: 0;
@@ -669,6 +694,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
 }
 
 #PanelUI-fxa-label,
+#PanelUI-footer-addons > toolbarbutton,
 #PanelUI-customize {
   flex: 1;
   padding-inline-start: 15px;
@@ -833,6 +859,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
 
 #PanelUI-fxa-label,
 #PanelUI-fxa-icon,
+#PanelUI-footer-addons > toolbarbutton,
 #PanelUI-customize,
 #PanelUI-help,
 #PanelUI-quit {
diff --git a/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css b/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css
index 2b23903..1637216 100644
--- a/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css
+++ b/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css
@@ -83,7 +83,7 @@ richlistitem.download > toolbarseparator {
   width: 16px;
   height: 16px;
   margin: 0;
-  filter: url("chrome://browser/skin/filters.svg#fill");
+  filter: url("chrome://global/skin/filters.svg#fill");
   fill: currentColor;
 }
 
diff --git a/arc-firefox-theme/chrome/browser/downloads/downloads.css b/arc-firefox-theme/chrome/browser/downloads/downloads.css
index 1bd933a..03c47d0 100644
--- a/arc-firefox-theme/chrome/browser/downloads/downloads.css
+++ b/arc-firefox-theme/chrome/browser/downloads/downloads.css
@@ -133,8 +133,8 @@ richlistitem[type="download"]:hover > toolbarseparator,
 .downloadsDropmarker > .button-box > .button-menu-dropmarker > .dropmarker-icon {
   width: 16px;
   height: 16px;
-  list-style-image: url("chrome://browser/skin/downloads/menubutton-dropmarker.svg");
-  filter: url("chrome://browser/skin/filters.svg#fill");
+  list-style-image: url("chrome://global/skin/icons/menubutton-dropmarker.svg");
+  filter: url("chrome://global/skin/filters.svg#fill");
   fill: currentColor;
 }
 
@@ -247,7 +247,7 @@ richlistitem[type="download"][verdict] > toolbarseparator {
   width: 16px;
   height: 16px;
   margin: 1px;
-  filter: url("chrome://browser/skin/filters.svg#fill");
+  filter: url("chrome://global/skin/filters.svg#fill");
   fill: currentColor;
 }
 
diff --git a/arc-firefox-theme/chrome/browser/newtab/whimsycorn.png b/arc-firefox-theme/chrome/browser/newtab/whimsycorn.png
deleted file mode 100644
index 5c5c2f4..0000000
--- a/arc-firefox-theme/chrome/browser/newtab/whimsycorn.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/notification-icons.svg b/arc-firefox-theme/chrome/browser/notification-icons.svg
index 5250770..de73d82 100644
--- a/arc-firefox-theme/chrome/browser/notification-icons.svg
+++ b/arc-firefox-theme/chrome/browser/notification-icons.svg
@@ -34,9 +34,8 @@
 
 </style>
   <style>
-    use:not(:target) {
-      display: none;
-    }
+    :root > use:not(:target),
+    :root > g:not(:target),
     #strikeout {
       display: none;
     }
@@ -44,7 +43,7 @@
       display: block;
     }
     .blocked {
-      clip-path: url(#clip);
+      clip-path: url(#blocked-clipPath);
     }
 
     #login-highlighted {
@@ -64,6 +63,13 @@
       fill: rgb(224, 41, 29);
       fill-opacity: 1;
     }
+
+    #camera-indicator,
+    #microphone-indicator,
+    #screen-indicator {
+      fill: white;
+      fill-opacity: 1;
+    }
   </style>
 
   <defs>
@@ -83,13 +89,24 @@
     <path id="popup-icon" d="m 2,24 a 4,4 0 0 0 4,4 l 8,0 a 10,10 0 0 1 -2,-4 l -4,0 a 2,2 0 0 1 -2,-2 l 0,-12 18,0 0,2 a 10,10 0 0 1 4,2 l 0,-8 a 4,4 0 0 0 -4,-4 l -18,0 a 4,4 0 0 0 -4,4 z m 12,-2.1 a 8,8 0 1 1 0,0.2 m 10.7,-4.3 a 5,5 0 0 0 -6.9,6.9 z m -5.4,8.4 a 5,5 0 0 0 6.9,-6.9 z" />
     <path id="screen-icon" d="m 2,18 a 2,2 0 0 0 2,2 l 2,0 0,-6 a 4,4 0 0 1 4,-4 l 14,0 0,-6 a 2,2 0 0 0 -2,-2 l -18,0 a 2,2 0 0 0 -2,2 z m 6,10 a 2,2 0 0 0 2,2 l 18,0 a 2,2 0 0 0 2,-2 l 0,-14 a 2,2 0 0 0 -2,-2 l -18,0 a 2,2 0 0 0 -2,2 z" />
 
-    <clipPath id="clip">
+    <clipPath id="blocked-clipPath">
       <path d="m 0,0 0,31 31,-31 z m 6,32 26,0 0,-26 z"/>
     </clipPath>
+
+    <mask id="i-mask" style="fill-opacity: 1;">
+      <rect fill="white" width="32" height="32"/>
+      <circle fill="black" cx="16" cy="9" r="2.5"/>
+      <rect fill="black" x="14" y="14" width="4" height="10" rx="2" ry="2"/>
+    </mask>
   </defs>
 
+  <g id="default-info">
+    <circle cx="16" cy="16" r="14" mask="url(#i-mask)"/>
+  </g>
+
   <use id="camera" xlink:href="#camera-icon" />
   <use id="camera-sharing" xlink:href="#camera-icon"/>
+  <use id="camera-indicator" xlink:href="#camera-icon" />
   <use id="camera-blocked" class="blocked" xlink:href="#camera-icon" />
   <use id="desktop-notification" xlink:href="#desktop-notification-icon" />
   <use id="desktop-notification-blocked" class="blocked" xlink:href="#desktop-notification-icon" />
@@ -108,6 +125,7 @@
   <use id="login-detailed" xlink:href="#login-detailed-icon" />
   <use id="microphone" xlink:href="#microphone-icon" />
   <use id="microphone-sharing" xlink:href="#microphone-icon"/>
+  <use id="microphone-indicator" xlink:href="#microphone-icon"/>
   <use id="microphone-blocked" class="blocked" xlink:href="#microphone-icon" />
   <use id="microphone-detailed" xlink:href="#microphone-detailed-icon" />
   <use id="plugin" xlink:href="#plugin-icon" />
@@ -115,6 +133,7 @@
   <use id="popup" xlink:href="#popup-icon" />
   <use id="screen" xlink:href="#screen-icon" />
   <use id="screen-sharing" xlink:href="#screen-icon"/>
+  <use id="screen-indicator" xlink:href="#screen-icon"/>
   <use id="screen-blocked" class="blocked" xlink:href="#screen-icon" />
 
   <path id="strikeout" d="m 2,28 2,2 26,-26 -2,-2 z"/>
diff --git a/arc-firefox-theme/chrome/browser/places/autocomplete-star.png b/arc-firefox-theme/chrome/browser/places/autocomplete-star.png
deleted file mode 100644
index 2675f93..0000000
--- a/arc-firefox-theme/chrome/browser/places/autocomplete-star.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/preferences/containers.css b/arc-firefox-theme/chrome/browser/preferences/containers.css
index 308f573..e2f23fc 100644
--- a/arc-firefox-theme/chrome/browser/preferences/containers.css
+++ b/arc-firefox-theme/chrome/browser/preferences/containers.css
@@ -87,7 +87,7 @@
 .subviewbutton[usercontextid] > .toolbarbutton-icon,
 #userContext-indicator {
   background-image: var(--identity-icon);
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: var(--identity-icon-color);
   background-size: contain;
   background-repeat: no-repeat;
@@ -100,12 +100,12 @@
   --preference-active-color: #858585;
 }
 
-radiogroup {
+.radio-buttons {
   display: flex;
   margin-inline-start: 0.35rem;
 }
 
-radio {
+.radio-buttons > radio {
   flex: auto;
   display: flex;
   align-items: center;
@@ -125,19 +125,23 @@ radio {
   fill: #4d4d4d;
 }
 
+.radio-buttons > radio {
+  padding-inline-start: 2px;
+}
+
 radio > [data-identity-icon] {
   inline-size: 22px;
   block-size: 22px;
 }
 
-radio[selected=true] {
+.radio-buttons > radio[selected=true] {
   outline-color: var(--preference-unselected-color);
 }
 
-radio[focused=true] {
+.radio-buttons > radio[focused=true] {
   outline-color: var(--preference-selected-color);
 }
 
-radio:hover:active {
+.radio-buttons > radio:hover:active {
   outline-color: var(--preference-active-color);
 }
diff --git a/arc-firefox-theme/chrome/browser/preferences/in-content/containers.css b/arc-firefox-theme/chrome/browser/preferences/in-content/containers.css
index 73e499a..3f21fed 100644
--- a/arc-firefox-theme/chrome/browser/preferences/in-content/containers.css
+++ b/arc-firefox-theme/chrome/browser/preferences/in-content/containers.css
@@ -87,7 +87,7 @@
 .subviewbutton[usercontextid] > .toolbarbutton-icon,
 #userContext-indicator {
   background-image: var(--identity-icon);
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: var(--identity-icon-color);
   background-size: contain;
   background-repeat: no-repeat;
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 51042a4..d774c77 100644
--- a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
+++ b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
@@ -42,6 +42,12 @@ treecol {
   min-width: 26px;
 }
 
+.learnMore {
+  margin-inline-start: 1.5em;
+  font-weight: normal;
+  white-space: nowrap;
+}
+
 /* Category List */
 
 #categories {
@@ -173,15 +179,6 @@ treecol {
 }
 
 /* Content pane */
-#playDRMContentLink {
-  /* Line up with the buttons in the other grid bits: */
-  margin-left: 4px !important;
-  margin-right: 4px !important;
-}
-
-#notificationsPolicyLearnMore {
-  margin-inline-start: 1.5em !important;
-}
 
 #defaultFontSizeLabel {
   /* !important needed to override common !important rule */
@@ -230,14 +227,6 @@ treecol {
 
 /* Privacy pane */
 
-#trackingProtectionPBMLearnMore,
-#trackingProtectionLearnMore,
-#browserContainersLearnMore {
-  margin-inline-start: 1.5em !important;
-  margin-top: 0;
-  font-weight: normal;
-}
-
 .doNotTrackLearnMore {
   margin-inline-start: calc(1em + 30px);
   margin-bottom: 1em;
@@ -283,17 +272,6 @@ description > html|a {
   margin-inline-end: 4px; /* add the 4px end-margin of other elements */
 }
 
-#telemetryLearnMore,
-#FHRLearnMore,
-#crashReporterLearnMore {
-  /* provide some margin between the links and the label text */
-  /* !important is needed to override the rules defined in common.css */
-  margin-inline-start: 20px !important;
-  /* center the links */
-  margin-top: 8px;
-  margin-bottom: 8px;
-}
-
 .indent {
   /* !important needed to override margin-inline-start:0 !important; rule
      define in common.css for labels */
@@ -420,9 +398,6 @@ description > html|a {
 }
 
 #noFxaAccount {
-  /* Overriding the margins from the base preferences.css theme file.
-     These overrides can be simplified by fixing bug 1027174 */
-  margin: 0;
   padding-top: 15px;
 }
 
@@ -512,7 +487,7 @@ description > html|a {
 }
 
 .fxaAccountBoxButtons > button:first-child {
-  margin-right: 14px !important;
+  margin-inline-end: 14px !important;
 }
 
 .fxaSyncIllustration {
diff --git a/arc-firefox-theme/chrome/browser/preferences/preferences.css b/arc-firefox-theme/chrome/browser/preferences/preferences.css
index 45e2dc2..810a9f8 100644
--- a/arc-firefox-theme/chrome/browser/preferences/preferences.css
+++ b/arc-firefox-theme/chrome/browser/preferences/preferences.css
@@ -54,7 +54,7 @@
 
 #advancedPrefs {
   margin-left: 0;
-  margin-right: 0; 
+  margin-right: 0;
 }
 
 #cookiesChildren::-moz-tree-image(domainCol, container) {
@@ -97,7 +97,6 @@
 }
 
 #noFxaAccount {
-  margin: 5px;
   line-height: 1.2em;
 }
 
diff --git a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
index 1e89eed..90b5124 100644
--- a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
+++ b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
@@ -1009,7 +1009,7 @@ toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-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"][panel-multiview-anchor=true] > .toolbarbutton-icon,
 :-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"][panel-multiview-anchor=true] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
 :-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"][panel-multiview-anchor=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor;
 }
 
@@ -1546,6 +1546,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   visibility: visible;
 }
 
+#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon,
 #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon {
   list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon);
   visibility: visible;
@@ -1557,13 +1560,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   visibility: visible;
 }
 
-#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon {
-  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon);
-  visibility: visible;
-}
-
 
 #identity-icon:-moz-lwtheme {
   list-style-image: url(chrome://browser/skin/identity-icon.svg#normal-black);
@@ -1604,6 +1600,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   visibility: visible;
 }
 
+#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme,
 #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme {
   list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black);
   visibility: visible;
@@ -1615,13 +1614,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   visibility: visible;
 }
 
-#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme {
-  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black);
-  visibility: visible;
-}
-
 #identity-box {
   --identity-box-verified-color: hsl(92,100%,30%);
   --identity-box-chrome-color: rgb(229,115,0);
@@ -1727,10 +1719,11 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
 
 #identity-box[sharing] > #identity-icon,
 #sharing-icon {
-  animation: 3s linear pulse infinite;
+  animation: 3s linear identity-box-sharing-icon-pulse infinite;
 }
 
-@keyframes pulse {
+/* This should remain identical to tab-sharing-icon-pulse in tabs.inc.css */
+@keyframes identity-box-sharing-icon-pulse {
   0%, 16.66%, 83.33%, 100% {
     opacity: 0;
   }
@@ -1793,31 +1786,15 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
    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);
-}
-
-@media (min-resolution: 1.1dppx) {
-  .notification-anchor-icon {
-    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog);
-  }
-}
-
-.popup-notification-icon {
-  width: 64px;
-  height: 64px;
-  margin-inline-end: 10px;
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#default-info);
 }
 
 .notification-anchor-icon:not(.plugin-blocked):-moz-lwtheme,
 #blocked-permissions-container > .blocked-permission-icon:-moz-lwtheme {
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor;
 }
 
-.notification-anchor-icon:not(.plugin-blocked):not(:hover) {
-  opacity: .8;
-}
-
 /* INDIVIDUAL NOTIFICATIONS */
 
 .popup-notification-icon[popupid="web-notifications"],
@@ -2063,6 +2040,29 @@ html|*#webRTC-previewVideo {
   font-weight: bold;
 }
 
+.addon-webext-perm-header {
+  font-size: 1.3em;
+}
+
+.addon-webext-name {
+  font-weight: bold;
+  margin: 0;
+}
+
+.addon-addon-icon {
+  width: 14px;
+  height: 14px;
+  list-style-image: url("chrome://browser/skin/menuPanel.svg");
+  -moz-image-region: rect(0px, 288px, 32px, 256px);
+}
+
+.addon-toolbar-icon {
+  width: 14px;
+  height: 14px;
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  -moz-image-region: rect(0, 486px, 18px, 468px);
+}
+
 /* Notification icon box */
 
 .notification-anchor-icon:-moz-focusring {
@@ -2315,14 +2315,13 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   border: 1px solid transparent;
 }
 
-.autocomplete-richlistitem[selected=true] {
-  background-color: Highlight;
-}
-
 .ac-title {
   font-size: 1.05em;
 }
 
+.ac-separator,
+.ac-url,
+.ac-action,
 .ac-tags {
   font-size: 0.9em;
 }
@@ -2335,20 +2334,12 @@ html|span.ac-tag {
   padding: 0 1px;
 }
 
-.ac-separator,
-.ac-url,
-.ac-action {
-  font-size: 0.9em;
+.ac-separator:not([selected=true]),
+.ac-url:not([selected=true]),
+.ac-action:not([selected=true]) {
   color: -moz-nativehyperlinktext;
 }
 
-.ac-title[selected=true],
-.ac-separator[selected],
-.ac-url[selected=true],
-.ac-action[selected=true] {
-  color: inherit !important;
-}
-
 .ac-tags-text[selected] > html|span.ac-tag {
   background-color: HighlightText;
   color: Highlight;
@@ -2368,30 +2359,16 @@ html|span.ac-emphasize-text-url {
   list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted");
 }
 
-.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/autocomplete-star.png");
-  width: 16px;
-  height: 16px;
-}
-
 .ac-type-icon[type=keyword],
-.ac-site-icon[type=searchengine],
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
+.ac-site-icon[type=searchengine] {
   list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon);
 }
 
 .ac-type-icon[type=keyword][selected],
-.ac-site-icon[type=searchengine][selected],
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) {
+.ac-site-icon[type=searchengine][selected] {
   list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted);
 }
 
-.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/tag.png");
-  width: 16px;
-  height: 16px;
-}
-
 .ac-type-icon[type=switchtab],
 .ac-type-icon[type=remotetab] {
   list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab");
@@ -2865,10 +2842,11 @@ html|span.ac-emphasize-text-url {
 
 .tab-icon-image[sharing]:not([selected]),
 .tab-sharing-icon-overlay {
-  animation: 3s linear pulse infinite;
+  animation: 3s linear tab-sharing-icon-pulse infinite;
 }
 
-@keyframes pulse {
+/* This should remain identical to identity-box-sharing-icon-pulse in identity-block.inc.css */
+@keyframes tab-sharing-icon-pulse {
   0%, 16.66%, 83.33%, 100% {
     opacity: 0;
   }
@@ -2980,7 +2958,7 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound[muted],
 .tab-icon-sound[blocked] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor;
 }
 
@@ -2995,13 +2973,13 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound:-moz-lwtheme-darktext[soundplaying],
 .tab-icon-sound:-moz-lwtheme-darktext[muted],
 .tab-icon-sound:-moz-lwtheme-darktext[blocked] {
-  filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px white);
+  filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px white);
 }
 
 .tab-icon-sound:-moz-lwtheme-brighttext[soundplaying],
 .tab-icon-sound:-moz-lwtheme-brighttext[muted],
 .tab-icon-sound:-moz-lwtheme-brighttext[blocked] {
-  filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px black);
+  filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px black);
 }
 
 .tab-icon-sound[soundplaying]:not(:hover),
@@ -3277,7 +3255,7 @@ html|span.ac-emphasize-text-url {
 .alltabs-endimage[muted],
 .alltabs-endimage[blocked] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor;
 }
 
@@ -3964,7 +3942,7 @@ html|*.pointerlockfswarning-exit-button {
 /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
    We are copy/pasting variables from light-theme and dark-theme,
    since they aren't loaded in this context (within browser.css). */
-:root[devtoolstheme="light"] #developer-toolbar {
+#browser-bottombox[devtoolstheme="light"] #developer-toolbar {
   --gcli-background-color: #fcfcfc; /* --theme-tab-toolbar-background */
   --gcli-input-background: #fcfcfc; /* --theme-toolbar-background */
   --gcli-input-focused-background: #ffffff; /* --theme-sidebar-background */
@@ -3976,7 +3954,7 @@ html|*.pointerlockfswarning-exit-button {
   --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 {
+#browser-bottombox[devtoolstheme="dark"] #developer-toolbar {
   --gcli-background-color: #272b35; /* --theme-toolbar-background */
   --gcli-input-background: #272b35; /* --theme-tab-toolbar-background */
   --gcli-input-focused-background: #272b35; /* --theme-tab-toolbar-background */
@@ -4009,8 +3987,8 @@ html|*.pointerlockfswarning-exit-button {
   margin: auto 10px;
 }
 
-:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image,
-:root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before  {
+#browser-bottombox[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image,
+#browser-bottombox[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before  {
   filter: invert(1);
 }
 
@@ -4020,7 +3998,7 @@ html|*.pointerlockfswarning-exit-button {
 }
 
 /* The toolkit close button is low contrast in the dark theme so invert it. */
-:root[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image {
+#browser-bottombox[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image {
   filter: invert(1);
 }
 
@@ -4614,7 +4592,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   width: 20px;
   height: 20px;
   border-radius: 2px;
-  background-image: url("chrome://browser/skin/theme-switcher-icon.png");
+  background-image: url("chrome://browser/content/default-theme-icon.svg");
   background-size: contain;
 }
 
@@ -4783,7 +4761,7 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring {
 }
 
 .customization-lwtheme-menu-theme[defaulttheme] {
-  list-style-image: url(chrome://browser/skin/theme-switcher-icon.png);
+  list-style-image: url(chrome://browser/content/default-theme-icon.svg);
 }
 
 .customization-lwtheme-menu-theme[active="true"],
@@ -5292,7 +5270,7 @@ notification.heartbeat {
 }
 
 /**
- * Override the --panel-arrowcontent-padding so the background extends
+ * Override the --arrowpanel-padding so the background extends
  * to the sides and bottom of the panel.
  */
 #UITourTooltipButtons {
@@ -5314,7 +5292,7 @@ notification.heartbeat {
   width: 16px;
   height: 16px;
   margin: 7px;
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor;
 }
 
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-dark.css b/arc-firefox-theme/chrome/browser/sass/browser-dark.css
index 4a15269..1171e26 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-dark.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-dark.css
@@ -760,7 +760,7 @@ toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-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"][panel-multiview-anchor=true] > .toolbarbutton-icon,
 :-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"][panel-multiview-anchor=true] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
 :-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"][panel-multiview-anchor=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 #home-button[cui-areatype="menu-panel"],
@@ -1154,6 +1154,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-secure.svg);
   visibility: visible; }
 
+#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon,
 #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon {
   list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon);
   visibility: visible; }
@@ -1163,12 +1166,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon);
   visibility: visible; }
 
-#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon {
-  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon);
-  visibility: visible; }
-
 #identity-icon:-moz-lwtheme {
   list-style-image: url(chrome://browser/skin/identity-icon.svg#normal-black); }
 
@@ -1198,6 +1195,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-secure.svg);
   visibility: visible; }
 
+#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme,
 #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme {
   list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black);
   visibility: visible; }
@@ -1207,12 +1207,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon-black);
   visibility: visible; }
 
-#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme {
-  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black);
-  visibility: visible; }
-
 #identity-box {
   --identity-box-verified-color: #479900;
   --identity-box-chrome-color: #e57300;
@@ -1281,9 +1275,10 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
 
 #identity-box[sharing] > #identity-icon,
 #sharing-icon {
-  animation: 3s linear pulse infinite; }
+  animation: 3s linear identity-box-sharing-icon-pulse infinite; }
 
-@keyframes pulse {
+/* This should remain identical to tab-sharing-icon-pulse in tabs.inc.css */
+@keyframes identity-box-sharing-icon-pulse {
   0%, 16.66%, 83.33%, 100% {
     opacity: 0; }
   33.33%, 66.66% {
@@ -1331,24 +1326,13 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
    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); }
-
-@media (min-resolution: 1.1dppx) {
-  .notification-anchor-icon {
-    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); } }
-.popup-notification-icon {
-  width: 64px;
-  height: 64px;
-  margin-inline-end: 10px; }
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#default-info); }
 
 .notification-anchor-icon:not(.plugin-blocked):-moz-lwtheme,
 #blocked-permissions-container > .blocked-permission-icon:-moz-lwtheme {
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
-.notification-anchor-icon:not(.plugin-blocked):not(:hover) {
-  opacity: .8; }
-
 /* INDIVIDUAL NOTIFICATIONS */
 .popup-notification-icon[popupid="web-notifications"],
 .desktop-notification-icon {
@@ -1536,6 +1520,25 @@ html|*#webRTC-previewVideo {
 .addon-install-confirmation-name {
   font-weight: bold; }
 
+.addon-webext-perm-header {
+  font-size: 1.3em; }
+
+.addon-webext-name {
+  font-weight: bold;
+  margin: 0; }
+
+.addon-addon-icon {
+  width: 14px;
+  height: 14px;
+  list-style-image: url("chrome://browser/skin/menuPanel.svg");
+  -moz-image-region: rect(0px, 288px, 32px, 256px); }
+
+.addon-toolbar-icon {
+  width: 14px;
+  height: 14px;
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  -moz-image-region: rect(0, 486px, 18px, 468px); }
+
 /* Notification icon box */
 .notification-anchor-icon:-moz-focusring {
   outline: 1px dotted -moz-DialogText; }
@@ -1733,12 +1736,12 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   border-radius: 2px;
   border: 1px solid transparent; }
 
-.autocomplete-richlistitem[selected=true] {
-  background-color: Highlight; }
-
 .ac-title {
   font-size: 1.05em; }
 
+.ac-separator,
+.ac-url,
+.ac-action,
 .ac-tags {
   font-size: 0.9em; }
 
@@ -1749,18 +1752,11 @@ html|span.ac-tag {
   border: 1px solid transparent;
   padding: 0 1px; }
 
-.ac-separator,
-.ac-url,
-.ac-action {
-  font-size: 0.9em;
+.ac-separator:not([selected=true]),
+.ac-url:not([selected=true]),
+.ac-action:not([selected=true]) {
   color: -moz-nativehyperlinktext; }
 
-.ac-title[selected=true],
-.ac-separator[selected],
-.ac-url[selected=true],
-.ac-action[selected=true] {
-  color: inherit !important; }
-
 .ac-tags-text[selected] > html|span.ac-tag {
   background-color: HighlightText;
   color: Highlight; }
@@ -1776,26 +1772,14 @@ html|span.ac-emphasize-text-url {
 .ac-type-icon[type=bookmark][selected][current] {
   list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted"); }
 
-.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/autocomplete-star.png");
-  width: 16px;
-  height: 16px; }
-
 .ac-type-icon[type=keyword],
-.ac-site-icon[type=searchengine],
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
+.ac-site-icon[type=searchengine] {
   list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); }
 
 .ac-type-icon[type=keyword][selected],
-.ac-site-icon[type=searchengine][selected],
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) {
+.ac-site-icon[type=searchengine][selected] {
   list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted); }
 
-.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/tag.png");
-  width: 16px;
-  height: 16px; }
-
 .ac-type-icon[type=switchtab],
 .ac-type-icon[type=remotetab] {
   list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab"); }
@@ -2158,9 +2142,10 @@ html|span.ac-emphasize-text-url {
 
 .tab-icon-image[sharing]:not([selected]),
 .tab-sharing-icon-overlay {
-  animation: 3s linear pulse infinite; }
+  animation: 3s linear tab-sharing-icon-pulse infinite; }
 
-@keyframes pulse {
+/* This should remain identical to identity-box-sharing-icon-pulse in identity-block.inc.css */
+@keyframes tab-sharing-icon-pulse {
   0%, 16.66%, 83.33%, 100% {
     opacity: 0; }
   33.33%, 66.66% {
@@ -2236,7 +2221,7 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound[muted],
 .tab-icon-sound[blocked] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 .tab-icon-sound[muted] {
@@ -2248,12 +2233,12 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound:-moz-lwtheme-darktext[soundplaying],
 .tab-icon-sound:-moz-lwtheme-darktext[muted],
 .tab-icon-sound:-moz-lwtheme-darktext[blocked] {
-  filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); }
+  filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); }
 
 .tab-icon-sound:-moz-lwtheme-brighttext[soundplaying],
 .tab-icon-sound:-moz-lwtheme-brighttext[muted],
 .tab-icon-sound:-moz-lwtheme-brighttext[blocked] {
-  filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); }
+  filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); }
 
 .tab-icon-sound[soundplaying]:not(:hover),
 .tab-icon-sound[muted]:not(:hover),
@@ -2454,7 +2439,7 @@ lwtHeader;*/
 .alltabs-endimage[muted],
 .alltabs-endimage[blocked] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 .alltabs-endimage[muted] {
@@ -2987,7 +2972,7 @@ html|*.pointerlockfswarning-exit-button {
 /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
    We are copy/pasting variables from light-theme and dark-theme,
    since they aren't loaded in this context (within browser.css). */
-:root[devtoolstheme="light"] #developer-toolbar {
+#browser-bottombox[devtoolstheme="light"] #developer-toolbar {
   --gcli-background-color: #fcfcfc;
   /* --theme-tab-toolbar-background */
   --gcli-input-background: #fcfcfc;
@@ -3007,7 +2992,7 @@ html|*.pointerlockfswarning-exit-button {
   --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 {
+#browser-bottombox[devtoolstheme="dark"] #developer-toolbar {
   --gcli-background-color: #272b35;
   /* --theme-toolbar-background */
   --gcli-input-background: #272b35;
@@ -3045,8 +3030,8 @@ html|*.pointerlockfswarning-exit-button {
 .developer-toolbar-button > image {
   margin: auto 10px; }
 
-:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image,
-:root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before {
+#browser-bottombox[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image,
+#browser-bottombox[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before {
   filter: invert(1); }
 
 .developer-toolbar-button > .toolbarbutton-icon {
@@ -3054,7 +3039,7 @@ html|*.pointerlockfswarning-exit-button {
   height: 16px; }
 
 /* The toolkit close button is low contrast in the dark theme so invert it. */
-:root[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image {
+#browser-bottombox[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image {
   filter: invert(1); }
 
 #developer-toolbar-toolbox-button {
@@ -3534,7 +3519,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   width: 20px;
   height: 20px;
   border-radius: 2px;
-  background-image: url("chrome://browser/skin/theme-switcher-icon.png");
+  background-image: url("chrome://browser/content/default-theme-icon.svg");
   background-size: contain; }
 
 #main-window[customize-entered] #customization-panel-container {
@@ -3671,7 +3656,7 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring {
   padding-inline-start: 0; }
 
 .customization-lwtheme-menu-theme[defaulttheme] {
-  list-style-image: url(chrome://browser/skin/theme-switcher-icon.png); }
+  list-style-image: url(chrome://browser/content/default-theme-icon.svg); }
 
 .customization-lwtheme-menu-theme[active="true"],
 .customization-lwtheme-menu-theme:hover {
@@ -4086,7 +4071,7 @@ notification.heartbeat {
   width: 16px; }
 
 /**
- * Override the --panel-arrowcontent-padding so the background extends
+ * Override the --arrowpanel-padding so the background extends
  * to the sides and bottom of the panel.
  */
 #UITourTooltipButtons {
@@ -4105,7 +4090,7 @@ notification.heartbeat {
   width: 16px;
   height: 16px;
   margin: 7px;
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 #context-back {
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-darker.css b/arc-firefox-theme/chrome/browser/sass/browser-darker.css
index f48dd3c..ddc4dfd 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-darker.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-darker.css
@@ -760,7 +760,7 @@ toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-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"][panel-multiview-anchor=true] > .toolbarbutton-icon,
 :-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"][panel-multiview-anchor=true] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
 :-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"][panel-multiview-anchor=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 #home-button[cui-areatype="menu-panel"],
@@ -1153,6 +1153,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-secure.svg);
   visibility: visible; }
 
+#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon,
 #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon {
   list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon);
   visibility: visible; }
@@ -1162,12 +1165,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon);
   visibility: visible; }
 
-#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon {
-  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon);
-  visibility: visible; }
-
 #identity-icon:-moz-lwtheme {
   list-style-image: url(chrome://browser/skin/identity-icon.svg#normal-black); }
 
@@ -1197,6 +1194,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-secure.svg);
   visibility: visible; }
 
+#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme,
 #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme {
   list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black);
   visibility: visible; }
@@ -1206,12 +1206,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon-black);
   visibility: visible; }
 
-#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme {
-  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black);
-  visibility: visible; }
-
 #identity-box {
   --identity-box-verified-color: #479900;
   --identity-box-chrome-color: #e57300;
@@ -1280,9 +1274,10 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
 
 #identity-box[sharing] > #identity-icon,
 #sharing-icon {
-  animation: 3s linear pulse infinite; }
+  animation: 3s linear identity-box-sharing-icon-pulse infinite; }
 
-@keyframes pulse {
+/* This should remain identical to tab-sharing-icon-pulse in tabs.inc.css */
+@keyframes identity-box-sharing-icon-pulse {
   0%, 16.66%, 83.33%, 100% {
     opacity: 0; }
   33.33%, 66.66% {
@@ -1330,24 +1325,13 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
    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); }
-
-@media (min-resolution: 1.1dppx) {
-  .notification-anchor-icon {
-    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); } }
-.popup-notification-icon {
-  width: 64px;
-  height: 64px;
-  margin-inline-end: 10px; }
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#default-info); }
 
 .notification-anchor-icon:not(.plugin-blocked):-moz-lwtheme,
 #blocked-permissions-container > .blocked-permission-icon:-moz-lwtheme {
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
-.notification-anchor-icon:not(.plugin-blocked):not(:hover) {
-  opacity: .8; }
-
 /* INDIVIDUAL NOTIFICATIONS */
 .popup-notification-icon[popupid="web-notifications"],
 .desktop-notification-icon {
@@ -1535,6 +1519,25 @@ html|*#webRTC-previewVideo {
 .addon-install-confirmation-name {
   font-weight: bold; }
 
+.addon-webext-perm-header {
+  font-size: 1.3em; }
+
+.addon-webext-name {
+  font-weight: bold;
+  margin: 0; }
+
+.addon-addon-icon {
+  width: 14px;
+  height: 14px;
+  list-style-image: url("chrome://browser/skin/menuPanel.svg");
+  -moz-image-region: rect(0px, 288px, 32px, 256px); }
+
+.addon-toolbar-icon {
+  width: 14px;
+  height: 14px;
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  -moz-image-region: rect(0, 486px, 18px, 468px); }
+
 /* Notification icon box */
 .notification-anchor-icon:-moz-focusring {
   outline: 1px dotted -moz-DialogText; }
@@ -1732,12 +1735,12 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   border-radius: 2px;
   border: 1px solid transparent; }
 
-.autocomplete-richlistitem[selected=true] {
-  background-color: Highlight; }
-
 .ac-title {
   font-size: 1.05em; }
 
+.ac-separator,
+.ac-url,
+.ac-action,
 .ac-tags {
   font-size: 0.9em; }
 
@@ -1748,18 +1751,11 @@ html|span.ac-tag {
   border: 1px solid transparent;
   padding: 0 1px; }
 
-.ac-separator,
-.ac-url,
-.ac-action {
-  font-size: 0.9em;
+.ac-separator:not([selected=true]),
+.ac-url:not([selected=true]),
+.ac-action:not([selected=true]) {
   color: -moz-nativehyperlinktext; }
 
-.ac-title[selected=true],
-.ac-separator[selected],
-.ac-url[selected=true],
-.ac-action[selected=true] {
-  color: inherit !important; }
-
 .ac-tags-text[selected] > html|span.ac-tag {
   background-color: HighlightText;
   color: Highlight; }
@@ -1775,26 +1771,14 @@ html|span.ac-emphasize-text-url {
 .ac-type-icon[type=bookmark][selected][current] {
   list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted"); }
 
-.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/autocomplete-star.png");
-  width: 16px;
-  height: 16px; }
-
 .ac-type-icon[type=keyword],
-.ac-site-icon[type=searchengine],
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
+.ac-site-icon[type=searchengine] {
   list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); }
 
 .ac-type-icon[type=keyword][selected],
-.ac-site-icon[type=searchengine][selected],
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) {
+.ac-site-icon[type=searchengine][selected] {
   list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted); }
 
-.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/tag.png");
-  width: 16px;
-  height: 16px; }
-
 .ac-type-icon[type=switchtab],
 .ac-type-icon[type=remotetab] {
   list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab"); }
@@ -2158,9 +2142,10 @@ html|span.ac-emphasize-text-url {
 
 .tab-icon-image[sharing]:not([selected]),
 .tab-sharing-icon-overlay {
-  animation: 3s linear pulse infinite; }
+  animation: 3s linear tab-sharing-icon-pulse infinite; }
 
-@keyframes pulse {
+/* This should remain identical to identity-box-sharing-icon-pulse in identity-block.inc.css */
+@keyframes tab-sharing-icon-pulse {
   0%, 16.66%, 83.33%, 100% {
     opacity: 0; }
   33.33%, 66.66% {
@@ -2236,7 +2221,7 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound[muted],
 .tab-icon-sound[blocked] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 .tab-icon-sound[muted] {
@@ -2248,12 +2233,12 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound:-moz-lwtheme-darktext[soundplaying],
 .tab-icon-sound:-moz-lwtheme-darktext[muted],
 .tab-icon-sound:-moz-lwtheme-darktext[blocked] {
-  filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); }
+  filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); }
 
 .tab-icon-sound:-moz-lwtheme-brighttext[soundplaying],
 .tab-icon-sound:-moz-lwtheme-brighttext[muted],
 .tab-icon-sound:-moz-lwtheme-brighttext[blocked] {
-  filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); }
+  filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); }
 
 .tab-icon-sound[soundplaying]:not(:hover),
 .tab-icon-sound[muted]:not(:hover),
@@ -2454,7 +2439,7 @@ lwtHeader;*/
 .alltabs-endimage[muted],
 .alltabs-endimage[blocked] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 .alltabs-endimage[muted] {
@@ -2987,7 +2972,7 @@ html|*.pointerlockfswarning-exit-button {
 /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
    We are copy/pasting variables from light-theme and dark-theme,
    since they aren't loaded in this context (within browser.css). */
-:root[devtoolstheme="light"] #developer-toolbar {
+#browser-bottombox[devtoolstheme="light"] #developer-toolbar {
   --gcli-background-color: #fcfcfc;
   /* --theme-tab-toolbar-background */
   --gcli-input-background: #fcfcfc;
@@ -3007,7 +2992,7 @@ html|*.pointerlockfswarning-exit-button {
   --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 {
+#browser-bottombox[devtoolstheme="dark"] #developer-toolbar {
   --gcli-background-color: #272b35;
   /* --theme-toolbar-background */
   --gcli-input-background: #272b35;
@@ -3045,8 +3030,8 @@ html|*.pointerlockfswarning-exit-button {
 .developer-toolbar-button > image {
   margin: auto 10px; }
 
-:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image,
-:root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before {
+#browser-bottombox[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image,
+#browser-bottombox[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before {
   filter: invert(1); }
 
 .developer-toolbar-button > .toolbarbutton-icon {
@@ -3054,7 +3039,7 @@ html|*.pointerlockfswarning-exit-button {
   height: 16px; }
 
 /* The toolkit close button is low contrast in the dark theme so invert it. */
-:root[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image {
+#browser-bottombox[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image {
   filter: invert(1); }
 
 #developer-toolbar-toolbox-button {
@@ -3534,7 +3519,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   width: 20px;
   height: 20px;
   border-radius: 2px;
-  background-image: url("chrome://browser/skin/theme-switcher-icon.png");
+  background-image: url("chrome://browser/content/default-theme-icon.svg");
   background-size: contain; }
 
 #main-window[customize-entered] #customization-panel-container {
@@ -3671,7 +3656,7 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring {
   padding-inline-start: 0; }
 
 .customization-lwtheme-menu-theme[defaulttheme] {
-  list-style-image: url(chrome://browser/skin/theme-switcher-icon.png); }
+  list-style-image: url(chrome://browser/content/default-theme-icon.svg); }
 
 .customization-lwtheme-menu-theme[active="true"],
 .customization-lwtheme-menu-theme:hover {
@@ -4086,7 +4071,7 @@ notification.heartbeat {
   width: 16px; }
 
 /**
- * Override the --panel-arrowcontent-padding so the background extends
+ * Override the --arrowpanel-padding so the background extends
  * to the sides and bottom of the panel.
  */
 #UITourTooltipButtons {
@@ -4105,7 +4090,7 @@ notification.heartbeat {
   width: 16px;
   height: 16px;
   margin: 7px;
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 #context-back {
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-light.css b/arc-firefox-theme/chrome/browser/sass/browser-light.css
index 6ccccc4..e3de08a 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-light.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-light.css
@@ -760,7 +760,7 @@ toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-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"][panel-multiview-anchor=true] > .toolbarbutton-icon,
 :-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"][panel-multiview-anchor=true] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
 :-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"][panel-multiview-anchor=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 #home-button[cui-areatype="menu-panel"],
@@ -1153,6 +1153,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-secure.svg);
   visibility: visible; }
 
+#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon,
 #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon {
   list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon);
   visibility: visible; }
@@ -1162,12 +1165,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon);
   visibility: visible; }
 
-#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon {
-  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon);
-  visibility: visible; }
-
 #identity-icon:-moz-lwtheme {
   list-style-image: url(chrome://browser/skin/identity-icon.svg#normal-black); }
 
@@ -1197,6 +1194,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-secure.svg);
   visibility: visible; }
 
+#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme,
 #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme {
   list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black);
   visibility: visible; }
@@ -1206,12 +1206,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
   list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon-black);
   visibility: visible; }
 
-#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme {
-  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black);
-  visibility: visible; }
-
 #identity-box {
   --identity-box-verified-color: #479900;
   --identity-box-chrome-color: #e57300;
@@ -1280,9 +1274,10 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
 
 #identity-box[sharing] > #identity-icon,
 #sharing-icon {
-  animation: 3s linear pulse infinite; }
+  animation: 3s linear identity-box-sharing-icon-pulse infinite; }
 
-@keyframes pulse {
+/* This should remain identical to tab-sharing-icon-pulse in tabs.inc.css */
+@keyframes identity-box-sharing-icon-pulse {
   0%, 16.66%, 83.33%, 100% {
     opacity: 0; }
   33.33%, 66.66% {
@@ -1330,24 +1325,13 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
    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); }
-
-@media (min-resolution: 1.1dppx) {
-  .notification-anchor-icon {
-    list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); } }
-.popup-notification-icon {
-  width: 64px;
-  height: 64px;
-  margin-inline-end: 10px; }
+  list-style-image: url(chrome://browser/skin/notification-icons.svg#default-info); }
 
 .notification-anchor-icon:not(.plugin-blocked):-moz-lwtheme,
 #blocked-permissions-container > .blocked-permission-icon:-moz-lwtheme {
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
-.notification-anchor-icon:not(.plugin-blocked):not(:hover) {
-  opacity: .8; }
-
 /* INDIVIDUAL NOTIFICATIONS */
 .popup-notification-icon[popupid="web-notifications"],
 .desktop-notification-icon {
@@ -1535,6 +1519,25 @@ html|*#webRTC-previewVideo {
 .addon-install-confirmation-name {
   font-weight: bold; }
 
+.addon-webext-perm-header {
+  font-size: 1.3em; }
+
+.addon-webext-name {
+  font-weight: bold;
+  margin: 0; }
+
+.addon-addon-icon {
+  width: 14px;
+  height: 14px;
+  list-style-image: url("chrome://browser/skin/menuPanel.svg");
+  -moz-image-region: rect(0px, 288px, 32px, 256px); }
+
+.addon-toolbar-icon {
+  width: 14px;
+  height: 14px;
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  -moz-image-region: rect(0, 486px, 18px, 468px); }
+
 /* Notification icon box */
 .notification-anchor-icon:-moz-focusring {
   outline: 1px dotted -moz-DialogText; }
@@ -1732,12 +1735,12 @@ notification[value="translation"] menulist > .menulist-dropmarker {
   border-radius: 2px;
   border: 1px solid transparent; }
 
-.autocomplete-richlistitem[selected=true] {
-  background-color: Highlight; }
-
 .ac-title {
   font-size: 1.05em; }
 
+.ac-separator,
+.ac-url,
+.ac-action,
 .ac-tags {
   font-size: 0.9em; }
 
@@ -1748,18 +1751,11 @@ html|span.ac-tag {
   border: 1px solid transparent;
   padding: 0 1px; }
 
-.ac-separator,
-.ac-url,
-.ac-action {
-  font-size: 0.9em;
+.ac-separator:not([selected=true]),
+.ac-url:not([selected=true]),
+.ac-action:not([selected=true]) {
   color: -moz-nativehyperlinktext; }
 
-.ac-title[selected=true],
-.ac-separator[selected],
-.ac-url[selected=true],
-.ac-action[selected=true] {
-  color: inherit !important; }
-
 .ac-tags-text[selected] > html|span.ac-tag {
   background-color: HighlightText;
   color: Highlight; }
@@ -1775,26 +1771,14 @@ html|span.ac-emphasize-text-url {
 .ac-type-icon[type=bookmark][selected][current] {
   list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted"); }
 
-.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/autocomplete-star.png");
-  width: 16px;
-  height: 16px; }
-
 .ac-type-icon[type=keyword],
-.ac-site-icon[type=searchengine],
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
+.ac-site-icon[type=searchengine] {
   list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); }
 
 .ac-type-icon[type=keyword][selected],
-.ac-site-icon[type=searchengine][selected],
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) {
+.ac-site-icon[type=searchengine][selected] {
   list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted); }
 
-.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/tag.png");
-  width: 16px;
-  height: 16px; }
-
 .ac-type-icon[type=switchtab],
 .ac-type-icon[type=remotetab] {
   list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab"); }
@@ -2158,9 +2142,10 @@ html|span.ac-emphasize-text-url {
 
 .tab-icon-image[sharing]:not([selected]),
 .tab-sharing-icon-overlay {
-  animation: 3s linear pulse infinite; }
+  animation: 3s linear tab-sharing-icon-pulse infinite; }
 
-@keyframes pulse {
+/* This should remain identical to identity-box-sharing-icon-pulse in identity-block.inc.css */
+@keyframes tab-sharing-icon-pulse {
   0%, 16.66%, 83.33%, 100% {
     opacity: 0; }
   33.33%, 66.66% {
@@ -2236,7 +2221,7 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound[muted],
 .tab-icon-sound[blocked] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 .tab-icon-sound[muted] {
@@ -2248,12 +2233,12 @@ html|span.ac-emphasize-text-url {
 .tab-icon-sound:-moz-lwtheme-darktext[soundplaying],
 .tab-icon-sound:-moz-lwtheme-darktext[muted],
 .tab-icon-sound:-moz-lwtheme-darktext[blocked] {
-  filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); }
+  filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); }
 
 .tab-icon-sound:-moz-lwtheme-brighttext[soundplaying],
 .tab-icon-sound:-moz-lwtheme-brighttext[muted],
 .tab-icon-sound:-moz-lwtheme-brighttext[blocked] {
-  filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); }
+  filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); }
 
 .tab-icon-sound[soundplaying]:not(:hover),
 .tab-icon-sound[muted]:not(:hover),
@@ -2454,7 +2439,7 @@ lwtHeader;*/
 .alltabs-endimage[muted],
 .alltabs-endimage[blocked] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 .alltabs-endimage[muted] {
@@ -2987,7 +2972,7 @@ html|*.pointerlockfswarning-exit-button {
 /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
    We are copy/pasting variables from light-theme and dark-theme,
    since they aren't loaded in this context (within browser.css). */
-:root[devtoolstheme="light"] #developer-toolbar {
+#browser-bottombox[devtoolstheme="light"] #developer-toolbar {
   --gcli-background-color: #fcfcfc;
   /* --theme-tab-toolbar-background */
   --gcli-input-background: #fcfcfc;
@@ -3007,7 +2992,7 @@ html|*.pointerlockfswarning-exit-button {
   --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 {
+#browser-bottombox[devtoolstheme="dark"] #developer-toolbar {
   --gcli-background-color: #272b35;
   /* --theme-toolbar-background */
   --gcli-input-background: #272b35;
@@ -3045,8 +3030,8 @@ html|*.pointerlockfswarning-exit-button {
 .developer-toolbar-button > image {
   margin: auto 10px; }
 
-:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image,
-:root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before {
+#browser-bottombox[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image,
+#browser-bottombox[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before {
   filter: invert(1); }
 
 .developer-toolbar-button > .toolbarbutton-icon {
@@ -3054,7 +3039,7 @@ html|*.pointerlockfswarning-exit-button {
   height: 16px; }
 
 /* The toolkit close button is low contrast in the dark theme so invert it. */
-:root[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image {
+#browser-bottombox[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image {
   filter: invert(1); }
 
 #developer-toolbar-toolbox-button {
@@ -3534,7 +3519,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   width: 20px;
   height: 20px;
   border-radius: 2px;
-  background-image: url("chrome://browser/skin/theme-switcher-icon.png");
+  background-image: url("chrome://browser/content/default-theme-icon.svg");
   background-size: contain; }
 
 #main-window[customize-entered] #customization-panel-container {
@@ -3671,7 +3656,7 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring {
   padding-inline-start: 0; }
 
 .customization-lwtheme-menu-theme[defaulttheme] {
-  list-style-image: url(chrome://browser/skin/theme-switcher-icon.png); }
+  list-style-image: url(chrome://browser/content/default-theme-icon.svg); }
 
 .customization-lwtheme-menu-theme[active="true"],
 .customization-lwtheme-menu-theme:hover {
@@ -4086,7 +4071,7 @@ notification.heartbeat {
   width: 16px; }
 
 /**
- * Override the --panel-arrowcontent-padding so the background extends
+ * Override the --arrowpanel-padding so the background extends
  * to the sides and bottom of the panel.
  */
 #UITourTooltipButtons {
@@ -4105,7 +4090,7 @@ notification.heartbeat {
   width: 16px;
   height: 16px;
   margin: 7px;
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor; }
 
 #context-back {
diff --git a/arc-firefox-theme/chrome/browser/searchReset.css b/arc-firefox-theme/chrome/browser/searchReset.css
index 3573d7d..8005073 100644
--- a/arc-firefox-theme/chrome/browser/searchReset.css
+++ b/arc-firefox-theme/chrome/browser/searchReset.css
@@ -17,6 +17,6 @@ body {
   background-size: 16px, 16px;
 }
 
-#defaultEngine:-moz-dir(rtl) {
+#defaultEngine: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 cb4103d..a07413c 100644
--- a/arc-firefox-theme/chrome/browser/searchbar.css
+++ b/arc-firefox-theme/chrome/browser/searchbar.css
@@ -266,6 +266,11 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
   color: HighlightText;
 }
 
+.addengine-item[type=menu][selected] {
+  color: inherit;
+  background-color: var(--arrowpanel-dimmed-further);
+}
+
 .addengine-icon {
   width: 16px;
 }
@@ -277,7 +282,8 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
   list-style-image: url("chrome://browser/skin/badge-add-engine.png");
 }
 
-.addengine-item > .button-box > .button-text {
+.addengine-item > .button-box > .button-text,
+.addengine-item[type=menu] > .button-box > .box-inherit > .button-text {
   -moz-box-flex: 1;
   text-align: start;
   padding-inline-start: 10px;
@@ -297,6 +303,12 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
   }
 }
 
+.addengine-item[type=menu] > .button-box > .button-menu-dropmarker {
+  display: -moz-box;
+  -moz-appearance: menuarrow !important;
+  list-style-image: none;
+}
+
 .search-panel-tree > .autocomplete-treebody::-moz-tree-cell {
   border-top: none !important;
 }
@@ -331,6 +343,6 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 
 .search-setting-button-compact > .button-box > .button-icon {
   list-style-image: url("chrome://browser/skin/gear.svg");
-  filter: url(chrome://browser/skin/filters.svg#fill);
+  filter: url(chrome://global/skin/filters.svg#fill);
   fill: currentColor;
 }
diff --git a/arc-firefox-theme/chrome/browser/social/gear_clicked.png b/arc-firefox-theme/chrome/browser/social/gear_clicked.png
deleted file mode 100644
index 7c93aa7..0000000
--- a/arc-firefox-theme/chrome/browser/social/gear_clicked.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/social/gear_default.png b/arc-firefox-theme/chrome/browser/social/gear_default.png
deleted file mode 100644
index 2a9c8e1..0000000
--- a/arc-firefox-theme/chrome/browser/social/gear_default.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/social/share-button-active.png b/arc-firefox-theme/chrome/browser/social/share-button-active.png
deleted file mode 100644
index 7df438d..0000000
--- a/arc-firefox-theme/chrome/browser/social/share-button-active.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/social/share-button.png b/arc-firefox-theme/chrome/browser/social/share-button.png
deleted file mode 100644
index c5298c1..0000000
--- a/arc-firefox-theme/chrome/browser/social/share-button.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/syncProgress-menuPanel.png b/arc-firefox-theme/chrome/browser/syncProgress-menuPanel.png
deleted file mode 100644
index 6fd6f9c..0000000
--- a/arc-firefox-theme/chrome/browser/syncProgress-menuPanel.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/syncProgress-menuPanel@2x.png b/arc-firefox-theme/chrome/browser/syncProgress-menuPanel@2x.png
deleted file mode 100644
index 04b2cae..0000000
--- a/arc-firefox-theme/chrome/browser/syncProgress-menuPanel@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/syncProgress-toolbar-inverted.png b/arc-firefox-theme/chrome/browser/syncProgress-toolbar-inverted.png
deleted file mode 100644
index 4ede438..0000000
--- a/arc-firefox-theme/chrome/browser/syncProgress-toolbar-inverted.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/syncProgress-toolbar.png b/arc-firefox-theme/chrome/browser/syncProgress-toolbar.png
deleted file mode 100644
index 49e224f..0000000
--- a/arc-firefox-theme/chrome/browser/syncProgress-toolbar.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/theme-switcher-icon.png b/arc-firefox-theme/chrome/browser/theme-switcher-icon.png
deleted file mode 100644
index 891e7af..0000000
--- a/arc-firefox-theme/chrome/browser/theme-switcher-icon.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/theme-switcher-icon@2x.png b/arc-firefox-theme/chrome/browser/theme-switcher-icon@2x.png
deleted file mode 100644
index 286adfe..0000000
--- a/arc-firefox-theme/chrome/browser/theme-switcher-icon@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/webRTC-camera-white-16.png b/arc-firefox-theme/chrome/browser/webRTC-camera-white-16.png
deleted file mode 100644
index e1e360b..0000000
--- a/arc-firefox-theme/chrome/browser/webRTC-camera-white-16.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/webRTC-indicator.css b/arc-firefox-theme/chrome/browser/webRTC-indicator.css
index c22f942..938d643 100644
--- a/arc-firefox-theme/chrome/browser/webRTC-indicator.css
+++ b/arc-firefox-theme/chrome/browser/webRTC-indicator.css
@@ -29,7 +29,7 @@ window {
 }
 
 #screenShareButton {
-  background-image: url("webRTC-screen-white-16.png");
+  background-image: url("chrome://browser/skin/notification-icons.svg#screen-indicator");
   background-position: center center;
   background-repeat: no-repeat;
   background-size: 16px;
@@ -61,17 +61,17 @@ window[sharingaudio] > #audioVideoButton {
 }
 
 window[sharingvideo] > #audioVideoButton {
-  background-image: url("webRTC-camera-white-16.png");
+  background-image: url("chrome://browser/skin/notification-icons.svg#camera-indicator");
 }
 
 window[sharingaudio] > #audioVideoButton {
-  background-image: url("webRTC-microphone-white-16.png");
+  background-image: url("chrome://browser/skin/notification-icons.svg#microphone-indicator");
 }
 
 /* Multi-icon button: */
 window[sharingaudio][sharingvideo] > #audioVideoButton {
-  background-image: url("webRTC-camera-white-16.png"),
-                    url("webRTC-microphone-white-16.png");
+  background-image: url("chrome://browser/skin/notification-icons.svg#camera-indicator"),
+                    url("chrome://browser/skin/notification-icons.svg#microphone-indicator");
   background-position: 6px center, 26px center;
   background-size: 16px, 16px;
   min-width: 46px;
diff --git a/arc-firefox-theme/chrome/browser/webRTC-microphone-white-16.png b/arc-firefox-theme/chrome/browser/webRTC-microphone-white-16.png
deleted file mode 100644
index 0091529..0000000
--- a/arc-firefox-theme/chrome/browser/webRTC-microphone-white-16.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/webRTC-screen-white-16.png b/arc-firefox-theme/chrome/browser/webRTC-screen-white-16.png
deleted file mode 100644
index 045bfd3..0000000
--- a/arc-firefox-theme/chrome/browser/webRTC-screen-white-16.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/about.css b/arc-firefox-theme/chrome/global/about.css
index 25f5299..de37ccd 100644
--- a/arc-firefox-theme/chrome/global/about.css
+++ b/arc-firefox-theme/chrome/global/about.css
@@ -39,6 +39,7 @@ img {
   font-weight: bold;
   color: #909090;
   margin: -24px 0 9px 17px;
+  text-align: left; /* Override direction alignment on RTL to make sure that the version will fit well on the background. bug 1325232 */
 }
 
 ul {
diff --git a/arc-firefox-theme/chrome/global/aboutReader.css b/arc-firefox-theme/chrome/global/aboutReader.css
index 49436de..36945de 100644
--- a/arc-firefox-theme/chrome/global/aboutReader.css
+++ b/arc-firefox-theme/chrome/global/aboutReader.css
@@ -6,19 +6,6 @@ body {
   padding: 64px 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;
-  }
-}
-
 body.loaded {
   transition: color 0.4s, background-color 0.4s;
 }
diff --git a/arc-firefox-theme/chrome/global/aboutReaderContent.css b/arc-firefox-theme/chrome/global/aboutReaderContent.css
index 633391d..f69c17b 100644
--- a/arc-firefox-theme/chrome/global/aboutReaderContent.css
+++ b/arc-firefox-theme/chrome/global/aboutReaderContent.css
@@ -55,6 +55,7 @@
   figure,
   .wp-caption {
     margin: 0 0 10px 0 !important;
+    padding: 0 !important;
   }
 }
 
diff --git a/arc-firefox-theme/chrome/global/aboutReaderControls.css b/arc-firefox-theme/chrome/global/aboutReaderControls.css
index a624901..1acd81e 100644
--- a/arc-firefox-theme/chrome/global/aboutReaderControls.css
+++ b/arc-firefox-theme/chrome/global/aboutReaderControls.css
@@ -63,11 +63,16 @@
 .header > .credits {
   font-size: 0.9em;
   line-height: 1.48em;
-  margin: 0 0 30px 0;
+  margin: 0 0 10px 0;
   padding: 0;
   font-style: italic;
 }
 
+.header > .meta-data {
+  font-size: 0.65em;
+  margin: 0 0 15px 0;
+}
+
 /*======= Controls toolbar =======*/
 
 .toolbar {
@@ -134,7 +139,7 @@
   border-radius: 4px;
   border: 1px solid #b5b5b5;
   border-bottom-width: 0;
-  box-shadow: 0 1px 12px #666;
+  box-shadow: 0 1px 3px #c1c1c1;
 }
 
 .keep-open .dropdown-popup {
@@ -153,7 +158,7 @@
   position: absolute;
   top: 30px; /* offset arrow from top of popup */
   left: -16px;
-  width: 24px;
+  width: 16px;
   height: 24px;
   background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg");
   display: block;
diff --git a/arc-firefox-theme/chrome/global/autocomplete.css b/arc-firefox-theme/chrome/global/autocomplete.css
index 0b4536c..6b31eed 100644
--- a/arc-firefox-theme/chrome/global/autocomplete.css
+++ b/arc-firefox-theme/chrome/global/autocomplete.css
@@ -105,6 +105,7 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
 }
 
 .autocomplete-richlistitem[selected] {
+  background-color: Highlight;
   color: HighlightText;
 }
 
diff --git a/arc-firefox-theme/chrome/global/datetimeinputpickers.css b/arc-firefox-theme/chrome/global/datetimeinputpickers.css
new file mode 100644
index 0000000..bed7be5
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/datetimeinputpickers.css
@@ -0,0 +1,342 @@
+/* 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/. */
+
+:root {
+  --font-size-default: 1.1rem;
+  --spinner-width: 3rem;
+  --spinner-margin-top-bottom: 0.4rem;
+  --spinner-item-height: 2.4rem;
+  --spinner-item-margin-bottom: 0.1rem;
+  --spinner-button-height: 1.2rem;
+  --colon-width: 2rem;
+  --day-period-spacing-width: 1rem;
+  --calendar-width: 23.1rem;
+  --date-picker-item-height: 2.4rem;
+
+  --border: 0.1rem solid #D6D6D6;
+  --border-radius: 0.3rem;
+  --border-active-color: #B1B1B1;
+
+  --font-color: #191919;
+  --fill-color: #EBEBEB;
+
+  --selected-font-color: #FFFFFF;
+  --selected-fill-color: #0996F8;
+
+  --button-font-color: #858585;
+  --button-font-color-hover: #4D4D4D;
+  --button-font-color-active: #191919;
+  --button-fill-color-active: #D4D4D4;
+
+  --weekday-font-color: #6C6C6C;
+  --weekday-outside-font-color: #6C6C6C;
+  --weekend-font-color: #DA4E44;
+  --weekend-outside-font-color: #FF988F;
+
+  --disabled-opacity: 0.2;
+}
+
+html {
+  font-size: 10px;
+}
+
+body {
+  margin: 0;
+  color: var(--font-color);
+  font: message-box;
+  font-size: var(--font-size-default);
+}
+
+button {
+  -moz-appearance: none;
+  background: none;
+  border: none;
+}
+
+.nav {
+  display: flex;
+  width: var(--calendar-width);
+  height: 2.4rem;
+  margin-bottom: 0.8rem;
+  justify-content: space-between;
+}
+
+.nav > button {
+  width: 3rem;
+  height: var(--date-picker-item-height);
+  filter: url("chrome://global/skin/filters.svg#fill");
+  fill: var(--button-font-color);
+}
+
+.nav > button:hover {
+  fill: var(--button-font-color-hover);
+}
+
+.nav > button.active {
+  fill: var(--button-font-color-active);
+}
+
+.nav > button.left {
+  background: url("chrome://global/skin/icons/calendar-arrows.svg#left") no-repeat 50% 50%;
+}
+
+.nav > button.right {
+  background: url("chrome://global/skin/icons/calendar-arrows.svg#right") no-repeat 50% 50%;
+}
+
+.month-year-container {
+  position: absolute;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  top: 0;
+  left: 3rem;
+  width: 17.1rem;
+  height: var(--date-picker-item-height);
+  z-index: 10;
+}
+
+button.month-year {
+  font-size: 1.3rem;
+  border: var(--border);
+  border-radius: 0.3rem;
+  padding: 0.2rem 2.6rem 0.2rem 1.2rem;
+}
+
+button.month-year:hover {
+  background: var(--fill-color);
+}
+
+button.month-year.active {
+  border-color: var(--border-active-color);
+  background: var(--button-fill-color-active);
+}
+
+button.month-year::after {
+  position: absolute;
+  content: "";
+  width: 2.6rem;
+  height: 1.6rem;
+  background: url("chrome://global/skin/icons/spinner-arrows.svg#down") no-repeat 50% 50%;
+  filter: url("chrome://global/skin/filters.svg#fill");
+  fill: var(--button-font-color);
+}
+
+button.month-year.active::after {
+  background: url("chrome://global/skin/icons/spinner-arrows.svg#up") no-repeat 50% 50%;
+}
+
+.month-year-view {
+  position: absolute;
+  z-index: 5;
+  padding-top: 3.2rem;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  width: var(--calendar-width);
+  background: window;
+  opacity: 1;
+  transition: opacity 0.15s;
+}
+
+.month-year-view.hidden {
+  visibility: hidden;
+  opacity: 0;
+}
+
+.month-year-view > .spinner-container {
+  width: 5.5rem;
+  margin: 0 0.5rem;
+}
+
+.month-year-view .spinner {
+  transform: scaleY(1);
+  transform-origin: top;
+  transition: transform 0.15s;
+}
+
+.month-year-view.hidden .spinner {
+  transform: scaleY(0);
+  transition: none;
+}
+
+.month-year-view .spinner > div {
+  transform: scaleY(1);
+  transition: transform 0.15s;
+}
+
+.month-year-view.hidden .spinner > div {
+  transform: scaleY(2.5);
+  transition: none;
+}
+
+.calendar-container {
+  cursor: default;
+  display: flex;
+  flex-direction: column;
+  width: var(--calendar-width);
+}
+
+.week-header {
+  display: flex;
+}
+
+.week-header > div {
+  color: var(--weekday-font-color);
+}
+
+.week-header > div.weekend {
+  color: var(--weekend-font-color);
+}
+
+.days-viewport {
+  height: 15rem;
+  overflow: hidden;
+  position: relative;
+}
+
+.days-view {
+  position: absolute;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+}
+
+.week-header > div,
+.days-view > div {
+  align-items: center;
+  display: flex;
+  height: var(--date-picker-item-height);
+  margin: 0.05rem 0.15rem;
+  position: relative;
+  justify-content: center;
+  width: 3rem;
+}
+
+.days-view > div.outside {
+  color: var(--weekday-outside-font-color);
+}
+
+.days-view > div.weekend {
+  color: var(--weekend-font-color);
+}
+
+.days-view > div.weekend.outside {
+  color: var(--weekend-outside-font-color);
+}
+
+#time-picker,
+.month-year-view {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+}
+
+.spinner-container {
+  display: flex;
+  flex-direction: column;
+  width: var(--spinner-width);
+}
+
+.spinner-container > button {
+  height: var(--spinner-button-height);
+  filter: url("chrome://global/skin/filters.svg#fill");
+  fill: var(--button-font-color);
+}
+
+.spinner-container > button:hover {
+  fill: var(--button-font-color-hover);
+}
+
+.spinner-container > button.active {
+  fill: var(--button-font-color-active);
+}
+
+.spinner-container > button.up {
+  background: url("chrome://global/skin/icons/spinner-arrows.svg#up") no-repeat 50% 50%;
+}
+
+.spinner-container > button.down {
+  background: url("chrome://global/skin/icons/spinner-arrows.svg#down") no-repeat 50% 50%;
+}
+
+.spinner-container.hide-buttons > button {
+  visibility: hidden;
+}
+
+.spinner-container > .spinner {
+  position: relative;
+  width: 100%;
+  margin: var(--spinner-margin-top-bottom) 0;
+  cursor: default;
+  overflow-y: scroll;
+  scroll-snap-type: mandatory;
+  scroll-snap-points-y: repeat(100%);
+}
+
+.spinner-container > .spinner > div {
+  box-sizing: border-box;
+  position: relative;
+  text-align: center;
+  padding: calc((var(--spinner-item-height) - var(--font-size-default)) / 2) 0;
+  margin-bottom: var(--spinner-item-margin-bottom);
+  height: var(--spinner-item-height);
+  -moz-user-select: none;
+  scroll-snap-coordinate: 0 0;
+}
+
+.spinner-container > .spinner > div:hover::before,
+.calendar-container .days-view > div:hover::before {
+  background: var(--fill-color);
+  border: var(--border);
+  border-radius: var(--border-radius);
+  content: "";
+  position: absolute;
+  top: 0%;
+  bottom: 0%;
+  left: 0%;
+  right: 0%;
+  z-index: -10;
+}
+
+.spinner-container > .spinner:not(.scrolling) > div.selection,
+.calendar-container .days-view > div.selection {
+  color: var(--selected-font-color);
+}
+
+.spinner-container > .spinner > div.selection::before,
+.calendar-container .days-view > div.selection::before {
+  background: var(--selected-fill-color);
+  border: none;
+  border-radius: var(--border-radius);
+  content: "";
+  position: absolute;
+  top: 0%;
+  bottom: 0%;
+  left: 0%;
+  right: 0%;
+  z-index: -10;
+}
+
+.spinner-container > .spinner > div.disabled::before,
+.spinner-container > .spinner.scrolling > div.selection::before,
+.spinner-container > .spinner.scrolling > div:hover::before {
+  display: none;
+}
+
+.spinner-container > .spinner > div.disabled {
+  opacity: var(--disabled-opacity);
+}
+
+.colon {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: var(--colon-width);
+  margin-bottom: 0.3rem;
+}
+
+.spacer {
+  width: var(--day-period-spacing-width);
+}
\ No newline at end of file
diff --git a/arc-firefox-theme/chrome/browser/feeds/subscribe-ui.css b/arc-firefox-theme/chrome/global/datetimepopup.css
index f165003..52f6fc7 100644
--- a/arc-firefox-theme/chrome/browser/feeds/subscribe-ui.css
+++ b/arc-firefox-theme/chrome/global/datetimepopup.css
@@ -2,6 +2,10 @@
  * 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/. */
 
-.alwaysUse {
-  padding: 5px;
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+panel[type="arrow"][side="top"],
+panel[type="arrow"][side="bottom"] {
+  margin-left: 0;
+  margin-right: 0;
 }
diff --git a/arc-firefox-theme/chrome/browser/filters.svg b/arc-firefox-theme/chrome/global/filters.svg
index 8fccb13..2d0f219 100644
--- a/arc-firefox-theme/chrome/browser/filters.svg
+++ b/arc-firefox-theme/chrome/global/filters.svg
@@ -6,4 +6,12 @@
   <filter id="fill">
     <feComposite in="FillPaint" in2="SourceGraphic" operator="in"/>
   </filter>
+  <filter id="iconPressed" color-interpolation-filters="sRGB">
+    <!-- Multiply all components with 0.55. -->
+    <feComponentTransfer>
+      <feFuncR type="linear" slope=".55"/>
+      <feFuncG type="linear" slope=".55"/>
+      <feFuncB type="linear" slope=".55"/>
+    </feComponentTransfer>
+  </filter>
 </svg>
diff --git a/arc-firefox-theme/chrome/global/findBar.css b/arc-firefox-theme/chrome/global/findBar.css
index f049114..9bf610b 100644
--- a/arc-firefox-theme/chrome/global/findBar.css
+++ b/arc-firefox-theme/chrome/global/findBar.css
@@ -105,12 +105,20 @@ findbar[noanim] {
 }
 
 .findbar-find-previous {
-  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-previous);
+  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#previous);
   border-inline-end-width: 0;
 }
 
 .findbar-find-next {
-  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-next);
+  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#next);
+}
+
+.findbar-find-previous[disabled] {
+  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#previous-disabled);
+}
+
+.findbar-find-next[disabled] {
+  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#next-disabled);
 }
 
 .findbar-find-previous > .toolbarbutton-icon,
diff --git a/arc-firefox-theme/chrome/global/global.css b/arc-firefox-theme/chrome/global/global.css
index 1f9e7e4..d78a911 100644
--- a/arc-firefox-theme/chrome/global/global.css
+++ b/arc-firefox-theme/chrome/global/global.css
@@ -292,6 +292,20 @@ popupnotificationcontent {
   margin-top: .5em;
 }
 
+.popup-notification-panel > .panel-arrowcontainer > .panel-arrowcontent {
+  /* In order to display the action buttons near the edge of the arrow panel we
+   * have to reset its default padding and specify the padding in the individual
+   * "popupnotification" elements instead. To keep the rounded borders of the
+   * panel, we also have to ensure the contents are clipped to the border box
+   * by hiding the overflow, and we have to override the "display" property so
+   * that the height of the contents is computed correctly in that case. */
+  padding: 0;
+  overflow: hidden;
+  display: flex;
+  /* Make multiple popupnotifications stack vertically. */
+  flex-direction: column;
+}
+
 /* :::::: autoscroll popup ::::: */
 
 .autoscroller {
diff --git a/arc-firefox-theme/chrome/global/icons/calendar-arrows.svg b/arc-firefox-theme/chrome/global/icons/calendar-arrows.svg
new file mode 100644
index 0000000..858676f
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/icons/calendar-arrows.svg
@@ -0,0 +1,13 @@
+<?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="14" height="14" viewBox="0 0 14 14">
+  <style>
+    path:not(:target) {
+      display: none;
+    }
+  </style>
+  <path id="right" d="M4.8 14L3 12.3 8.5 7 3 1.7 4.8 0 12 7"/>
+  <path id="left" d="M9.2 0L11 1.7 5.5 7 11 12.3 9.2 14 2 7"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/global/icons/find-arrows.svg b/arc-firefox-theme/chrome/global/icons/find-arrows.svg
index 608c0a7..d6c59c7 100644
--- a/arc-firefox-theme/chrome/global/icons/find-arrows.svg
+++ b/arc-firefox-theme/chrome/global/icons/find-arrows.svg
@@ -2,15 +2,26 @@
 <!-- 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
   <style>
-    path:not(:target) {
-      display: none;
-    }
-    path {
+    #previous,
+    #next {
       fill: -moz-dialogtext;
     }
+    #previous-disabled,
+    #next-disabled {
+      fill: GrayText;
+    }
+    use:not(:target) {
+      display: none;
+    }
   </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"/>
+  <defs>
+    <path id="path-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="path-next" d="M5.547,8.255L0.538,3.53l1.239-1.265l3.77,3.641l3.719-3.641l1.264,1.188L5.547,8.255z"/>
+  </defs>
+  <use xlink:href="#path-previous" id="previous"/>
+  <use xlink:href="#path-next" id="next"/>
+  <use xlink:href="#path-previous" id="previous-disabled"/>
+  <use xlink:href="#path-next" id="next-disabled"/>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/downloads/menubutton-dropmarker.svg b/arc-firefox-theme/chrome/global/icons/menubutton-dropmarker.svg
index 76af113..76af113 100644
--- a/arc-firefox-theme/chrome/browser/downloads/menubutton-dropmarker.svg
+++ b/arc-firefox-theme/chrome/global/icons/menubutton-dropmarker.svg
diff --git a/arc-firefox-theme/chrome/global/icons/spinner-arrows.svg b/arc-firefox-theme/chrome/global/icons/spinner-arrows.svg
new file mode 100644
index 0000000..a8ba72d
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/icons/spinner-arrows.svg
@@ -0,0 +1,13 @@
+<?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="10" height="6" viewBox="0 0 10 6">
+  <style>
+    path:not(:target) {
+      display: none;
+    }
+  </style>
+  <path id="down" d="M0 1l1-1 4 4 4-4 1 1-5 5"/>
+  <path id="up" d="M0 5l1 1 4-4 4 4 1-1-5-5"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css
index 05c91b4..2f1bfac 100644
--- a/arc-firefox-theme/chrome/global/in-content/common.css
+++ b/arc-firefox-theme/chrome/global/in-content/common.css
@@ -109,7 +109,7 @@ xul|groupbox {
   font-size: 1.25rem;
 }
 
-xul|groupbox xul|label:not(.menu-accel):not(.menu-text):not(.indent),
+xul|groupbox xul|label:not(.menu-accel):not(.menu-text):not(.indent):not(.learnMore),
 xul|groupbox xul|description {
   /* !important needed to override toolkit !important rule */
   margin-inline-start: 0 !important;
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 b75b06a..3de0ce5 100644
--- a/arc-firefox-theme/chrome/global/in-content/info-pages.css
+++ b/arc-firefox-theme/chrome/global/in-content/info-pages.css
@@ -37,6 +37,7 @@ body {
   font-size: 2.5em;
 }
 
+.title:-moz-locale-dir(rtl),
 .title:dir(rtl) {
   background-position: right 0;
 }
diff --git a/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css b/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css
index 760cdcd..2d857ce 100644
--- a/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css
+++ b/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css
@@ -8,5 +8,5 @@ body {
 }
 
 video {
-  box-shadow: 0 0 15px #000;
+  box-shadow: 0 0 5px rgba(0,0,0,0.6);
 }
diff --git a/arc-firefox-theme/chrome/global/media/closeCaptionButton.png b/arc-firefox-theme/chrome/global/media/closeCaptionButton.png
deleted file mode 100644
index 469310f..0000000
--- a/arc-firefox-theme/chrome/global/media/closeCaptionButton.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/closeCaptionButton@2x.png b/arc-firefox-theme/chrome/global/media/closeCaptionButton@2x.png
deleted file mode 100644
index 0335078..0000000
--- a/arc-firefox-theme/chrome/global/media/closeCaptionButton@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/closedCaptionButton.svg b/arc-firefox-theme/chrome/global/media/closedCaptionButton.svg
new file mode 100644
index 0000000..0c55071
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/media/closedCaptionButton.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #ffffff;
+    }
+    use[id$="-hover"] {
+      fill: #48a0f7;
+    }
+    use[id$="-active"] {
+      fill: #2d89e6;
+    }
+    use[id$="-focus"] {
+      fill: #48a0f7;
+    }
+    use[id$="-disabled"] {
+      fill: #ffffff;
+    }
+  </style>
+  <symbol id="cc-off-shape">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M16.531,16.107H5.267l1.982-2H15c0.6,0,1-0.4,1-1V5.274
+      l1.946-1.964C17.963,3.399,18,3.483,18,3.576v11.031C18,15.407,17.331,16.107,16.531,16.107z M14.016,8.506h-1.218l1.005-1.014
+      C13.913,7.789,13.984,8.128,14.016,8.506z M11.786,12.361c-0.828,0-1.476-0.326-1.913-0.902l1.09-1.101
+      c0.136,0.323,0.374,0.541,0.796,0.541c0.514,0,0.695-0.44,0.756-1.014h1.535C13.908,11.43,13.071,12.361,11.786,12.361z
+       M1.496,16.106C0.697,16.104,0,15.406,0,14.607V3.576c0-0.8,0.7-1.5,1.5-1.5h12.846L16.299,0l1.316,1.283L2.615,17.13L1.496,16.106
+      z M3,4.107c-0.6,0-1,0.4-1,1v8c0,0.6,0.4,1,1,1h0.029l2.031-2.16c-0.757-0.503-1.191-1.457-1.191-2.744
+      c0-1.936,1.069-3.14,2.428-3.14c1.357,0,2.136,0.76,2.361,2.059l3.777-4.016H3z M8.298,8.506H7.355
+      c-0.047-0.623-0.49-1.23-0.99-1.23c-0.561,0-1.337,0.84-1.337,1.995c0,0.674,0.381,1.427,0.95,1.702L8.298,8.506z"/>
+  </symbol>
+
+  <symbol id="cc-shape">
+    <path d="M16.531,1.984H1.5c-0.8,0-1.5,0.7-1.5,1.5v11.031c0,0.8,0.7,1.5,1.5,1.5h15.031
+      c0.8,0,1.469-0.7,1.469-1.5V3.484C18,2.684,17.331,1.984,16.531,1.984z M16,13.016c0,0.6-0.4,1-1,1H3c-0.6,0-1-0.4-1-1v-8
+      c0-0.6,0.4-1,1-1h12c0.6,0,1,0.4,1,1V13.016z M6.426,10.807c-0.811,0-0.96-0.789-0.96-1.628c0-1.155,0.338-1.745,0.899-1.745
+      c0.5,0,0.818,0.357,0.866,0.98h1.484C8.585,6.877,7.785,5.972,6.297,5.972c-1.359,0-2.428,1.205-2.428,3.14
+      c0,1.944,0.974,3.157,2.583,3.157c1.285,0,2.153-0.93,2.295-2.476H7.244C7.183,10.367,6.94,10.807,6.426,10.807z M11.759,10.807
+      c-0.811,0-0.96-0.789-0.96-1.628c0-1.155,0.338-1.745,0.899-1.745c0.5,0,0.756,0.357,0.803,0.98h1.515
+      c-0.129-1.537-0.898-2.443-2.385-2.443c-1.359,0-2.396,1.205-2.396,3.14c0,1.944,0.943,3.157,2.552,3.157
+      c1.285,0,2.122-0.93,2.264-2.476h-1.535C12.454,10.367,12.273,10.807,11.759,10.807z"/>
+  </symbol>
+  <use id="cc" xlink:href="#cc-shape"/>
+  <use id="cc-hover" xlink:href="#cc-shape"/>
+  <use id="cc-active" xlink:href="#cc-shape"/>
+  <use id="cc-focus" xlink:href="#cc-shape"/>
+  <use id="cc-disabled" xlink:href="#cc-shape"/>
+
+  <use id="cc-off" xlink:href="#cc-off-shape"/>
+  <use id="cc-off-hover" xlink:href="#cc-off-shape"/>
+  <use id="cc-off-active" xlink:href="#cc-off-shape"/>
+  <use id="cc-off-focus" xlink:href="#cc-off-shape"/>
+  <use id="cc-off-disabled" xlink:href="#cc-off-shape"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/global/media/error.png b/arc-firefox-theme/chrome/global/media/error.png
index 58e3728..362a293 100644
--- a/arc-firefox-theme/chrome/global/media/error.png
+++ b/arc-firefox-theme/chrome/global/media/error.png
diff --git a/arc-firefox-theme/chrome/global/media/fullscreenButton.png b/arc-firefox-theme/chrome/global/media/fullscreenButton.png
deleted file mode 100644
index ffbc3d5..0000000
--- a/arc-firefox-theme/chrome/global/media/fullscreenButton.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/fullscreenButton.svg b/arc-firefox-theme/chrome/global/media/fullscreenButton.svg
new file mode 100644
index 0000000..0bf3ec2
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/media/fullscreenButton.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #ffffff;
+    }
+    use[id$="-hover"] {
+      fill: #48a0f7;
+    }
+    use[id$="-active"] {
+      fill: #2d89e6;
+    }
+    use[id$="-focus"] {
+      fill: #48a0f7;
+    }
+    use[id$="-disabled"] {
+      fill: #ffffff;
+    }
+  </style>
+  <symbol id="fullscreen-shape">
+    <path d="M6.728,10.188l-3.235,3.094l0.017-2.267l-1.513-0.016l0,5l4.987-0.008l0.011-1.537l-2.281-0.022
+  l3.097-3.158L6.728,10.188z M14.453,11.004l-0.022,2.281l-3.158-3.097l-1.086,1.083l3.094,3.235l-2.267-0.017l-0.016,1.514l5,0
+  l-0.008-4.988L14.453,11.004z M11.015,2.01l-0.011,1.537l2.281,0.022l-3.097,3.158l1.083,1.086l3.235-3.094L14.49,6.986
+  l1.513,0.016v-5L11.015,2.01z M6.986,3.511l0.016-1.514l-5,0L2.01,6.985l1.537,0.011l0.022-2.281l3.158,3.097l1.086-1.083
+  L4.718,3.494L6.986,3.511z"/>
+  </symbol>
+  <symbol id="unfullscreen-shape">
+    <path d="M2.047,11.135l-0.011,1.537l2.281,0.022L1.22,15.851l1.083,1.086l3.235-3.094l-0.017,2.268l1.513,0.016
+  l0-5L2.047,11.135z M13.781,12.587l2.267,0.017l0.016-1.514l-5,0l0.008,4.988l1.537,0.011l0.022-2.281l3.158,3.097l1.086-1.083
+  L13.781,12.587z M16.058,5.578l-2.281-0.021l3.097-3.158l-1.083-1.086l-3.235,3.094l0.017-2.267L11.06,2.123v5l4.988-0.008
+  L16.058,5.578z M5.516,2.098L5.494,4.379L2.336,1.283L1.25,2.365L4.344,5.6L2.077,5.583L2.06,7.097l5,0L7.053,2.109L5.516,2.098z"/>
+  </symbol>
+  <use id="fullscreen" xlink:href="#fullscreen-shape"/>
+  <use id="fullscreen-hover" xlink:href="#fullscreen-shape"/>
+  <use id="fullscreen-active" xlink:href="#fullscreen-shape"/>
+  <use id="fullscreen-focus" xlink:href="#fullscreen-shape"/>
+  <use id="fullscreen-disabled" xlink:href="#fullscreen-shape"/>
+
+  <use id="unfullscreen" xlink:href="#unfullscreen-shape"/>
+  <use id="unfullscreen-hover" xlink:href="#unfullscreen-shape"/>
+  <use id="unfullscreen-active" xlink:href="#unfullscreen-shape"/>
+  <use id="unfullscreen-focus" xlink:href="#unfullscreen-shape"/>
+  <use id="unfullscreen-disabled" xlink:href="#unfullscreen-shape"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/global/media/fullscreenButton@2x.png b/arc-firefox-theme/chrome/global/media/fullscreenButton@2x.png
deleted file mode 100644
index b09ebbd..0000000
--- a/arc-firefox-theme/chrome/global/media/fullscreenButton@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/muteButton.png b/arc-firefox-theme/chrome/global/media/muteButton.png
deleted file mode 100644
index 8944807..0000000
--- a/arc-firefox-theme/chrome/global/media/muteButton.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/muteButton.svg b/arc-firefox-theme/chrome/global/media/muteButton.svg
new file mode 100644
index 0000000..779957c
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/media/muteButton.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #ffffff;
+    }
+    use[id$="-hover"] {
+      fill: #48a0f7;
+    }
+    use[id$="-active"] {
+      fill: #2d89e6;
+    }
+    use[id$="-focus"] {
+      fill: #48a0f7;
+    }
+    use[id$="-disabled"] {
+      fill: #ffffff;
+    }
+  </style>
+  <symbol id="unmute-shape">
+    <path d="M3.52,5.367c-1.332,0-2.422,1.09-2.422,2.422v2.422c0,1.332,1.09,2.422,2.422,2.422h1.516l4.102,3.633
+    V1.735L5.035,5.367H3.52z M12.059,9c0-0.727-0.484-1.211-1.211-1.211v2.422C11.574,10.211,12.059,9.727,12.059,9z M14.48,9
+    c0-1.695-1.211-3.148-2.785-3.512l-0.363,1.09C12.422,6.82,13.27,7.789,13.27,9c0,1.211-0.848,2.18-1.938,2.422l0.484,1.09
+    C13.27,12.148,14.48,10.695,14.48,9z M12.543,3.188l-0.484,1.09C14.238,4.883,15.691,6.82,15.691,9c0,2.18-1.453,4.117-3.512,4.601
+    l0.484,1.09c2.422-0.605,4.238-2.906,4.238-5.691C16.902,6.215,15.086,3.914,12.543,3.188z"/>
+  </symbol>
+  <symbol id="mute-shape">
+    <path d="M3.52,5.367c-1.332,0-2.422,1.09-2.422,2.422v2.422c0,1.332,1.09,2.422,2.422,2.422h1.516l4.102,3.633
+      V1.735L5.035,5.367H3.52z"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M12.155,12.066l-1.138-1.138l4.872-4.872l1.138,1.138
+      L12.155,12.066z"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M10.998,7.204l1.138-1.138l4.872,4.872l-1.138,1.138L10.998,7.204
+		z"/>
+  </symbol>
+  <symbol id="noaudio-shape">
+	  <path d="M14.901,3.571l-4.412,3.422V1.919L6.286,5.46H4.869c-1.298,0-2.36,1.062-2.36,2.36v2.36
+		c0,1.062,0.708,1.888,1.652,2.242l-2.242,1.77l1.18,1.416L16.081,4.987L14.901,3.571z M10.489,16.081V11.36l-2.669,2.36
+		L10.489,16.081z"/>
+  </symbol>
+  <use id="unmute" xlink:href="#unmute-shape"/>
+  <use id="unmute-hover" xlink:href="#unmute-shape"/>
+  <use id="unmute-active" xlink:href="#unmute-shape"/>
+  <use id="unmute-focus" xlink:href="#unmute-shape"/>
+  <use id="unmute-disabled" xlink:href="#unmute-shape"/>
+
+  <use id="mute" xlink:href="#mute-shape"/>
+  <use id="mute-hover" xlink:href="#mute-shape"/>
+  <use id="mute-active" xlink:href="#mute-shape"/>
+  <use id="mute-focus" xlink:href="#mute-shape"/>
+  <use id="mute-disabled" xlink:href="#mute-shape"/>
+
+  <use id="noaudio" xlink:href="#noaudio-shape"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/global/media/muteButton@2x.png b/arc-firefox-theme/chrome/global/media/muteButton@2x.png
deleted file mode 100644
index b2cd21c..0000000
--- a/arc-firefox-theme/chrome/global/media/muteButton@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/noAudio.png b/arc-firefox-theme/chrome/global/media/noAudio.png
deleted file mode 100644
index 3db8c97..0000000
--- a/arc-firefox-theme/chrome/global/media/noAudio.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/noAudio@2x.png b/arc-firefox-theme/chrome/global/media/noAudio@2x.png
deleted file mode 100644
index 7de728b..0000000
--- a/arc-firefox-theme/chrome/global/media/noAudio@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/pauseButton.png b/arc-firefox-theme/chrome/global/media/pauseButton.png
deleted file mode 100644
index 944098c..0000000
--- a/arc-firefox-theme/chrome/global/media/pauseButton.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/pauseButton.svg b/arc-firefox-theme/chrome/global/media/pauseButton.svg
new file mode 100644
index 0000000..8d56b96
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/media/pauseButton.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #ffffff;
+    }
+    use[id$="-hover"] {
+      fill: #48a0f7;
+    }
+    use[id$="-active"] {
+      fill: #2d89e6;
+    }
+    use[id$="-focus"] {
+      fill: #48a0f7;
+    }
+    use[id$="-disabled"] {
+      fill: #ffffff;
+    }
+  </style>
+
+
+  <symbol id="pause-shape">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M6.002,1.953C5.172,1.953,4.5,2.626,4.5,3.455v11.08
+        c0,0.83,0.672,1.502,1.502,1.502c0.829,0,1.502-0.672,1.502-1.502V3.455C7.504,2.626,6.831,1.953,6.002,1.953z M12,1.953
+        c-0.828,0-1.5,0.672-1.5,1.5v11.094c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5V3.453C13.5,2.625,12.828,1.953,12,1.953z"/>
+  </symbol>
+
+  <use id="pause" xlink:href="#pause-shape"/>
+  <use id="pause-hover" xlink:href="#pause-shape"/>
+  <use id="pause-active" xlink:href="#pause-shape"/>
+  <use id="pause-focus" xlink:href="#pause-shape"/>
+  <use id="pause-disalbed" xlink:href="#pause-shape"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/global/media/pauseButton@2x.png b/arc-firefox-theme/chrome/global/media/pauseButton@2x.png
deleted file mode 100644
index df22919..0000000
--- a/arc-firefox-theme/chrome/global/media/pauseButton@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/playButton.png b/arc-firefox-theme/chrome/global/media/playButton.png
deleted file mode 100644
index 11e2731..0000000
--- a/arc-firefox-theme/chrome/global/media/playButton.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/playButton.svg b/arc-firefox-theme/chrome/global/media/playButton.svg
new file mode 100644
index 0000000..dc20c61
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/media/playButton.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #ffffff;
+    }
+    use[id$="-hover"] {
+      fill: #48a0f7;
+    }
+    use[id$="-active"] {
+      fill: #2d89e6;
+    }
+    use[id$="-focus"] {
+      fill: #48a0f7;
+    }
+    use[id$="-disabled"] {
+      fill: #ffffff;
+    }
+    use[id$="-clicktoplay"] {
+      fill: #000000;
+    }
+  </style>
+
+  <symbol id="play-shape">
+    <path d="M3.243,15.155c0,0.845,0.593,1.157,1.317,0.707l9.659-6.041c0.727-0.453,0.722-1.193,0-1.645L4.556,2.137
+    C3.827,1.682,3.237,2.014,3.237,2.844v12.312H3.243z"/>
+  </symbol>
+
+  <use id="play" xlink:href="#play-shape"/>
+  <use id="play-hover" xlink:href="#play-shape"/>
+  <use id="play-active" xlink:href="#play-shape"/>
+  <use id="play-focus" xlink:href="#play-shape"/>
+  <use id="play-clicktoplay" xlink:href="#play-shape"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/global/media/playButton@2x.png b/arc-firefox-theme/chrome/global/media/playButton@2x.png
deleted file mode 100644
index fb20075..0000000
--- a/arc-firefox-theme/chrome/global/media/playButton@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/scrubberThumb.png b/arc-firefox-theme/chrome/global/media/scrubberThumb.png
deleted file mode 100644
index f159627..0000000
--- a/arc-firefox-theme/chrome/global/media/scrubberThumb.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/scrubberThumb@2x.png b/arc-firefox-theme/chrome/global/media/scrubberThumb@2x.png
deleted file mode 100644
index f8790f4..0000000
--- a/arc-firefox-theme/chrome/global/media/scrubberThumb@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/scrubberThumbWide.png b/arc-firefox-theme/chrome/global/media/scrubberThumbWide.png
deleted file mode 100644
index 96d2ed7..0000000
--- a/arc-firefox-theme/chrome/global/media/scrubberThumbWide.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/scrubberThumbWide@2x.png b/arc-firefox-theme/chrome/global/media/scrubberThumbWide@2x.png
deleted file mode 100644
index 52c9d72..0000000
--- a/arc-firefox-theme/chrome/global/media/scrubberThumbWide@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/unmuteButton.png b/arc-firefox-theme/chrome/global/media/unmuteButton.png
deleted file mode 100644
index 5b76e2f..0000000
--- a/arc-firefox-theme/chrome/global/media/unmuteButton.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/unmuteButton@2x.png b/arc-firefox-theme/chrome/global/media/unmuteButton@2x.png
deleted file mode 100644
index 86f2185..0000000
--- a/arc-firefox-theme/chrome/global/media/unmuteButton@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/videocontrols.css b/arc-firefox-theme/chrome/global/media/videocontrols.css
index 6907620..03a050e 100644
--- a/arc-firefox-theme/chrome/global/media/videocontrols.css
+++ b/arc-firefox-theme/chrome/global/media/videocontrols.css
@@ -2,271 +2,369 @@
  * 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/. */
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace url("http://www.w3.org/1999/xhtml");
+
+video > xul|videocontrols,
+audio > xul|videocontrols {
+  writing-mode: horizontal-tb;
+  width: 100%;
+  height: 100%;
+  display: inline-block;
+}
+
+.controlsContainer [hidden="true"],
+.controlBar[hidden] {
+  display: none;
+}
+
+.controlBar[size="hidden"] {
+  display: none;
+}
+
+.controlsSpacer[hideCursor] {
+  cursor: none;
+}
+
+.controlsContainer,
+.progressContainer {
+  position: relative;
+  height: 100%;
+}
+
+.stackItem {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.statusOverlay {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  background-color: rgb(80,80,80);
+}
+
+.controlsOverlay {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  position: relative;
+}
+
+.controlsSpacerStack {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  justify-content: center;
+  align-items: center;
+}
+
+.controlsSpacer {
+  background-color: rgba(255,255,255,.4);
+}
 
 .controlBar {
-  height: 28px;
-  background-color: rgba(35,31,32,.74);
+  position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+  height: 40px;
+  padding: 0 9px;
+  background-color: rgba(26,26,26,.8);
 }
 
 .playButton,
 .muteButton,
 .closedCaptionButton,
 .fullscreenButton {
+  height: 100%;
+  min-height: 30px;
+  min-width: 30px;
+  padding: 6px;
+  border: 0;
+  margin: 0;
   background-color: transparent;
   background-repeat: no-repeat;
   background-position: center;
-  -moz-appearance: none;   /* Remove the native button appearance and styling */
-  margin: 0;
-  padding: 0;
-  min-height: 28px;
-  min-width: 28px;
-  border: none;
-  opacity: 0.7;
+  background-origin: content-box;
+  background-clip: content-box;
 }
 
-.playButton:hover,
-.muteButton:hover,
-.closedCaptionButton:hover,
-.fullscreenButton:hover {
-  opacity: 1;
+.playButton {
+  background-image: url(chrome://global/skin/media/pauseButton.svg#pause);
 }
-
-.playButton:hover:active,
-.muteButton:hover:active,
-.closedCaptionButton:hover:active,
-.fullscreenButton:hover:active {
-  opacity: 0.4;
+.playButton:hover {
+  background-image: url(chrome://global/skin/media/pauseButton.svg#pause-hover);
 }
-
-.playButton {
-  background-image: url(chrome://global/skin/media/pauseButton.png);
-  margin-right: -22px; /* 1/2 of scrubber thumb width, for overhang. */
-  position: relative; /* Trick to work around negative margin interfering with clicking on the button. */
+.playButton:hover:active {
+  background-image: url(chrome://global/skin/media/pauseButton.svg#pause-active);
 }
-
 .playButton[paused] {
-  background-image: url(chrome://global/skin/media/playButton.png);
+  background-image: url(chrome://global/skin/media/playButton.svg#play);
+}
+.playButton[paused]:hover {
+  background-image: url(chrome://global/skin/media/playButton.svg#play-hover);
+}
+.playButton[paused]:hover:active {
+  background-image: url(chrome://global/skin/media/playButton.svg#play-active);
 }
 
 .muteButton {
-  background-image: url(chrome://global/skin/media/muteButton.png);
-  min-width: 33px;
+  background-image: url(chrome://global/skin/media/muteButton.svg#unmute);
+}
+.muteButton:hover {
+  background-image: url(chrome://global/skin/media/muteButton.svg#unmute-hover);
+}
+.muteButton:hover:active {
+  background-image: url(chrome://global/skin/media/muteButton.svg#unmute-active);
 }
 .muteButton[muted] {
-  background-image: url(chrome://global/skin/media/unmuteButton.png);
+  background-image: url(chrome://global/skin/media/muteButton.svg#mute);
 }
-
-.muteButton[noAudio] {
-  background-image: url(chrome://global/skin/media/noAudio.png);
+.muteButton[muted]:hover {
+  background-image: url(chrome://global/skin/media/muteButton.svg#mute-hover);
+}
+.muteButton[muted]:hover:active {
+  background-image: url(chrome://global/skin/media/muteButton.svg#mute-active);
+}
+.muteButton[noAudio],
+.muteButton[noAudio]:hover,
+.muteButton[noAudio]:hover:active {
+  background-image: url(chrome://global/skin/media/muteButton.svg#noaudio);
 }
-
 .muteButton[noAudio] + .volumeStack {
   display: none;
 }
 
 .closedCaptionButton {
-  background-image: url(chrome://global/skin/media/closeCaptionButton.png);
-  background-position: 4px;
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off);
+}
+.closedCaptionButton:hover {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off-hover);
+}
+.closedCaptionButton:hover:active {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off-active);
 }
-
 .closedCaptionButton[enabled] {
-  opacity: 1;
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc);
 }
-
-.closedCaptionButton[hidden] {
-  display: none;
+.closedCaptionButton[enabled]:hover {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-hover);
+}
+.closedCaptionButton[enabled]:hover:active {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-active);
 }
 
 .fullscreenButton {
-  background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 16, 16, 0);
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen);
+}
+.fullscreenButton:hover {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen-hover);
+}
+.fullscreenButton:hover:active {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen-active);
 }
-
 .fullscreenButton[fullscreened] {
-  background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 32, 16, 16);
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen);
+}
+.fullscreenButton[fullscreened]:hover {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen-hover);
+}
+.fullscreenButton[fullscreened]:hover:active {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen-active);
 }
 
-.volumeControl {
-  width: 32px;
-  opacity: 0;
+.controlBarSpacer {
+  flex-grow: 1;
 }
 
-.volumeBackground,
-.volumeForeground {
-  background-repeat: no-repeat;
-  background-position: center;
-  width: 32px;
+.volumeControl::-moz-range-thumb,
+.scrubber::-moz-range-thumb {
+  height: 13px;
+  width: 13px;
+  border: none;
+  border-radius: 50%;
+  background-color: #ffffff;
+  filter: drop-shadow(0px 0px 2px rgba(0,0,0,0.65));
 }
 
-.volumeBackground {
-  background-image: url(chrome://global/skin/media/volume-empty.png);
+.volumeControl::-moz-focus-outer,
+.scrubber::-moz-focus-outer {
+  border: 0;
 }
 
-.volumeForeground {
-  background-image: url(chrome://global/skin/media/volume-full.png);
-  background-clip: content-box;
+.progressBackgroundBar {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
 }
 
-.textTrackList {
-  display: -moz-box;
-  -moz-appearance: none;
-  -moz-box-pack: end;
-  -moz-box-align: end;
-  padding: 0;
+.progressStack {
+  position: relative;
+  width: 100%;
+  height: 5px;
 }
 
-.textTrackList[hidden] {
-  display: none;
+.scrubberStack {
+  min-width: 48px;
+  flex-basis: 48px;
+  flex-grow: 2;
+  flex-shrink: 0;
+  margin: 0 9px;
 }
 
-.textTrackList > html|*.textTrackItem {
-  -moz-appearance: none;
-  -moz-box-align: start;
-  text-align: start;
-  overflow: hidden;
+.volumeStack {
+  max-width: 60px;
+  min-width: 48px;
+  flex-grow: 1;
+  flex-shrink: 0;
+  margin-right: 6px;
+  margin-left: 4px;
+}
+
+.bufferBar,
+.progressBar,
+.scrubber,
+.volumeBackground,
+.volumeControl {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  padding: 0;
+  border: 0;
+  border-radius: 2.5px;
   margin: 0;
-  padding: 2px 10px;
-  -moz-margin-end: 10px;
-  border: none;
-  color: rgba(255,255,255,.5);
-  background-color: rgba(35,31,32,.74);
-  white-space: nowrap;
+  background: none;
+  background-color: transparent;
 }
 
-.textTrackList > html|*.textTrackItem[on] {
-  color: white;
-  background-color: black;
+.bufferBar,
+.volumeBackground {
+  background-color: rgba(0,0,0,0.7);
 }
 
-.textTrackList > html|*.textTrackItem:hover {
-  background-color: rgba(0,0,0,.55);
+.bufferBar::-moz-progress-bar,
+.progressBar::-moz-progress-bar,
+.volumeBackground::-moz-meter-bar {
+  height: 100%;
+  padding: 0;
+  margin: 0;
+  border: 0;
+  border-radius: 2.5px;
+  background: none;
 }
 
-.controlBar[fullscreen-unavailable] {
-  /* This value is duplicated in the videocontrols.xml adjustControlSize function. */
-  padding-inline-end: 8px;
+.scrubber:hover::-moz-range-thumb,
+.volumeControl:hover::-moz-range-thumb {
+  background-color: #48a0f7;
 }
 
-.volumeControl .scale-thumb {
-  min-width: 0;
-  opacity: 0;
+.scrubber:active::-moz-range-thumb,
+.volumeControl:active::-moz-range-thumb {
+  background-color: #2d89e6;
 }
 
-.durationBox {
-  -moz-box-pack: center;
+.scrubber::-moz-range-track,
+.scrubber::-moz-range-progress {
+  background-color: transparent;
 }
 
-.durationLabel {
-  margin-left: -22px; /* 1/2 of scrubber thumb width, for overhang. */
-  padding-left: 8px; /* don't bump into the scrubber bar */
-  color: rgba(255,255,255,.75);
-  font: message-box;
-  font-size: 11px;
+.volumeControl::-moz-range-progress,
+.volumeControl::-moz-range-track {
+  height: 5px;
+  border-radius: 2.5px;
 }
 
-.durationLabel {
-  padding-top: 0; /* center vertically with scrubber bar */
+.volumeControl::-moz-range-progress {
+  background-color: #ffffff;
 }
 
-.positionLabel {
-  display: none;
+.volumeControl::-moz-range-track {
+  background-color: rgba(0,0,0,0.7);
 }
 
-.backgroundBar {
-  /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */
-  /* margin left/right: 1/2 of scrubber thumb width, for overhang. */
-  margin: 10px 22px;
-  background-color: rgba(255,255,255,.5);
+
+.bufferBar::-moz-progress-bar {
+  background-color: rgba(255,255,255,0.3);
   border-radius: 2.5px;
 }
 
-.bufferBar,
-.progressBar {
-  /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */
-  /* margin left/right: 1/2 of scrubber thumb width, for overhang. */
-  margin: 10px 22px;
-  -moz-appearance: none;
-  border: none;
-  background-color: transparent;
-  min-width: 0;
-  min-height: 0;
-}
-
-/* .progress-bar is an element inside the <progressmeter> implementation. */
-.bufferBar .progress-bar {
-  /*
-   * Note that this is drawn on top of the .backgroundBar. So although this
-   * has the same background-color specified, the semitransparent
-   * compositing gives it a different visual appearance.
-   */
-  background-color: rgba(255,255,255,.5);
-  border-radius: 2.5px;
-  -moz-appearance: none;
+.progressBar::-moz-progress-bar {
+  background-color: #00b6f0;
 }
 
-.progressBar .progress-bar {
-  background-color: white;
+.textTrackList {
+  position: absolute;
+  right: 5px;
+  bottom: 45px;
+  max-width: 80%;
+  border: 1px solid #000000;
   border-radius: 2.5px;
-  -moz-appearance: none;
+  padding: 5px 0;
+  vertical-align: middle;
+  font-size: 12px;
+  background-color: #000000;
+  opacity: 0.7;
 }
 
-/* .scale-slider is an element inside the <scale> implementation. */
-.scrubber .scale-slider,
-.volumeControl .scale-slider {
-  /* Hide the default horizontal bar. */
-  -moz-appearance: none;
-  background: none;
+.textTrackList > .textTrackItem {
+  display: block;
+  width: 100%;
+  height: 30px;
+  padding: 2px 10px;
+  border: none;
   margin: 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-align: left;
+  text-overflow: ellipsis;
+  color: #ffffff;
+  background-color: transparent;
 }
 
-.scrubber .scale-slider {
-  /* abs(margin-top) + margin-bottom + bar height == timeThumb height */
-  margin-top: -10px;
-  margin-bottom: 10px;
-}
-/* .scale-thumb is an element inside the <scale> implementation. */
-.scrubber .scale-thumb,
-.volumeControl .scale-thumb {
-  /* Override the default thumb appearance with a custom image. */
-  -moz-appearance: none;
-  background: transparent;
-  border: none;
+.textTrackList > .textTrackItem:hover {
+  background-color: #444444;
 }
 
-.timeThumb {
-  background: url(chrome://global/skin/media/scrubberThumb.png) no-repeat center;
-  min-width: 45px;
-  min-height: 28px;
-  -moz-box-pack: center;
+.textTrackList > .textTrackItem[on] {
+  color: #48a0f7;
 }
 
-.timeThumb[showhours="true"] {
-  background-image: url(chrome://global/skin/media/scrubberThumbWide.png);
+.positionLabel,
+.durationLabel {
+  display: none;
 }
 
-.timeLabel {
-  color: rgba(255,255,255,.75);
+.positionDurationBox {
+  text-align: center;
+  padding-inline-start: 1px;
+  padding-inline-end: 9px;
+  white-space: nowrap;
   font: message-box;
-  font-size: 10px;
-  text-shadow: rgba(0,0,0,.3) 0 1px;
-  padding-top: 7px;
+  font-size: 13px;
+  font-size-adjust: 0.55;
+  color: #ffffff;
 }
 
-.timeLabel {
-  padding-top: 5px; /* center vertically with scrubber bar */
-}
 
-.statusOverlay {
-  -moz-box-align: center;
-  -moz-box-pack: center;
-  background-color: rgba(0,0,0,.55);
+.duration {
+  display: inline-block;
+  white-space: pre;
+  color: #929292;
 }
 
 .statusIcon {
-  margin-bottom: 28px; /* same height as .controlBar, to keep icon centered above it */
   width: 36px;
   height: 36px;
+  margin-bottom: 20px;
 }
 
 .statusIcon[type="throbber"] {
@@ -278,61 +376,55 @@
 }
 
 .statusIcon[type="error"] {
+  min-width: 70px;
+  min-height: 60px;
   background: url(chrome://global/skin/media/error.png) no-repeat center;
+  background-size: contain;
 }
 
 /* Overlay Play button */
 .clickToPlay {
-  width: 64px;
-  height: 64px;
-  -moz-box-pack: center;
-  -moz-box-align: center;
-  opacity: 0.7;
-  background-image: url(chrome://global/skin/media/clicktoplay-bgtexture.png),
-                    url(chrome://global/skin/media/videoClickToPlayButton.svg);
-  background-repeat: repeat, no-repeat;
-  background-position: center, center;
-  background-size: auto, 64px 64px;
-  background-color: hsla(0,0%,10%,.5);
+  min-width: 48px;
+  min-height: 48px;
+  border-radius: 50%;
+  background-image: url(chrome://global/skin/media/playButton.svg#play);
+  background-repeat: no-repeat;
+  background-position: 54% 50%;
+  background-size: 40% 40%;
+  background-color: #1a1a1a;
+  opacity: 0.8;
+  position: relative;
+  top: 20px;
 }
+
+.controlsSpacerStack:hover > .clickToPlay,
 .clickToPlay:hover {
-  opacity: 1;
+  opacity: 0.55;
 }
 
-/* Statistics formatting */
-html|*.statsDiv {
-  position: relative;
+.controlsSpacerStack:hover > .clickToPlay[fadeout] {
+  opacity: 0;
 }
-html|td {
-  height: 1em;
-  max-height: 1em;
-  padding: 0 2px;
-}
-html|table {
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 11px;
-  color: white;
-  text-shadow:
-    -1px -1px 0 #000,
-    1px -1px 0 #000,
-    -1px 1px 0 #000,
-    1px 1px 0 #000;
-  min-width: 100%;
-  background: rgba(68,68,68,.7);
-  table-layout: fixed;
-  border-collapse: collapse;
-  position: absolute;
+
+.controlBar[fullscreen-unavailable] .fullscreenButton {
+  display: none;
 }
 
 /* CSS Transitions */
 .clickToPlay {
-  transition-property: opacity, background-size;
+  transition-property: transform, opacity;
   transition-duration: 400ms, 400ms;
 }
+
+.controlsSpacer[fadeout] {
+  opacity: 0;
+}
+
 .clickToPlay[fadeout] {
-  background-size: auto, 192px 192px;
+  transform: scale(3);
   opacity: 0;
 }
+
 .clickToPlay[fadeout][immediate] {
   transition-property: opacity, background-size;
   transition-duration: 0s, 0s;
@@ -348,10 +440,6 @@ html|table {
   transition-property: opacity, margin-top;
   transition-duration: 200ms, 200ms;
 }
-.volumeStack[fadeout] {
-  opacity: 0;
-  margin-top: 0;
-}
 .statusOverlay:not([immediate]) {
   transition-property: opacity;
   transition-duration: 300ms;
@@ -363,66 +451,22 @@ html|table {
 
 /* Error description formatting */
 .errorLabel {
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 11px;
-  color: #bbb;
-  text-shadow:
-    -1px -1px 0 #000,
-    1px -1px 0 #000,
-    -1px 1px 0 #000,
-    1px 1px 0 #000;
   padding: 0 10px;
   text-align: center;
+  font: message-box;
+  font-size: 14px;
+  color: #ffffff;
+}
+
+.errorLabel {
+  display: none;
 }
 
-@media (min-resolution: 2dppx) {
-  .playButton {
-    background-image: url(chrome://global/skin/media/pauseButton@2x.png);
-    background-size: 28px 28px;
-  }
-  .playButton[paused] {
-    background-image: url(chrome://global/skin/media/playButton@2x.png);
-    background-size: 28px 28px;
-  }
-  .volumeBackground {
-    background-image: url(chrome://global/skin/media/volume-empty@2x.png);
-    background-size: 32px 16px;
-  }
-  .volumeForeground {
-    background-image: url(chrome://global/skin/media/volume-full@2x.png);
-    background-size: 32px 16px;
-  }
-  .muteButton {
-    background-image: url(chrome://global/skin/media/muteButton@2x.png);
-    background-size: 33px 28px;
-  }
-  .muteButton[muted] {
-    background-image: url(chrome://global/skin/media/unmuteButton@2x.png);
-    background-size: 33px 28px;
-  }
-  .muteButton[noAudio] {
-    background-image: url(chrome://global/skin/media/noAudio@2x.png);
-    background-size: 33px 28px;
-  }
-  .closedCaptionButton {
-    background-image: url(chrome://global/skin/media/closeCaptionButton@2x.png);
-    background-position: 4px;
-    background-size: 28px 28px;
-  }
-  .fullscreenButton {
-    background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton@2x.png"), 0, 32, 32, 0);
-    background-size: 16px 16px;
-  }
-  .fullscreenButton[fullscreened] {
-    background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton@2x.png"), 0, 64, 32, 32);
-    background-size: 16px 16px;
-  }
-  .timeThumb {
-    background-image: url(chrome://global/skin/media/scrubberThumb@2x.png);
-    background-size: 33px 28px;
-  }
-  .timeThumb[showhours="true"] {
-    background-image: url(chrome://global/skin/media/scrubberThumbWide@2x.png);
-    background-size: 45px 28px;
-  }
+[error="errorAborted"]         > [anonid="errorAborted"],
+[error="errorNetwork"]         > [anonid="errorNetwork"],
+[error="errorDecode"]          > [anonid="errorDecode"],
+[error="errorSrcNotSupported"] > [anonid="errorSrcNotSupported"],
+[error="errorNoSource"]        > [anonid="errorNoSource"],
+[error="errorGeneric"]         > [anonid="errorGeneric"] {
+  display: inline;
 }
diff --git a/arc-firefox-theme/chrome/global/media/volume-empty.png b/arc-firefox-theme/chrome/global/media/volume-empty.png
deleted file mode 100644
index 589abfb..0000000
--- a/arc-firefox-theme/chrome/global/media/volume-empty.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/volume-empty@2x.png b/arc-firefox-theme/chrome/global/media/volume-empty@2x.png
deleted file mode 100644
index ca494e8..0000000
--- a/arc-firefox-theme/chrome/global/media/volume-empty@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/volume-full.png b/arc-firefox-theme/chrome/global/media/volume-full.png
deleted file mode 100644
index 4398a56..0000000
--- a/arc-firefox-theme/chrome/global/media/volume-full.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/volume-full@2x.png b/arc-firefox-theme/chrome/global/media/volume-full@2x.png
deleted file mode 100644
index 5bf63c7..0000000
--- a/arc-firefox-theme/chrome/global/media/volume-full@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/menu.css b/arc-firefox-theme/chrome/global/menu.css
index 06e3b21..386d911 100644
--- a/arc-firefox-theme/chrome/global/menu.css
+++ b/arc-firefox-theme/chrome/global/menu.css
@@ -12,8 +12,7 @@
 
 menu,
 menuitem,
-menucaption,
-.splitmenu-menuitem {
+menucaption {
   -moz-appearance: menuitem;
   -moz-box-align: center;
   max-width: 42em;
@@ -28,15 +27,13 @@ menuitem[default="true"] {
 }
 
 menu[_moz-menuactive="true"],
-menuitem[_moz-menuactive="true"],
-.splitmenu-menuitem[_moz-menuactive="true"] {
+menuitem[_moz-menuactive="true"] {
   color: -moz-menuhovertext;
   background-color: -moz-menuhover;
 }
 
 menu[disabled="true"],
 menuitem[disabled="true"],
-.splitmenu-menuitem[disabled="true"],
 menucaption[disabled="true"] {
   color: GrayText;
 }
diff --git a/arc-firefox-theme/chrome/global/narrate.css b/arc-firefox-theme/chrome/global/narrate.css
index 8a44e78..4514eff 100644
--- a/arc-firefox-theme/chrome/global/narrate.css
+++ b/arc-firefox-theme/chrome/global/narrate.css
@@ -22,7 +22,7 @@ body.dark .narrating {
   z-index: -1;
   border-bottom-style: solid;
   border-bottom-width: 7px;
-  transition: left 0.1s ease;
+  transition: left 0.1s ease, width 0.1s ease;
 }
 
 .narrating > .narrate-word-highlight {
diff --git a/arc-firefox-theme/chrome/global/notification.css b/arc-firefox-theme/chrome/global/notification.css
index 2e57051..a9e3ea8 100644
--- a/arc-firefox-theme/chrome/global/notification.css
+++ b/arc-firefox-theme/chrome/global/notification.css
@@ -73,10 +73,27 @@ notification[type="critical"] {
   padding-right: 11px;
 }
 
-/* Popup notification */
+/* 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/. */
+
+.popup-notification-body-container {
+  padding: var(--arrowpanel-padding);
+}
+
+.popup-notification-icon {
+  width: 32px;
+  height: 32px;
+  margin-inline-end: var(--arrowpanel-padding);
+}
 
 .popup-notification-body {
-  max-width: 25em;
+  width: 25em;
+}
+
+.popup-notification-closebutton {
+  margin-inline-end: -8px;
+  margin-top: -8px;
 }
 
 .popup-notification-origin:not([value]),
@@ -93,14 +110,106 @@ notification[type="critical"] {
 }
 
 .popup-notification-button-container {
-  margin-top: 17px;
+  background-color: var(--arrowpanel-dimmed);
+  display: flex;
 }
 
-.popup-notification-closebutton {
-  margin-inline-end: -10px;
-  margin-top: -6px;
+.popup-notification-button-container > toolbarseparator {
+  -moz-appearance: none;
+  border: 0;
+  border-left: 1px solid var(--panel-separator-color);
+  margin: 7px 0 7px;
+  min-width: 0;
+}
+
+.popup-notification-button-container:hover > toolbarseparator {
+  margin: 0;
+}
+
+.popup-notification-button {
+  flex: 1;
+  -moz-appearance: none;
+  background-color: transparent;
+  color: inherit;
+  margin: 0;
+  padding: 0;
+  min-width: 0;
+  min-height: 41px;
+  border: none;
+  border-top: 1px solid var(--panel-separator-color);
+}
+
+.popup-notification-button:hover:not([disabled]) {
+  background-color: var(--arrowpanel-dimmed);
+}
+
+.popup-notification-button:hover:active:not([disabled]) {
+  background-color: var(--arrowpanel-dimmed-further);
+  box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset;
+}
+
+.popup-notification-button[disabled] {
+  background-color: var(--arrowpanel-dimmed-further);
+  color: graytext;
+  /* the !important is to override the button[disabled] settings in
+   * windows/linux button.css */
+  -moz-border-top-colors: var(--panel-separator-color) !important;
+}
+
+.popup-notification-button[default] {
+  flex: 0 50%;
+}
+
+.popup-notification-button[default]:not([disabled]) {
+  background-color: #0996f8;
+  color: white;
+}
+
+.popup-notification-button[default]:hover:not([disabled]) {
+  background-color: #0675d3;
+}
+
+.popup-notification-button[default]:hover:active:not([disabled]) {
+  background-color: #0568ba;
+}
+
+.popup-notification-button[anonid="secondarybutton"][hidden="true"] ~ .popup-notification-button[default] {
+  flex: 1;
+}
+
+.popup-notification-button > .button-box {
+  padding: 0;
+  margin: 0;
+  /* prevent double border on windows when focused */
+  border: none;
+}
+
+.popup-notification-dropmarker {
+  flex: none;
+  padding: 0 15px;
+}
+
+.popup-notification-dropmarker > .button-box > hbox {
+  display: none;
+}
+
+.popup-notification-dropmarker > .button-box > .button-menu-dropmarker {
+  /* This is to override the linux !important */
+  -moz-appearance: none !important;
+  display: -moz-box;
+  padding: 0;
+  margin: 0;
+}
+
+.popup-notification-dropmarker > .button-box > .button-menu-dropmarker > .dropmarker-icon {
+  width: 16px;
+  height: 16px;
+  list-style-image: url(chrome://global/skin/icons/menubutton-dropmarker.svg);
+  filter: url(chrome://global/skin/filters.svg#fill);
+  fill: currentColor;
 }
 
-.popup-notification-menubutton > .button-menubutton-button[disabled] {
-  opacity: 0.5;
+.popup-notification-button:-moz-focusring {
+  outline: 1px -moz-dialogtext dotted;
+  outline-offset: -5px;
 }
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg b/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg
index 837392f..9c66311 100644
--- a/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg
+++ b/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg
@@ -1,8 +1,8 @@
-<?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" viewBox="0 0 24 24">

-  <polygon opacity="0.15"  points="16.583,0.015 16.569,0 4.583,12 16.569,24 16.583,23.985"/>

-  <polygon fill="#fbfbfb" points="16.575,1.021 16.561,1.008 5.583,12 16.577,23.008 16.591,22.994 "/>

-</svg>

+<?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" viewBox="0 0 16 24">
+  <polygon points="16.58 0.01 16.57 0 4.58 12 16.57 24 16.58 23.98 16.58 0.01" fill="#b5b5b5"/>
+  <polyline points="16.63 1.51 6.08 12.01 16.63 22.5" fill="#fbfbfb"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/global/timepicker.css b/arc-firefox-theme/chrome/global/timepicker.css
deleted file mode 100644
index e8d081b..0000000
--- a/arc-firefox-theme/chrome/global/timepicker.css
+++ /dev/null
@@ -1,153 +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/. */
-
-:root {
-  --font-size-default: 1.1rem;
-  --spinner-width: 3rem;
-  --spinner-margin-top-bottom: 0.4rem;
-  --spinner-item-height: 2.4rem;
-  --spinner-item-margin-bottom: 0.1rem;
-  --spinner-button-height: 1.2rem;
-  --colon-width: 2rem;
-  --day-period-spacing-width: 1rem;
-
-  --border: 0.1rem solid #D6D6D6;
-  --border-radius: 0.3rem;
-
-  --font-color: #191919;
-  --fill-color: #EBEBEB;
-
-  --selected-font-color: #FFFFFF;
-  --selected-fill-color: #0996F8;
-
-  --button-font-color: #858585;
-  --button-font-color-hover: #4D4D4D;
-  --button-font-color-active: #191919;
-
-  --disabled-opacity: 0.2;
-}
-
-html {
-  font-size: 10px;
-}
-
-body {
-  margin: 0;
-  color: var(--font-color);
-  font-size: var(--font-size-default);
-}
-
-#time-picker {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-}
-
-.spinner-container {
-  font-family: sans-serif;
-  display: flex;
-  flex-direction: column;
-  width: var(--spinner-width);
-}
-
-.spinner-container > button {
-  -moz-appearance: none;
-  border: none;
-  background: none;
-  background-color: var(--button-font-color);
-  height: var(--spinner-button-height);
-}
-
-.spinner-container > button:hover {
-  background-color: var(--button-font-color-hover);
-}
-
-.spinner-container > button.active {
-  background-color: var(--button-font-color-active);
-}
-
-.spinner-container > button.up {
-  mask: url("chrome://global/skin/icons/find-arrows.svg#glyph-find-previous") no-repeat 50% 50%;
-}
-
-.spinner-container > button.down {
-  mask: url("chrome://global/skin/icons/find-arrows.svg#glyph-find-next") no-repeat 50% 50%;
-}
-
-.spinner-container.hide-buttons > button {
-  visibility: hidden;
-}
-
-.spinner-container > .spinner {
-  position: relative;
-  width: 100%;
-  margin: var(--spinner-margin-top-bottom) 0;
-  cursor: default;
-  overflow-y: scroll;
-  scroll-snap-type: mandatory;
-  scroll-snap-points-y: repeat(100%);
-}
-
-.spinner-container > .spinner > div {
-  box-sizing: border-box;
-  position: relative;
-  text-align: center;
-  padding: calc((var(--spinner-item-height) - var(--font-size-default)) / 2) 0;
-  margin-bottom: var(--spinner-item-margin-bottom);
-  height: var(--spinner-item-height);
-  -moz-user-select: none;
-  scroll-snap-coordinate: 0 0;
-}
-
-.spinner-container > .spinner > div:hover::before {
-  background: var(--fill-color);
-  border: var(--border);
-  border-radius: var(--border-radius);
-  content: "";
-  position: absolute;
-  top: 0%;
-  bottom: 0%;
-  left: 0%;
-  right: 0%;
-  z-index: -10;
-}
-
-.spinner-container > .spinner:not(.scrolling) > div.selection {
-  color: var(--selected-font-color);
-}
-
-.spinner-container > .spinner > div.selection::before {
-  background: var(--selected-fill-color);
-  border: none;
-  border-radius: var(--border-radius);
-  content: "";
-  position: absolute;
-  top: 0%;
-  bottom: 0%;
-  left: 0%;
-  right: 0%;
-  z-index: -10;
-}
-
-.spinner-container > .spinner > div.disabled::before,
-.spinner-container > .spinner.scrolling > div.selection::before,
-.spinner-container > .spinner.scrolling > div:hover::before {
-  display: none;
-}
-
-.spinner-container > .spinner > div.disabled {
-  opacity: var(--disabled-opacity);
-}
-
-.colon {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: var(--colon-width);
-  margin-bottom: 0.3rem;
-}
-
-.spacer {
-  width: var(--day-period-spacing-width);
-}
\ No newline at end of file
diff --git a/arc-firefox-theme/chrome/mozapps/aboutNetworking.css b/arc-firefox-theme/chrome/mozapps/aboutNetworking.css
index 981c04a..619a367 100644
--- a/arc-firefox-theme/chrome/mozapps/aboutNetworking.css
+++ b/arc-firefox-theme/chrome/mozapps/aboutNetworking.css
@@ -18,6 +18,10 @@ body {
   float: left;
 }
 
+#sectionTitle:dir(rtl) {
+  float: right;
+}
+
 #refreshDiv {
   justify-content: flex-end;
   margin-bottom: 0.5em;
@@ -86,6 +90,11 @@ body {
   background-size: 1.6em;
 }
 
+.title:dir(rtl)::before {
+  left: auto;
+  right: -2.3em;
+}
+
 .warningBackground button {
   margin-top: 1em;
   margin-left: 0;
diff --git a/arc-firefox-theme/chrome/mozapps/aboutProfiles.css b/arc-firefox-theme/chrome/mozapps/aboutProfiles.css
index 09dc9ea..0640b71 100644
--- a/arc-firefox-theme/chrome/mozapps/aboutProfiles.css
+++ b/arc-firefox-theme/chrome/mozapps/aboutProfiles.css
@@ -48,6 +48,7 @@ th.column {
 
 td {
   border-color: var(--in-content-table-border-dark-color);
+  unicode-bidi: plaintext; /* Make sure file paths will be LTR */
 }
 
 #action-box {
diff --git a/arc-firefox-theme/chrome/mozapps/downloads/downloads.css b/arc-firefox-theme/chrome/mozapps/downloads/downloads.css
deleted file mode 100644
index bb441f4..0000000
--- a/arc-firefox-theme/chrome/mozapps/downloads/downloads.css
+++ /dev/null
@@ -1,112 +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/. */
-
-#downloadManager {
-  background-color: ThreeDFace;
-}
-
-/* Download View */
-#downloadView {
-  -moz-appearance: none !important;
-  margin: 0;
-  border-bottom: 2px solid;
-  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-}
-
-/* Download View Items */
-richlistitem[type="download"] {
-  padding: 4px 8px 4px 4px;
-  min-height: 46px;
-}
-
-richlistitem[type="download"]:not([selected="true"]):nth-child(odd) {
-  background-color: -moz-oddtreerow;
-}
-
-richlistitem[type="download"] .name {
-  font-size: larger;
-}
-
-richlistitem[type="download"] .dateTime {
-  font-size: smaller;
-}
-
-.mini-button {
-  -moz-appearance: none;
-  background-color: transparent;
-  border: none;
-  padding: 0;
-  margin: 0;
-  min-width: 0;
-  min-height: 0;
-}
-
-.mini-button > .button-box {
-  padding: 0 !important;
-}
-
-menuitem:not([type]) {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
-}
-
-.cancel,
-#menuitem_cancel {
-  list-style-image: url("moz-icon://stock/gtk-cancel?size=menu");
-}
-
-#menuitem_open {
-  list-style-image: url("moz-icon://stock/gtk-open?size=menu");
-}
-#menuitem_open[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-open?size=menu&state=disabled");
-}
-
-.pause,
-#menuitem_pause {
-  list-style-image: url("moz-icon://stock/gtk-media-pause?size=menu");
-}
-
-.pause[disabled="true"],
-#menuitem_pause[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-media-pause?size=menu&state=disabled");
-}
-
-.resume,
-#menuitem_resume {
-  list-style-image: url("moz-icon://stock/gtk-media-play?size=menu");
-}
-
-.retry,
-#menuitem_retry {
-  list-style-image: url("moz-icon://stock/gtk-redo?size=menu");
-}
-
-#menuitem_removeFromList {
-  list-style-image: url("moz-icon://stock/gtk-remove?size=menu");
-}
-
-#menuitem_copyLocation {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=menu");
-}
-
-.blockedIcon {
-  list-style-image: url("moz-icon://stock/gtk-dialog-error?size=dialog");
-  width: 32px;
-  height: 32px;
-}
-
-/* prevent flickering when changing states */
-.downloadTypeIcon {
-  min-height: 32px;
-  min-width: 32px;
-}
-
-#clearListButton {
-  list-style-image: url(moz-icon://stock/gtk-clear?size=button);
-  margin-top: 3px;
-}
-
-#clearListButton[disabled="true"] {
-  list-style-image: url(moz-icon://stock/gtk-clear?size=button&state=disabled);
-}
diff --git a/arc-firefox-theme/install.rdf b/arc-firefox-theme/install.rdf
index 14512f8..e10d79e 100644
--- a/arc-firefox-theme/install.rdf
+++ b/arc-firefox-theme/install.rdf
@@ -5,7 +5,7 @@
   
   <Description about="urn:mozilla:install-manifest">
     <em:id>{52c2877e-44e1-11e5-8874-a62d1d5d46B0}</em:id>
-    <em:version>52.20170311</em:version>
+    <em:version>53.20170420</em:version>
     <em:type>4</em:type>
     <em:name>Arc Theme</em:name>
     <em:description>Arc Theme for Firefox</em:description>
@@ -21,8 +21,8 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>52.0</em:minVersion>
-        <em:maxVersion>55.0</em:maxVersion>
+        <em:minVersion>53.0</em:minVersion>
+        <em:maxVersion>56.0</em:maxVersion>
       </Description>
     </em:targetApplication>
     
diff --git a/configure.ac b/configure.ac
index 11fc973..aacac62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([arc-firefox-theme], [52.20170311], [https://github.com/horst3180/arc-firefox-theme/issues], [arc-firefox-theme], [https://github.com/horst3180/arc-firefox-theme])
+AC_INIT([arc-firefox-theme], [53.20170420], [https://github.com/horst3180/arc-firefox-theme/issues], [arc-firefox-theme], [https://github.com/horst3180/arc-firefox-theme])
 AM_INIT_AUTOMAKE([-Wno-portability no-dist-gzip dist-xz foreign subdir-objects tar-ustar])
 AC_PREFIX_DEFAULT(/usr/local)
 AM_SILENT_RULES([yes])