From bf714978b2886d6041c292e4282a8a779d3ec513 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 1 Sep 2024 01:16:34 +0800
Subject: [PATCH] update

---
 .../firefox/Monterey/colors/dark-adaptive.css |   3 +-
 src/other/firefox/Monterey/colors/dark.css    |   1 +
 .../Monterey/colors/light-adaptive.css        |   3 +-
 src/other/firefox/Monterey/colors/light.css   |   3 +-
 src/other/firefox/Monterey/theme-adaptive.css |   1 -
 .../firefox/Monterey/theme-alt-adaptive.css   |   1 -
 src/other/firefox/Monterey/theme-alt.css      |   1 -
 src/other/firefox/Monterey/theme.css          |   1 -
 .../firefox/WhiteSur/colors/dark-adaptive.css |   3 +-
 src/other/firefox/WhiteSur/colors/dark.css    |   1 +
 .../WhiteSur/colors/light-adaptive.css        |   3 +-
 src/other/firefox/WhiteSur/colors/light.css   |   3 +-
 src/other/firefox/WhiteSur/parts/toolbox.css  |   6 +-
 src/other/firefox/WhiteSur/theme-adaptive.css |   1 -
 src/other/firefox/WhiteSur/theme.css          |   1 -
 .../application-x-addon-blocked-symbolic.svg  |   9 +-
 .../icons/application-x-addon-symbolic.svg    |  17 +-
 .../applications-engineering-symbolic.svg     |   4 +-
 .../icons/audio-muted-symbolic-light.svg      |   4 -
 .../common/icons/audio-muted-symbolic.svg     |   6 +-
 .../icons/audio-playing-symbolic-light.svg    |   3 -
 .../common/icons/audio-playing-symbolic.svg   |  64 +---
 .../icons/autoplay-media-blocked-symbolic.svg |   6 +-
 .../common/icons/autoplay-media-symbolic.svg  |   4 +-
 .../icons/blocked-permission-symbolic.svg     |  11 +-
 .../common/icons/bookmarks-symbolic.svg       |   4 +-
 .../firefox/common/icons/bullet-symbolic.svg  |  39 +--
 .../common/icons/character-symbolic.svg       |  16 +-
 .../icons/checkbox-checked-symbolic.svg       |   6 +-
 .../common/icons/checkbox-symbolic.svg        |   4 +-
 .../firefox/common/icons/drm-symbolic.svg     |  13 +-
 .../common/icons/edit-copy-symbolic.svg       |   6 +-
 .../common/icons/edit-cut-symbolic.svg        |   6 +-
 .../common/icons/edit-find-symbolic.svg       |   6 +-
 .../common/icons/edit-paste-symbolic.svg      |   4 +-
 .../firefox/common/icons/firefox-view.svg     |   4 +-
 .../common/icons/folder-download-symbolic.svg |   7 +-
 .../common/icons/folder-locked-symbolic.svg   |   9 +-
 .../common/icons/folder-symbolic-light.svg    |  44 ---
 .../firefox/common/icons/folder-symbolic.svg  |   7 +-
 .../common/icons/forget-history-symbolic.svg  |   7 +-
 src/other/firefox/common/icons/geo.svg        |  17 +-
 .../common/icons/go-next-symbolic-light.svg   |   3 -
 .../firefox/common/icons/go-next-symbolic.svg |   4 +-
 .../icons/go-previous-symbolic-light.svg      |   3 -
 .../common/icons/go-previous-symbolic.svg     |   4 +-
 src/other/firefox/common/icons/home.svg       |   6 +
 src/other/firefox/common/icons/icon.svg       |  61 +---
 .../firefox/common/icons/import-symbolic.svg  |   6 +-
 .../common/icons/info-symbolic-light.svg      |  57 ----
 .../firefox/common/icons/info-symbolic.svg    |  60 +---
 .../firefox/common/icons/key-symbolic.svg     |   4 +-
 .../firefox/common/icons/library-symbolic.svg |   7 +-
 .../common/icons/mail-unread-symbolic.svg     |   4 +-
 .../common/icons/microphone-symbolic.svg      |   6 +-
 .../network-workgroup-symbolic-light.svg      |  44 ---
 .../icons/network-workgroup-symbolic.svg      |   7 +-
 .../common/icons/notification-symbolic.svg    |   4 +-
 .../common/icons/open-folder-symbolic.svg     |  11 +-
 .../common/icons/open-menu-symbolic.svg       |   4 +-
 .../firefox/common/icons/page-action.svg      |  10 +-
 .../firefox/common/icons/page-symbolic.svg    |   4 +-
 .../common/icons/pan-down-symbolic-light.svg  |   3 -
 .../common/icons/pan-down-symbolic.svg        |   4 +-
 .../common/icons/pan-end-symbolic-light.svg   |   3 -
 .../firefox/common/icons/pan-end-symbolic.svg |   4 +-
 .../common/icons/pan-start-symbolic.svg       |   4 +-
 .../firefox/common/icons/pan-up-symbolic.svg  |   4 +-
 .../common/icons/permissions-granted.svg      |  12 +-
 .../common/icons/persistent-storage.svg       |  12 +-
 .../common/icons/picture-in-picture-open.svg  |   4 +-
 .../icons/preferences-system-symbolic.svg     |   4 +-
 ...preferences-system-time-symbolic-light.svg |  56 ----
 .../preferences-system-time-symbolic.svg      |  64 +---
 .../firefox/common/icons/printer-symbolic.svg |  16 +-
 .../common/icons/process-stop-symbolic.svg    |   4 +-
 .../icons/process-working-symbolic-black.svg  | 182 -----------
 .../icons/process-working-symbolic-light.svg  | 186 ------------
 .../common/icons/process-working-symbolic.svg | 200 +-----------
 .../common/icons/radio-checked-symbolic.svg   |   4 +-
 .../firefox/common/icons/radio-symbolic.svg   |   4 +-
 .../firefox/common/icons/reader-mode.svg      |  13 +-
 .../common/icons/save-folder-symbolic.svg     |   9 +-
 .../common/icons/save-to-pocket-light.svg     |   6 -
 .../icons/save-to-pocket-open-light.svg       |  47 ---
 .../common/icons/save-to-pocket-open.svg      |  48 +--
 .../firefox/common/icons/save-to-pocket.svg   |  51 +---
 .../common/icons/screen-blocked-symbolic.svg  |  13 +-
 .../firefox/common/icons/screen-symbolic.svg  |  11 +-
 .../common/icons/screenshot-symbolic.svg      |   7 +-
 .../common/icons/security-broken-symbolic.svg |  11 +-
 .../icons/security-warning-symbolic.svg       |  11 +-
 .../firefox/common/icons/select-symbolic.svg  |   4 +-
 .../firefox/common/icons/star-symbolic.svg    |   5 +-
 src/other/firefox/common/icons/sync.svg       |   4 +-
 .../icons/tab-audio-blocked-small-light.svg   |   4 -
 .../common/icons/tab-audio-blocked-small.svg  |   6 +-
 .../firefox/common/icons/tab-new-symbolic.svg |   6 +-
 .../common/icons/tab-sync-symbolic-light.svg  |   4 -
 .../common/icons/tab-sync-symbolic.svg        |   6 +-
 .../icons/toggle-right-sidebar-symbolic.svg   |  10 +-
 .../common/icons/toggle-sidebar-symbolic.svg  |  12 +-
 .../firefox/common/icons/tool-profiler.svg    |   8 +-
 .../common/icons/tracking-protection.svg      |   4 +-
 .../common/icons/user-home-symbolic.svg       |   4 +-
 .../common/icons/user-not-tracked-dark.svg    |   4 -
 .../firefox/common/icons/user-not-tracked.svg |   8 +-
 .../common/icons/view-fullscreen-symbolic.svg |   4 +-
 .../icons/view-more-horizontal-symbolic.svg   |   4 +-
 .../common/icons/view-refresh-symbolic.svg    |   4 +-
 .../common/icons/view-restore-symbolic.svg    |   6 +-
 .../icons/window-close-symbolic-light.svg     |   3 -
 .../common/icons/window-close-symbolic.svg    |   5 +-
 .../common/icons/window-maximize-symbolic.svg |   4 +-
 .../common/icons/window-minimize-symbolic.svg |   4 +-
 .../common/icons/window-new-symbolic.svg      |   6 +-
 .../common/icons/window-restore-symbolic.svg  |   6 +-
 .../firefox/common/icons/zoom-in-symbolic.svg |   6 +-
 .../common/icons/zoom-out-symbolic.svg        |   6 +-
 .../firefox/common/parts/custom-icons.css     |  34 ---
 src/other/firefox/common/parts/headerbar.css  |  26 +-
 src/other/firefox/common/parts/icons.css      | 286 ++++--------------
 122 files changed, 335 insertions(+), 1823 deletions(-)
 delete mode 100644 src/other/firefox/common/icons/audio-muted-symbolic-light.svg
 delete mode 100644 src/other/firefox/common/icons/audio-playing-symbolic-light.svg
 delete mode 100644 src/other/firefox/common/icons/folder-symbolic-light.svg
 delete mode 100644 src/other/firefox/common/icons/go-next-symbolic-light.svg
 delete mode 100644 src/other/firefox/common/icons/go-previous-symbolic-light.svg
 create mode 100644 src/other/firefox/common/icons/home.svg
 delete mode 100644 src/other/firefox/common/icons/info-symbolic-light.svg
 delete mode 100644 src/other/firefox/common/icons/network-workgroup-symbolic-light.svg
 delete mode 100644 src/other/firefox/common/icons/pan-down-symbolic-light.svg
 delete mode 100644 src/other/firefox/common/icons/pan-end-symbolic-light.svg
 delete mode 100644 src/other/firefox/common/icons/preferences-system-time-symbolic-light.svg
 delete mode 100644 src/other/firefox/common/icons/process-working-symbolic-black.svg
 delete mode 100644 src/other/firefox/common/icons/process-working-symbolic-light.svg
 delete mode 100644 src/other/firefox/common/icons/save-to-pocket-light.svg
 delete mode 100644 src/other/firefox/common/icons/save-to-pocket-open-light.svg
 delete mode 100644 src/other/firefox/common/icons/tab-audio-blocked-small-light.svg
 delete mode 100644 src/other/firefox/common/icons/tab-sync-symbolic-light.svg
 delete mode 100644 src/other/firefox/common/icons/user-not-tracked-dark.svg
 delete mode 100644 src/other/firefox/common/icons/window-close-symbolic-light.svg
 delete mode 100644 src/other/firefox/common/parts/custom-icons.css

diff --git a/src/other/firefox/Monterey/colors/dark-adaptive.css b/src/other/firefox/Monterey/colors/dark-adaptive.css
index 8f9c1035..ac05ab3e 100644
--- a/src/other/firefox/Monterey/colors/dark-adaptive.css
+++ b/src/other/firefox/Monterey/colors/dark-adaptive.css
@@ -22,7 +22,8 @@
 	--gnome-toolbar-background: var(--lwt-accent-color, #363636);
 	--gnome-tabstoolbar-background: var(--lwt-accent-color, #363636);
 	--gnome-findbar-background: var(--lwt-accent-color, #363636);
-	--gnome-toolbar-color: var(--toolbar-color);
+	--gnome-toolbar-color: var(--toolbar-color, #ffffff);
+	--gnome-toolbar-icon-fill: var(--toolbar-color, #ffffff);
 	--gnome-toolbar-border-color: rgba(255, 255, 255, 0.1);
 	--gnome-inactive-toolbar-background: var(--lwt-accent-color, #363636);
 	--gnome-inactive-toolbar-border-color: var(--chrome-content-separator-color);
diff --git a/src/other/firefox/Monterey/colors/dark.css b/src/other/firefox/Monterey/colors/dark.css
index 38a48c3d..98fd35a0 100644
--- a/src/other/firefox/Monterey/colors/dark.css
+++ b/src/other/firefox/Monterey/colors/dark.css
@@ -19,6 +19,7 @@
 	--gnome-tabstoolbar-background: #1e1e1e;
 	--gnome-findbar-background: #373737;
 	--gnome-toolbar-color: #ffffff;
+	--gnome-toolbar-icon-fill: #ffffff;
 	--gnome-toolbar-border-color: #070707;
 	--gnome-inactive-toolbar-background: #313131;
 	--gnome-inactive-toolbar-border-color: #121212;
diff --git a/src/other/firefox/Monterey/colors/light-adaptive.css b/src/other/firefox/Monterey/colors/light-adaptive.css
index d18a062b..346a3fb2 100644
--- a/src/other/firefox/Monterey/colors/light-adaptive.css
+++ b/src/other/firefox/Monterey/colors/light-adaptive.css
@@ -21,7 +21,8 @@
 	--gnome-toolbar-background: var(--lwt-accent-color, #ffffff);
 	--gnome-tabstoolbar-background: var(--lwt-accent-color, #ffffff);
 	--gnome-findbar-background: var(--lwt-accent-color, #ffffff);
-	--gnome-toolbar-color: var(--toolbar-color, #323232);
+	--gnome-toolbar-color: var(--toolbar-color, #2e2e2e);
+	--gnome-toolbar-icon-fill: var(--toolbar-color, #2e2e2e);
 	--gnome-toolbar-border-color: var(--chrome-content-separator-color);
 	--gnome-inactive-toolbar-color: color-mix(in srgb, var(--gnome-toolbar-color) 45%, var(--gnome-toolbar-background));
 	--gnome-inactive-toolbar-background: var(--lwt-accent-color, #ffffff);
diff --git a/src/other/firefox/Monterey/colors/light.css b/src/other/firefox/Monterey/colors/light.css
index 4298fdde..91826303 100644
--- a/src/other/firefox/Monterey/colors/light.css
+++ b/src/other/firefox/Monterey/colors/light.css
@@ -17,7 +17,8 @@
 	--gnome-toolbar-background: #ffffff;
 	--gnome-tabstoolbar-background: #E5E5E5;
 	--gnome-findbar-background: #ffffff;
-	--gnome-toolbar-color: rgb(46, 52, 54);
+	--gnome-toolbar-color: #2e2e2e;
+	--gnome-toolbar-icon-fill: #2e2e2e;
 	--gnome-toolbar-border-color: #cfcfcf;
 	--gnome-inactive-toolbar-color: rgba(46, 52, 54, 0.35);
 	--gnome-inactive-toolbar-background: #f6f5f4;
diff --git a/src/other/firefox/Monterey/theme-adaptive.css b/src/other/firefox/Monterey/theme-adaptive.css
index e6cafe1d..37142746 100644
--- a/src/other/firefox/Monterey/theme-adaptive.css
+++ b/src/other/firefox/Monterey/theme-adaptive.css
@@ -15,7 +15,6 @@
 @import "parts/notification.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
-@import "parts/custom-icons.css";
 @import "parts/icons.css";
 @import "colors/light-adaptive.css";
 @import "colors/dark-adaptive.css";
diff --git a/src/other/firefox/Monterey/theme-alt-adaptive.css b/src/other/firefox/Monterey/theme-alt-adaptive.css
index c50a3fce..30d10d6e 100644
--- a/src/other/firefox/Monterey/theme-alt-adaptive.css
+++ b/src/other/firefox/Monterey/theme-alt-adaptive.css
@@ -15,7 +15,6 @@
 @import "parts/notification.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
-@import "parts/custom-icons.css";
 @import "parts/icons.css";
 @import "colors/light-adaptive.css";
 @import "colors/dark-adaptive.css";
diff --git a/src/other/firefox/Monterey/theme-alt.css b/src/other/firefox/Monterey/theme-alt.css
index 7380aabc..be6a30f9 100644
--- a/src/other/firefox/Monterey/theme-alt.css
+++ b/src/other/firefox/Monterey/theme-alt.css
@@ -15,7 +15,6 @@
 @import "parts/notification.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
-@import "parts/custom-icons.css";
 @import "parts/icons.css";
 @import "colors/light.css";
 @import "colors/dark.css";
diff --git a/src/other/firefox/Monterey/theme.css b/src/other/firefox/Monterey/theme.css
index d8128bbd..7a687dfc 100644
--- a/src/other/firefox/Monterey/theme.css
+++ b/src/other/firefox/Monterey/theme.css
@@ -15,7 +15,6 @@
 @import "parts/notification.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
-@import "parts/custom-icons.css";
 @import "parts/icons.css";
 @import "colors/light.css";
 @import "colors/dark.css";
diff --git a/src/other/firefox/WhiteSur/colors/dark-adaptive.css b/src/other/firefox/WhiteSur/colors/dark-adaptive.css
index d65a85e2..0953b228 100644
--- a/src/other/firefox/WhiteSur/colors/dark-adaptive.css
+++ b/src/other/firefox/WhiteSur/colors/dark-adaptive.css
@@ -21,7 +21,8 @@
 	--gnome-toolbar-background: var(--lwt-accent-color, #363636);
 	--gnome-tabstoolbar-background: color-mix(in srgb, #ffffff 6%, var(--lwt-accent-color, #363636));
 	--gnome-findbar-background: var(--lwt-accent-color, #282828);
-	--gnome-toolbar-color: var(--toolbar-color);
+	--gnome-toolbar-color: var(--toolbar-color, #ffffff);
+	--gnome-toolbar-icon-fill: var(--toolbar-color, #ffffff);
 	--gnome-toolbar-border-color: rgba(255, 255, 255, 0.1);
 	--gnome-inactive-toolbar-color: color-mix(in srgb, var(--gnome-toolbar-color) 45%, var(--gnome-toolbar-background));
 	--gnome-inactive-toolbar-background: var(--lwt-accent-color, #282828);
diff --git a/src/other/firefox/WhiteSur/colors/dark.css b/src/other/firefox/WhiteSur/colors/dark.css
index 5ee02658..9db93502 100644
--- a/src/other/firefox/WhiteSur/colors/dark.css
+++ b/src/other/firefox/WhiteSur/colors/dark.css
@@ -18,6 +18,7 @@
 	--gnome-tabstoolbar-background: #1e1e1e;
 	--gnome-findbar-background: #333333;
 	--gnome-toolbar-color: #ffffff;
+	--gnome-toolbar-icon-fill: #ffffff;
 	--gnome-toolbar-border-color: #070707;
 	--gnome-inactive-toolbar-color: rgba(255, 255, 255, 0.45);
 	--gnome-inactive-toolbar-background: #313131;
diff --git a/src/other/firefox/WhiteSur/colors/light-adaptive.css b/src/other/firefox/WhiteSur/colors/light-adaptive.css
index befc0029..36224a50 100644
--- a/src/other/firefox/WhiteSur/colors/light-adaptive.css
+++ b/src/other/firefox/WhiteSur/colors/light-adaptive.css
@@ -20,7 +20,8 @@
 	--gnome-toolbar-background: var(--lwt-accent-color, #ffffff);
 	--gnome-tabstoolbar-background: color-mix(in srgb, #000000 8%, var(--lwt-accent-color, #ffffff));
 	--gnome-findbar-background: var(--lwt-accent-color, #ffffff);
-	--gnome-toolbar-color: var(--toolbar-color, #323232);
+	--gnome-toolbar-color: var(--toolbar-color, #2e2e2e);
+	--gnome-toolbar-icon-fill: var(--toolbar-color, #2e2e2e);
 	--gnome-toolbar-border-color: rgba(0, 0, 0, 0.1);
 	--gnome-inactive-toolbar-color: color-mix(in srgb, var(--gnome-toolbar-color) 45%, var(--gnome-toolbar-background));
 	--gnome-inactive-toolbar-background: var(--lwt-accent-color, #ffffff);
diff --git a/src/other/firefox/WhiteSur/colors/light.css b/src/other/firefox/WhiteSur/colors/light.css
index ab0fa6c4..5e5ce1fb 100644
--- a/src/other/firefox/WhiteSur/colors/light.css
+++ b/src/other/firefox/WhiteSur/colors/light.css
@@ -16,7 +16,8 @@
 	--gnome-toolbar-background: #ffffff;
 	--gnome-tabstoolbar-background: #E5E5E5;
 	--gnome-findbar-background: #f5f5f5;
-	--gnome-toolbar-color: rgb(46, 46, 46);
+	--gnome-toolbar-color: #2e2e2e;
+	--gnome-toolbar-icon-fill: #2e2e2e;
 	--gnome-toolbar-border-color: #cfcfcf;
 	--gnome-inactive-toolbar-color: rgba(46, 46, 46, 0.65);
 	--gnome-inactive-toolbar-background: #f6f5f4;
diff --git a/src/other/firefox/WhiteSur/parts/toolbox.css b/src/other/firefox/WhiteSur/parts/toolbox.css
index 430d7f09..468d436d 100644
--- a/src/other/firefox/WhiteSur/parts/toolbox.css
+++ b/src/other/firefox/WhiteSur/parts/toolbox.css
@@ -13,11 +13,6 @@
 	background: none !important;
 }
 
-.toolbarbutton-icon {
-	color: var(--gnome-toolbar-color);
-	fill: var(--gnome-toolbar-color);
-}
-
 toolbar .toolbarbutton-1 {
 	> .toolbarbutton-icon,
 	> .toolbarbutton-text,
@@ -164,4 +159,5 @@ toolbarbutton.bookmark-item {
 	margin: 0 2px !important;
 	border-radius: 3px !important;
 	max-height: 24px !important;
+	color: var(--gnome-toolbar-color) !important;
 }
diff --git a/src/other/firefox/WhiteSur/theme-adaptive.css b/src/other/firefox/WhiteSur/theme-adaptive.css
index 64ea2339..ae824cdc 100644
--- a/src/other/firefox/WhiteSur/theme-adaptive.css
+++ b/src/other/firefox/WhiteSur/theme-adaptive.css
@@ -15,7 +15,6 @@
 @import "parts/notification.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
-@import "parts/custom-icons.css";
 @import "parts/icons.css";
 @import "colors/light-adaptive.css";
 @import "colors/dark-adaptive.css";
diff --git a/src/other/firefox/WhiteSur/theme.css b/src/other/firefox/WhiteSur/theme.css
index 428bac54..e8e6124c 100644
--- a/src/other/firefox/WhiteSur/theme.css
+++ b/src/other/firefox/WhiteSur/theme.css
@@ -15,7 +15,6 @@
 @import "parts/notification.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
-@import "parts/custom-icons.css";
 @import "parts/icons.css";
 @import "colors/light.css";
 @import "colors/dark.css";
diff --git a/src/other/firefox/common/icons/application-x-addon-blocked-symbolic.svg b/src/other/firefox/common/icons/application-x-addon-blocked-symbolic.svg
index 74a645fc..a8481794 100644
--- a/src/other/firefox/common/icons/application-x-addon-blocked-symbolic.svg
+++ b/src/other/firefox/common/icons/application-x-addon-blocked-symbolic.svg
@@ -1,7 +1,4 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#6e6e6e; } .ColorScheme-Highlight { color:#5294e2; }</style>
- </defs>
- <path d="m7 0c-1.108 0-2 0.892-2 2v1h-2.1543c-1.0228 0-1.8457 0.82293-1.8457 1.8457v3.1543h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v3.1543c0 1.0228 0.82293 1.8457 1.8457 1.8457h3.1543v-2c0-0.554 0.446-1 1-1s1 0.446 1 1v2h3.1543c1.0228 0 1.8457-0.82293 1.8457-1.8457v-2.1543h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2.1543c0-1.0228-0.82293-1.8457-1.8457-1.8457h-2.1543v-1c0-1.108-0.892-2-2-2zm0 1c0.554 0 1 0.446 1 1v2h3c0.554 0 1 0.446 1 1v3h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v3c0 0.554-0.446 1-1 1h-2v-1c0-1.108-0.892-2-2-2s-2 0.892-2 2v1h-2c-0.554 0-1-0.446-1-1v-2h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2c0-0.554 0.446-1 1-1h3v-2c0-0.554 0.446-1 1-1z" fill="#363636" opacity=".35"/>
- <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".86" stroke-width="2.2361"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m7 0c-1.108 0-2 0.892-2 2v1h-2.1543c-1.0228 0-1.8457 0.82293-1.8457 1.8457v3.1543h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v3.1543c0 1.0228 0.82293 1.8457 1.8457 1.8457h3.1543v-2c0-0.554 0.446-1 1-1s1 0.446 1 1v2h3.1543c1.0228 0 1.8457-0.82293 1.8457-1.8457v-2.1543h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2.1543c0-1.0228-0.82293-1.8457-1.8457-1.8457h-2.1543v-1c0-1.108-0.892-2-2-2zm0 1c0.554 0 1 0.446 1 1v2h3c0.554 0 1 0.446 1 1v3h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v3c0 0.554-0.446 1-1 1h-2v-1c0-1.108-0.892-2-2-2s-2 0.892-2 2v1h-2c-0.554 0-1-0.446-1-1v-2h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2c0-0.554 0.446-1 1-1h3v-2c0-0.554 0.446-1 1-1z" opacity=".35"/>
+ <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0"/>
 </svg>
diff --git a/src/other/firefox/common/icons/application-x-addon-symbolic.svg b/src/other/firefox/common/icons/application-x-addon-symbolic.svg
index 0b896c92..e30a1674 100644
--- a/src/other/firefox/common/icons/application-x-addon-symbolic.svg
+++ b/src/other/firefox/common/icons/application-x-addon-symbolic.svg
@@ -1,16 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#6e6e6e; } .ColorScheme-Highlight { color:#5294e2; }</style>
- </defs>
- <path d="m7 0c-1.108 0-2 0.892-2 2v1h-2.1543c-1.0228 0-1.8457 0.82293-1.8457 1.8457v2.1543 1h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v1 2.1543c0 1.0228 0.82293 1.8457 1.8457 1.8457h2.1543 1v-2c0-0.554 0.446-1 1-1s1 0.446 1 1v2h1 2.1543c1.0228 0 1.8457-0.82293 1.8457-1.8457v-2.1543h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2.1543c0-1.0228-0.82293-1.8457-1.8457-1.8457h-2.1543v-1c0-1.108-0.892-2-2-2zm0 1c0.554 0 1 0.446 1 1v2h1 2c0.554 0 1 0.446 1 1v2 1h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v1 2c0 0.554-0.446 1-1 1h-2v-1c0-1.108-0.892-2-2-2s-2 0.892-2 2v1h-2c-0.554 0-1-0.446-1-1v-2h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2c0-0.554 0.446-1 1-1h2 1v-2c0-0.554 0.446-1 1-1z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m7 0c-1.108 0-2 0.892-2 2v1h-2.1543c-1.0228 0-1.8457 0.82293-1.8457 1.8457v2.1543 1h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v1 2.1543c0 1.0228 0.82293 1.8457 1.8457 1.8457h2.1543 1v-2c0-0.554 0.446-1 1-1s1 0.446 1 1v2h1 2.1543c1.0228 0 1.8457-0.82293 1.8457-1.8457v-2.1543h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2.1543c0-1.0228-0.82293-1.8457-1.8457-1.8457h-2.1543v-1c0-1.108-0.892-2-2-2zm0 1c0.554 0 1 0.446 1 1v2h1 2c0.554 0 1 0.446 1 1v2 1h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v1 2c0 0.554-0.446 1-1 1h-2v-1c0-1.108-0.892-2-2-2s-2 0.892-2 2v1h-2c-0.554 0-1-0.446-1-1v-2h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2c0-0.554 0.446-1 1-1h2 1v-2c0-0.554 0.446-1 1-1z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/applications-engineering-symbolic.svg b/src/other/firefox/common/icons/applications-engineering-symbolic.svg
index e355e5aa..947b6c76 100644
--- a/src/other/firefox/common/icons/applications-engineering-symbolic.svg
+++ b/src/other/firefox/common/icons/applications-engineering-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m11.02 0.53711a1.0001 1.0001 0 0 0-0.58984 0.19336c-0.89811 0.65868-1.4296 1.7085-1.4297 2.8223 0.00118 1.3259 0.86654 2.3529 2 2.9434v1.1797a7 7 0 0 1 1 0.58008v-2.2559c-1.1632-0.23743-1.9989-1.2601-2-2.4473 9.8e-5 -0.7962 0.37943-1.5447 1.0215-2.0156-4e-3 0.036332-0.021484 0.068046-0.021484 0.10547v2c0 0.554 0.446 1 1 1h1c0.554 0 1-0.446 1-1v-2c0-0.037422-0.017524-0.069136-0.021484-0.10547 0.64204 0.47088 1.0214 1.2194 1.0215 2.0156-1.29e-4 1.1879-0.83612 2.2116-2 2.4492v3.0996a7 7 0 0 1 1 1.2949v-3.9004c1.134-0.59095 1.9999-1.6166 2-2.9434-1.38e-4 -1.1138-0.53157-2.1636-1.4297-2.8223a1.0001 1.0001 0 0 0-1.5859 0.91602c0.01271 0.11643 0.014165 0.1478 0.015625 0.16797v1.8281h-1v-1.8281c0.0015-0.020168 0.002895-0.051534 0.015625-0.16797a1.0001 1.0001 0 0 0-0.99609-1.1094zm-3.0195 7.4629a6 6 0 0 0-6 6h-2v1h16v-1h-2a6 6 0 0 0-6-6zm0 1a5 5 0 0 1 5 5h-1a4 4 0 0 0-4-4 4 4 0 0 0-0.060547 0 4 4 0 0 0-3.9395 4h-1a5 5 0 0 1 5-5zm-0.052734 2a3 3 0 0 1 0.0019532 0 3 3 0 0 1 0.050781 0 3 3 0 0 1 3 3h-6a3 3 0 0 1 2.9473-3z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m11.02 0.53711a1.0001 1.0001 0 0 0-0.58984 0.19336c-0.89811 0.65868-1.4296 1.7085-1.4297 2.8223 0.00118 1.3259 0.86654 2.3529 2 2.9434v1.1797a7 7 0 0 1 1 0.58008v-2.2559c-1.1632-0.23743-1.9989-1.2601-2-2.4473 9.8e-5 -0.7962 0.37943-1.5447 1.0215-2.0156-4e-3 0.036332-0.021484 0.068046-0.021484 0.10547v2c0 0.554 0.446 1 1 1h1c0.554 0 1-0.446 1-1v-2c0-0.037422-0.017524-0.069136-0.021484-0.10547 0.64204 0.47088 1.0214 1.2194 1.0215 2.0156-1.29e-4 1.1879-0.83612 2.2116-2 2.4492v3.0996a7 7 0 0 1 1 1.2949v-3.9004c1.134-0.59095 1.9999-1.6166 2-2.9434-1.38e-4 -1.1138-0.53157-2.1636-1.4297-2.8223a1.0001 1.0001 0 0 0-1.5859 0.91602c0.01271 0.11643 0.014165 0.1478 0.015625 0.16797v1.8281h-1v-1.8281c0.0015-0.020168 0.002895-0.051534 0.015625-0.16797a1.0001 1.0001 0 0 0-0.99609-1.1094zm-3.0195 7.4629a6 6 0 0 0-6 6h-2v1h16v-1h-2a6 6 0 0 0-6-6zm0 1a5 5 0 0 1 5 5h-1a4 4 0 0 0-4-4 4 4 0 0 0-0.060547 0 4 4 0 0 0-3.9395 4h-1a5 5 0 0 1 5-5zm-0.052734 2a3 3 0 0 1 0.0019532 0 3 3 0 0 1 0.050781 0 3 3 0 0 1 3 3h-6a3 3 0 0 1 2.9473-3z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/audio-muted-symbolic-light.svg b/src/other/firefox/common/icons/audio-muted-symbolic-light.svg
deleted file mode 100644
index 12fd4be3..00000000
--- a/src/other/firefox/common/icons/audio-muted-symbolic-light.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg">
- <path d="m3.3703 0.34106c-0.099392 0.0070445-0.16522 0.12967-0.07493 0.23048a2.1166 2.1166 0 0 1 0.67334 1.5451 2.1166 2.1166 0 0 1-0.67592 1.5482c-0.118 0.12462 0.047819 0.30388 0.17932 0.19275a2.3812 2.3812 0 0 0 0.76119-1.741 2.3812 2.3812 0 0 0-0.75705-1.7389c-0.036049-0.02831-0.072805-0.039038-0.10594-0.03669zm-0.63251 0.37465c-0.10467 0.0031254-0.16989 0.14175-0.067696 0.24236a1.5875 1.5875 0 0 1 0.50487 1.1586 1.5875 1.5875 0 0 1-0.50694 1.1612c-0.12409 0.118 0.04569 0.30335 0.17983 0.19275a1.8521 1.8521 0 0 0 0.59169-1.3539 1.8521 1.8521 0 0 0-0.58859-1.3524c-0.038827-0.035388-0.078279-0.049617-0.11317-0.048575zm-1.1503 0.078031-0.79374 0.79374h-0.52916c-0.14658 0-0.26458 0.118-0.26458 0.26458v0.52916c3.9166e-17 0.14658 0.118 0.26458 0.26458 0.26458h0.52916l0.79374 0.79374v-2.6458zm0.53381 0.31316c-0.099441 0.0043159-0.17066 0.13599-0.076997 0.23719a1.0583 1.0583 0 0 1 0.33693 0.77256 1.0583 1.0583 0 0 1-0.33796 0.77411c-0.12515 0.11377 0.036959 0.30492 0.17983 0.19327a1.3229 1.3229 0 0 0 0.42271-0.96738 1.3229 1.3229 0 0 0-0.42064-0.96582c-0.034396-0.032676-0.070722-0.045363-0.10387-0.043925z" fill="#dfdfdf" opacity=".35" stroke-width=".26458"/>
- <rect transform="rotate(45)" x=".34758" y="-.13229" width="5.2916" height=".26458" rx=".13229" ry=".13229" fill="#dfdfdf" style="paint-order:markers stroke fill"/>
-</svg>
diff --git a/src/other/firefox/common/icons/audio-muted-symbolic.svg b/src/other/firefox/common/icons/audio-muted-symbolic.svg
index 7e8210ad..972ebf90 100644
--- a/src/other/firefox/common/icons/audio-muted-symbolic.svg
+++ b/src/other/firefox/common/icons/audio-muted-symbolic.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg">
- <path d="m3.3703 0.34106c-0.099392 0.0070445-0.16522 0.12967-0.07493 0.23048a2.1166 2.1166 0 0 1 0.67334 1.5451 2.1166 2.1166 0 0 1-0.67592 1.5482c-0.118 0.12462 0.047819 0.30388 0.17932 0.19275a2.3812 2.3812 0 0 0 0.76119-1.741 2.3812 2.3812 0 0 0-0.75705-1.7389c-0.036049-0.02831-0.072805-0.039038-0.10594-0.03669zm-0.63251 0.37465c-0.10467 0.0031254-0.16989 0.14175-0.067696 0.24236a1.5875 1.5875 0 0 1 0.50487 1.1586 1.5875 1.5875 0 0 1-0.50694 1.1612c-0.12409 0.118 0.04569 0.30335 0.17983 0.19275a1.8521 1.8521 0 0 0 0.59169-1.3539 1.8521 1.8521 0 0 0-0.58859-1.3524c-0.038827-0.035388-0.078279-0.049617-0.11317-0.048575zm-1.1503 0.078031-0.79374 0.79374h-0.52916c-0.14658 0-0.26458 0.118-0.26458 0.26458v0.52916c3.9166e-17 0.14658 0.118 0.26458 0.26458 0.26458h0.52916l0.79374 0.79374v-2.6458zm0.53381 0.31316c-0.099441 0.0043159-0.17066 0.13599-0.076997 0.23719a1.0583 1.0583 0 0 1 0.33693 0.77256 1.0583 1.0583 0 0 1-0.33796 0.77411c-0.12515 0.11377 0.036959 0.30492 0.17983 0.19327a1.3229 1.3229 0 0 0 0.42271-0.96738 1.3229 1.3229 0 0 0-0.42064-0.96582c-0.034396-0.032676-0.070722-0.045363-0.10387-0.043925z" fill="#363636" opacity=".35" stroke-width=".26458"/>
- <rect transform="rotate(45)" x=".34758" y="-.13229" width="5.2916" height=".26458" rx=".13229" ry=".13229" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m12.738 1.2891c-0.37566 0.026625-0.62446 0.4901-0.2832 0.87111a7.9998 7.9998 0 0 1 2.5449 5.8398 7.9998 7.9998 0 0 1-2.5547 5.8515c-0.44599 0.47101 0.18074 1.1485 0.67775 0.72851a8.9999 8.9999 0 0 0 2.877-6.5802 8.9999 8.9999 0 0 0-2.8613-6.5723c-0.13625-0.107-0.27517-0.14755-0.40041-0.13867zm-2.3906 1.416c-0.39561 0.011813-0.64211 0.53575-0.25586 0.91602a6.0001 6.0001 0 0 1 1.9082 4.379 6.0001 6.0001 0 0 1-1.916 4.3888c-0.46901 0.44599 0.17269 1.1465 0.67968 0.72851a7.0001 7.0001 0 0 0 2.2363-5.1172 7.0001 7.0001 0 0 0-2.2246-5.1115c-0.14675-0.13375-0.29586-0.18753-0.42773-0.18359zm-4.3476 0.29492-3 3h-2c-0.55401 0-1 0.44599-1 1v2c0 0.55401 0.44599 1 1 1h2l3 3zm2.0176 1.1836c-0.37584 0.016328-0.64502 0.51398-0.29102 0.89648a3.9999 3.9999 0 0 1 1.2734 2.9199 3.9999 3.9999 0 0 1-1.2773 2.9258c-0.47301 0.43 0.13969 1.1525 0.67968 0.73048a5 5 0 0 0 1.5977-3.6563 5 5 0 0 0-1.5898-3.6504c-0.13-0.1235-0.2673-0.17145-0.39258-0.16602z" opacity=".35"/>
+ <rect transform="rotate(45)" x="1.3137" y="-5" width="20" height="1" rx=".5" ry=".5"/>
 </svg>
diff --git a/src/other/firefox/common/icons/audio-playing-symbolic-light.svg b/src/other/firefox/common/icons/audio-playing-symbolic-light.svg
deleted file mode 100644
index 64a8afd0..00000000
--- a/src/other/firefox/common/icons/audio-playing-symbolic-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m12.738 1.2891c-0.37566 0.026625-0.62445 0.49009-0.2832 0.87109a8 8 0 0 1 2.5449 5.8398 8 8 0 0 1-2.5547 5.8516c-0.446 0.471 0.18074 1.1485 0.67774 0.72852a9 9 0 0 0 2.877-6.5801 9 9 0 0 0-2.8613-6.5723c-0.13625-0.107-0.27517-0.14755-0.40039-0.13867zm-2.3906 1.416c-0.39562 0.011812-0.64211 0.53577-0.25586 0.91602a6 6 0 0 1 1.9082 4.3789 6 6 0 0 1-1.916 4.3887c-0.469 0.446 0.17269 1.1465 0.67969 0.72852a7 7 0 0 0 2.2363-5.1172 7 7 0 0 0-2.2246-5.1113c-0.14675-0.13375-0.29586-0.18753-0.42774-0.18359zm-4.3477 0.29492-3 3h-2c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h2l3 3v-10zm2.0176 1.1836c-0.37584 0.016312-0.64502 0.51398-0.29102 0.89648a4 4 0 0 1 1.2734 2.9199 4 4 0 0 1-1.2773 2.9258c-0.473 0.43 0.13969 1.1525 0.67969 0.73047a5 5 0 0 0 1.5977-3.6562 5 5 0 0 0-1.5898-3.6504c-0.13-0.1235-0.2673-0.17145-0.39258-0.16602z" fill="#dedede"/>
-</svg>
diff --git a/src/other/firefox/common/icons/audio-playing-symbolic.svg b/src/other/firefox/common/icons/audio-playing-symbolic.svg
index 37656ee5..500abb31 100644
--- a/src/other/firefox/common/icons/audio-playing-symbolic.svg
+++ b/src/other/firefox/common/icons/audio-playing-symbolic.svg
@@ -1,63 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   version="1.1"
-   id="svg10"
-   sodipodi:docname="audio-playing-symbolic.svg"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs14" />
-  <sodipodi:namedview
-     id="namedview12"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="7.9661017"
-     inkscape:cy="8"
-     inkscape:window-width="960"
-     inkscape:window-height="600"
-     inkscape:window-x="25"
-     inkscape:window-y="59"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg10" />
-  <g
-     transform="translate(0,-4.7914e-4)"
-     fill="#363636"
-     id="g14">
-    <rect
-       y="6"
-       width="5"
-       height="4"
-       ry="1"
-       fill-rule="evenodd"
-       id="rect2"
-       x="0" />
-    <path
-       d="M 6,3 3,6 v 4 l 3,3 z"
-       id="path4" />
-    <g
-       fill-rule="evenodd"
-       id="g12">
-      <path
-         d="M 13.139,1.428 C 12.594,1 12,1.652 12.455,2.16 A 8,8 0 0 1 15,8 8,8 0 0 1 12.446,13.852 C 12,14.323 12.626,15 13.123,14.58 A 9,9 0 0 0 16,8 9,9 0 0 0 13.139,1.428 Z"
-         id="path6" />
-      <path
-         d="M 10.775,2.889 C 10.188,2.354 9.576,3.114 10.091,3.621 A 6,6 0 0 1 12,8 6,6 0 0 1 10.084,12.389 c -0.469,0.446 0.173,1.146 0.68,0.728 A 7,7 0 0 0 13,8 7,7 0 0 0 10.775,2.889 Z"
-         id="path8" />
-      <path
-         d="M 8.41,4.35 C 7.89,3.856 7.255,4.57 7.727,5.08 A 4,4 0 0 1 9,8 4,4 0 0 1 7.723,10.926 c -0.473,0.43 0.14,1.152 0.68,0.73 A 5,5 0 0 0 10,8 5,5 0 0 0 8.41,4.35 Z"
-         id="path10" />
-    </g>
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m12.738 1.2891c-0.37566 0.026625-0.62445 0.49009-0.2832 0.87109a8 8 0 0 1 2.5449 5.8398 8 8 0 0 1-2.5547 5.8516c-0.446 0.471 0.18074 1.1485 0.67774 0.72852a9 9 0 0 0 2.877-6.5801 9 9 0 0 0-2.8613-6.5723c-0.13625-0.107-0.27517-0.14755-0.40039-0.13867zm-2.3906 1.416c-0.39562 0.011812-0.64211 0.53577-0.25586 0.91602a6 6 0 0 1 1.9082 4.3789 6 6 0 0 1-1.916 4.3887c-0.469 0.446 0.17269 1.1465 0.67969 0.72852a7 7 0 0 0 2.2363-5.1172 7 7 0 0 0-2.2246-5.1113c-0.14675-0.13375-0.29586-0.18753-0.42774-0.18359zm-4.3477 0.29492-3 3h-2c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h2l3 3v-10zm2.0176 1.1836c-0.37584 0.016312-0.64502 0.51398-0.29102 0.89648a4 4 0 0 1 1.2734 2.9199 4 4 0 0 1-1.2773 2.9258c-0.473 0.43 0.13969 1.1525 0.67969 0.73047a5 5 0 0 0 1.5977-3.6562 5 5 0 0 0-1.5898-3.6504c-0.13-0.1235-0.2673-0.17145-0.39258-0.16602z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/autoplay-media-blocked-symbolic.svg b/src/other/firefox/common/icons/autoplay-media-blocked-symbolic.svg
index e8ba914e..1d405753 100644
--- a/src/other/firefox/common/icons/autoplay-media-blocked-symbolic.svg
+++ b/src/other/firefox/common/icons/autoplay-media-blocked-symbolic.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m7.9062 1a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 6.9277-6h-1.0117a6 6 0 0 1-5.916 5 6 6 0 0 1-6-6 6 6 0 0 1 6-6h2l-1.8281 1.8281 0.70703 0.70703 2.8281-2.8281-0.70703-0.70703h-3a7 7 0 0 0-0.09375 0zm-1.4238 4a0.50005 0.50005 0 0 0-0.48242 0.5v5a0.50005 0.50005 0 0 0 0.76562 0.42383l4-2.5a0.50005 0.50005 0 0 0 0-0.84766l-4-2.5a0.50005 0.50005 0 0 0-0.2832-0.076172z" fill="#363636" opacity=".35" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".86" stroke-width="2"/>
- <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m7.9062 1a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 6.9277-6h-1.0117a6 6 0 0 1-5.916 5 6 6 0 0 1-6-6 6 6 0 0 1 6-6h2l-1.8281 1.8281 0.70703 0.70703 2.8281-2.8281-0.70703-0.70703h-3a7 7 0 0 0-0.09375 0zm-1.4238 4a0.50005 0.50005 0 0 0-0.48242 0.5v5a0.50005 0.50005 0 0 0 0.76562 0.42383l4-2.5a0.50005 0.50005 0 0 0 0-0.84766l-4-2.5a0.50005 0.50005 0 0 0-0.2832-0.076172z" opacity=".35"/>
+ <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0"/>
 </svg>
diff --git a/src/other/firefox/common/icons/autoplay-media-symbolic.svg b/src/other/firefox/common/icons/autoplay-media-symbolic.svg
index 85824fe6..623a83c1 100644
--- a/src/other/firefox/common/icons/autoplay-media-symbolic.svg
+++ b/src/other/firefox/common/icons/autoplay-media-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m7.9062 1a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 6.9277-6h-1.0117a6 6 0 0 1-5.916 5 6 6 0 0 1-6-6 6 6 0 0 1 6-6h2l-1.8281 1.8281 0.70703 0.70703 2.8281-2.8281-0.70703-0.70703h-3a7 7 0 0 0-0.09375 0zm-1.4238 4a0.50005 0.50005 0 0 0-0.48242 0.5v5a0.50005 0.50005 0 0 0 0.76562 0.42383l4-2.5a0.50005 0.50005 0 0 0 0-0.84766l-4-2.5a0.50005 0.50005 0 0 0-0.2832-0.076172z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".86" stroke-width="2"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m7.9062 1a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 6.9277-6h-1.0117a6 6 0 0 1-5.916 5 6 6 0 0 1-6-6 6 6 0 0 1 6-6h2l-1.8281 1.8281 0.70703 0.70703 2.8281-2.8281-0.70703-0.70703h-3a7 7 0 0 0-0.09375 0zm-1.4238 4a0.50005 0.50005 0 0 0-0.48242 0.5v5a0.50005 0.50005 0 0 0 0.76562 0.42383l4-2.5a0.50005 0.50005 0 0 0 0-0.84766l-4-2.5a0.50005 0.50005 0 0 0-0.2832-0.076172z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/blocked-permission-symbolic.svg b/src/other/firefox/common/icons/blocked-permission-symbolic.svg
index 23482164..c12d8713 100644
--- a/src/other/firefox/common/icons/blocked-permission-symbolic.svg
+++ b/src/other/firefox/common/icons/blocked-permission-symbolic.svg
@@ -1,9 +1,4 @@
-<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#363636;
-      }</style>
- </defs>
- <path class="ColorScheme-Text" d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h5.7617a4.5 4.5 0 0 1-0.49805-1h-5.2637c-0.554 0-1-0.446-1-1v-8c0-0.554 0.446-1 1-1h10c0.554 0 1 0.446 1 1v3.2637a4.5 4.5 0 0 1 1 0.49609v-5.7598c0-1.108-0.892-2-2-2h-10z" fill="currentColor"/>
- <path class="ColorScheme-Text" d="m14.975 10.025c-1.3668-1.3668-3.5829-1.3668-4.9497 0-1.3668 1.3668-1.3668 3.5829 0 4.9497 1.3668 1.3668 3.5829 1.3668 4.9497 0 1.3668-1.3668 1.3668-3.5829 0-4.9497zm-1.0607 0.35355 0.70711 0.70711-1.4142 1.4142 1.4142 1.4142-0.70711 0.70711-1.4142-1.4142-1.4142 1.4142-0.70711-0.70711 1.4142-1.4142-1.4142-1.4142 0.70711-0.70711 1.4142 1.4142z" fill="#ff8080"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h5.7617a4.5 4.5 0 0 1-0.49805-1h-5.2637c-0.554 0-1-0.446-1-1v-8c0-0.554 0.446-1 1-1h10c0.554 0 1 0.446 1 1v3.2637a4.5 4.5 0 0 1 1 0.49609v-5.7598c0-1.108-0.892-2-2-2h-10z"/>
+ <path d="m14.975 10.025c-1.3668-1.3668-3.5829-1.3668-4.9497 0-1.3668 1.3668-1.3668 3.5829 0 4.9497 1.3668 1.3668 3.5829 1.3668 4.9497 0 1.3668-1.3668 1.3668-3.5829 0-4.9497zm-1.0607 0.35355 0.70711 0.70711-1.4142 1.4142 1.4142 1.4142-0.70711 0.70711-1.4142-1.4142-1.4142 1.4142-0.70711-0.70711 1.4142-1.4142-1.4142-1.4142 0.70711-0.70711 1.4142 1.4142z" fill="#ff8080"/>
 </svg>
diff --git a/src/other/firefox/common/icons/bookmarks-symbolic.svg b/src/other/firefox/common/icons/bookmarks-symbolic.svg
index 1d6cb675..0ef1e061 100644
--- a/src/other/firefox/common/icons/bookmarks-symbolic.svg
+++ b/src/other/firefox/common/icons/bookmarks-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m4.8008 0s-0.43146-0.012793-0.87695 0.22852c-0.44549 0.24131-0.92383 0.89765-0.92383 1.6387v12.133a1.0001 1.0001 0 0 0 1.5449 0.83789l3.4551-2.2461 3.4551 2.2461a1.0001 1.0001 0 0 0 1.5449-0.83789v-12.133s0.01489-0.40654-0.19141-0.85352c-0.2063-0.44698-0.84826-1.0137-1.6094-1.0137h-6.3984zm0 1h6.3984c0.8 0 0.80078 0.86719 0.80078 0.86719v12.133l-4-2.5996-4 2.5996v-12.133c0-0.86667 0.80078-0.86719 0.80078-0.86719z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#363636" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m4.8008 0s-0.43146-0.012793-0.87695 0.22852c-0.44549 0.24131-0.92383 0.89765-0.92383 1.6387v12.133a1.0001 1.0001 0 0 0 1.5449 0.83789l3.4551-2.2461 3.4551 2.2461a1.0001 1.0001 0 0 0 1.5449-0.83789v-12.133s0.01489-0.40654-0.19141-0.85352c-0.2063-0.44698-0.84826-1.0137-1.6094-1.0137h-6.3984zm0 1h6.3984c0.8 0 0.80078 0.86719 0.80078 0.86719v12.133l-4-2.5996-4 2.5996v-12.133c0-0.86667 0.80078-0.86719 0.80078-0.86719z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/bullet-symbolic.svg b/src/other/firefox/common/icons/bullet-symbolic.svg
index b3873167..ebc13b7c 100644
--- a/src/other/firefox/common/icons/bullet-symbolic.svg
+++ b/src/other/firefox/common/icons/bullet-symbolic.svg
@@ -1,38 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="14"
-   width="14"
-   version="1.1"
-   id="svg442"
-   sodipodi:docname="bullet-symbolic.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs446" />
-  <sodipodi:namedview
-     id="namedview444"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="33.714286"
-     inkscape:cx="-7.0444915"
-     inkscape:cy="8.0677965"
-     inkscape:window-width="3840"
-     inkscape:window-height="2034"
-     inkscape:window-x="0"
-     inkscape:window-y="58"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg442" />
-  <path
-     d="M 7,3 C 4.793,3 3,4.793 3,7 3,9.207 4.793,11 7,11 9.208,11 11,9.207 11,7 11,4.793 9.208,3 7,3 Z"
-     id="path438"
-     style="fill:#333333" />
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m7 3c-2.207 0-4 1.793-4 4s1.793 4 4 4c2.208 0 4-1.793 4-4s-1.792-4-4-4z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/character-symbolic.svg b/src/other/firefox/common/icons/character-symbolic.svg
index 47a62e43..43866840 100644
--- a/src/other/firefox/common/icons/character-symbolic.svg
+++ b/src/other/firefox/common/icons/character-symbolic.svg
@@ -1,18 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g fill="#363636" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g>
   <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-10c0-1.108-0.892-2-2-2h-10zm0 1h10c0.554 0 1 0.446 1 1v10c0 0.554-0.446 1-1 1h-10c-0.554 0-1-0.446-1-1v-10c0-0.554 0.446-1 1-1z"/>
   <path d="m6 9c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1v-1c0-0.554-0.446-1-1-1zm0 1h4v1h-4z"/>
   <path d="m5 7v1h5v2h1v-2c0-0.554-0.446-1-1-1z"/>
-  <rect transform="rotate(-30)" x="2.1603" y="7.5981" width="5" height="1" rx="0" ry="0" stroke-width=".91287"/>
+  <rect transform="rotate(-30)" x="2.1603" y="7.5981" width="5" height="1" rx="0" ry="0"/>
  </g>
 </svg>
diff --git a/src/other/firefox/common/icons/checkbox-checked-symbolic.svg b/src/other/firefox/common/icons/checkbox-checked-symbolic.svg
index da86336e..7e4e9d87 100644
--- a/src/other/firefox/common/icons/checkbox-checked-symbolic.svg
+++ b/src/other/firefox/common/icons/checkbox-checked-symbolic.svg
@@ -1,5 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
- <rect y="6.1719e-7" width="16" height="16" color="#000000" fill="none"/>
- <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-10c0-1.108-0.892-2-2-2h-10zm8.2773 3.8438c0.25562 0 0.51116 0.097101 0.70703 0.29297 0.39174 0.39174 0.39174 1.0223 0 1.4141l-4.2422 4.2422c-0.39173 0.39173-0.99323 0.42083-1.3496 0.064453l-0.064453-0.064453-2.1855-2.1836c-0.35633-0.35637-0.32729-0.95983 0.064453-1.3516 0.39173-0.39173 0.99323-0.41888 1.3496-0.0625l1.4785 1.4766 3.5352-3.5352c0.19587-0.19587 0.45141-0.29297 0.70703-0.29297z" color="#000000" fill="#474747" style="paint-order:fill markers stroke"/>
- <rect transform="rotate(45)" x="8.1066" y="1.1569" width="3" height="1" fill-opacity="0"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-10c0-1.108-0.892-2-2-2h-10zm8.2773 3.8438c0.25562 0 0.51116 0.097101 0.70703 0.29297 0.39174 0.39174 0.39174 1.0223 0 1.4141l-4.2422 4.2422c-0.39173 0.39173-0.99323 0.42083-1.3496 0.064453l-0.064453-0.064453-2.1855-2.1836c-0.35633-0.35637-0.32729-0.95983 0.064453-1.3516 0.39173-0.39173 0.99323-0.41888 1.3496-0.0625l1.4785 1.4766 3.5352-3.5352c0.19587-0.19587 0.45141-0.29297 0.70703-0.29297z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/checkbox-symbolic.svg b/src/other/firefox/common/icons/checkbox-symbolic.svg
index 554e9272..143b9609 100644
--- a/src/other/firefox/common/icons/checkbox-symbolic.svg
+++ b/src/other/firefox/common/icons/checkbox-symbolic.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M3.5 1A2.506 2.506 0 0 0 1 3.5v9C1 13.876 2.124 15 3.5 15h9c1.376 0 2.5-1.124 2.5-2.5v-9C15 2.124 13.876 1 12.5 1zm0 1h9c.84 0 1.5.66 1.5 1.5v9c0 .84-.66 1.5-1.5 1.5h-9c-.84 0-1.5-.66-1.5-1.5v-9C2 2.66 2.66 2 3.5 2z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="#474747"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+    <path d="M3.5 1A2.506 2.506 0 0 0 1 3.5v9C1 13.876 2.124 15 3.5 15h9c1.376 0 2.5-1.124 2.5-2.5v-9C15 2.124 13.876 1 12.5 1zm0 1h9c.84 0 1.5.66 1.5 1.5v9c0 .84-.66 1.5-1.5 1.5h-9c-.84 0-1.5-.66-1.5-1.5v-9C2 2.66 2.66 2 3.5 2z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/drm-symbolic.svg b/src/other/firefox/common/icons/drm-symbolic.svg
index 019bec4d..9b312357 100644
--- a/src/other/firefox/common/icons/drm-symbolic.svg
+++ b/src/other/firefox/common/icons/drm-symbolic.svg
@@ -1,12 +1,7 @@
-<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#363636;
-      }</style>
- </defs>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
  <g transform="translate(-.20339 -.13559)">
-  <path d="m9.6176 6.7214c-0.12118-0.12118-0.25154-0.22665-0.38947-0.31763l-0.73473 0.73473c0.14934 0.07242 0.2917 0.16462 0.41709 0.29001 0.59372 0.59372 0.59372 1.5276 0 2.1213l-2.1213 2.1213c-0.59372 0.59372-1.5276 0.59372-2.1213 0-0.59372-0.59372-0.59372-1.5276 0-2.1213l0.60491-0.60491c-0.13649-0.39092-0.21105-0.79819-0.20578-1.2084l-1.1062 1.1062c-0.97323 0.97323-0.97323 2.5623 0 3.5355 0.97323 0.97323 2.5623 0.97323 3.5355 0l2.1213-2.1213c0.97323-0.97323 0.97323-2.5623 0-3.5355z" style="fill:currentColor" class="ColorScheme-Text"/>
-  <path d="m6.7892 9.5498c0.12118 0.12118 0.25154 0.22665 0.38948 0.31763l0.73473-0.73473c-0.14934-0.07241-0.29166-0.16466-0.41705-0.29006-0.59372-0.59372-0.59372-1.5276 0-2.1213l2.1213-2.1213c0.59372-0.59372 1.5276-0.59372 2.1213 0 0.59372 0.59372 0.59372 1.5276 0 2.1213l-0.60491 0.60491c0.13649 0.39092 0.21105 0.79819 0.20578 1.2084l1.1062-1.1062c0.97323-0.97323 0.97323-2.5623 0-3.5355-0.97323-0.97323-2.5623-0.97323-3.5355 0l-2.1213 2.1213c-0.97323 0.97323-0.97323 2.5623 0 3.5355z" style="fill:currentColor" class="ColorScheme-Text"/>
+  <path d="m9.6176 6.7214c-0.12118-0.12118-0.25154-0.22665-0.38947-0.31763l-0.73473 0.73473c0.14934 0.07242 0.2917 0.16462 0.41709 0.29001 0.59372 0.59372 0.59372 1.5276 0 2.1213l-2.1213 2.1213c-0.59372 0.59372-1.5276 0.59372-2.1213 0-0.59372-0.59372-0.59372-1.5276 0-2.1213l0.60491-0.60491c-0.13649-0.39092-0.21105-0.79819-0.20578-1.2084l-1.1062 1.1062c-0.97323 0.97323-0.97323 2.5623 0 3.5355 0.97323 0.97323 2.5623 0.97323 3.5355 0l2.1213-2.1213c0.97323-0.97323 0.97323-2.5623 0-3.5355z"/>
+  <path d="m6.7892 9.5498c0.12118 0.12118 0.25154 0.22665 0.38948 0.31763l0.73473-0.73473c-0.14934-0.07241-0.29166-0.16466-0.41705-0.29006-0.59372-0.59372-0.59372-1.5276 0-2.1213l2.1213-2.1213c0.59372-0.59372 1.5276-0.59372 2.1213 0 0.59372 0.59372 0.59372 1.5276 0 2.1213l-0.60491 0.60491c0.13649 0.39092 0.21105 0.79819 0.20578 1.2084l1.1062-1.1062c0.97323-0.97323 0.97323-2.5623 0-3.5355-0.97323-0.97323-2.5623-0.97323-3.5355 0l-2.1213 2.1213c-0.97323 0.97323-0.97323 2.5623 0 3.5355z"/>
  </g>
- <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z" style="fill:currentColor" class="ColorScheme-Text"/>
+ <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/edit-copy-symbolic.svg b/src/other/firefox/common/icons/edit-copy-symbolic.svg
index e6360cd6..7235c692 100644
--- a/src/other/firefox/common/icons/edit-copy-symbolic.svg
+++ b/src/other/firefox/common/icons/edit-copy-symbolic.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m2 0c-1.108 0-2 0.892-2 2v8c0 1.108 0.892 2 2 2h7c1.108 0 2-0.892 2-2v-8c0-1.108-0.892-2-2-2h-7zm0 1h7c0.554 0 1 0.446 1 1v8c0 0.554-0.446 1-1 1h-7c-0.554 0-1-0.446-1-1v-8c0-0.554 0.446-1 1-1z" fill="#363636"/>
- <path d="m12 4v1h1c0.554 0 1 0.446 1 1v8c0 0.554-0.446 1-1 1h-7c-0.554 0-1-0.446-1-1v-1h-1v1c0 1.108 0.892 2 2 2h7c1.108 0 2-0.892 2-2v-8c0-1.108-0.892-2-2-2h-1z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m2 0c-1.108 0-2 0.892-2 2v8c0 1.108 0.892 2 2 2h7c1.108 0 2-0.892 2-2v-8c0-1.108-0.892-2-2-2h-7zm0 1h7c0.554 0 1 0.446 1 1v8c0 0.554-0.446 1-1 1h-7c-0.554 0-1-0.446-1-1v-8c0-0.554 0.446-1 1-1z"/>
+ <path d="m12 4v1h1c0.554 0 1 0.446 1 1v8c0 0.554-0.446 1-1 1h-7c-0.554 0-1-0.446-1-1v-1h-1v1c0 1.108 0.892 2 2 2h7c1.108 0 2-0.892 2-2v-8c0-1.108-0.892-2-2-2h-1z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/edit-cut-symbolic.svg b/src/other/firefox/common/icons/edit-cut-symbolic.svg
index d88918c2..a397d54f 100644
--- a/src/other/firefox/common/icons/edit-cut-symbolic.svg
+++ b/src/other/firefox/common/icons/edit-cut-symbolic.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m13.418 3.01a1.99 1.99 0 0 0-0.55 0.65 7.27 7.27 0 0 1-0.206 0.375c-0.076 0.136-0.168 0.296-0.275 0.494a10.953 10.953 0 0 1-1.14 1.712c-4e-3 4e-3 -0.32 0.365-0.669 0.677-1.953-0.838-5.151-2.203-5.46-2.281-0.459-0.116-0.897 0.21-0.916 0.223l-0.202 0.152 0.216 0.13 4.708 2.858-4.708 2.857-0.216 0.13 0.202 0.152c0.019 0.014 0.457 0.338 0.917 0.223 0.305-0.076 3.506-1.443 5.459-2.282 0.35 0.315 0.664 0.675 0.667 0.678 6e-3 7e-3 0.579 0.678 1.142 1.714 0.107 0.197 0.199 0.359 0.277 0.494 0.085 0.152 0.154 0.271 0.205 0.373 0.099 0.195 0.305 0.473 0.549 0.652a1.627 1.627 0 0 0 2.27-0.349c0.204-0.28 0.312-0.61 0.312-0.956 0-0.512-0.245-1.002-0.657-1.31a1.568 1.568 0 0 0-0.57-0.268c-0.154-0.056-0.27-0.074-0.394-0.095-0.184-0.032-0.392-0.067-0.81-0.234-0.813-0.326-1.493-0.93-1.504-0.943-0.198-0.164-0.391-0.454-0.561-0.836 0.17-0.383 0.363-0.672 0.565-0.843 7e-3 -4e-3 0.685-0.608 1.5-0.935 0.418-0.168 0.626-0.204 0.81-0.234 0.123-0.02 0.24-0.041 0.378-0.09 0.207-0.05 0.41-0.145 0.59-0.275 0.41-0.308 0.653-0.796 0.653-1.308a1.6 1.6 0 0 0-0.312-0.956 1.625 1.625 0 0 0-2.27-0.35m1.066 0.617a0.705 0.705 0 0 1 0.595 0.691 0.706 0.706 0 0 1-0.287 0.568 0.693 0.693 0 0 1-0.522 0.127 0.69 0.69 0 0 1-0.457-0.279 0.702 0.702 0 0 1 0.671-1.107m-4.69 4.374m4.998 3.117a0.7 0.7 0 0 1-0.308 1.256 0.693 0.693 0 0 1-0.522-0.127 0.705 0.705 0 0 1-0.15-0.98 0.7 0.7 0 0 1 0.98-0.15" fill="#363636"/>
- <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h7c1.108 0 2-0.892 2-2v-1h-1v1c0 0.554-0.446 1-1 1h-7c-0.554 0-1-0.446-1-1v-10c0-0.554 0.446-1 1-1h7c0.554 0 1 0.446 1 1v1h1v-1c0-1.108-0.892-2-2-2h-7z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m13.418 3.01a1.99 1.99 0 0 0-0.55 0.65 7.27 7.27 0 0 1-0.206 0.375c-0.076 0.136-0.168 0.296-0.275 0.494a10.953 10.953 0 0 1-1.14 1.712c-4e-3 4e-3 -0.32 0.365-0.669 0.677-1.953-0.838-5.151-2.203-5.46-2.281-0.459-0.116-0.897 0.21-0.916 0.223l-0.202 0.152 0.216 0.13 4.708 2.858-4.708 2.857-0.216 0.13 0.202 0.152c0.019 0.014 0.457 0.338 0.917 0.223 0.305-0.076 3.506-1.443 5.459-2.282 0.35 0.315 0.664 0.675 0.667 0.678 6e-3 7e-3 0.579 0.678 1.142 1.714 0.107 0.197 0.199 0.359 0.277 0.494 0.085 0.152 0.154 0.271 0.205 0.373 0.099 0.195 0.305 0.473 0.549 0.652a1.627 1.627 0 0 0 2.27-0.349c0.204-0.28 0.312-0.61 0.312-0.956 0-0.512-0.245-1.002-0.657-1.31a1.568 1.568 0 0 0-0.57-0.268c-0.154-0.056-0.27-0.074-0.394-0.095-0.184-0.032-0.392-0.067-0.81-0.234-0.813-0.326-1.493-0.93-1.504-0.943-0.198-0.164-0.391-0.454-0.561-0.836 0.17-0.383 0.363-0.672 0.565-0.843 7e-3 -4e-3 0.685-0.608 1.5-0.935 0.418-0.168 0.626-0.204 0.81-0.234 0.123-0.02 0.24-0.041 0.378-0.09 0.207-0.05 0.41-0.145 0.59-0.275 0.41-0.308 0.653-0.796 0.653-1.308a1.6 1.6 0 0 0-0.312-0.956 1.625 1.625 0 0 0-2.27-0.35m1.066 0.617a0.705 0.705 0 0 1 0.595 0.691 0.706 0.706 0 0 1-0.287 0.568 0.693 0.693 0 0 1-0.522 0.127 0.69 0.69 0 0 1-0.457-0.279 0.702 0.702 0 0 1 0.671-1.107m-4.69 4.374m4.998 3.117a0.7 0.7 0 0 1-0.308 1.256 0.693 0.693 0 0 1-0.522-0.127 0.705 0.705 0 0 1-0.15-0.98 0.7 0.7 0 0 1 0.98-0.15"/>
+ <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h7c1.108 0 2-0.892 2-2v-1h-1v1c0 0.554-0.446 1-1 1h-7c-0.554 0-1-0.446-1-1v-10c0-0.554 0.446-1 1-1h7c0.554 0 1 0.446 1 1v1h1v-1c0-1.108-0.892-2-2-2h-7z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/edit-find-symbolic.svg b/src/other/firefox/common/icons/edit-find-symbolic.svg
index 0e0905f2..9a4cd45b 100644
--- a/src/other/firefox/common/icons/edit-find-symbolic.svg
+++ b/src/other/firefox/common/icons/edit-find-symbolic.svg
@@ -1,6 +1,6 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g transform="rotate(45 7.7071 8.7071)" fill="#363636">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g transform="rotate(45 7.7071 8.7071)">
   <path d="m6 3a5 5 0 0 0-5 5 5 5 0 0 0 5 5 5 5 0 0 0 5-5 5 5 0 0 0-5-5zm0 1a4 4 0 0 1 4 4 4 4 0 0 1-4 4 4 4 0 0 1-4-4 4 4 0 0 1 4-4z"/>
-  <rect x="10" y="7.5" width="7" height="1" stroke-width=".93541"/>
+  <rect x="10" y="7.5" width="7" height="1"/>
  </g>
 </svg>
diff --git a/src/other/firefox/common/icons/edit-paste-symbolic.svg b/src/other/firefox/common/icons/edit-paste-symbolic.svg
index 124bf7cd..8b80405a 100644
--- a/src/other/firefox/common/icons/edit-paste-symbolic.svg
+++ b/src/other/firefox/common/icons/edit-paste-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m8 0c-1.1046 0-2 0.89543-2 2h-1-0.93945-0.060547v0.0058594c-1.113 0.032581-2 0.93345-2 2.0547v8.8789c0 1.142 0.91853 2.0605 2.0605 2.0605h7.8789c1.142 0 2.0605-0.91853 2.0605-2.0605v-8.8789c0-1.142-0.91853-2.0605-2.0605-2.0605h-0.93945-1c0-0.138-0.00525-0.27625-0.03125-0.40625-0.19615-0.93036-1.0179-1.5956-1.9688-1.5938zm-0.011719 1c0.0039062-2.289e-5 0.0078126-2.289e-5 0.011719 0 0.414 0 0.75425 0.266 0.90625 0.625 0.056891 0.11716 0.088816 0.24486 0.09375 0.375-6.1e-5 0.88813-1.0716 1.3352-1.7031 0.71094-0.63157-0.62426-0.19666-1.7005 0.69141-1.7109zm-3.9883 2h1 1v1s-1 0-1 1h6c0-0.75-0.56275-0.953-0.84375-1h-0.15625v-1h1 1c0.554 0 1 0.446 1 1v9c0 0.554-0.446 1-1 1h-8c-0.554 0-1-0.446-1-1v-9c0-0.554 0.446-1 1-1z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8 0c-1.1046 0-2 0.89543-2 2h-1-0.93945-0.060547v0.0058594c-1.113 0.032581-2 0.93345-2 2.0547v8.8789c0 1.142 0.91853 2.0605 2.0605 2.0605h7.8789c1.142 0 2.0605-0.91853 2.0605-2.0605v-8.8789c0-1.142-0.91853-2.0605-2.0605-2.0605h-0.93945-1c0-0.138-0.00525-0.27625-0.03125-0.40625-0.19615-0.93036-1.0179-1.5956-1.9688-1.5938zm-0.011719 1c0.0039062-2.289e-5 0.0078126-2.289e-5 0.011719 0 0.414 0 0.75425 0.266 0.90625 0.625 0.056891 0.11716 0.088816 0.24486 0.09375 0.375-6.1e-5 0.88813-1.0716 1.3352-1.7031 0.71094-0.63157-0.62426-0.19666-1.7005 0.69141-1.7109zm-3.9883 2h1 1v1s-1 0-1 1h6c0-0.75-0.56275-0.953-0.84375-1h-0.15625v-1h1 1c0.554 0 1 0.446 1 1v9c0 0.554-0.446 1-1 1h-8c-0.554 0-1-0.446-1-1v-9c0-0.554 0.446-1 1-1z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/firefox-view.svg b/src/other/firefox/common/icons/firefox-view.svg
index a3f91f1e..014a627e 100644
--- a/src/other/firefox/common/icons/firefox-view.svg
+++ b/src/other/firefox/common/icons/firefox-view.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" fill="none" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m4 0c-1.108 0-2 0.892-2 2v1c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-9c0-1.108-0.892-2-2-2v-1c0-1.108-0.892-2-2-2h-8zm0 1h8c0.554 0 1 0.446 1 1v1h-10v-1c0-0.554 0.446-1 1-1zm-2 3h1 10 1c0.554 0 1 0.446 1 1v9c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-9c0-0.554 0.446-1 1-1zm3 3v1h6v-1h-6z" fill="#333333"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m4 0c-1.108 0-2 0.892-2 2v1c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-9c0-1.108-0.892-2-2-2v-1c0-1.108-0.892-2-2-2h-8zm0 1h8c0.554 0 1 0.446 1 1v1h-10v-1c0-0.554 0.446-1 1-1zm-2 3h1 10 1c0.554 0 1 0.446 1 1v9c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-9c0-0.554 0.446-1 1-1zm3 3v1h6v-1h-6z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/folder-download-symbolic.svg b/src/other/firefox/common/icons/folder-download-symbolic.svg
index 6f9e5531..b145e085 100644
--- a/src/other/firefox/common/icons/folder-download-symbolic.svg
+++ b/src/other/firefox/common/icons/folder-download-symbolic.svg
@@ -1,6 +1,3 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Text { color:#363636; }</style>
- </defs>
- <path class="ColorScheme-Text" d="m8 3.4391e-7c-4.4183-2.687e-7 -8 3.5817-8 8-5.6569e-8 4.4183 3.5817 8 8 8 4.4183 0 8-3.5817 8-8 0-4.4183-3.5817-8-8-8zm-2e-7 1c3.866 0 7 3.134 7 7 1e-6 3.866-3.134 7-7 7-3.866 0-7-3.134-7-7 1e-8 -3.866 3.134-7 7-7zm3e-7 3c-0.277-4e-7 -0.5 0.223-0.5 0.5l2e-7 5.3163-1.7189-1.7189c-0.19587-0.19587-0.51116-0.19587-0.70703 0-0.19587 0.19587-0.19587 0.51116 0 0.70703l2.5724 2.5724c0.047009 0.04701 0.10324 0.08408 0.16602 0.10938 0.12034 0.04897 0.25466 0.04897 0.375 1e-6 0.062777-0.0253 0.119-0.06236 0.16602-0.10938l2.5724-2.5724c0.19587-0.19587 0.19587-0.51116 0-0.70703-0.19587-0.19587-0.51116-0.19587-0.70703 2e-7l-1.7189 1.7189v-5.3163c3e-7 -0.277-0.223-0.5-0.5-0.5z" fill="currentColor"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8 3.4391e-7c-4.4183-2.687e-7 -8 3.5817-8 8-5.6569e-8 4.4183 3.5817 8 8 8 4.4183 0 8-3.5817 8-8 0-4.4183-3.5817-8-8-8zm-2e-7 1c3.866 0 7 3.134 7 7 1e-6 3.866-3.134 7-7 7-3.866 0-7-3.134-7-7 1e-8 -3.866 3.134-7 7-7zm3e-7 3c-0.277-4e-7 -0.5 0.223-0.5 0.5l2e-7 5.3163-1.7189-1.7189c-0.19587-0.19587-0.51116-0.19587-0.70703 0-0.19587 0.19587-0.19587 0.51116 0 0.70703l2.5724 2.5724c0.047009 0.04701 0.10324 0.08408 0.16602 0.10938 0.12034 0.04897 0.25466 0.04897 0.375 1e-6 0.062777-0.0253 0.119-0.06236 0.16602-0.10938l2.5724-2.5724c0.19587-0.19587 0.19587-0.51116 0-0.70703-0.19587-0.19587-0.51116-0.19587-0.70703 2e-7l-1.7189 1.7189v-5.3163c3e-7 -0.277-0.223-0.5-0.5-0.5z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/folder-locked-symbolic.svg b/src/other/firefox/common/icons/folder-locked-symbolic.svg
index fbf365e6..717ecb98 100644
--- a/src/other/firefox/common/icons/folder-locked-symbolic.svg
+++ b/src/other/firefox/common/icons/folder-locked-symbolic.svg
@@ -1,7 +1,4 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
- </defs>
- <path d="m8 0c-2.216 0-4 1.784-4 4v2h1v-2c0-1.662 1.338-3 3-3s3 1.338 3 3v2h1v-2c0-2.216-1.784-4-4-4z" style="fill:currentColor" class="ColorScheme-Text"/>
- <path d="m4 6c-1.108 0-2 0.892-2 2v5c0 1.108 0.892 2 2 2h8c1.108 0 2-0.892 2-2v-5c0-1.108-0.892-2-2-2h-8zm0 1h8c0.554 0 1 0.446 1 1v5c0 0.554-0.446 1-1 1h-8c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1z" style="fill:currentColor" class="ColorScheme-Text"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8 0c-2.216 0-4 1.784-4 4v2h1v-2c0-1.662 1.338-3 3-3s3 1.338 3 3v2h1v-2c0-2.216-1.784-4-4-4z"/>
+ <path d="m4 6c-1.108 0-2 0.892-2 2v5c0 1.108 0.892 2 2 2h8c1.108 0 2-0.892 2-2v-5c0-1.108-0.892-2-2-2h-8zm0 1h8c0.554 0 1 0.446 1 1v5c0 0.554-0.446 1-1 1h-8c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/folder-symbolic-light.svg b/src/other/firefox/common/icons/folder-symbolic-light.svg
deleted file mode 100644
index 882a36dd..00000000
--- a/src/other/firefox/common/icons/folder-symbolic-light.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   version="1.1"
-   viewBox="0 0 16 16"
-   id="svg1032"
-   sodipodi:docname="folder-symbolic-light.svg"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1034"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="7.9661017"
-     inkscape:cy="8"
-     inkscape:window-width="960"
-     inkscape:window-height="600"
-     inkscape:window-x="25"
-     inkscape:window-y="59"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1032" />
-  <defs
-     id="defs1028">
-    <style
-       id="current-color-scheme"
-       type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Text { color:#363636; }</style>
-  </defs>
-  <path
-     d="m2 2c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-8c0-1.108-0.892-2-2-2h-2-5.6289c-0.57985-0.0229-0.60474 0.076886-1.0391-0.35742-0.43381-0.43381-0.61297-0.64213-1.332-0.64258h-2zm0 1h2c0.31116-1.7e-6 0.52033 1.383e-4 0.99805 0.4707 0.47877 0.47161 0.6388 0.5293 1 0.5293h6.002 2c0.554 0 1 0.446 1 1v1h-14v-2c0-0.554 0.446-1 1-1zm-1 4h14v6c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-6z"
-     style="fill:#cccccc"
-     class="ColorScheme-Text"
-     id="path1030" />
-</svg>
diff --git a/src/other/firefox/common/icons/folder-symbolic.svg b/src/other/firefox/common/icons/folder-symbolic.svg
index 05e119d9..bd0a6d76 100644
--- a/src/other/firefox/common/icons/folder-symbolic.svg
+++ b/src/other/firefox/common/icons/folder-symbolic.svg
@@ -1,6 +1,3 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Text { color:#363636; }</style>
- </defs>
- <path d="m2 2c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-8c0-1.108-0.892-2-2-2h-2-5.6289c-0.57985-0.0229-0.60474 0.076886-1.0391-0.35742-0.43381-0.43381-0.61297-0.64213-1.332-0.64258h-2zm0 1h2c0.31116-1.7e-6 0.52033 1.383e-4 0.99805 0.4707 0.47877 0.47161 0.6388 0.5293 1 0.5293h6.002 2c0.554 0 1 0.446 1 1v1h-14v-2c0-0.554 0.446-1 1-1zm-1 4h14v6c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-6z" style="fill:currentColor" class="ColorScheme-Text"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m2 2c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-8c0-1.108-0.892-2-2-2h-2-5.6289c-0.57985-0.0229-0.60474 0.076886-1.0391-0.35742-0.43381-0.43381-0.61297-0.64213-1.332-0.64258h-2zm0 1h2c0.31116-1.7e-6 0.52033 1.383e-4 0.99805 0.4707 0.47877 0.47161 0.6388 0.5293 1 0.5293h6.002 2c0.554 0 1 0.446 1 1v1h-14v-2c0-0.554 0.446-1 1-1zm-1 4h14v6c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-6z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/forget-history-symbolic.svg b/src/other/firefox/common/icons/forget-history-symbolic.svg
index f7512cbd..4966567c 100644
--- a/src/other/firefox/common/icons/forget-history-symbolic.svg
+++ b/src/other/firefox/common/icons/forget-history-symbolic.svg
@@ -1,8 +1,5 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
- </defs>
- <g style="fill:currentColor" class="ColorScheme-Text">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g>
   <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z"/>
   <rect x="8" y="2" width="1" height="7" ry=".5"/>
   <rect transform="rotate(90)" x="8" y="-9" width="1" height="6" ry=".5"/>
diff --git a/src/other/firefox/common/icons/geo.svg b/src/other/firefox/common/icons/geo.svg
index 69040ef7..b2d24496 100644
--- a/src/other/firefox/common/icons/geo.svg
+++ b/src/other/firefox/common/icons/geo.svg
@@ -1,11 +1,8 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
- </defs>
- <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z" color="#363636" fill="#363636"/>
- <rect transform="scale(-1)" x="-8.5" y="-4" width="1" height="4" rx=".5" ry=".5" color="#363636" fill="#363636" stroke-width=".8165"/>
- <rect transform="scale(-1)" x="-8.5" y="-16" width="1" height="4" rx=".5" ry=".5" color="#363636" fill="#363636" stroke-width=".8165"/>
- <rect transform="rotate(-90)" x="-8.5" y="12" width="1" height="4" rx=".5" ry=".5" color="#363636" fill="#363636" stroke-width=".8165"/>
- <rect transform="rotate(-90)" x="-8.5" width="1" height="4" rx=".5" ry=".5" color="#363636" fill="#363636" stroke-width=".8165"/>
- <path d="m7.9492 5a3 3 0 0 0-2.9492 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-0.050781 0zm0.0019531 1a2 2 0 0 1 0.048828 0 2 2 0 0 1 2 2 2 2 0 0 1-2 2 2 2 0 0 1-2-2 2 2 0 0 1 1.9512-2z" fill="#363636" stroke-width="0" style="paint-order:stroke fill markers"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z"/>
+ <rect transform="scale(-1)" x="-8.5" y="-4" width="1" height="4" rx=".5" ry=".5"/>
+ <rect transform="scale(-1)" x="-8.5" y="-16" width="1" height="4" rx=".5" ry=".5"/>
+ <rect transform="rotate(-90)" x="-8.5" y="12" width="1" height="4" rx=".5" ry=".5"/>
+ <rect transform="rotate(-90)" x="-8.5" width="1" height="4" rx=".5" ry=".5"/>
+ <path d="m7.9492 5a3 3 0 0 0-2.9492 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-0.050781 0zm0.0019531 1a2 2 0 0 1 0.048828 0 2 2 0 0 1 2 2 2 2 0 0 1-2 2 2 2 0 0 1-2-2 2 2 0 0 1 1.9512-2z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/go-next-symbolic-light.svg b/src/other/firefox/common/icons/go-next-symbolic-light.svg
deleted file mode 100644
index bd8c9daf..00000000
--- a/src/other/firefox/common/icons/go-next-symbolic-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m4.8418 1.8416c-0.12781 0-0.25558 0.04855-0.35352 0.14648-0.19587 0.19587-0.19587 0.51116 0 0.70703l5.3047 5.3047-5.3047 5.3047c-0.19587 0.19587-0.19587 0.51116 0 0.70703s0.51116 0.19587 0.70703 0l5.6582-5.6582c0.19587-0.19587 0.19587-0.51116 0-0.70703l-5.6582-5.6582c-0.097934-0.097934-0.22571-0.14648-0.35352-0.14648z" fill="#dfdfdf" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8091"/>
-</svg>
diff --git a/src/other/firefox/common/icons/go-next-symbolic.svg b/src/other/firefox/common/icons/go-next-symbolic.svg
index ce6449ae..e2fc4f71 100644
--- a/src/other/firefox/common/icons/go-next-symbolic.svg
+++ b/src/other/firefox/common/icons/go-next-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m4.8418 1.8416c-0.12781 0-0.25558 0.04855-0.35352 0.14648-0.19587 0.19587-0.19587 0.51116 0 0.70703l5.3047 5.3047-5.3047 5.3047c-0.19587 0.19587-0.19587 0.51116 0 0.70703 0.19587 0.19587 0.51116 0.19587 0.70703 0l5.6582-5.6582c0.19587-0.19587 0.19587-0.51116 0-0.70703l-5.6582-5.6582c-0.097934-0.097934-0.22571-0.14648-0.35352-0.14648z" fill="#333" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8091"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m4.8418 1.8416c-0.12781 0-0.25558 0.04855-0.35352 0.14648-0.19587 0.19587-0.19587 0.51116 0 0.70703l5.3047 5.3047-5.3047 5.3047c-0.19587 0.19587-0.19587 0.51116 0 0.70703 0.19587 0.19587 0.51116 0.19587 0.70703 0l5.6582-5.6582c0.19587-0.19587 0.19587-0.51116 0-0.70703l-5.6582-5.6582c-0.097934-0.097934-0.22571-0.14648-0.35352-0.14648z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/go-previous-symbolic-light.svg b/src/other/firefox/common/icons/go-previous-symbolic-light.svg
deleted file mode 100644
index abb90a0e..00000000
--- a/src/other/firefox/common/icons/go-previous-symbolic-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m10.159 1.8416c0.12781 0 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-5.3047 5.3047 5.3047 5.3047c0.19587 0.19587 0.19587 0.51116 0 0.70703s-0.51116 0.19587-0.70703 0l-5.6582-5.6582c-0.19587-0.19587-0.19587-0.51116 0-0.70703l5.6582-5.6582c0.09793-0.097934 0.22571-0.14648 0.35352-0.14648z" fill="#dfdfdf" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8091"/>
-</svg>
diff --git a/src/other/firefox/common/icons/go-previous-symbolic.svg b/src/other/firefox/common/icons/go-previous-symbolic.svg
index ede8ba35..751648db 100644
--- a/src/other/firefox/common/icons/go-previous-symbolic.svg
+++ b/src/other/firefox/common/icons/go-previous-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m10.159 1.8416c0.12781 0 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-5.3047 5.3047 5.3047 5.3047c0.19587 0.19587 0.19587 0.51116 0 0.70703-0.19587 0.19587-0.51116 0.19587-0.70703 0l-5.6582-5.6582c-0.19587-0.19587-0.19587-0.51116 0-0.70703l5.6582-5.6582c0.09793-0.097934 0.22571-0.14648 0.35352-0.14648z" fill="#333" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8091"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m10.159 1.8416c0.12781 0 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-5.3047 5.3047 5.3047 5.3047c0.19587 0.19587 0.19587 0.51116 0 0.70703-0.19587 0.19587-0.51116 0.19587-0.70703 0l-5.6582-5.6582c-0.19587-0.19587-0.19587-0.51116 0-0.70703l5.6582-5.6582c0.09793-0.097934 0.22571-0.14648 0.35352-0.14648z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/home.svg b/src/other/firefox/common/icons/home.svg
new file mode 100644
index 00000000..18f3bae2
--- /dev/null
+++ b/src/other/firefox/common/icons/home.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M14.817 7.507 8.852 1.542a1.918 1.918 0 0 0-2.703 0L.183 7.507A.618.618 0 0 0 1 8.436L1 14a2 2 0 0 0 2 2l9 0a2 2 0 0 0 2-2l0-5.564a.62.62 0 0 0 .375.139.626.626 0 0 0 .442-1.068zM8.75 14.75l-2.5 0 0-4 .5-.5 1.5 0 .5.5 0 4zm4-.581-.6.581-2.15 0L10 11a2 2 0 0 0-2-2L7 9a2 2 0 0 0-2 2l0 3.75-2.15 0-.6-.581-.001-6.96 4.783-4.783a.663.663 0 0 1 .936 0L12.75 7.21l0 6.959z"/>
+</svg>
\ No newline at end of file
diff --git a/src/other/firefox/common/icons/icon.svg b/src/other/firefox/common/icons/icon.svg
index c832d960..4d567d9e 100644
--- a/src/other/firefox/common/icons/icon.svg
+++ b/src/other/firefox/common/icons/icon.svg
@@ -1,60 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="64"
-   height="64"
-   version="1.1"
-   viewBox="0 0 16.933 16.933"
-   id="svg11"
-   sodipodi:docname="icon.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview13"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="19.661017"
-     inkscape:cy="32.135593"
-     inkscape:window-width="1920"
-     inkscape:window-height="1004"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg11" />
-  <defs
-     id="defs7">
-    <linearGradient
-       id="linearGradient1041"
-       x1="3.2959"
-       x2="13.637"
-       y1="8.4665"
-       y2="8.4665"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#ffd137"
-         offset="0"
-         id="stop2" />
-      <stop
-         stop-color="#e50d71"
-         offset="1"
-         id="stop4" />
-    </linearGradient>
-  </defs>
-  <path
-     class="ColorScheme-Text"
-     d="m11.932 8.8634c-0.01587-1.5875 1.3121-2.3812 1.3708-2.3812-0.74611-1.1112-1.9081-1.27-2.3217-1.27-0.98904-0.15875-1.9304 0.55561-2.432 0.55561-0.50005 0-1.2747-0.55561-2.0955-0.55561-1.0778 0-2.0717 0.63499-2.6272 1.5875-1.1184 1.9843-0.28495 4.8418 0.80564 6.4292 0.53418 0.71436 1.17 1.5875 2.0049 1.5875 0.80406 0 1.1081-0.55561 2.0804-0.55561 0.97235 0 1.2462 0.55561 2.0971 0.55561 0.86517 0 1.4137-0.79374 1.9431-1.5875 0.61196-0.87311 0.86438-1.7462 0.87946-1.8256-0.0192 0-1.6874-0.63499-1.7041-2.54zm-1.5994-4.683c0.44369-0.55561 0.74293-1.3493 0.66118-2.0637-0.63816 0-1.4128 0.39687-1.8709 0.95248-0.41036 0.47624-0.76992 1.27-0.67467 1.9843 0.71356 0.07938 1.4406-0.39687 1.8844-0.87311z"
-     color="#ffffff"
-     fill="url(#linearGradient1041)"
-     stroke-width=".79374"
-     id="path9"
-     style="fill:#999999" />
+<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg">
+ <path class="ColorScheme-Text" d="m11.932 8.8634c-0.01587-1.5875 1.3121-2.3812 1.3708-2.3812-0.74611-1.1112-1.9081-1.27-2.3217-1.27-0.98904-0.15875-1.9304 0.55561-2.432 0.55561-0.50005 0-1.2747-0.55561-2.0955-0.55561-1.0778 0-2.0717 0.63499-2.6272 1.5875-1.1184 1.9843-0.28495 4.8418 0.80564 6.4292 0.53418 0.71436 1.17 1.5875 2.0049 1.5875 0.80406 0 1.1081-0.55561 2.0804-0.55561 0.97235 0 1.2462 0.55561 2.0971 0.55561 0.86517 0 1.4137-0.79374 1.9431-1.5875 0.61196-0.87311 0.86438-1.7462 0.87946-1.8256-0.0192 0-1.6874-0.63499-1.7041-2.54zm-1.5994-4.683c0.44369-0.55561 0.74293-1.3493 0.66118-2.0637-0.63816 0-1.4128 0.39687-1.8709 0.95248-0.41036 0.47624-0.76992 1.27-0.67467 1.9843 0.71356 0.07938 1.4406-0.39687 1.8844-0.87311z" color="#ffffff" fill="#999999" stroke-width=".79374"/>
 </svg>
diff --git a/src/other/firefox/common/icons/import-symbolic.svg b/src/other/firefox/common/icons/import-symbolic.svg
index a9fd389e..446becdc 100644
--- a/src/other/firefox/common/icons/import-symbolic.svg
+++ b/src/other/firefox/common/icons/import-symbolic.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 15c1.108 0 2-0.892 2-2v-10c0-1.108-0.892-2-2-2h-8c-1.108 0-2 0.892-2 2v5.6797a4.3293 4.3293 0 0 1 1-0.2832v-5.3965c0-0.554 0.446-1 1-1h8c0.554 0 1 0.446 1 1v10c0 0.554-0.446 1-1 1h-4.2109a4.3293 4.3293 0 0 1-0.47461 1h4.6855z" fill="#363636"/>
- <path d="m7 12.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5zm-1.0859 0-2.5-2.5-0.70703 0.70703 1.293 1.293h-3v1h3l-1.293 1.293 0.70703 0.70703 2.5-2.5z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m12 15c1.108 0 2-0.892 2-2v-10c0-1.108-0.892-2-2-2h-8c-1.108 0-2 0.892-2 2v5.6797a4.3293 4.3293 0 0 1 1-0.2832v-5.3965c0-0.554 0.446-1 1-1h8c0.554 0 1 0.446 1 1v10c0 0.554-0.446 1-1 1h-4.2109a4.3293 4.3293 0 0 1-0.47461 1h4.6855z"/>
+ <path d="m7 12.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5zm-1.0859 0-2.5-2.5-0.70703 0.70703 1.293 1.293h-3v1h3l-1.293 1.293 0.70703 0.70703 2.5-2.5z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/info-symbolic-light.svg b/src/other/firefox/common/icons/info-symbolic-light.svg
deleted file mode 100644
index 408b943a..00000000
--- a/src/other/firefox/common/icons/info-symbolic-light.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   version="1.1"
-   id="svg12"
-   sodipodi:docname="info-symbolic-light.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs16" />
-  <sodipodi:namedview
-     id="namedview14"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="true"
-     inkscape:zoom="20.85965"
-     inkscape:cx="-9.3242216"
-     inkscape:cy="6.9991587"
-     inkscape:window-width="1920"
-     inkscape:window-height="1000"
-     inkscape:window-x="0"
-     inkscape:window-y="44"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg12">
-    <inkscape:grid
-       type="xygrid"
-       id="grid292" />
-  </sodipodi:namedview>
-  <path
-     d="M 8,0 A 8,8 0 0 0 0,8 8,8 0 0 0 8,16 8,8 0 0 0 16,8 8,8 0 0 0 8,0 Z M 8,1 A 7,7 0 0 1 15,8 7,7 0 0 1 8,15 7,7 0 0 1 1,8 7,7 0 0 1 8,1 Z"
-     id="path2"
-     style="color:#363636;fill:#dfdfdf;fill-opacity:1" />
-  <circle
-     cx="8"
-     cy="4.5"
-     r="0.5"
-     id="circle6"
-     style="color:#363636;fill:#dfdfdf;fill-opacity:1;stroke-width:0.5" />
-  <rect
-     id="rect346"
-     width="1"
-     height="6"
-     x="7.5"
-     y="6"
-     rx="0.5"
-     ry="0.42857143"
-     style="fill:#dfdfdf;fill-opacity:1;stroke-width:0.654654" />
-</svg>
diff --git a/src/other/firefox/common/icons/info-symbolic.svg b/src/other/firefox/common/icons/info-symbolic.svg
index d4a367df..990b61a5 100644
--- a/src/other/firefox/common/icons/info-symbolic.svg
+++ b/src/other/firefox/common/icons/info-symbolic.svg
@@ -1,57 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   version="1.1"
-   id="svg12"
-   sodipodi:docname="info-symbolic.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs16" />
-  <sodipodi:namedview
-     id="namedview14"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="true"
-     inkscape:zoom="1.84375"
-     inkscape:cx="21.152542"
-     inkscape:cy="-5.4237288"
-     inkscape:window-width="1920"
-     inkscape:window-height="1000"
-     inkscape:window-x="0"
-     inkscape:window-y="44"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg12">
-    <inkscape:grid
-       type="xygrid"
-       id="grid292" />
-  </sodipodi:namedview>
-  <path
-     d="M 8,0 A 8,8 0 0 0 0,8 8,8 0 0 0 8,16 8,8 0 0 0 16,8 8,8 0 0 0 8,0 Z M 8,1 A 7,7 0 0 1 15,8 7,7 0 0 1 8,15 7,7 0 0 1 1,8 7,7 0 0 1 8,1 Z"
-     id="path2"
-     style="color:#363636;fill:#333333;fill-opacity:1" />
-  <circle
-     cx="8"
-     cy="4.5"
-     r="0.5"
-     id="circle6"
-     style="color:#363636;fill:#333333;fill-opacity:1;stroke-width:0.5" />
-  <rect
-     id="rect346"
-     width="1"
-     height="6"
-     x="7.5"
-     y="6"
-     rx="0.5"
-     ry="0.42857143"
-     style="fill:#333333;fill-opacity:1;stroke-width:0.654654" />
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z"/>
+ <circle cx="8" cy="4.5" r=".5"/>
+ <rect x="7.5" y="6" width="1" height="6" rx=".5" ry=".42857"/>
 </svg>
diff --git a/src/other/firefox/common/icons/key-symbolic.svg b/src/other/firefox/common/icons/key-symbolic.svg
index 651a9d0e..bafca933 100644
--- a/src/other/firefox/common/icons/key-symbolic.svg
+++ b/src/other/firefox/common/icons/key-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <path d="m4.5 3a4.5 4.5 0 0 0-4.5 4.5 4.5 4.5 0 0 0 4.5 4.5 4.5 4.5 0 0 0 4.4648-4h2.0352v3.5c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-3.5h1v3.5c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-3.5h1.5c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-6.5293a4.5 4.5 0 0 0-4.4707-4zm0 1a3.5 3.5 0 0 1 3.5 3.5 3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5z" fill="#333333"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m4.5 3a4.5 4.5 0 0 0-4.5 4.5 4.5 4.5 0 0 0 4.5 4.5 4.5 4.5 0 0 0 4.4648-4h2.0352v3.5c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-3.5h1v3.5c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-3.5h1.5c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-6.5293a4.5 4.5 0 0 0-4.4707-4zm0 1a3.5 3.5 0 0 1 3.5 3.5 3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/library-symbolic.svg b/src/other/firefox/common/icons/library-symbolic.svg
index 20c92767..4dac27a3 100644
--- a/src/other/firefox/common/icons/library-symbolic.svg
+++ b/src/other/firefox/common/icons/library-symbolic.svg
@@ -1,6 +1,3 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg">
- <rect x=".52916" y=".26458" width=".26458" height="3.7042" rx=".13229" ry=".13229" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width=".57157" style="paint-order:markers stroke fill"/>
- <rect x="1.3229" y=".79374" width=".26458" height="3.1749" rx=".13229" ry=".13229" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width=".52916" style="paint-order:markers stroke fill"/>
- <rect x="2.1167" y=".52916" width=".26458" height="3.4396" rx=".13229" ry=".13229" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width=".55078" style="paint-order:markers stroke fill"/>
- <rect transform="rotate(-15)" x="2.5415" y="1.6454" width=".26458" height="3.175" rx=".13229" ry=".13229" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width=".52917" style="paint-order:markers stroke fill"/>
+<svg width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.5018 1c-0.27688 0-0.50176 0.22488-0.50176 0.50176v12.994c0 0.27688 0.22488 0.50176 0.50176 0.50176s0.49438-0.22488 0.49438-0.50176v-12.994c0-0.27688-0.2175-0.50176-0.49438-0.50176zm5.9916 1.0035c-0.27688 0-0.49438 0.22488-0.49438 0.50176v11.991c0 0.27688 0.2175 0.50176 0.49438 0.50176 0.27688 0 0.50176-0.22488 0.50176-0.50176v-11.991c0-0.27688-0.22488-0.50176-0.50176-0.50176zm-2.9958 0.99613c-0.27688 0-0.50176 0.22488-0.50176 0.50176v10.994c0 0.27688 0.22488 0.50176 0.50176 0.50176 0.27688 0 0.50176-0.22488 0.50176-0.50176v-10.994c0-0.27688-0.22488-0.50176-0.50176-0.50176zm5.9694 0.37632c-0.0332 0.00203-0.06987 0.0058-0.1033 0.014758-0.26744 0.071662-0.42584 0.34499-0.35418 0.61244l2.8482 10.625c0.07166 0.26744 0.34499 0.42584 0.61244 0.35418 0.26745-0.07166 0.42584-0.34499 0.35418-0.61244l-2.8482-10.625c-0.062704-0.23401-0.27673-0.38312-0.50914-0.36894z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/mail-unread-symbolic.svg b/src/other/firefox/common/icons/mail-unread-symbolic.svg
index 035ac16c..05513f33 100644
--- a/src/other/firefox/common/icons/mail-unread-symbolic.svg
+++ b/src/other/firefox/common/icons/mail-unread-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path class="ColorScheme-Text" d="m2 2c-1.108 0-2 0.892-2 2v8c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-8c0-1.108-0.892-2-2-2zm0 1h12c0.48888 0 0.87448 0.35406 0.96289 0.81641l-6.4238 5.1152c-0.30559 0.24335-0.77254 0.24335-1.0781 0l-6.4238-5.1152c0.088406-0.46235 0.47401-0.81641 0.96289-0.81641zm-1 2.0488 3.7051 2.9512-3.7051 2.9512v-5.9023zm14 0v5.9023l-3.7051-2.9512 3.7051-2.9512zm-9.502 3.584 1.1699 0.93164c0.73087 0.58201 1.9332 0.58201 2.6641 0l1.1699-0.93164 4.4609 3.5508c-0.08841 0.46235-0.47401 0.81641-0.96289 0.81641h-12c-0.48888 0-0.87448-0.35406-0.96289-0.81641l4.4609-3.5508z" color="#363636" fill="currentColor"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m2 2c-1.108 0-2 0.892-2 2v8c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-8c0-1.108-0.892-2-2-2zm0 1h12c0.48888 0 0.87448 0.35406 0.96289 0.81641l-6.4238 5.1152c-0.30559 0.24335-0.77254 0.24335-1.0781 0l-6.4238-5.1152c0.088406-0.46235 0.47401-0.81641 0.96289-0.81641zm-1 2.0488 3.7051 2.9512-3.7051 2.9512v-5.9023zm14 0v5.9023l-3.7051-2.9512 3.7051-2.9512zm-9.502 3.584 1.1699 0.93164c0.73087 0.58201 1.9332 0.58201 2.6641 0l1.1699-0.93164 4.4609 3.5508c-0.08841 0.46235-0.47401 0.81641-0.96289 0.81641h-12c-0.48888 0-0.87448-0.35406-0.96289-0.81641l4.4609-3.5508z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/microphone-symbolic.svg b/src/other/firefox/common/icons/microphone-symbolic.svg
index 4cf08c21..d7e13a3c 100644
--- a/src/other/firefox/common/icons/microphone-symbolic.svg
+++ b/src/other/firefox/common/icons/microphone-symbolic.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m8 0c-1.662 0-3 1.338-3 3v6c0 1.662 1.338 3 3 3s3-1.338 3-3v-6c0-1.662-1.338-3-3-3zm0 1c1.108 0 2 0.892 2 2v6c0 1.108-0.892 2-2 2s-2-0.892-2-2v-6c0-1.108 0.892-2 2-2z" fill="#363636" stroke-width="1.0954"/>
- <path class="ColorScheme-Text" d="m3.5 7c-0.277 0-0.5 0.223-0.5 0.5v1.5c0 2.6008 1.967 4.7248 4.5 4.9746v1.0254h-2c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h5c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-2v-1.0254c2.533-0.24983 4.5-2.3738 4.5-4.9746v-1.5c0-0.277-0.223-0.5-0.5-0.5-0.277 0-0.5 0.223-0.5 0.5v1.5c0 2.216-1.784 4-4 4-2.216 0-4-1.784-4-4v-1.5c0-0.277-0.223-0.5-0.5-0.5z" color="#ffffff" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">>
+ <path d="m8 0c-1.662 0-3 1.338-3 3v6c0 1.662 1.338 3 3 3s3-1.338 3-3v-6c0-1.662-1.338-3-3-3zm0 1c1.108 0 2 0.892 2 2v6c0 1.108-0.892 2-2 2s-2-0.892-2-2v-6c0-1.108 0.892-2 2-2z"/>
+ <path d="m3.5 7c-0.277 0-0.5 0.223-0.5 0.5v1.5c0 2.6008 1.967 4.7248 4.5 4.9746v1.0254h-2c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h5c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-2v-1.0254c2.533-0.24983 4.5-2.3738 4.5-4.9746v-1.5c0-0.277-0.223-0.5-0.5-0.5-0.277 0-0.5 0.223-0.5 0.5v1.5c0 2.216-1.784 4-4 4-2.216 0-4-1.784-4-4v-1.5c0-0.277-0.223-0.5-0.5-0.5z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/network-workgroup-symbolic-light.svg b/src/other/firefox/common/icons/network-workgroup-symbolic-light.svg
deleted file mode 100644
index 0097eca8..00000000
--- a/src/other/firefox/common/icons/network-workgroup-symbolic-light.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   version="1.1"
-   viewBox="0 0 16 16"
-   id="svg2150"
-   sodipodi:docname="network-workgroup-symbolic-light.svg"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview2152"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="7.9661017"
-     inkscape:cy="8"
-     inkscape:window-width="960"
-     inkscape:window-height="600"
-     inkscape:window-x="25"
-     inkscape:window-y="59"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2150" />
-  <defs
-     id="defs2146">
-    <style
-       id="current-color-scheme"
-       type="text/css">.ColorScheme-Text { color:#363636; }</style>
-  </defs>
-  <path
-     d="m8 0a8 8 0 0 0-0.15234 0.0058594l-0.0019531 0.0019531a8 8 0 0 0-0.035156 0.0019531 8.1695 8.1695 0 0 0-0.029297-0.0019531 8 8 0 0 0-0.097656 0.0078125 8 8 0 0 0-0.67383 0.052734 8 8 0 0 0-0.10156 0.015625 8 8 0 0 0-0.66406 0.11914 8 8 0 0 0-0.1582 0.039062 8 8 0 0 0-0.63477 0.18359 8 8 0 0 0-0.076172 0.027344 8 8 0 0 0-0.68555 0.27148 8 8 0 0 0-0.015625 0.0078125 8 8 0 0 0-0.68945 0.35547 8 8 0 0 0-0.033203 0.021484 8 8 0 0 0-0.64258 0.41992 8 8 0 0 0-0.013672 0.0097656 8 8 0 0 0-0.5918 0.47656 8 8 0 0 0-0.072266 0.066406 8 8 0 0 0-0.5 0.49219 8 8 0 0 0-0.0625 0.070312 8 8 0 0 0-0.45898 0.55469 8 8 0 0 0-0.025391 0.037109 8 8 0 0 0-0.41211 0.60938 8 8 0 0 0-0.060547 0.10352 8 8 0 0 0-0.31445 0.58594 8 8 0 0 0-0.0625 0.13867 8 8 0 0 0-0.25586 0.62305 8 8 0 0 0-0.023438 0.068359 8 8 0 0 0-0.20312 0.66992 8 8 0 0 0-0.064453 0.26758c0.0013275 5.628e-4 0.0025782 0.0013918 0.0039062 0.0019531a8 8 0 0 0-0.017578 0.083984 8 8 0 0 0-0.09375 0.55273 8 8 0 0 0-0.033203 0.27148 8 8 0 0 0-0.041016 0.61719 8 8 0 0 0-0.0058594 0.16992 8 8 0 0 0 4.5859 7.2246 8 8 0 0 0 0.011719 0.00586 8 8 0 0 0 0.38867 0.17383v0.001953a8 8 0 0 0 0.0097657 0.003906 8 8 0 0 0 0.61719 0.2168 8 8 0 0 0 0.1543 0.050781 8 8 0 0 0 0.53906 0.13086 8 8 0 0 0 0.25781 0.05664 8 8 0 0 0 0.51367 0.072266 8 8 0 0 0 0.27734 0.033203 8 8 0 0 0 0.64453 0.029297 8 8 0 0 0 0.66211-0.03125v-0.001953a8 8 0 0 0 0.013672 0 8 8 0 0 0 0.73633-0.099609 8 8 0 0 0 0.056641-0.007813 8 8 0 0 0 0.011719-0.001953 8 8 0 0 0 0.76563-0.18555 8 8 0 0 0 3.6543-2.2832 8 8 0 0 0 0.019531-0.021484 8 8 0 0 0 0.19922-0.21289 8 8 0 0 0 0.001953-0.003906c-0.0052 0.00186-0.01045 0.003879-0.015625 0.005859a8 8 0 0 0 1.8945-5.1562 8 8 0 0 0-0.26172-1.9902c0.0013-4.06e-5 0.002606 4e-5 0.003907 0a8 8 0 0 0-0.021485-0.064453 8 8 0 0 0-0.003906-0.013672 8 8 0 0 0-0.19336-0.62109 8 8 0 0 0-0.042969-0.11914 8 8 0 0 0-1.1016-2.0059 8 8 0 0 0-0.029297-0.037109 8 8 0 0 0-0.023437-0.029297 8 8 0 0 0-1.0352-1.1074 8 8 0 0 0-0.046875-0.039063 8 8 0 0 0-0.009766-0.0097656 8 8 0 0 0-0.56445-0.44727 8 8 0 0 0-0.070313-0.050781 8 8 0 0 0-0.57617-0.36719 8 8 0 0 0-0.089844-0.052734 8 8 0 0 0-3.9336-1.0449zm0 1a7 7 0 0 1 0.023438 0.0019531c-0.004856 0.12253-0.023438 0.24142-0.023438 0.36523 0 0.9854 0.12584 1.9405 0.33984 2.8613-1.1091 0.93745-2.4934 1.5589-4.0176 1.7246 0.4294-1.8215 1.2905-3.4696 2.4629-4.8457a7 7 0 0 1 0.49414-0.0625 7 7 0 0 1 0.21289-0.025391 7 7 0 0 1 0.50781-0.019531zm1.0176 0.082031a7 7 0 0 1 0.015625 0.0039063 7 7 0 0 1 0.66797 0.13281 7 7 0 0 1 0.0019531 0 7 7 0 0 1 0.0019531 0 7 7 0 0 1 0.66797 0.20508 7 7 0 0 1 0.023437 0.0078125c-0.30467 0.7143-0.71025 1.3749-1.209 1.9551-0.11504-0.6572-0.1875-1.3291-0.1875-2.0195 0-0.09654 0.014878-0.18928 0.017578-0.28516zm-3.8613 0.53125c-0.88323 1.306-1.5326 2.7808-1.873 4.375-0.6532-0.01864-1.2809-0.12781-1.8809-0.30273a7 7 0 0 1 0.25781-0.63281 7 7 0 0 1 0.019531-0.041016 7 7 0 0 1 0.31055-0.58594 7 7 0 0 1 0.0097656-0.015625 7 7 0 0 1 0.38281-0.57227 7 7 0 0 1 0.44141-0.53711 7 7 0 0 1 0.0078124-0.0097656 7 7 0 0 1 0.48242-0.48047 7 7 0 0 1 0.023438-0.019531 7 7 0 0 1 0.51562-0.41992 7 7 0 0 1 0.03125-0.021484 7 7 0 0 1 0.55859-0.36914 7 7 0 0 1 0.015625-0.0078126 7 7 0 0 1 0.61133-0.32031 7 7 0 0 1 0.085938-0.039063zm6.1484 0.21875a7 7 0 0 1 0.005859 0.0039063 7 7 0 0 1 0.59375 0.35742 7 7 0 0 1 0.5 0.37305 7 7 0 0 1 0.060547 0.044922 7 7 0 0 1 0.005859 0.0058594 7 7 0 0 1 0.45117 0.41211 7 7 0 0 1 0.058594 0.054688 7 7 0 0 1 0.003906 0.0058594 7 7 0 0 1 0.33594 0.37305 7 7 0 0 1 0.13867 0.16016 7 7 0 0 1 0.25977 0.35352 7 7 0 0 1 0.15039 0.21289 7 7 0 0 1 0.29297 0.50195 7 7 0 0 1 0.048829 0.083984 7 7 0 0 1 0.001953 0.0058594 7 7 0 0 1 0.23828 0.51758 7 7 0 0 1 0.050781 0.11328 7 7 0 0 1 0.003906 0.011719 7 7 0 0 1 0.15625 0.45703 7 7 0 0 1 0.076172 0.22656c-1.4278 0.2149-2.7415 0.77943-3.8457 1.6133-0.63033-0.9649-1.1166-2.0286-1.4395-3.1641 0.7851-0.7717 1.4127-1.6983 1.8516-2.7246zm-2.6816 3.4355c0.3607 1.109 0.86629 2.1525 1.502 3.1035-1.2292 1.1787-2.1088 2.7182-2.457 4.4512-1.1424-0.19436-2.2259-0.5536-3.2285-1.0547-0.27868-0.9986-0.43945-2.0466-0.43945-3.1348 0-0.5675 0.054496-1.1203 0.13281-1.666 1.6799-0.1247 3.2223-0.73726 4.4902-1.6992zm-7.4883 1.3672c0.6353 0.1889 1.2968 0.31508 1.9863 0.3457-0.071136 0.542-0.12109 1.0911-0.12109 1.6523 0 0.8395 0.087521 1.6592 0.24414 2.4531-0.7856-0.5172-1.4925-1.1383-2.127-1.8262a7 7 0 0 1 0-0.0019531 7 7 0 0 1-0.068359-0.50195 7 7 0 0 1-0.027344-0.22266 7 7 0 0 1-0.021484-0.5332 7 7 0 0 1 0.035156-0.69922 7 7 0 0 1 0.099609-0.66602zm13.797 0.45117a7 7 0 0 1 0.058593 0.66406 7 7 0 0 1 0.009766 0.25 7 7 0 0 1-0.70703 3.043 7 7 0 0 1-0.023438 0.052734c-1.0662-0.7006-2.0125-1.566-2.7969-2.5684 0.9896-0.7507 2.1713-1.2568 3.459-1.4414zm-4.2129 2.0898c0.8577 1.087 1.8961 2.0176 3.0605 2.7734a7 7 0 0 1-0.001953 0.003906 7 7 0 0 1-0.2832 0.37109c-1.2096 0.42703-2.5046 0.67578-3.8613 0.67578-0.32798 0-0.64964-0.022288-0.9707-0.048828 0.3059-1.4617 1.0363-2.7633 2.0566-3.7754zm-8.8984 2.1016c0.5552 0.44425 1.1479 0.84413 1.7773 1.1875 0.1492 0.46809 0.32934 0.92167 0.53125 1.3633a7 7 0 0 1-0.0058593-0.003906 7 7 0 0 1-0.5293-0.39258 7 7 0 0 1-0.03125-0.023438 7 7 0 0 1-0.51367-0.4668 7 7 0 0 1-0.46875-0.51953 7 7 0 0 1-0.41406-0.5625 7 7 0 0 1-0.3457-0.58203zm3.0566 1.7871c0.8443 0.34419 1.7346 0.59108 2.6582 0.74609-0.01846 0.22827-0.035156 0.45649-0.035156 0.68945 0 0.16094 0.012184 0.3181 0.021484 0.47656a7 7 0 0 1-0.0097656-0.001953 7 7 0 0 1-1.8516-0.38672 7 7 0 0 1-0.0078124-0.001953c-0.29525-0.484-0.55676-0.99058-0.77539-1.5215zm7.0605 0.71484a7 7 0 0 1-0.003906 0.003906 7 7 0 0 1-0.58203 0.35352 7 7 0 0 1-0.011718 0.007812 7 7 0 0 1-0.00586 0.001953 7 7 0 0 1-0.5332 0.25977 7 7 0 0 1-0.13086 0.056641 7 7 0 0 1-0.51367 0.1875 7 7 0 0 1-0.14453 0.046875 7 7 0 0 1-0.48242 0.125 7 7 0 0 1-0.2168 0.048828 7 7 0 0 1-0.44922 0.066406 7 7 0 0 1-0.33398 0.041016c-0.012573-0.15893-0.029297-0.3161-0.029297-0.47852 0-0.18734 0.013906-0.37084 0.027344-0.55469 0.36492 0.031773 0.73241 0.054688 1.1055 0.054688 0.7889 0 1.5586-0.076983 2.3047-0.2207z"
-     style="fill:#cccccc;fill-opacity:1"
-     class="ColorScheme-Text"
-     id="path2148" />
-</svg>
diff --git a/src/other/firefox/common/icons/network-workgroup-symbolic.svg b/src/other/firefox/common/icons/network-workgroup-symbolic.svg
index 631781d6..1a4c1a62 100644
--- a/src/other/firefox/common/icons/network-workgroup-symbolic.svg
+++ b/src/other/firefox/common/icons/network-workgroup-symbolic.svg
@@ -1,6 +1,3 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
- </defs>
- <path d="m8 0a8 8 0 0 0-0.15234 0.0058594l-0.0019531 0.0019531a8 8 0 0 0-0.035156 0.0019531 8.1695 8.1695 0 0 0-0.029297-0.0019531 8 8 0 0 0-0.097656 0.0078125 8 8 0 0 0-0.67383 0.052734 8 8 0 0 0-0.10156 0.015625 8 8 0 0 0-0.66406 0.11914 8 8 0 0 0-0.1582 0.039062 8 8 0 0 0-0.63477 0.18359 8 8 0 0 0-0.076172 0.027344 8 8 0 0 0-0.68555 0.27148 8 8 0 0 0-0.015625 0.0078125 8 8 0 0 0-0.68945 0.35547 8 8 0 0 0-0.033203 0.021484 8 8 0 0 0-0.64258 0.41992 8 8 0 0 0-0.013672 0.0097656 8 8 0 0 0-0.5918 0.47656 8 8 0 0 0-0.072266 0.066406 8 8 0 0 0-0.5 0.49219 8 8 0 0 0-0.0625 0.070312 8 8 0 0 0-0.45898 0.55469 8 8 0 0 0-0.025391 0.037109 8 8 0 0 0-0.41211 0.60938 8 8 0 0 0-0.060547 0.10352 8 8 0 0 0-0.31445 0.58594 8 8 0 0 0-0.0625 0.13867 8 8 0 0 0-0.25586 0.62305 8 8 0 0 0-0.023438 0.068359 8 8 0 0 0-0.20312 0.66992 8 8 0 0 0-0.064453 0.26758c0.0013275 5.628e-4 0.0025782 0.0013918 0.0039062 0.0019531a8 8 0 0 0-0.017578 0.083984 8 8 0 0 0-0.09375 0.55273 8 8 0 0 0-0.033203 0.27148 8 8 0 0 0-0.041016 0.61719 8 8 0 0 0-0.0058594 0.16992 8 8 0 0 0 4.5859 7.2246 8 8 0 0 0 0.011719 0.00586 8 8 0 0 0 0.38867 0.17383v0.001953a8 8 0 0 0 0.0097657 0.003906 8 8 0 0 0 0.61719 0.2168 8 8 0 0 0 0.1543 0.050781 8 8 0 0 0 0.53906 0.13086 8 8 0 0 0 0.25781 0.05664 8 8 0 0 0 0.51367 0.072266 8 8 0 0 0 0.27734 0.033203 8 8 0 0 0 0.64453 0.029297 8 8 0 0 0 0.66211-0.03125v-0.001953a8 8 0 0 0 0.013672 0 8 8 0 0 0 0.73633-0.099609 8 8 0 0 0 0.056641-0.007813 8 8 0 0 0 0.011719-0.001953 8 8 0 0 0 0.76563-0.18555 8 8 0 0 0 3.6543-2.2832 8 8 0 0 0 0.019531-0.021484 8 8 0 0 0 0.19922-0.21289 8 8 0 0 0 0.001953-0.003906c-0.0052 0.00186-0.01045 0.003879-0.015625 0.005859a8 8 0 0 0 1.8945-5.1562 8 8 0 0 0-0.26172-1.9902c0.0013-4.06e-5 0.002606 4e-5 0.003907 0a8 8 0 0 0-0.021485-0.064453 8 8 0 0 0-0.003906-0.013672 8 8 0 0 0-0.19336-0.62109 8 8 0 0 0-0.042969-0.11914 8 8 0 0 0-1.1016-2.0059 8 8 0 0 0-0.029297-0.037109 8 8 0 0 0-0.023437-0.029297 8 8 0 0 0-1.0352-1.1074 8 8 0 0 0-0.046875-0.039063 8 8 0 0 0-0.009766-0.0097656 8 8 0 0 0-0.56445-0.44727 8 8 0 0 0-0.070313-0.050781 8 8 0 0 0-0.57617-0.36719 8 8 0 0 0-0.089844-0.052734 8 8 0 0 0-3.9336-1.0449zm0 1a7 7 0 0 1 0.023438 0.0019531c-0.004856 0.12253-0.023438 0.24142-0.023438 0.36523 0 0.9854 0.12584 1.9405 0.33984 2.8613-1.1091 0.93745-2.4934 1.5589-4.0176 1.7246 0.4294-1.8215 1.2905-3.4696 2.4629-4.8457a7 7 0 0 1 0.49414-0.0625 7 7 0 0 1 0.21289-0.025391 7 7 0 0 1 0.50781-0.019531zm1.0176 0.082031a7 7 0 0 1 0.015625 0.0039063 7 7 0 0 1 0.66797 0.13281 7 7 0 0 1 0.0019531 0 7 7 0 0 1 0.0019531 0 7 7 0 0 1 0.66797 0.20508 7 7 0 0 1 0.023437 0.0078125c-0.30467 0.7143-0.71025 1.3749-1.209 1.9551-0.11504-0.6572-0.1875-1.3291-0.1875-2.0195 0-0.09654 0.014878-0.18928 0.017578-0.28516zm-3.8613 0.53125c-0.88323 1.306-1.5326 2.7808-1.873 4.375-0.6532-0.01864-1.2809-0.12781-1.8809-0.30273a7 7 0 0 1 0.25781-0.63281 7 7 0 0 1 0.019531-0.041016 7 7 0 0 1 0.31055-0.58594 7 7 0 0 1 0.0097656-0.015625 7 7 0 0 1 0.38281-0.57227 7 7 0 0 1 0.44141-0.53711 7 7 0 0 1 0.0078124-0.0097656 7 7 0 0 1 0.48242-0.48047 7 7 0 0 1 0.023438-0.019531 7 7 0 0 1 0.51562-0.41992 7 7 0 0 1 0.03125-0.021484 7 7 0 0 1 0.55859-0.36914 7 7 0 0 1 0.015625-0.0078126 7 7 0 0 1 0.61133-0.32031 7 7 0 0 1 0.085938-0.039063zm6.1484 0.21875a7 7 0 0 1 0.005859 0.0039063 7 7 0 0 1 0.59375 0.35742 7 7 0 0 1 0.5 0.37305 7 7 0 0 1 0.060547 0.044922 7 7 0 0 1 0.005859 0.0058594 7 7 0 0 1 0.45117 0.41211 7 7 0 0 1 0.058594 0.054688 7 7 0 0 1 0.003906 0.0058594 7 7 0 0 1 0.33594 0.37305 7 7 0 0 1 0.13867 0.16016 7 7 0 0 1 0.25977 0.35352 7 7 0 0 1 0.15039 0.21289 7 7 0 0 1 0.29297 0.50195 7 7 0 0 1 0.048829 0.083984 7 7 0 0 1 0.001953 0.0058594 7 7 0 0 1 0.23828 0.51758 7 7 0 0 1 0.050781 0.11328 7 7 0 0 1 0.003906 0.011719 7 7 0 0 1 0.15625 0.45703 7 7 0 0 1 0.076172 0.22656c-1.4278 0.2149-2.7415 0.77943-3.8457 1.6133-0.63033-0.9649-1.1166-2.0286-1.4395-3.1641 0.7851-0.7717 1.4127-1.6983 1.8516-2.7246zm-2.6816 3.4355c0.3607 1.109 0.86629 2.1525 1.502 3.1035-1.2292 1.1787-2.1088 2.7182-2.457 4.4512-1.1424-0.19436-2.2259-0.5536-3.2285-1.0547-0.27868-0.9986-0.43945-2.0466-0.43945-3.1348 0-0.5675 0.054496-1.1203 0.13281-1.666 1.6799-0.1247 3.2223-0.73726 4.4902-1.6992zm-7.4883 1.3672c0.6353 0.1889 1.2968 0.31508 1.9863 0.3457-0.071136 0.542-0.12109 1.0911-0.12109 1.6523 0 0.8395 0.087521 1.6592 0.24414 2.4531-0.7856-0.5172-1.4925-1.1383-2.127-1.8262a7 7 0 0 1 0-0.0019531 7 7 0 0 1-0.068359-0.50195 7 7 0 0 1-0.027344-0.22266 7 7 0 0 1-0.021484-0.5332 7 7 0 0 1 0.035156-0.69922 7 7 0 0 1 0.099609-0.66602zm13.797 0.45117a7 7 0 0 1 0.058593 0.66406 7 7 0 0 1 0.009766 0.25 7 7 0 0 1-0.70703 3.043 7 7 0 0 1-0.023438 0.052734c-1.0662-0.7006-2.0125-1.566-2.7969-2.5684 0.9896-0.7507 2.1713-1.2568 3.459-1.4414zm-4.2129 2.0898c0.8577 1.087 1.8961 2.0176 3.0605 2.7734a7 7 0 0 1-0.001953 0.003906 7 7 0 0 1-0.2832 0.37109c-1.2096 0.42703-2.5046 0.67578-3.8613 0.67578-0.32798 0-0.64964-0.022288-0.9707-0.048828 0.3059-1.4617 1.0363-2.7633 2.0566-3.7754zm-8.8984 2.1016c0.5552 0.44425 1.1479 0.84413 1.7773 1.1875 0.1492 0.46809 0.32934 0.92167 0.53125 1.3633a7 7 0 0 1-0.0058593-0.003906 7 7 0 0 1-0.5293-0.39258 7 7 0 0 1-0.03125-0.023438 7 7 0 0 1-0.51367-0.4668 7 7 0 0 1-0.46875-0.51953 7 7 0 0 1-0.41406-0.5625 7 7 0 0 1-0.3457-0.58203zm3.0566 1.7871c0.8443 0.34419 1.7346 0.59108 2.6582 0.74609-0.01846 0.22827-0.035156 0.45649-0.035156 0.68945 0 0.16094 0.012184 0.3181 0.021484 0.47656a7 7 0 0 1-0.0097656-0.001953 7 7 0 0 1-1.8516-0.38672 7 7 0 0 1-0.0078124-0.001953c-0.29525-0.484-0.55676-0.99058-0.77539-1.5215zm7.0605 0.71484a7 7 0 0 1-0.003906 0.003906 7 7 0 0 1-0.58203 0.35352 7 7 0 0 1-0.011718 0.007812 7 7 0 0 1-0.00586 0.001953 7 7 0 0 1-0.5332 0.25977 7 7 0 0 1-0.13086 0.056641 7 7 0 0 1-0.51367 0.1875 7 7 0 0 1-0.14453 0.046875 7 7 0 0 1-0.48242 0.125 7 7 0 0 1-0.2168 0.048828 7 7 0 0 1-0.44922 0.066406 7 7 0 0 1-0.33398 0.041016c-0.012573-0.15893-0.029297-0.3161-0.029297-0.47852 0-0.18734 0.013906-0.37084 0.027344-0.55469 0.36492 0.031773 0.73241 0.054688 1.1055 0.054688 0.7889 0 1.5586-0.076983 2.3047-0.2207z" style="fill:currentColor" class="ColorScheme-Text"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8 0a8 8 0 0 0-0.15234 0.0058594l-0.0019531 0.0019531a8 8 0 0 0-0.035156 0.0019531 8.1695 8.1695 0 0 0-0.029297-0.0019531 8 8 0 0 0-0.097656 0.0078125 8 8 0 0 0-0.67383 0.052734 8 8 0 0 0-0.10156 0.015625 8 8 0 0 0-0.66406 0.11914 8 8 0 0 0-0.1582 0.039062 8 8 0 0 0-0.63477 0.18359 8 8 0 0 0-0.076172 0.027344 8 8 0 0 0-0.68555 0.27148 8 8 0 0 0-0.015625 0.0078125 8 8 0 0 0-0.68945 0.35547 8 8 0 0 0-0.033203 0.021484 8 8 0 0 0-0.64258 0.41992 8 8 0 0 0-0.013672 0.0097656 8 8 0 0 0-0.5918 0.47656 8 8 0 0 0-0.072266 0.066406 8 8 0 0 0-0.5 0.49219 8 8 0 0 0-0.0625 0.070312 8 8 0 0 0-0.45898 0.55469 8 8 0 0 0-0.025391 0.037109 8 8 0 0 0-0.41211 0.60938 8 8 0 0 0-0.060547 0.10352 8 8 0 0 0-0.31445 0.58594 8 8 0 0 0-0.0625 0.13867 8 8 0 0 0-0.25586 0.62305 8 8 0 0 0-0.023438 0.068359 8 8 0 0 0-0.20312 0.66992 8 8 0 0 0-0.064453 0.26758c0.0013275 5.628e-4 0.0025782 0.0013918 0.0039062 0.0019531a8 8 0 0 0-0.017578 0.083984 8 8 0 0 0-0.09375 0.55273 8 8 0 0 0-0.033203 0.27148 8 8 0 0 0-0.041016 0.61719 8 8 0 0 0-0.0058594 0.16992 8 8 0 0 0 4.5859 7.2246 8 8 0 0 0 0.011719 0.00586 8 8 0 0 0 0.38867 0.17383v0.001953a8 8 0 0 0 0.0097657 0.003906 8 8 0 0 0 0.61719 0.2168 8 8 0 0 0 0.1543 0.050781 8 8 0 0 0 0.53906 0.13086 8 8 0 0 0 0.25781 0.05664 8 8 0 0 0 0.51367 0.072266 8 8 0 0 0 0.27734 0.033203 8 8 0 0 0 0.64453 0.029297 8 8 0 0 0 0.66211-0.03125v-0.001953a8 8 0 0 0 0.013672 0 8 8 0 0 0 0.73633-0.099609 8 8 0 0 0 0.056641-0.007813 8 8 0 0 0 0.011719-0.001953 8 8 0 0 0 0.76563-0.18555 8 8 0 0 0 3.6543-2.2832 8 8 0 0 0 0.019531-0.021484 8 8 0 0 0 0.19922-0.21289 8 8 0 0 0 0.001953-0.003906c-0.0052 0.00186-0.01045 0.003879-0.015625 0.005859a8 8 0 0 0 1.8945-5.1562 8 8 0 0 0-0.26172-1.9902c0.0013-4.06e-5 0.002606 4e-5 0.003907 0a8 8 0 0 0-0.021485-0.064453 8 8 0 0 0-0.003906-0.013672 8 8 0 0 0-0.19336-0.62109 8 8 0 0 0-0.042969-0.11914 8 8 0 0 0-1.1016-2.0059 8 8 0 0 0-0.029297-0.037109 8 8 0 0 0-0.023437-0.029297 8 8 0 0 0-1.0352-1.1074 8 8 0 0 0-0.046875-0.039063 8 8 0 0 0-0.009766-0.0097656 8 8 0 0 0-0.56445-0.44727 8 8 0 0 0-0.070313-0.050781 8 8 0 0 0-0.57617-0.36719 8 8 0 0 0-0.089844-0.052734 8 8 0 0 0-3.9336-1.0449zm0 1a7 7 0 0 1 0.023438 0.0019531c-0.004856 0.12253-0.023438 0.24142-0.023438 0.36523 0 0.9854 0.12584 1.9405 0.33984 2.8613-1.1091 0.93745-2.4934 1.5589-4.0176 1.7246 0.4294-1.8215 1.2905-3.4696 2.4629-4.8457a7 7 0 0 1 0.49414-0.0625 7 7 0 0 1 0.21289-0.025391 7 7 0 0 1 0.50781-0.019531zm1.0176 0.082031a7 7 0 0 1 0.015625 0.0039063 7 7 0 0 1 0.66797 0.13281 7 7 0 0 1 0.0019531 0 7 7 0 0 1 0.0019531 0 7 7 0 0 1 0.66797 0.20508 7 7 0 0 1 0.023437 0.0078125c-0.30467 0.7143-0.71025 1.3749-1.209 1.9551-0.11504-0.6572-0.1875-1.3291-0.1875-2.0195 0-0.09654 0.014878-0.18928 0.017578-0.28516zm-3.8613 0.53125c-0.88323 1.306-1.5326 2.7808-1.873 4.375-0.6532-0.01864-1.2809-0.12781-1.8809-0.30273a7 7 0 0 1 0.25781-0.63281 7 7 0 0 1 0.019531-0.041016 7 7 0 0 1 0.31055-0.58594 7 7 0 0 1 0.0097656-0.015625 7 7 0 0 1 0.38281-0.57227 7 7 0 0 1 0.44141-0.53711 7 7 0 0 1 0.0078124-0.0097656 7 7 0 0 1 0.48242-0.48047 7 7 0 0 1 0.023438-0.019531 7 7 0 0 1 0.51562-0.41992 7 7 0 0 1 0.03125-0.021484 7 7 0 0 1 0.55859-0.36914 7 7 0 0 1 0.015625-0.0078126 7 7 0 0 1 0.61133-0.32031 7 7 0 0 1 0.085938-0.039063zm6.1484 0.21875a7 7 0 0 1 0.005859 0.0039063 7 7 0 0 1 0.59375 0.35742 7 7 0 0 1 0.5 0.37305 7 7 0 0 1 0.060547 0.044922 7 7 0 0 1 0.005859 0.0058594 7 7 0 0 1 0.45117 0.41211 7 7 0 0 1 0.058594 0.054688 7 7 0 0 1 0.003906 0.0058594 7 7 0 0 1 0.33594 0.37305 7 7 0 0 1 0.13867 0.16016 7 7 0 0 1 0.25977 0.35352 7 7 0 0 1 0.15039 0.21289 7 7 0 0 1 0.29297 0.50195 7 7 0 0 1 0.048829 0.083984 7 7 0 0 1 0.001953 0.0058594 7 7 0 0 1 0.23828 0.51758 7 7 0 0 1 0.050781 0.11328 7 7 0 0 1 0.003906 0.011719 7 7 0 0 1 0.15625 0.45703 7 7 0 0 1 0.076172 0.22656c-1.4278 0.2149-2.7415 0.77943-3.8457 1.6133-0.63033-0.9649-1.1166-2.0286-1.4395-3.1641 0.7851-0.7717 1.4127-1.6983 1.8516-2.7246zm-2.6816 3.4355c0.3607 1.109 0.86629 2.1525 1.502 3.1035-1.2292 1.1787-2.1088 2.7182-2.457 4.4512-1.1424-0.19436-2.2259-0.5536-3.2285-1.0547-0.27868-0.9986-0.43945-2.0466-0.43945-3.1348 0-0.5675 0.054496-1.1203 0.13281-1.666 1.6799-0.1247 3.2223-0.73726 4.4902-1.6992zm-7.4883 1.3672c0.6353 0.1889 1.2968 0.31508 1.9863 0.3457-0.071136 0.542-0.12109 1.0911-0.12109 1.6523 0 0.8395 0.087521 1.6592 0.24414 2.4531-0.7856-0.5172-1.4925-1.1383-2.127-1.8262a7 7 0 0 1 0-0.0019531 7 7 0 0 1-0.068359-0.50195 7 7 0 0 1-0.027344-0.22266 7 7 0 0 1-0.021484-0.5332 7 7 0 0 1 0.035156-0.69922 7 7 0 0 1 0.099609-0.66602zm13.797 0.45117a7 7 0 0 1 0.058593 0.66406 7 7 0 0 1 0.009766 0.25 7 7 0 0 1-0.70703 3.043 7 7 0 0 1-0.023438 0.052734c-1.0662-0.7006-2.0125-1.566-2.7969-2.5684 0.9896-0.7507 2.1713-1.2568 3.459-1.4414zm-4.2129 2.0898c0.8577 1.087 1.8961 2.0176 3.0605 2.7734a7 7 0 0 1-0.001953 0.003906 7 7 0 0 1-0.2832 0.37109c-1.2096 0.42703-2.5046 0.67578-3.8613 0.67578-0.32798 0-0.64964-0.022288-0.9707-0.048828 0.3059-1.4617 1.0363-2.7633 2.0566-3.7754zm-8.8984 2.1016c0.5552 0.44425 1.1479 0.84413 1.7773 1.1875 0.1492 0.46809 0.32934 0.92167 0.53125 1.3633a7 7 0 0 1-0.0058593-0.003906 7 7 0 0 1-0.5293-0.39258 7 7 0 0 1-0.03125-0.023438 7 7 0 0 1-0.51367-0.4668 7 7 0 0 1-0.46875-0.51953 7 7 0 0 1-0.41406-0.5625 7 7 0 0 1-0.3457-0.58203zm3.0566 1.7871c0.8443 0.34419 1.7346 0.59108 2.6582 0.74609-0.01846 0.22827-0.035156 0.45649-0.035156 0.68945 0 0.16094 0.012184 0.3181 0.021484 0.47656a7 7 0 0 1-0.0097656-0.001953 7 7 0 0 1-1.8516-0.38672 7 7 0 0 1-0.0078124-0.001953c-0.29525-0.484-0.55676-0.99058-0.77539-1.5215zm7.0605 0.71484a7 7 0 0 1-0.003906 0.003906 7 7 0 0 1-0.58203 0.35352 7 7 0 0 1-0.011718 0.007812 7 7 0 0 1-0.00586 0.001953 7 7 0 0 1-0.5332 0.25977 7 7 0 0 1-0.13086 0.056641 7 7 0 0 1-0.51367 0.1875 7 7 0 0 1-0.14453 0.046875 7 7 0 0 1-0.48242 0.125 7 7 0 0 1-0.2168 0.048828 7 7 0 0 1-0.44922 0.066406 7 7 0 0 1-0.33398 0.041016c-0.012573-0.15893-0.029297-0.3161-0.029297-0.47852 0-0.18734 0.013906-0.37084 0.027344-0.55469 0.36492 0.031773 0.73241 0.054688 1.1055 0.054688 0.7889 0 1.5586-0.076983 2.3047-0.2207z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/notification-symbolic.svg b/src/other/firefox/common/icons/notification-symbolic.svg
index eaab11b6..b3cecc06 100644
--- a/src/other/firefox/common/icons/notification-symbolic.svg
+++ b/src/other/firefox/common/icons/notification-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m8 1a1 1 0 0 0-0.994 1.1 4.988 4.988 0 0 0-4.006 4.9v4.5l-2 2v0.5h14v-0.5l-2-2v-4.5a4.987 4.987 0 0 0-4.006-4.9 1 1 0 0 0-0.994-1.1zm0 2a4 4 0 0 1 4 4v4.922l1 1.078h-10l1-1.078v-4.922a4 4 0 0 1 4-4zm-1.73 12a2 2 0 0 0 1.73 1 2 2 0 0 0 1.729-1z" fill="#363636" stroke-linecap="round" stroke-width="3"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8 1a1 1 0 0 0-0.994 1.1 4.988 4.988 0 0 0-4.006 4.9v4.5l-2 2v0.5h14v-0.5l-2-2v-4.5a4.987 4.987 0 0 0-4.006-4.9 1 1 0 0 0-0.994-1.1zm0 2a4 4 0 0 1 4 4v4.922l1 1.078h-10l1-1.078v-4.922a4 4 0 0 1 4-4zm-1.73 12a2 2 0 0 0 1.73 1 2 2 0 0 0 1.729-1z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/open-folder-symbolic.svg b/src/other/firefox/common/icons/open-folder-symbolic.svg
index 1d13e4d5..910ce7be 100644
--- a/src/other/firefox/common/icons/open-folder-symbolic.svg
+++ b/src/other/firefox/common/icons/open-folder-symbolic.svg
@@ -1,9 +1,4 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#363636;
-      }</style>
- </defs>
- <path class="ColorScheme-Text" d="m2 2c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h7.6777a4.5 4.5 0 0 1-0.91602-1h-6.7617c-0.554 0-1-0.446-1-1v-6h14v0.75977a4.5 4.5 0 0 1 1 0.91406v-3.6738c0-1.108-0.892-2-2-2h-7.6289c-0.57985-0.0229-0.6047 0.076884-1.0391-0.35742-0.43381-0.43381-0.613-0.64213-1.332-0.64258h-2zm0 1h2c0.31116-1.7e-6 0.52033 1.414e-4 0.99805 0.4707 0.47877 0.47161 0.6388 0.5293 1 0.5293h8.002c0.554 0 1 0.446 1 1v1h-14v-2c0-0.554 0.446-1 1-1z" fill="currentColor"/>
- <path d="m12.5 8a3.5 3.5 0 0 0-3.5 3.5 3.5 3.5 0 0 0 3.5 3.5 3.5 3.5 0 0 0 3.5-3.5 3.5 3.5 0 0 0-3.5-3.5zm0 1.0859 2.5 2.5-0.70703 0.70703-1.293-1.293v3h-1v-3l-1.293 1.293-0.70703-0.70703 2.5-2.5z" fill="currentColor" class="ColorScheme-Text"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m2 2c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h7.6777a4.5 4.5 0 0 1-0.91602-1h-6.7617c-0.554 0-1-0.446-1-1v-6h14v0.75977a4.5 4.5 0 0 1 1 0.91406v-3.6738c0-1.108-0.892-2-2-2h-7.6289c-0.57985-0.0229-0.6047 0.076884-1.0391-0.35742-0.43381-0.43381-0.613-0.64213-1.332-0.64258h-2zm0 1h2c0.31116-1.7e-6 0.52033 1.414e-4 0.99805 0.4707 0.47877 0.47161 0.6388 0.5293 1 0.5293h8.002c0.554 0 1 0.446 1 1v1h-14v-2c0-0.554 0.446-1 1-1z"/>
+ <path d="m12.5 8a3.5 3.5 0 0 0-3.5 3.5 3.5 3.5 0 0 0 3.5 3.5 3.5 3.5 0 0 0 3.5-3.5 3.5 3.5 0 0 0-3.5-3.5zm0 1.0859 2.5 2.5-0.70703 0.70703-1.293-1.293v3h-1v-3l-1.293 1.293-0.70703-0.70703 2.5-2.5z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/open-menu-symbolic.svg b/src/other/firefox/common/icons/open-menu-symbolic.svg
index f5d29646..909083e7 100644
--- a/src/other/firefox/common/icons/open-menu-symbolic.svg
+++ b/src/other/firefox/common/icons/open-menu-symbolic.svg
@@ -1,5 +1,5 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#333" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.1909">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g>
   <rect x="2" y="4" width="12" height="1" ry=".5"/>
   <rect x="2" y="8" width="12" height="1" ry=".5"/>
   <rect x="2" y="12" width="12" height="1" ry=".5"/>
diff --git a/src/other/firefox/common/icons/page-action.svg b/src/other/firefox/common/icons/page-action.svg
index 7c8932e4..c445854b 100644
--- a/src/other/firefox/common/icons/page-action.svg
+++ b/src/other/firefox/common/icons/page-action.svg
@@ -1,7 +1,7 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#333">
-  <circle cx="2" cy="8" r="1" color="#363636"/>
-  <circle cx="8" cy="8" r="1" color="#363636"/>
-  <circle cx="14" cy="8" r="1" color="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g>
+  <circle cx="2" cy="8" r="1"/>
+  <circle cx="8" cy="8" r="1"/>
+  <circle cx="14" cy="8" r="1"/>
  </g>
 </svg>
diff --git a/src/other/firefox/common/icons/page-symbolic.svg b/src/other/firefox/common/icons/page-symbolic.svg
index 00b8b8da..6e95de0e 100644
--- a/src/other/firefox/common/icons/page-symbolic.svg
+++ b/src/other/firefox/common/icons/page-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="4.2333mm" height="4.2333mm" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg">
- <path d="m1.0563 0c-0.28858 0-0.52917 0.24059-0.52917 0.52917v3.176c0 0.28858 0.24059 0.5271 0.52917 0.5271h2.3833c0.28858 0 0.52917-0.23852 0.52917-0.5271v-1.9632l-1.7441-1.742zm0.00103 0.26458h1.0583v1.0583c0 0.29316 0.23601 0.52917 0.52917 0.52917h1.0583v1.8521c0 0.14658-0.118 0.26458-0.26458 0.26458h-2.3812c-0.14658 0-0.26458-0.118-0.26458-0.26458v-3.175c0-0.14658 0.118-0.26458 0.26458-0.26458zm1.3229 0.26458 1.0583 1.0583h-0.79375c-0.14658 0-0.26458-0.118-0.26458-0.26458z" fill="#363636" stroke-linecap="square" stroke-width=".52917" style="paint-order:fill markers stroke"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3.0005 5.0948e-5c-1.091 0-2.0005 0.90954-2.0005 2.0005v12.007c0 1.091 0.90954 1.9927 2.0005 1.9927h8.999c1.091 0 2.0005-0.90171 2.0005-1.9927v-7.4218l-6.5935-6.5855zm0.0038939 1.0002h3.9899v4.0009c0 1.1083 0.89222 2.0005 2.0005 2.0005h4.0009v7.0018c0 0.55414-0.44609 1.0002-1.0002 1.0002h-8.9911c-0.55414 0-1.0002-0.44609-1.0002-1.0002v-12.003c0-0.55414 0.44609-1.0002 1.0002-1.0002zm4.9902 1.0002 4.0009 4.0009h-3.0007c-0.55414 0-1.0002-0.44609-1.0002-1.0002z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/pan-down-symbolic-light.svg b/src/other/firefox/common/icons/pan-down-symbolic-light.svg
deleted file mode 100644
index 84fcd70c..00000000
--- a/src/other/firefox/common/icons/pan-down-symbolic-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m13 6-5 5-5-5z" fill="#dfdfdf"/>
-</svg>
diff --git a/src/other/firefox/common/icons/pan-down-symbolic.svg b/src/other/firefox/common/icons/pan-down-symbolic.svg
index 0afbfed7..e2d46573 100644
--- a/src/other/firefox/common/icons/pan-down-symbolic.svg
+++ b/src/other/firefox/common/icons/pan-down-symbolic.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M13 6l-5 5-5-5z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+    <path d="M13 6l-5 5-5-5z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/pan-end-symbolic-light.svg b/src/other/firefox/common/icons/pan-end-symbolic-light.svg
deleted file mode 100644
index 72a9a553..00000000
--- a/src/other/firefox/common/icons/pan-end-symbolic-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m6 13 5-5-5-5z" fill="#dfdfdf"/>
-</svg>
diff --git a/src/other/firefox/common/icons/pan-end-symbolic.svg b/src/other/firefox/common/icons/pan-end-symbolic.svg
index ceaa1508..7b961bc5 100644
--- a/src/other/firefox/common/icons/pan-end-symbolic.svg
+++ b/src/other/firefox/common/icons/pan-end-symbolic.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M6 13l5-5-5-5z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+    <path d="M6 13l5-5-5-5z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/pan-start-symbolic.svg b/src/other/firefox/common/icons/pan-start-symbolic.svg
index dd05cda6..4440e75b 100644
--- a/src/other/firefox/common/icons/pan-start-symbolic.svg
+++ b/src/other/firefox/common/icons/pan-start-symbolic.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M10 13L5 8l5-5z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+    <path d="M10 13L5 8l5-5z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/pan-up-symbolic.svg b/src/other/firefox/common/icons/pan-up-symbolic.svg
index 0e98312c..31929449 100644
--- a/src/other/firefox/common/icons/pan-up-symbolic.svg
+++ b/src/other/firefox/common/icons/pan-up-symbolic.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M13 10L8 5l-5 5z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+    <path d="M13 10L8 5l-5 5z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/permissions-granted.svg b/src/other/firefox/common/icons/permissions-granted.svg
index a6b3b156..a753e73c 100644
--- a/src/other/firefox/common/icons/permissions-granted.svg
+++ b/src/other/firefox/common/icons/permissions-granted.svg
@@ -1,8 +1,8 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#333">
-  <path d="m1.5 4c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h2.5879a1.5 1.5 0 0 1-0.087891-0.5 1.5 1.5 0 0 1 0.085938-0.5h-2.5859zm5.4121 0a1.5 1.5 0 0 1 0.087891 0.5 1.5 1.5 0 0 1-0.085938 0.5h7.5859c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-7.5879z" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.3664"/>
-  <path d="m1.5 11c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h7.5879a1.5 1.5 0 0 1-0.087891-0.5 1.5 1.5 0 0 1 0.085938-0.5h-7.5859zm10.412 0a1.5 1.5 0 0 1 0.087891 0.5 1.5 1.5 0 0 1-0.085938 0.5h2.5859c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-2.5879z" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.3664"/>
-  <path d="m5.5 2a2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0-2.5-2.5zm0 1a1.5 1.5 0 0 1 1.5 1.5 1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5z" stroke-linecap="square" stroke-width="2"/>
-  <path d="m10.5 9a2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0-2.5-2.5zm0 1a1.5 1.5 0 0 1 1.5 1.5 1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5z" stroke-linecap="square" stroke-width="2"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g>
+  <path d="m1.5 4c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h2.5879a1.5 1.5 0 0 1-0.087891-0.5 1.5 1.5 0 0 1 0.085938-0.5h-2.5859zm5.4121 0a1.5 1.5 0 0 1 0.087891 0.5 1.5 1.5 0 0 1-0.085938 0.5h7.5859c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-7.5879z"/>
+  <path d="m1.5 11c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h7.5879a1.5 1.5 0 0 1-0.087891-0.5 1.5 1.5 0 0 1 0.085938-0.5h-7.5859zm10.412 0a1.5 1.5 0 0 1 0.087891 0.5 1.5 1.5 0 0 1-0.085938 0.5h2.5859c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-2.5879z"/>
+  <path d="m5.5 2a2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0-2.5-2.5zm0 1a1.5 1.5 0 0 1 1.5 1.5 1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5z"/>
+  <path d="m10.5 9a2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0-2.5-2.5zm0 1a1.5 1.5 0 0 1 1.5 1.5 1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5z"/>
  </g>
 </svg>
diff --git a/src/other/firefox/common/icons/persistent-storage.svg b/src/other/firefox/common/icons/persistent-storage.svg
index 126fb2a0..0897c6d4 100644
--- a/src/other/firefox/common/icons/persistent-storage.svg
+++ b/src/other/firefox/common/icons/persistent-storage.svg
@@ -1,7 +1,7 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <path d="m3 2c-1.662 0-3 1.338-3 3v6c0 1.662 1.338 3 3 3h10c1.662 0 3-1.338 3-3v-6c0-1.662-1.338-3-3-3h-10zm0 1h10c1.108 0 2 0.892 2 2v6c0 1.108-0.892 2-2 2h-10c-1.108 0-2-0.892-2-2v-6c0-1.108 0.892-2 2-2z" fill="#363636" fill-rule="evenodd" stop-color="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
- <path d="m3 8c-1.662 0-3 1.338-3 3 0 1.662 1.338 3 3 3h10c1.662 0 3-1.338 3-3 0-1.662-1.338-3-3-3h-10zm0 1h10c1.108 0 2 0.892 2 2 0 1.108-0.892 2-2 2h-10c-1.108 0-2-0.892-2-2 0-1.108 0.892-2 2-2z" fill="#363636" fill-rule="evenodd" stop-color="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
- <rect x="3" y="10" width="1" height="2" rx=".5" ry=".5" fill="#363636" fill-rule="evenodd" stop-color="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
- <rect x="5" y="10" width="1" height="2" rx=".5" ry=".5" fill="#363636" fill-rule="evenodd" stop-color="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
- <rect x="7" y="10" width="1" height="2" rx=".5" ry=".5" fill="#363636" fill-rule="evenodd" stop-color="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 2c-1.662 0-3 1.338-3 3v6c0 1.662 1.338 3 3 3h10c1.662 0 3-1.338 3-3v-6c0-1.662-1.338-3-3-3h-10zm0 1h10c1.108 0 2 0.892 2 2v6c0 1.108-0.892 2-2 2h-10c-1.108 0-2-0.892-2-2v-6c0-1.108 0.892-2 2-2z"/>
+ <path d="m3 8c-1.662 0-3 1.338-3 3 0 1.662 1.338 3 3 3h10c1.662 0 3-1.338 3-3 0-1.662-1.338-3-3-3h-10zm0 1h10c1.108 0 2 0.892 2 2 0 1.108-0.892 2-2 2h-10c-1.108 0-2-0.892-2-2 0-1.108 0.892-2 2-2z"/>
+ <rect x="3" y="10" width="1" height="2" rx=".5" ry=".5"/>
+ <rect x="5" y="10" width="1" height="2" rx=".5" ry=".5"/>
+ <rect x="7" y="10" width="1" height="2" rx=".5" ry=".5"/>
 </svg>
diff --git a/src/other/firefox/common/icons/picture-in-picture-open.svg b/src/other/firefox/common/icons/picture-in-picture-open.svg
index c09330c7..3c022bd4 100644
--- a/src/other/firefox/common/icons/picture-in-picture-open.svg
+++ b/src/other/firefox/common/icons/picture-in-picture-open.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <path d="m3 0c-1.662 0-3 1.338-3 3v8c0 1.662 1.338 3 3 3h6v-1h-6c-1.108 0-2-0.892-2-2v-8c0-1.108 0.892-2 2-2h8c1.108 0 2 0.892 2 2v6h1v-6c0-1.662-1.338-3-3-3h-8zm0.75781 3.0508-0.70703 0.70703 4.2422 4.2422h-1.293v1h2 1v-1-2h-1v1.293l-4.2422-4.2422zm8.2422 6.9492c-1.108 0-2 0.892-2 2v2c0 1.108 0.892 2 2 2h2c1.108 0 2-0.892 2-2v-2c0-1.108-0.892-2-2-2h-2zm0 1h2c0.554 0 1 0.446 1 1v2c0 0.554-0.446 1-1 1h-2c-0.554 0-1-0.446-1-1v-2c0-0.554 0.446-1 1-1z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 0c-1.662 0-3 1.338-3 3v8c0 1.662 1.338 3 3 3h6v-1h-6c-1.108 0-2-0.892-2-2v-8c0-1.108 0.892-2 2-2h8c1.108 0 2 0.892 2 2v6h1v-6c0-1.662-1.338-3-3-3h-8zm0.75781 3.0508-0.70703 0.70703 4.2422 4.2422h-1.293v1h2 1v-1-2h-1v1.293l-4.2422-4.2422zm8.2422 6.9492c-1.108 0-2 0.892-2 2v2c0 1.108 0.892 2 2 2h2c1.108 0 2-0.892 2-2v-2c0-1.108-0.892-2-2-2h-2zm0 1h2c0.554 0 1 0.446 1 1v2c0 0.554-0.446 1-1 1h-2c-0.554 0-1-0.446-1-1v-2c0-0.554 0.446-1 1-1z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/preferences-system-symbolic.svg b/src/other/firefox/common/icons/preferences-system-symbolic.svg
index 55013cfa..6f89b2af 100644
--- a/src/other/firefox/common/icons/preferences-system-symbolic.svg
+++ b/src/other/firefox/common/icons/preferences-system-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path class="ColorScheme-Text" d="m6.127 0.25972c-0.064351-0.008882-0.13038-0.004251-0.19727 0.013672-0.26756 0.071693-0.42521 0.34377-0.35352 0.61133l0.13672 0.50977a7 7 0 0 0-1.1719 0.5293c-0.013468 0.00627-0.027897 0.0061-0.041016 0.013672-0.01342 0.00775-0.020785 0.02055-0.033203 0.029297a7 7 0 0 0-1.0449 0.74805l-0.37109-0.37109c-0.19587-0.19587-0.51116-0.19587-0.70703 0s-0.19587 0.51116 0 0.70703l0.36914 0.36914a7 7 0 0 0-0.77539 1.0801 7 7 0 0 0-0.54883 1.2109l-0.50391-0.13477c-0.26756-0.071693-0.53964 0.085954-0.61133 0.35352s0.085954 0.53964 0.35352 0.61133l0.50586 0.13672a7 7 0 0 0-0.00195 2.6465l-0.50391 0.13477c-0.26756 0.071693-0.42521 0.34377-0.35352 0.61133 0.071693 0.26756 0.34377 0.42521 0.61133 0.35352l0.50977-0.13672a7 7 0 0 0 1.3203 2.291l-0.37109 0.37109c-0.19587 0.19587-0.19587 0.51116 0 0.70703s0.51116 0.19587 0.70703 0l0.36914-0.36914a7 7 0 0 0 1.0801 0.77539 7 7 0 0 0 1.2109 0.54883l-0.13477 0.50391c-0.071693 0.26756 0.085954 0.53964 0.35352 0.61133 0.26756 0.07169 0.53964-0.08595 0.61133-0.35352l0.13672-0.50586a7 7 0 0 0 2.6465 2e-3l0.13477 0.50391c0.071693 0.26756 0.34377 0.42521 0.61133 0.35352 0.26756-0.07169 0.42521-0.34377 0.35352-0.61133l-0.13672-0.50976a7 7 0 0 0 2.291-1.3203l0.37109 0.37109c0.19587 0.19587 0.51116 0.19587 0.70703 0s0.19587-0.51116 0-0.70703l-0.36914-0.36914a7 7 0 0 0 0.77539-1.0801 7 7 0 0 0 0.54883-1.2109l0.50391 0.13477c0.26756 0.07169 0.53964-0.08595 0.61133-0.35352 0.07169-0.26756-0.08595-0.53963-0.35352-0.61133l-0.50586-0.13672a7 7 0 0 0 0.12695-1.2949c5.42e-4 -0.00958 0.0059-0.017622 0.0059-0.027344 0-0.012518-0.0069-0.022874-0.0078-0.035156a7 7 0 0 0-0.12305-1.2891l0.50391-0.13477c0.26756-0.071693 0.42521-0.34377 0.35352-0.61133s-0.34377-0.42521-0.61133-0.35352l-0.50976 0.13672a7 7 0 0 0-1.3203-2.291l0.37109-0.37109c0.19587-0.19587 0.19587-0.51116 0-0.70703s-0.51116-0.19587-0.70703 0l-0.36914 0.36914a7 7 0 0 0-1.0801-0.77539 7 7 0 0 0-1.2109-0.54883l0.13477-0.50391c0.07169-0.26756-0.08595-0.53964-0.35352-0.61133-0.26762-0.07174-0.53969 0.085907-0.61139 0.35347l-0.13672 0.50586a7 7 0 0 0-2.6465-0.00195l-0.13477-0.50391c-0.05377-0.20067-0.22101-0.34054-0.41406-0.36719zm1.5898 1.7461a6 6 0 0 1 3.2832 0.79883 6 6 0 0 1 2.9727 4.6953h-4.0391a2 2 0 0 0-1.9336-1.5 2 2 0 0 0-0.5332 0.074219l-2.0215-3.5a6 6 0 0 1 2.2715-0.56836zm-3.1367 1.0723 2.0195 3.4961a2 2 0 0 0-0.59961 1.4258 2 2 0 0 0 0.59766 1.4258l-2.0195 3.498a6 6 0 0 1-1.7734-7.9238 6 6 0 0 1 1.7754-1.9219zm3.4199 3.9219a1 1 0 0 1 1 1 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1zm1.9355 1.5h4.0371a6 6 0 0 1-0.77734 2.5 6 6 0 0 1-7.75 2.4238l2.0195-3.4961a2 2 0 0 0 0.53516 0.072266 2 2 0 0 0 1.9355-1.5z" color="#5d656b" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m6.127 0.25972c-0.064351-0.008882-0.13038-0.004251-0.19727 0.013672-0.26756 0.071693-0.42521 0.34377-0.35352 0.61133l0.13672 0.50977a7 7 0 0 0-1.1719 0.5293c-0.013468 0.00627-0.027897 0.0061-0.041016 0.013672-0.01342 0.00775-0.020785 0.02055-0.033203 0.029297a7 7 0 0 0-1.0449 0.74805l-0.37109-0.37109c-0.19587-0.19587-0.51116-0.19587-0.70703 0s-0.19587 0.51116 0 0.70703l0.36914 0.36914a7 7 0 0 0-0.77539 1.0801 7 7 0 0 0-0.54883 1.2109l-0.50391-0.13477c-0.26756-0.071693-0.53964 0.085954-0.61133 0.35352s0.085954 0.53964 0.35352 0.61133l0.50586 0.13672a7 7 0 0 0-0.00195 2.6465l-0.50391 0.13477c-0.26756 0.071693-0.42521 0.34377-0.35352 0.61133 0.071693 0.26756 0.34377 0.42521 0.61133 0.35352l0.50977-0.13672a7 7 0 0 0 1.3203 2.291l-0.37109 0.37109c-0.19587 0.19587-0.19587 0.51116 0 0.70703s0.51116 0.19587 0.70703 0l0.36914-0.36914a7 7 0 0 0 1.0801 0.77539 7 7 0 0 0 1.2109 0.54883l-0.13477 0.50391c-0.071693 0.26756 0.085954 0.53964 0.35352 0.61133 0.26756 0.07169 0.53964-0.08595 0.61133-0.35352l0.13672-0.50586a7 7 0 0 0 2.6465 2e-3l0.13477 0.50391c0.071693 0.26756 0.34377 0.42521 0.61133 0.35352 0.26756-0.07169 0.42521-0.34377 0.35352-0.61133l-0.13672-0.50976a7 7 0 0 0 2.291-1.3203l0.37109 0.37109c0.19587 0.19587 0.51116 0.19587 0.70703 0s0.19587-0.51116 0-0.70703l-0.36914-0.36914a7 7 0 0 0 0.77539-1.0801 7 7 0 0 0 0.54883-1.2109l0.50391 0.13477c0.26756 0.07169 0.53964-0.08595 0.61133-0.35352 0.07169-0.26756-0.08595-0.53963-0.35352-0.61133l-0.50586-0.13672a7 7 0 0 0 0.12695-1.2949c5.42e-4 -0.00958 0.0059-0.017622 0.0059-0.027344 0-0.012518-0.0069-0.022874-0.0078-0.035156a7 7 0 0 0-0.12305-1.2891l0.50391-0.13477c0.26756-0.071693 0.42521-0.34377 0.35352-0.61133s-0.34377-0.42521-0.61133-0.35352l-0.50976 0.13672a7 7 0 0 0-1.3203-2.291l0.37109-0.37109c0.19587-0.19587 0.19587-0.51116 0-0.70703s-0.51116-0.19587-0.70703 0l-0.36914 0.36914a7 7 0 0 0-1.0801-0.77539 7 7 0 0 0-1.2109-0.54883l0.13477-0.50391c0.07169-0.26756-0.08595-0.53964-0.35352-0.61133-0.26762-0.07174-0.53969 0.085907-0.61139 0.35347l-0.13672 0.50586a7 7 0 0 0-2.6465-0.00195l-0.13477-0.50391c-0.05377-0.20067-0.22101-0.34054-0.41406-0.36719zm1.5898 1.7461a6 6 0 0 1 3.2832 0.79883 6 6 0 0 1 2.9727 4.6953h-4.0391a2 2 0 0 0-1.9336-1.5 2 2 0 0 0-0.5332 0.074219l-2.0215-3.5a6 6 0 0 1 2.2715-0.56836zm-3.1367 1.0723 2.0195 3.4961a2 2 0 0 0-0.59961 1.4258 2 2 0 0 0 0.59766 1.4258l-2.0195 3.498a6 6 0 0 1-1.7734-7.9238 6 6 0 0 1 1.7754-1.9219zm3.4199 3.9219a1 1 0 0 1 1 1 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1zm1.9355 1.5h4.0371a6 6 0 0 1-0.77734 2.5 6 6 0 0 1-7.75 2.4238l2.0195-3.4961a2 2 0 0 0 0.53516 0.072266 2 2 0 0 0 1.9355-1.5z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/preferences-system-time-symbolic-light.svg b/src/other/firefox/common/icons/preferences-system-time-symbolic-light.svg
deleted file mode 100644
index 60d17362..00000000
--- a/src/other/firefox/common/icons/preferences-system-time-symbolic-light.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   version="1.1"
-   id="svg10"
-   sodipodi:docname="preferences-system-time-symbolic-light.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs14" />
-  <sodipodi:namedview
-     id="namedview12"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="3.1186441"
-     inkscape:cy="8"
-     inkscape:window-width="1432"
-     inkscape:window-height="452"
-     inkscape:window-x="244"
-     inkscape:window-y="312"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg10" />
-  <path
-     d="M 8,0 A 8,8 0 0 1 16,8 8,8 0 0 1 8,16 8,8 0 0 1 0,8 8,8 0 0 1 8,0 Z M 8,1 A 7,7 0 0 0 1,8 7,7 0 0 0 8,15 7,7 0 0 0 15,8 7,7 0 0 0 8,1 Z"
-     id="path2"
-     style="color:#363636;fill:#dedede;fill-opacity:1" />
-  <rect
-     x="-8"
-     y="2"
-     width="1"
-     height="7"
-     ry="0.5"
-     id="rect4"
-     style="color:#363636;fill:#dedede;fill-opacity:1"
-     transform="scale(-1,1)" />
-  <rect
-     transform="matrix(0,1,1,0,0,0)"
-     x="8"
-     y="7"
-     width="1"
-     height="6"
-     ry="0.5"
-     id="rect6"
-     style="color:#363636;fill:#dedede;fill-opacity:1" />
-</svg>
diff --git a/src/other/firefox/common/icons/preferences-system-time-symbolic.svg b/src/other/firefox/common/icons/preferences-system-time-symbolic.svg
index b15ad68f..b786cc23 100644
--- a/src/other/firefox/common/icons/preferences-system-time-symbolic.svg
+++ b/src/other/firefox/common/icons/preferences-system-time-symbolic.svg
@@ -1,59 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   version="1.1"
-   id="svg10"
-   sodipodi:docname="preferences-system-time-symbolic.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs14" />
-  <sodipodi:namedview
-     id="namedview12"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="5.7627119"
-     inkscape:cy="8"
-     inkscape:window-width="1432"
-     inkscape:window-height="452"
-     inkscape:window-x="244"
-     inkscape:window-y="312"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg10" />
-  <g
-     class="ColorScheme-Text"
-     color="#363636"
-     fill="currentColor"
-     id="g8">
-    <path
-       d="M 8,0 A 8,8 0 0 1 16,8 8,8 0 0 1 8,16 8,8 0 0 1 0,8 8,8 0 0 1 8,0 Z M 8,1 A 7,7 0 0 0 1,8 7,7 0 0 0 8,15 7,7 0 0 0 15,8 7,7 0 0 0 8,1 Z"
-       id="path2" />
-    <rect
-       x="-8"
-       y="2"
-       width="1"
-       height="7"
-       ry="0.5"
-       id="rect4"
-       transform="scale(-1,1)" />
-    <rect
-       transform="matrix(0,1,1,0,0,0)"
-       x="8"
-       y="7"
-       width="1"
-       height="6"
-       ry="0.5"
-       id="rect6" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g>
+  <path d="m8 0a8 8 0 0 1 8 8 8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8zm0 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7z"/>
+  <rect transform="scale(-1,1)" x="-8" y="2" width="1" height="7" ry=".5"/>
+  <rect transform="matrix(0,1,1,0,0,0)" x="8" y="7" width="1" height="6" ry=".5"/>
+ </g>
 </svg>
diff --git a/src/other/firefox/common/icons/printer-symbolic.svg b/src/other/firefox/common/icons/printer-symbolic.svg
index 92cf435c..4735ba05 100644
--- a/src/other/firefox/common/icons/printer-symbolic.svg
+++ b/src/other/firefox/common/icons/printer-symbolic.svg
@@ -1,10 +1,10 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#333">
-  <path class="ColorScheme-Text" d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h2v-1h-2c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1h12c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-2v1h2c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2z" color="#363636"/>
-  <path class="ColorScheme-Text" d="m5 0c-1.108 0-2.0366 0.8926-2 2v2h1v-2c0-0.554 0.446-1 1-1h6c0.554 0 1.0418 0.44758 1 1v2h1v-2c0-1.108-0.892-2-2-2z" color="#363636"/>
-  <rect class="ColorScheme-Text" x="5" y="10" width="6" height="1" color="#363636"/>
-  <rect class="ColorScheme-Text" x="5" y="12" width="6" height="1" color="#363636"/>
-  <path class="ColorScheme-Text" d="m5 7c-1.108 0-2 0.892-2 2v5c0 1.108 0.892 2 2 2h6c1.108 0 2-0.892 2-2v-5c0-1.108-0.892-2-2-2zm0 1h6c0.554 0 1 0.446 1 1v5c0 0.554-0.446 1-1 1h-6c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1z" color="#363636"/>
-  <circle class="ColorScheme-Text" cx="13.5" cy="5.5" r=".5" color="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g>
+  <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h2v-1h-2c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1h12c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-2v1h2c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2z"/>
+  <path d="m5 0c-1.108 0-2.0366 0.8926-2 2v2h1v-2c0-0.554 0.446-1 1-1h6c0.554 0 1.0418 0.44758 1 1v2h1v-2c0-1.108-0.892-2-2-2z"/>
+  <rect x="5" y="10" width="6" height="1"/>
+  <rect x="5" y="12" width="6" height="1"/>
+  <path d="m5 7c-1.108 0-2 0.892-2 2v5c0 1.108 0.892 2 2 2h6c1.108 0 2-0.892 2-2v-5c0-1.108-0.892-2-2-2zm0 1h6c0.554 0 1 0.446 1 1v5c0 0.554-0.446 1-1 1h-6c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1z"/>
+  <circle cx="13.5" cy="5.5" r=".5"/>
  </g>
 </svg>
diff --git a/src/other/firefox/common/icons/process-stop-symbolic.svg b/src/other/firefox/common/icons/process-stop-symbolic.svg
index dd95443a..a562edcf 100644
--- a/src/other/firefox/common/icons/process-stop-symbolic.svg
+++ b/src/other/firefox/common/icons/process-stop-symbolic.svg
@@ -1,5 +1,5 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g transform="translate(.5 -.5)" fill="#333" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.1483">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g transform="translate(.5 -.5)">
   <rect transform="rotate(45)" x="3.8137" y=".20711" width="15" height="1" ry=".5"/>
   <rect transform="rotate(135)" x="-6.7929" y="-11.814" width="15" height="1" ry=".5"/>
  </g>
diff --git a/src/other/firefox/common/icons/process-working-symbolic-black.svg b/src/other/firefox/common/icons/process-working-symbolic-black.svg
deleted file mode 100644
index cb341688..00000000
--- a/src/other/firefox/common/icons/process-working-symbolic-black.svg
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="17"
-   height="16"
-   viewBox="0 0 17 16"
-   fill="none"
-   version="1.1"
-   id="svg6132"
-   sodipodi:docname="process-working-symbolic-black.svg"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview6134"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="8.440678"
-     inkscape:cy="8"
-     inkscape:window-width="960"
-     inkscape:window-height="600"
-     inkscape:window-x="25"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg6132" />
-  <defs
-     id="defs6130">
-    <pattern
-       id="pattern0"
-       patternContentUnits="objectBoundingBox"
-       width="1"
-       height="1">
-      <use
-         xlink:href="#image0_605_8"
-         transform="scale(0.0714286)"
-         id="use6126" />
-    </pattern>
-    <image
-       id="image0_605_8"
-       width="14"
-       height="14"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAF3SURBVHgBVZJBTsMwEEVjJ2lpoYpUVXSbdbaIfa7DKYLECbgAB+AkIIFUsSBQZQssGgWJQJ0mtc2fdIJMpNeJ3fn+33aE53kGCGC5/nuE6KeUtfYB9d73/ZXWOpdO81CtI7I8LkEBXkiEupZOg9N/GMNFAA3WGD6BFcizLNt6HJUazeCAapz6Bq7AGQg5me+5jQNORJq/BefcLNM0DWiBwN0Ti/qIPCa3a/BIIqKu68N28PPN9hIiCdFwYBLPhTHmJkkS0batKIpCxHH8d5LvTiwNOvADnsHlYrH4KMvSuKmWy2Xv+Ar2TAPXGq4buOVwu6NT5FTGMehzU+gv8En3RSLUDUTkOgWn4CSKIsn9/nw+lwHHaoHilWu4Ue3gHuLCj/EeYY9kRPdnqqqydCCKxdsBuO0ANJquYEzOSilaYDqbzWhOBOzUwEWhuX/nBLQfiW+TXEdhGB6hR/N1NAH2RI3ksGPBnk+3/+jZddR13Zj/s5PJxP4C9v3NuV90MtwAAAAASUVORK5CYII=" />
-  </defs>
-  <rect
-     x="7.3635931"
-     y="1.0000049"
-     width="1.2727425"
-     height="4.4536157"
-     rx="0.63635927"
-     ry="0.63621706"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-     id="rect4201" />
-  <rect
-     x="7.3635931"
-     y="10.54639"
-     width="1.2727425"
-     height="4.4536157"
-     rx="0.63635927"
-     ry="0.63621706"
-     opacity="0.4"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-     id="rect4203" />
-  <rect
-     transform="matrix(0.8660738,0.49991616,-0.50008381,0.86597701,0,0)"
-     x="10.288762"
-     y="-4.0808816"
-     width="1.2726713"
-     height="4.4538646"
-     rx="0.63632375"
-     ry="0.63625264"
-     opacity="0.05"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-     id="rect4205" />
-  <rect
-     transform="matrix(0.8660738,0.49991616,-0.50008381,0.86597701,0,0)"
-     x="10.288762"
-     y="5.4660001"
-     width="1.2726713"
-     height="4.4538646"
-     rx="0.63632375"
-     ry="0.63625264"
-     opacity="0.5"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-     id="rect4207" />
-  <rect
-     transform="matrix(0.50008384,0.86597699,-0.86607378,0.49991619,0,0)"
-     x="10.289461"
-     y="-9.9379177"
-     width="1.2725292"
-     height="4.4543624"
-     rx="0.63625264"
-     ry="0.63632375"
-     opacity="0.1"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-     id="rect4209" />
-  <rect
-     transform="matrix(0.50008384,0.86597699,-0.86607378,0.49991619,0,0)"
-     x="10.289461"
-     y="-0.3899329"
-     width="1.2725292"
-     height="4.4543624"
-     rx="0.63625264"
-     ry="0.63632375"
-     opacity="0.6"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-     id="rect4211" />
-  <rect
-     transform="rotate(90)"
-     x="7.3482637"
-     y="-15"
-     width="1.2724581"
-     height="4.4546113"
-     rx="0.63621706"
-     ry="0.63635927"
-     opacity="0.15"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-     id="rect4213" />
-  <rect
-     transform="rotate(90)"
-     x="7.3482637"
-     y="-5.4546113"
-     width="1.2724581"
-     height="4.4546113"
-     rx="0.63621706"
-     ry="0.63635927"
-     opacity="0.7"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-     id="rect4215" />
-  <rect
-     transform="matrix(-0.50008381,0.86597701,-0.8660738,-0.49991616,0,0)"
-     x="2.2917297"
-     y="-17.93675"
-     width="1.2725292"
-     height="4.4543619"
-     rx="0.63625264"
-     ry="0.63632375"
-     opacity="0.2"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-     id="rect4217" />
-  <rect
-     transform="matrix(-0.50008381,0.86597701,-0.8660738,-0.49991616,0,0)"
-     x="2.2917297"
-     y="-8.3887653"
-     width="1.2725292"
-     height="4.4543619"
-     rx="0.63625264"
-     ry="0.63632375"
-     opacity="0.8"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-     id="rect4219" />
-  <rect
-     transform="matrix(-0.8660738,0.49991616,-0.50008381,-0.86597701,0,0)"
-     x="-3.56458"
-     y="-17.912498"
-     width="1.2726713"
-     height="4.4538646"
-     rx="0.63632375"
-     ry="0.63625264"
-     opacity="0.3"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-     id="rect4221" />
-  <rect
-     transform="matrix(-0.8660738,0.49991616,-0.50008381,-0.86597701,0,0)"
-     x="-3.56458"
-     y="-8.3896513"
-     width="1.2726713"
-     height="4.4538646"
-     rx="0.63632375"
-     ry="0.63625264"
-     opacity="0.9"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-     id="rect4223" />
-</svg>
diff --git a/src/other/firefox/common/icons/process-working-symbolic-light.svg b/src/other/firefox/common/icons/process-working-symbolic-light.svg
deleted file mode 100644
index 5d635f52..00000000
--- a/src/other/firefox/common/icons/process-working-symbolic-light.svg
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   fill="none"
-   version="1.1"
-   id="svg4400"
-   sodipodi:docname="process-working-symbolic-light.svg"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview4402"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="7.9661017"
-     inkscape:cy="8"
-     inkscape:window-width="1280"
-     inkscape:window-height="650"
-     inkscape:window-x="0"
-     inkscape:window-y="34"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4400" />
-  <defs
-     id="defs4398">
-    <pattern
-       id="pattern0"
-       patternContentUnits="objectBoundingBox"
-       width="1"
-       height="1">
-      <use
-         xlink:href="#image0_605_19"
-         transform="scale(0.0714286)"
-         id="use4394" />
-    </pattern>
-    <image
-       id="image0_605_19"
-       width="14"
-       height="14"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHJSURBVHgBZVJLagJBEJ3unoxDFLILKC6yVnDhbQTvootcIFfJBbIIISQkIFkkoln4ISqOH6LOdM+380p6giQFRVX31Kv3qqZZp9PJGEzDKFowpJZJj5YkiZzP5y/T6fQJsbdarT54XnwC0icgTR4EwWqz2Xyu1+s+gQAe8Lw4rzQN8jPLsiwFaLBYLN48z+sB9AGVAc8lnoJ/6WBSyuVsNntcLpf3k8nkDVeqXq8z++98OVOegOlhNBrdNpvNXrvd1t1uV4CVkdR/M+UHsH0Nh8ObVqv1WqvVGACiUqmw7XbLSGpANSQBHiNPyY3M60aj8QxpNuYU5XJZQLZAE26jaGekZggEihF9xPdSqXRXrVbd8XicFQoFy/d9q1gsatwzAu4BSuh3ISr4HkAP2+w7jnMVx7E8wIQQmeu6NEaGo3UEGpYQIB+AHc6ebduUn4dheAkGC8CDUkrDGTWgB0CyDkbyt4kHgKjZGSQWwXoBlhJygXpaKKffIVGkOOcKFwFyWlZI8+KbiKKokKbpORQkNCPAEoypjUJJs5kozZwRLQx36MfPAHLA6iJP8W7pYShiVGa+EEwRLckUaAAY2EieAxZipiVqzKt/AFRdZrrYGKEYAAAAAElFTkSuQmCC" />
-  </defs>
-  <g
-     id="g1262"
-     style="opacity:0.5;fill:#cccccc">
-    <rect
-       x="7.3635931"
-       y="1.0000049"
-       width="1.2727425"
-       height="4.4536157"
-       rx="0.63635927"
-       ry="0.63621706"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4201" />
-    <rect
-       x="7.3635931"
-       y="10.54639"
-       width="1.2727425"
-       height="4.4536157"
-       rx="0.63635927"
-       ry="0.63621706"
-       opacity="0.4"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4203" />
-    <rect
-       transform="matrix(0.8660738,0.49991616,-0.50008381,0.86597701,0,0)"
-       x="10.288762"
-       y="-4.0808816"
-       width="1.2726713"
-       height="4.4538646"
-       rx="0.63632375"
-       ry="0.63625264"
-       opacity="0.05"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4205" />
-    <rect
-       transform="matrix(0.8660738,0.49991616,-0.50008381,0.86597701,0,0)"
-       x="10.288762"
-       y="5.4660001"
-       width="1.2726713"
-       height="4.4538646"
-       rx="0.63632375"
-       ry="0.63625264"
-       opacity="0.5"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4207" />
-    <rect
-       transform="matrix(0.50008384,0.86597699,-0.86607378,0.49991619,0,0)"
-       x="10.289461"
-       y="-9.9379177"
-       width="1.2725292"
-       height="4.4543624"
-       rx="0.63625264"
-       ry="0.63632375"
-       opacity="0.1"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4209" />
-    <rect
-       transform="matrix(0.50008384,0.86597699,-0.86607378,0.49991619,0,0)"
-       x="10.289461"
-       y="-0.3899329"
-       width="1.2725292"
-       height="4.4543624"
-       rx="0.63625264"
-       ry="0.63632375"
-       opacity="0.6"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4211" />
-    <rect
-       transform="rotate(90)"
-       x="7.3482637"
-       y="-15"
-       width="1.2724581"
-       height="4.4546113"
-       rx="0.63621706"
-       ry="0.63635927"
-       opacity="0.15"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4213" />
-    <rect
-       transform="rotate(90)"
-       x="7.3482637"
-       y="-5.4546113"
-       width="1.2724581"
-       height="4.4546113"
-       rx="0.63621706"
-       ry="0.63635927"
-       opacity="0.7"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4215" />
-    <rect
-       transform="matrix(-0.50008381,0.86597701,-0.8660738,-0.49991616,0,0)"
-       x="2.2917297"
-       y="-17.93675"
-       width="1.2725292"
-       height="4.4543619"
-       rx="0.63625264"
-       ry="0.63632375"
-       opacity="0.2"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4217" />
-    <rect
-       transform="matrix(-0.50008381,0.86597701,-0.8660738,-0.49991616,0,0)"
-       x="2.2917297"
-       y="-8.3887653"
-       width="1.2725292"
-       height="4.4543619"
-       rx="0.63625264"
-       ry="0.63632375"
-       opacity="0.8"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4219" />
-    <rect
-       transform="matrix(-0.8660738,0.49991616,-0.50008381,-0.86597701,0,0)"
-       x="-3.56458"
-       y="-17.912498"
-       width="1.2726713"
-       height="4.4538646"
-       rx="0.63632375"
-       ry="0.63625264"
-       opacity="0.3"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4221" />
-    <rect
-       transform="matrix(-0.8660738,0.49991616,-0.50008381,-0.86597701,0,0)"
-       x="-3.56458"
-       y="-8.3896513"
-       width="1.2726713"
-       height="4.4538646"
-       rx="0.63632375"
-       ry="0.63625264"
-       opacity="0.9"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4223" />
-  </g>
-</svg>
diff --git a/src/other/firefox/common/icons/process-working-symbolic.svg b/src/other/firefox/common/icons/process-working-symbolic.svg
index 9e9c88db..6975e4bb 100644
--- a/src/other/firefox/common/icons/process-working-symbolic.svg
+++ b/src/other/firefox/common/icons/process-working-symbolic.svg
@@ -1,186 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   fill="none"
-   version="1.1"
-   id="svg4400"
-   sodipodi:docname="process-working-symbolic.svg"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview4402"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="7.9661017"
-     inkscape:cy="8"
-     inkscape:window-width="1280"
-     inkscape:window-height="650"
-     inkscape:window-x="0"
-     inkscape:window-y="34"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4400" />
-  <defs
-     id="defs4398">
-    <pattern
-       id="pattern0"
-       patternContentUnits="objectBoundingBox"
-       width="1"
-       height="1">
-      <use
-         xlink:href="#image0_605_19"
-         transform="scale(0.0714286)"
-         id="use4394" />
-    </pattern>
-    <image
-       id="image0_605_19"
-       width="14"
-       height="14"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHJSURBVHgBZVJLagJBEJ3unoxDFLILKC6yVnDhbQTvootcIFfJBbIIISQkIFkkoln4ISqOH6LOdM+380p6giQFRVX31Kv3qqZZp9PJGEzDKFowpJZJj5YkiZzP5y/T6fQJsbdarT54XnwC0icgTR4EwWqz2Xyu1+s+gQAe8Lw4rzQN8jPLsiwFaLBYLN48z+sB9AGVAc8lnoJ/6WBSyuVsNntcLpf3k8nkDVeqXq8z++98OVOegOlhNBrdNpvNXrvd1t1uV4CVkdR/M+UHsH0Nh8ObVqv1WqvVGACiUqmw7XbLSGpANSQBHiNPyY3M60aj8QxpNuYU5XJZQLZAE26jaGekZggEihF9xPdSqXRXrVbd8XicFQoFy/d9q1gsatwzAu4BSuh3ISr4HkAP2+w7jnMVx7E8wIQQmeu6NEaGo3UEGpYQIB+AHc6ebduUn4dheAkGC8CDUkrDGTWgB0CyDkbyt4kHgKjZGSQWwXoBlhJygXpaKKffIVGkOOcKFwFyWlZI8+KbiKKokKbpORQkNCPAEoypjUJJs5kozZwRLQx36MfPAHLA6iJP8W7pYShiVGa+EEwRLckUaAAY2EieAxZipiVqzKt/AFRdZrrYGKEYAAAAAElFTkSuQmCC" />
-  </defs>
-  <g
-     id="g1262"
-     style="opacity:0.5">
-    <rect
-       x="7.3635931"
-       y="1.0000049"
-       width="1.2727425"
-       height="4.4536157"
-       rx="0.63635927"
-       ry="0.63621706"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4201" />
-    <rect
-       x="7.3635931"
-       y="10.54639"
-       width="1.2727425"
-       height="4.4536157"
-       rx="0.63635927"
-       ry="0.63621706"
-       opacity="0.4"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4203" />
-    <rect
-       transform="matrix(0.8660738,0.49991616,-0.50008381,0.86597701,0,0)"
-       x="10.288762"
-       y="-4.0808816"
-       width="1.2726713"
-       height="4.4538646"
-       rx="0.63632375"
-       ry="0.63625264"
-       opacity="0.05"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4205" />
-    <rect
-       transform="matrix(0.8660738,0.49991616,-0.50008381,0.86597701,0,0)"
-       x="10.288762"
-       y="5.4660001"
-       width="1.2726713"
-       height="4.4538646"
-       rx="0.63632375"
-       ry="0.63625264"
-       opacity="0.5"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4207" />
-    <rect
-       transform="matrix(0.50008384,0.86597699,-0.86607378,0.49991619,0,0)"
-       x="10.289461"
-       y="-9.9379177"
-       width="1.2725292"
-       height="4.4543624"
-       rx="0.63625264"
-       ry="0.63632375"
-       opacity="0.1"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4209" />
-    <rect
-       transform="matrix(0.50008384,0.86597699,-0.86607378,0.49991619,0,0)"
-       x="10.289461"
-       y="-0.3899329"
-       width="1.2725292"
-       height="4.4543624"
-       rx="0.63625264"
-       ry="0.63632375"
-       opacity="0.6"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4211" />
-    <rect
-       transform="rotate(90)"
-       x="7.3482637"
-       y="-15"
-       width="1.2724581"
-       height="4.4546113"
-       rx="0.63621706"
-       ry="0.63635927"
-       opacity="0.15"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4213" />
-    <rect
-       transform="rotate(90)"
-       x="7.3482637"
-       y="-5.4546113"
-       width="1.2724581"
-       height="4.4546113"
-       rx="0.63621706"
-       ry="0.63635927"
-       opacity="0.7"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4215" />
-    <rect
-       transform="matrix(-0.50008381,0.86597701,-0.8660738,-0.49991616,0,0)"
-       x="2.2917297"
-       y="-17.93675"
-       width="1.2725292"
-       height="4.4543619"
-       rx="0.63625264"
-       ry="0.63632375"
-       opacity="0.2"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4217" />
-    <rect
-       transform="matrix(-0.50008381,0.86597701,-0.8660738,-0.49991616,0,0)"
-       x="2.2917297"
-       y="-8.3887653"
-       width="1.2725292"
-       height="4.4543619"
-       rx="0.63625264"
-       ry="0.63632375"
-       opacity="0.8"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4219" />
-    <rect
-       transform="matrix(-0.8660738,0.49991616,-0.50008381,-0.86597701,0,0)"
-       x="-3.56458"
-       y="-17.912498"
-       width="1.2726713"
-       height="4.4538646"
-       rx="0.63632375"
-       ry="0.63625264"
-       opacity="0.3"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4221" />
-    <rect
-       transform="matrix(-0.8660738,0.49991616,-0.50008381,-0.86597701,0,0)"
-       x="-3.56458"
-       y="-8.3896513"
-       width="1.2726713"
-       height="4.4538646"
-       rx="0.63632375"
-       ry="0.63625264"
-       opacity="0.9"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:2.4049;paint-order:fill markers stroke"
-       id="rect4223" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g opacity=".5">
+  <rect x="7.3636" y="1" width="1.2727" height="4.4536" rx=".63636" ry=".63622" style="paint-order:fill markers stroke"/>
+  <rect x="7.3636" y="10.546" width="1.2727" height="4.4536" rx=".63636" ry=".63622" opacity=".4" style="paint-order:fill markers stroke"/>
+  <rect transform="matrix(.86607 .49992 -.50008 .86598 0 0)" x="10.289" y="-4.0809" width="1.2727" height="4.4539" rx=".63632" ry=".63625" opacity=".05" style="paint-order:fill markers stroke"/>
+  <rect transform="matrix(.86607 .49992 -.50008 .86598 0 0)" x="10.289" y="5.466" width="1.2727" height="4.4539" rx=".63632" ry=".63625" opacity=".5" style="paint-order:fill markers stroke"/>
+  <rect transform="matrix(.50008 .86598 -.86607 .49992 0 0)" x="10.289" y="-9.9379" width="1.2725" height="4.4544" rx=".63625" ry=".63632" opacity=".1" style="paint-order:fill markers stroke"/>
+  <rect transform="matrix(.50008 .86598 -.86607 .49992 0 0)" x="10.289" y="-.38993" width="1.2725" height="4.4544" rx=".63625" ry=".63632" opacity=".6" style="paint-order:fill markers stroke"/>
+  <rect transform="rotate(90)" x="7.3483" y="-15" width="1.2725" height="4.4546" rx=".63622" ry=".63636" opacity=".15" style="paint-order:fill markers stroke"/>
+  <rect transform="rotate(90)" x="7.3483" y="-5.4546" width="1.2725" height="4.4546" rx=".63622" ry=".63636" opacity=".7" style="paint-order:fill markers stroke"/>
+  <rect transform="matrix(-.50008 .86598 -.86607 -.49992 0 0)" x="2.2917" y="-17.937" width="1.2725" height="4.4544" rx=".63625" ry=".63632" opacity=".2" style="paint-order:fill markers stroke"/>
+  <rect transform="matrix(-.50008 .86598 -.86607 -.49992 0 0)" x="2.2917" y="-8.3888" width="1.2725" height="4.4544" rx=".63625" ry=".63632" opacity=".8" style="paint-order:fill markers stroke"/>
+  <rect transform="matrix(-.86607 .49992 -.50008 -.86598 0 0)" x="-3.5646" y="-17.912" width="1.2727" height="4.4539" rx=".63632" ry=".63625" opacity=".3" style="paint-order:fill markers stroke"/>
+  <rect transform="matrix(-.86607 .49992 -.50008 -.86598 0 0)" x="-3.5646" y="-8.3897" width="1.2727" height="4.4539" rx=".63632" ry=".63625" opacity=".9" style="paint-order:fill markers stroke"/>
+ </g>
 </svg>
diff --git a/src/other/firefox/common/icons/radio-checked-symbolic.svg b/src/other/firefox/common/icons/radio-checked-symbolic.svg
index cfb076ed..1b050bb1 100644
--- a/src/other/firefox/common/icons/radio-checked-symbolic.svg
+++ b/src/other/firefox/common/icons/radio-checked-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m8.0039 1c-3.86 0-7.0039 3.1439-7.0039 7.0039 0 3.86 3.1439 7.0059 7.0039 7.0059 3.86 0 7.0059-3.1459 7.0059-7.0059 0-3.86-3.1459-7.0039-7.0059-7.0039zm-0.0039062 5c1.104 0 2 0.896 2 2s-0.896 2-2 2-2-0.896-2-2 0.896-2 2-2z" color="#bebebe" fill="#474747" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8.0039 1c-3.86 0-7.0039 3.1439-7.0039 7.0039 0 3.86 3.1439 7.0059 7.0039 7.0059 3.86 0 7.0059-3.1459 7.0059-7.0059 0-3.86-3.1459-7.0039-7.0059-7.0039zm-0.0039062 5c1.104 0 2 0.896 2 2s-0.896 2-2 2-2-0.896-2-2 0.896-2 2-2z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/radio-symbolic.svg b/src/other/firefox/common/icons/radio-symbolic.svg
index c7e082cf..19d4be44 100644
--- a/src/other/firefox/common/icons/radio-symbolic.svg
+++ b/src/other/firefox/common/icons/radio-symbolic.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M8 1C4.142 1 1 4.142 1 8s3.142 7 7 7 7-3.142 7-7-3.142-7-7-7zm0 1c3.316 0 6 2.684 6 6s-2.684 6-6 6-6-2.684-6-6 2.684-6 6-6z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="Andale Mono" white-space="normal" overflow="visible" fill="#474747"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+    <path d="M8 1C4.142 1 1 4.142 1 8s3.142 7 7 7 7-3.142 7-7-3.142-7-7-7zm0 1c3.316 0 6 2.684 6 6s-2.684 6-6 6-6-2.684-6-6 2.684-6 6-6z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/reader-mode.svg b/src/other/firefox/common/icons/reader-mode.svg
index 631b92d1..bf6637e8 100644
--- a/src/other/firefox/common/icons/reader-mode.svg
+++ b/src/other/firefox/common/icons/reader-mode.svg
@@ -1,12 +1,3 @@
-<svg width="4.2333mm" height="4.2333mm" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg">
- <g fill="#333">
-  <path d="m0.26459 0.52917c0-0.29316 0.23601-0.52917 0.52917-0.52917h2.6458c0.29316 0 0.52917 0.23601 0.52917 0.52917v3.175c0 0.29316-0.23601 0.52917-0.52917 0.52917h-2.6458c-0.29316 0-0.52917-0.23601-0.52917-0.52917zm0.26458 0v3.175c0 0.14658 0.118 0.26458 0.26458 0.26458h2.6458c0.14658 0 0.26458-0.118 0.26458-0.26458v-3.175c0-0.14658-0.118-0.26458-0.26458-0.26458h-2.6458c-0.14658 0-0.26458 0.118-0.26458 0.26458z" color="#363636" stroke-width=".26458"/>
-  <g stroke-linecap="square">
-   <g stroke-width=".5657">
-    <rect x="1.0583" y="1.0583" width="2.1167" height=".26458" ry=".13229"/>
-    <rect x="1.0583" y="1.8521" width="2.1167" height=".26458" ry=".13229"/>
-   </g>
-   <rect x="1.0583" y="2.6458" width="1.2095" height=".26458" ry=".13229" stroke-width=".42763"/>
-  </g>
- </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 0c-1.108 5.9212e-16 -2 0.892-2 2v12c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-12c0-1.108-0.892-2-2-2h-10zm0 1h10c0.554 0 1 0.446 1 1v12c0 0.554-0.446 1-1 1h-10c-0.554 0-1-0.446-1-1v-12c0-0.554 0.446-1 1-1zm1.5 3c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h7c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-7zm0 3c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h7c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-7zm0 3c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h3.5703c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-3.5703z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/save-folder-symbolic.svg b/src/other/firefox/common/icons/save-folder-symbolic.svg
index 9b0c91f9..84fcf15f 100644
--- a/src/other/firefox/common/icons/save-folder-symbolic.svg
+++ b/src/other/firefox/common/icons/save-folder-symbolic.svg
@@ -1,7 +1,4 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
-  </defs>
-  <path class="ColorScheme-Text" d="m2 2c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h7.6777a4.5 4.5 0 0 1-0.91602-1h-6.7617c-0.554 0-1-0.446-1-1v-6h14v0.75977a4.5 4.5 0 0 1 1 0.91406v-3.6738c0-1.108-0.892-2-2-2h-7.6289c-0.57985-0.0229-0.6047 0.076884-1.0391-0.35742-0.43381-0.43381-0.613-0.64213-1.332-0.64258h-2zm0 1h2c0.31116-1.7e-6 0.52033 1.414e-4 0.99805 0.4707 0.47877 0.47161 0.6388 0.5293 1 0.5293h8.002c0.554 0 1 0.446 1 1v1h-14v-2c0-0.554 0.446-1 1-1z" fill="currentColor" />
-  <path d="M 12.5,15 A 3.5,-3.5 0 0 1 9,11.5 3.5,-3.5 0 0 1 12.5,8 3.5,-3.5 0 0 1 16,11.5 3.5,-3.5 0 0 1 12.5,15 Z m 0,-1.0859 2.5,-2.5 -0.70703,-0.70703 -1.293,1.293 v -3 h -1 v 3 l -1.293,-1.293 -0.70703,0.70703 2.5,2.5 z" fill="currentColor" class="ColorScheme-Text" />
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="m2 2c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h7.6777a4.5 4.5 0 0 1-0.91602-1h-6.7617c-0.554 0-1-0.446-1-1v-6h14v0.75977a4.5 4.5 0 0 1 1 0.91406v-3.6738c0-1.108-0.892-2-2-2h-7.6289c-0.57985-0.0229-0.6047 0.076884-1.0391-0.35742-0.43381-0.43381-0.613-0.64213-1.332-0.64258h-2zm0 1h2c0.31116-1.7e-6 0.52033 1.414e-4 0.99805 0.4707 0.47877 0.47161 0.6388 0.5293 1 0.5293h8.002c0.554 0 1 0.446 1 1v1h-14v-2c0-0.554 0.446-1 1-1z"/>
+  <path d="M 12.5,15 A 3.5,-3.5 0 0 1 9,11.5 3.5,-3.5 0 0 1 12.5,8 3.5,-3.5 0 0 1 16,11.5 3.5,-3.5 0 0 1 12.5,15 Z m 0,-1.0859 2.5,-2.5 -0.70703,-0.70703 -1.293,1.293 v -3 h -1 v 3 l -1.293,-1.293 -0.70703,0.70703 2.5,2.5 z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/save-to-pocket-light.svg b/src/other/firefox/common/icons/save-to-pocket-light.svg
deleted file mode 100644
index ed4b0152..00000000
--- a/src/other/firefox/common/icons/save-to-pocket-light.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
- </defs>
- <path d="m3 1c-1.108 0-2 0.892-2 2v5c0 3.866 3.134 7 7 7 3.866 0 7-3.134 7-7v-5c0-1.108-0.892-2-2-2zm0 1h10c0.554 0 1 0.446 1 1v5c0 3.3137-2.6863 6-6 6-3.3137 0-6-2.6863-6-6v-5c0-0.554 0.446-1 1-1zm0.75781 2.9629c-0.12781 0-0.25558 0.050503-0.35352 0.14844-0.19587 0.19587-0.19587 0.51116 0 0.70703l4.2422 4.2422c0.19587 0.19587 0.51116 0.19587 0.70703 0l4.2422-4.2422c0.19587-0.19587 0.19587-0.51116 0-0.70703s-0.51116-0.19587-0.70703 0l-3.8887 3.8887-3.8887-3.8887c-0.097934-0.097934-0.22571-0.14844-0.35352-0.14844z" fill="#dedede"/>
-</svg>
diff --git a/src/other/firefox/common/icons/save-to-pocket-open-light.svg b/src/other/firefox/common/icons/save-to-pocket-open-light.svg
deleted file mode 100644
index b2ecda59..00000000
--- a/src/other/firefox/common/icons/save-to-pocket-open-light.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   version="1.1"
-   id="svg2169"
-   sodipodi:docname="save-to-pocket-open-light.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview2171"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="true"
-     inkscape:zoom="14.75"
-     inkscape:cx="0.50847458"
-     inkscape:cy="6.7118644"
-     inkscape:window-width="1920"
-     inkscape:window-height="1012"
-     inkscape:window-x="0"
-     inkscape:window-y="32"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2169">
-    <inkscape:grid
-       type="xygrid"
-       id="grid234" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2165">
-    <style
-       id="current-color-scheme"
-       type="text/css">.ColorScheme-Text { color:#363636; }</style>
-  </defs>
-  <path
-     id="path2167"
-     d="M 3,1 C 1.8920011,1 1,1.8920011 1,3 v 5 c 0,3.865989 3.1340107,7 7,7 3.865989,0 7,-3.134011 7,-7 V 3 C 15,1.8920011 14.107999,1 13,1 Z m 0.7578125,3.9628906 c 0.1278099,0 0.2555817,0.050504 0.3535156,0.1484375 L 8,9 11.888672,5.1113281 c 0.19587,-0.1958698 0.511161,-0.1958698 0.707031,0 0.19587,0.1958698 0.19587,0.5111615 0,0.7070313 L 8.3535156,10.060546 c -0.1958698,0.19587 -0.5111614,0.19587 -0.7070312,0 L 3.4042969,5.8183594 c -0.1958698,-0.1958698 -0.1958698,-0.5111615 0,-0.7070313 0.09794,-0.097937 0.2257057,-0.1484375 0.3535156,-0.1484375 z"
-     style="fill:#dedede;fill-opacity:1"
-     sodipodi:nodetypes="ssssssssscccscccscs" />
-</svg>
diff --git a/src/other/firefox/common/icons/save-to-pocket-open.svg b/src/other/firefox/common/icons/save-to-pocket-open.svg
index 504bfa73..03b663b1 100644
--- a/src/other/firefox/common/icons/save-to-pocket-open.svg
+++ b/src/other/firefox/common/icons/save-to-pocket-open.svg
@@ -1,47 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   version="1.1"
-   id="svg2169"
-   sodipodi:docname="save-to-pocket-open.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview2171"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="true"
-     inkscape:zoom="29.5"
-     inkscape:cx="5.1186441"
-     inkscape:cy="5.559322"
-     inkscape:window-width="1920"
-     inkscape:window-height="1012"
-     inkscape:window-x="0"
-     inkscape:window-y="32"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2169">
-    <inkscape:grid
-       type="xygrid"
-       id="grid234" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2165">
-    <style
-       id="current-color-scheme"
-       type="text/css">.ColorScheme-Text { color:#363636; }</style>
-  </defs>
-  <path
-     id="path2167"
-     d="M 3,1 C 1.8920011,1 1,1.8920011 1,3 v 5 c 0,3.865989 3.1340107,7 7,7 3.865989,0 7,-3.134011 7,-7 V 3 C 15,1.8920011 14.107999,1 13,1 Z m 0.7578125,3.9628906 c 0.1278099,0 0.2555817,0.050504 0.3535156,0.1484375 L 8,9 11.888672,5.1113281 c 0.19587,-0.1958698 0.511161,-0.1958698 0.707031,0 0.19587,0.1958698 0.19587,0.5111615 0,0.7070313 L 8.3535156,10.060546 c -0.1958698,0.195871 -0.5111614,0.195871 -0.7070312,0 L 3.4042969,5.8183594 c -0.1958698,-0.1958698 -0.1958698,-0.5111615 0,-0.7070313 0.09794,-0.097937 0.2257057,-0.1484375 0.3535156,-0.1484375 z"
-     style="fill:#333333"
-     sodipodi:nodetypes="ssssssssssccscccscs" />
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 1c-1.108 0-2 0.892-2 2v5c0 3.866 3.134 7 7 7 3.866 0 7-3.134 7-7v-5c0-1.108-0.892-2-2-2zm0.75781 3.9629c0.12781 0 0.25558 0.050504 0.35352 0.14844l3.8887 3.8887 3.8887-3.8887c0.19587-0.19587 0.51116-0.19587 0.70703 0s0.19587 0.51116 0 0.70703l-4.2422 4.2422c-0.19587 0.19587-0.51116 0.19587-0.70703 0l-4.2422-4.2422c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.09794-0.097937 0.22571-0.14844 0.35352-0.14844z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/save-to-pocket.svg b/src/other/firefox/common/icons/save-to-pocket.svg
index 92959cf2..c35a55d2 100644
--- a/src/other/firefox/common/icons/save-to-pocket.svg
+++ b/src/other/firefox/common/icons/save-to-pocket.svg
@@ -1,50 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   version="1.1"
-   id="svg7"
-   sodipodi:docname="save-to-pocket.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview9"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="true"
-     inkscape:zoom="29.5"
-     inkscape:cx="8.6779661"
-     inkscape:cy="6.7118644"
-     inkscape:window-width="1920"
-     inkscape:window-height="1012"
-     inkscape:window-x="0"
-     inkscape:window-y="32"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7">
-    <inkscape:grid
-       type="xygrid"
-       id="grid238" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <style
-       id="current-color-scheme"
-       type="text/css">.ColorScheme-Text { color:#363636; }</style>
-  </defs>
-  <path
-     d="M 3,1 C 1.892,1 1,1.892 1,3 v 5 c 0,3.865993 3.1340068,7 7,7 3.865993,0 7,-3.134007 7,-7 V 3 C 15,1.892 14.108,1 13,1 Z m 0,1 h 10 c 0.554,0 1,0.446 1,1 v 5 c 0,3.313708 -2.686292,6 -6,6 C 4.6862915,14 2,11.313708 2,8 V 3 C 2,2.446 2.446,2 3,2 Z m 0.75781,2.96286 c -0.12781,0 -0.25558,0.050503 -0.35352,0.14844 -0.19587,0.19587 -0.19587,0.51116 0,0.70703 l 4.2422,4.2422 c 0.19587,0.19587 0.51116,0.19587 0.70703,0 l 4.2422,-4.2422 c 0.19587,-0.19587 0.19587,-0.51116 0,-0.70703 -0.19587,-0.19587 -0.51116,-0.19587 -0.70703,0 L 7.99999,9 4.11129,5.1113 C 4.013356,5.013366 3.88558,4.96286 3.75777,4.96286 Z"
-     fill="#333333"
-     stroke-linecap="round"
-     stroke-linejoin="round"
-     stroke-width="2.0755"
-     id="path5"
-     sodipodi:nodetypes="ssssssssssssssssccsssssscscc" />
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 1c-1.108 0-2 0.892-2 2v5c0 3.866 3.134 7 7 7 3.866 0 7-3.134 7-7v-5c0-1.108-0.892-2-2-2zm0 1h10c0.554 0 1 0.446 1 1v5c0 3.3137-2.6863 6-6 6-3.3137 0-6-2.6863-6-6v-5c0-0.554 0.446-1 1-1zm0.75781 2.9629c-0.12781 0-0.25558 0.050503-0.35352 0.14844-0.19587 0.19587-0.19587 0.51116 0 0.70703l4.2422 4.2422c0.19587 0.19587 0.51116 0.19587 0.70703 0l4.2422-4.2422c0.19587-0.19587 0.19587-0.51116 0-0.70703s-0.51116-0.19587-0.70703 0l-3.8887 3.8887-3.8887-3.8887c-0.097934-0.097934-0.22571-0.14844-0.35352-0.14844z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/screen-blocked-symbolic.svg b/src/other/firefox/common/icons/screen-blocked-symbolic.svg
index f6633092..1f29172b 100644
--- a/src/other/firefox/common/icons/screen-blocked-symbolic.svg
+++ b/src/other/firefox/common/icons/screen-blocked-symbolic.svg
@@ -1,10 +1,5 @@
-<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#363636;
-      }</style>
- </defs>
- <path d="m3 1c-1.1075 0-2 0.89253-2 2v6c0 1.1075 0.89253 2 2 2v-1c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1h7c0.554 0 1 0.446 1 1h1v-1c0-1.1075-0.89253-2-2-2h-7zm8 7v1c0 0.554-0.446 1-1 1h-4v1h4c1.1075 0 2-0.89253 2-2v-1h-1z" fill="#363636" opacity=".35" style="paint-order:stroke fill markers"/>
- <path d="m6 5c-1.1075 0-2 0.89253-2 2v6c0 1.1075 0.89253 2 2 2h7c1.1075 0 2-0.89253 2-2v-6c0-1.1075-0.89253-2-2-2zm0 2h7c0.554 0 1 0.446 1 1v5c0 0.554-0.446 1-1 1h-7c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1z" fill="#363636" opacity=".35" style="paint-order:stroke fill markers"/>
- <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 1c-1.1075 0-2 0.89253-2 2v6c0 1.1075 0.89253 2 2 2v-1c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1h7c0.554 0 1 0.446 1 1h1v-1c0-1.1075-0.89253-2-2-2h-7zm8 7v1c0 0.554-0.446 1-1 1h-4v1h4c1.1075 0 2-0.89253 2-2v-1h-1z" opacity=".35"/>
+ <path d="m6 5c-1.1075 0-2 0.89253-2 2v6c0 1.1075 0.89253 2 2 2h7c1.1075 0 2-0.89253 2-2v-6c0-1.1075-0.89253-2-2-2zm0 2h7c0.554 0 1 0.446 1 1v5c0 0.554-0.446 1-1 1h-7c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1z" opacity=".35"/>
+ <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0"/>
 </svg>
diff --git a/src/other/firefox/common/icons/screen-symbolic.svg b/src/other/firefox/common/icons/screen-symbolic.svg
index 585d7ee4..265d8ec1 100644
--- a/src/other/firefox/common/icons/screen-symbolic.svg
+++ b/src/other/firefox/common/icons/screen-symbolic.svg
@@ -1,9 +1,4 @@
-<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#363636;
-      }</style>
- </defs>
- <path d="m3 1c-1.1075 0-2 0.89253-2 2v6c0 1.1075 0.89253 2 2 2v-1c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1h7c0.554 0 1 0.446 1 1h1v-1c0-1.1075-0.89253-2-2-2h-7zm8 7v1c0 0.554-0.446 1-1 1h-4v1h4c1.1075 0 2-0.89253 2-2v-1h-1z" fill="#363636" style="paint-order:stroke fill markers"/>
- <path d="m6 5c-1.1075 0-2 0.89253-2 2v6c0 1.1075 0.89253 2 2 2h7c1.1075 0 2-0.89253 2-2v-6c0-1.1075-0.89253-2-2-2zm0 2h7c0.554 0 1 0.446 1 1v5c0 0.554-0.446 1-1 1h-7c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1z" fill="#363636" style="paint-order:stroke fill markers"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 1c-1.1075 0-2 0.89253-2 2v6c0 1.1075 0.89253 2 2 2v-1c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1h7c0.554 0 1 0.446 1 1h1v-1c0-1.1075-0.89253-2-2-2h-7zm8 7v1c0 0.554-0.446 1-1 1h-4v1h4c1.1075 0 2-0.89253 2-2v-1h-1z"/>
+ <path d="m6 5c-1.1075 0-2 0.89253-2 2v6c0 1.1075 0.89253 2 2 2h7c1.1075 0 2-0.89253 2-2v-6c0-1.1075-0.89253-2-2-2zm0 2h7c0.554 0 1 0.446 1 1v5c0 0.554-0.446 1-1 1h-7c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/screenshot-symbolic.svg b/src/other/firefox/common/icons/screenshot-symbolic.svg
index 3232ca15..7f2277aa 100644
--- a/src/other/firefox/common/icons/screenshot-symbolic.svg
+++ b/src/other/firefox/common/icons/screenshot-symbolic.svg
@@ -1 +1,6 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><g fill="#363636"><path d="M11 12h5v1h-5z"/><path d="M13 10h1v5h-1zM13 8h1v1h-1zM1 8h1v1H1zM13 4h1v1h-1zM1 4h1v1H1zM13 2h1v1h-1zM1 2h1v1H1zM1 10h1v1H1zM1 12h1v1H1zM3 12h1v1H3zM5 12h1v1H5zM7 12h1v1H7zM3 2h1v1H3zM5 2h1v1H5zM7 2h1v1H7zM11 2h1v1h-1zM9 12h1v1H9zM9 2h1v1H9zM13 6h1v1h-1zM1 6h1v1H1z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+<g>
+<path d="M11 12h5v1h-5z"/>
+<path d="M13 10h1v5h-1zM13 8h1v1h-1zM1 8h1v1H1zM13 4h1v1h-1zM1 4h1v1H1zM13 2h1v1h-1zM1 2h1v1H1zM1 10h1v1H1zM1 12h1v1H1zM3 12h1v1H3zM5 12h1v1H5zM7 12h1v1H7zM3 2h1v1H3zM5 2h1v1H5zM7 2h1v1H7zM11 2h1v1h-1zM9 12h1v1H9zM9 2h1v1H9zM13 6h1v1h-1zM1 6h1v1H1z"/>
+</g>
+</svg>
diff --git a/src/other/firefox/common/icons/security-broken-symbolic.svg b/src/other/firefox/common/icons/security-broken-symbolic.svg
index d6315b10..8364b36b 100644
--- a/src/other/firefox/common/icons/security-broken-symbolic.svg
+++ b/src/other/firefox/common/icons/security-broken-symbolic.svg
@@ -1,8 +1,5 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
- </defs>
- <path class="ColorScheme-Text" d="m8 0c-2.216 0-4 1.784-4 4v2h1v-2c0-1.662 1.338-3 3-3s3 1.338 3 3v2h1v-2c0-2.216-1.784-4-4-4z" fill="currentColor" opacity=".35"/>
- <path class="ColorScheme-Text" d="m4 6c-1.108 0-2 0.892-2 2v5c0 1.108 0.892 2 2 2h8c1.108 0 2-0.892 2-2v-5c0-1.108-0.892-2-2-2h-8zm0 1h8c0.554 0 1 0.446 1 1v5c0 0.554-0.446 1-1 1h-8c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1z" fill="currentColor" opacity=".35"/>
- <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0" class="ColorScheme-Text" fill="currentColor"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8 0c-2.216 0-4 1.784-4 4v2h1v-2c0-1.662 1.338-3 3-3s3 1.338 3 3v2h1v-2c0-2.216-1.784-4-4-4z" opacity=".35"/>
+ <path d="m4 6c-1.108 0-2 0.892-2 2v5c0 1.108 0.892 2 2 2h8c1.108 0 2-0.892 2-2v-5c0-1.108-0.892-2-2-2h-8zm0 1h8c0.554 0 1 0.446 1 1v5c0 0.554-0.446 1-1 1h-8c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1z" opacity=".35"/>
+ <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0"/>
 </svg>
diff --git a/src/other/firefox/common/icons/security-warning-symbolic.svg b/src/other/firefox/common/icons/security-warning-symbolic.svg
index c55aa2a5..9bed6152 100644
--- a/src/other/firefox/common/icons/security-warning-symbolic.svg
+++ b/src/other/firefox/common/icons/security-warning-symbolic.svg
@@ -1,8 +1,5 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
- </defs>
- <path class="ColorScheme-Text" d="m8 0c-2.216 0-4 1.784-4 4v2h1v-2c0-1.662 1.338-3 3-3s3 1.338 3 3v2h1v-2c0-2.216-1.784-4-4-4z" color="#363636" fill="currentColor"/>
- <path class="ColorScheme-Text" d="m4 6c-1.108 0-2 0.892-2 2v5c0 1.108 0.892 2 2 2h3.2676a5.5 5.5 0 0 1-0.6543-1h-2.6133c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1h4.3574a5.5 5.5 0 0 1 3.1426-1h-7.5zm7.5 0a5.5 5.5 0 0 1 0.025391 0.0019531v-0.0019531h-0.025391z" color="#363636" fill="currentColor"/>
- <path d="m11.5 7a4.5 4.5 0 0 0-4.5 4.5 4.5 4.5 0 0 0 4.5 4.5 4.5 4.5 0 0 0 4.5-4.5 4.5 4.5 0 0 0-4.5-4.5zm0 1c0.277 0 0.5 0.223 0.5 0.5v4c0 0.277-0.223 0.5-0.5 0.5s-0.5-0.223-0.5-0.5v-4c0-0.277 0.223-0.5 0.5-0.5zm0 6a0.5 0.5 0 0 1 0.5 0.5 0.5 0.5 0 0 1-0.5 0.5 0.5 0.5 0 0 1-0.5-0.5 0.5 0.5 0 0 1 0.5-0.5z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.6" style="paint-order:stroke fill markers"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8 0c-2.216 0-4 1.784-4 4v2h1v-2c0-1.662 1.338-3 3-3s3 1.338 3 3v2h1v-2c0-2.216-1.784-4-4-4z"/>
+ <path d="m4 6c-1.108 0-2 0.892-2 2v5c0 1.108 0.892 2 2 2h3.2676a5.5 5.5 0 0 1-0.6543-1h-2.6133c-0.554 0-1-0.446-1-1v-5c0-0.554 0.446-1 1-1h4.3574a5.5 5.5 0 0 1 3.1426-1h-7.5zm7.5 0a5.5 5.5 0 0 1 0.025391 0.0019531v-0.0019531h-0.025391z"/>
+ <path d="m11.5 7a4.5 4.5 0 0 0-4.5 4.5 4.5 4.5 0 0 0 4.5 4.5 4.5 4.5 0 0 0 4.5-4.5 4.5 4.5 0 0 0-4.5-4.5zm0 1c0.277 0 0.5 0.223 0.5 0.5v4c0 0.277-0.223 0.5-0.5 0.5s-0.5-0.223-0.5-0.5v-4c0-0.277 0.223-0.5 0.5-0.5zm0 6a0.5 0.5 0 0 1 0.5 0.5 0.5 0.5 0 0 1-0.5 0.5 0.5 0.5 0 0 1-0.5-0.5 0.5 0.5 0 0 1 0.5-0.5z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/select-symbolic.svg b/src/other/firefox/common/icons/select-symbolic.svg
index 48d9afbb..474c1727 100644
--- a/src/other/firefox/common/icons/select-symbolic.svg
+++ b/src/other/firefox/common/icons/select-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <path d="m14.01 3.4038-7.7782 7.7782-4.2426-4.2426-0.70711 0.70711 4.9498 4.9497 8.4853-8.4853z" fill="#333333"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m14.01 3.4038-7.7782 7.7782-4.2426-4.2426-0.70711 0.70711 4.9498 4.9497 8.4853-8.4853z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/star-symbolic.svg b/src/other/firefox/common/icons/star-symbolic.svg
index 8ddd7943..55b3de0d 100644
--- a/src/other/firefox/common/icons/star-symbolic.svg
+++ b/src/other/firefox/common/icons/star-symbolic.svg
@@ -1,4 +1,3 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <title>Gnome Symbolic Icons</title>
- <path d="m8.0601 0.84236a0.50005 0.50005 0 0 0-0.52052 0.27575l-2.0383 4.1518-4.575 0.67561a0.50005 0.50005 0 0 0-0.27448 0.85273l3.3195 3.2204-0.77068 4.5601a0.50005 0.50005 0 0 0 0.7266 0.52653l4.0884-2.1632 4.0985 2.1425a0.50005 0.50005 0 0 0 0.72395-0.5286l-0.79268-4.5563 3.3038-3.2357a0.50005 0.50005 0 0 0-0.27869-0.85219l-4.5782-0.65453-2.0566-4.1425a0.50005 0.50005 0 0 0-0.37554-0.27241zm-0.070268 1.6258 1.7242 3.47a0.50005 0.50005 0 0 0 0.37711 0.27265l3.8361 0.54683-2.7687 2.7114a0.50005 0.50005 0 0 0-0.14319 0.44393l0.66377 3.8159-3.4341-1.7945a0.50005 0.50005 0 0 0-0.46488 0.0015l-3.4258 1.8115 0.64729-3.8205a0.50005 0.50005 0 0 0-0.14487-0.44227l-2.7802-2.699 3.8311-0.56494a0.50005 0.50005 0 0 0 0.37583-0.27581z" color="#000000" color-rendering="auto" dominant-baseline="auto" enable-background="accumulate" fill="#333" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stop-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8.0601 0.84236a0.50005 0.50005 0 0 0-0.52052 0.27575l-2.0383 4.1518-4.575 0.67561a0.50005 0.50005 0 0 0-0.27448 0.85273l3.3195 3.2204-0.77068 4.5601a0.50005 0.50005 0 0 0 0.7266 0.52653l4.0884-2.1632 4.0985 2.1425a0.50005 0.50005 0 0 0 0.72395-0.5286l-0.79268-4.5563 3.3038-3.2357a0.50005 0.50005 0 0 0-0.27869-0.85219l-4.5782-0.65453-2.0566-4.1425a0.50005 0.50005 0 0 0-0.37554-0.27241zm-0.070268 1.6258 1.7242 3.47a0.50005 0.50005 0 0 0 0.37711 0.27265l3.8361 0.54683-2.7687 2.7114a0.50005 0.50005 0 0 0-0.14319 0.44393l0.66377 3.8159-3.4341-1.7945a0.50005 0.50005 0 0 0-0.46488 0.0015l-3.4258 1.8115 0.64729-3.8205a0.50005 0.50005 0 0 0-0.14487-0.44227l-2.7802-2.699 3.8311-0.56494a0.50005 0.50005 0 0 0 0.37583-0.27581z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/sync.svg b/src/other/firefox/common/icons/sync.svg
index 5f622cc2..887574e3 100644
--- a/src/other/firefox/common/icons/sync.svg
+++ b/src/other/firefox/common/icons/sync.svg
@@ -1,5 +1,5 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g transform="scale(3.7795)" fill="#363636">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g transform="scale(3.7795)">
   <path d="m0.57929 2.1627c0.017081-0.00191 0.03514-5.465e-4 0.05271 0.00465l0.76119 0.22531c0.070279 0.020789 0.11019 0.094051 0.0894 0.16433-0.020789 0.070279-0.094568 0.11019-0.16485 0.0894l-0.43408-0.12867a1.3229 1.3229 0 0 0 1.2599 0.92191 1.3229 1.3229 0 0 0 1.296-1.0583h0.26923a1.5875 1.5875 0 0 1-1.5653 1.3229 1.5875 1.5875 0 0 1-1.5064-1.0878l-0.14108 0.47646c-0.020789 0.07028-0.094052 0.11019-0.16433 0.0894-0.07028-0.020789-0.11019-0.094052-0.0894-0.16433l0.22531-0.76119c0.015592-0.052709 0.060378-0.088322 0.11162-0.094051z"/>
   <path d="m3.654 2.0707c-0.017081 0.00191-0.03514 5.464e-4 -0.05271-0.00465l-0.76119-0.22531c-0.07028-0.020789-0.11019-0.094051-0.0894-0.16433 0.020789-0.070279 0.094568-0.11019 0.16485-0.0894l0.43408 0.12867a1.3229 1.3229 0 0 0-1.2599-0.92191 1.3229 1.3229 0 0 0-1.296 1.0583h-0.26923a1.5875 1.5875 0 0 1 1.5653-1.3229 1.5875 1.5875 0 0 1 1.5064 1.0878l0.14108-0.47646c0.020789-0.07028 0.094052-0.11019 0.16433-0.0894 0.07028 0.020789 0.11019 0.094052 0.0894 0.16433l-0.22531 0.76119c-0.015592 0.052709-0.060378 0.088322-0.11162 0.094051z"/>
  </g>
diff --git a/src/other/firefox/common/icons/tab-audio-blocked-small-light.svg b/src/other/firefox/common/icons/tab-audio-blocked-small-light.svg
deleted file mode 100644
index 8e50b6f8..00000000
--- a/src/other/firefox/common/icons/tab-audio-blocked-small-light.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <path d="m6 10.26v-4.5198c0-0.45198 0.45198-0.67797 0.79096-0.45198l3.9548 2.2599c0.33898 0.22599 0.33898 0.79096 0 1.0169l-3.8418 2.1469c-0.33898 0.22599-0.90395 0-0.90395-0.45198z" fill="#dfdfdf"/>
- <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z" fill="#dfdfdf"/>
-</svg>
diff --git a/src/other/firefox/common/icons/tab-audio-blocked-small.svg b/src/other/firefox/common/icons/tab-audio-blocked-small.svg
index 7233fbf3..5fe95de2 100644
--- a/src/other/firefox/common/icons/tab-audio-blocked-small.svg
+++ b/src/other/firefox/common/icons/tab-audio-blocked-small.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <path d="m6 10.26v-4.5198c0-0.45198 0.45198-0.67797 0.79096-0.45198l3.9548 2.2599c0.33898 0.22599 0.33898 0.79096 0 1.0169l-3.8418 2.1469c-0.33898 0.22599-0.90395 0-0.90395-0.45198z" fill="#363636"/>
- <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m6 10.26v-4.5198c0-0.45198 0.45198-0.67797 0.79096-0.45198l3.9548 2.2599c0.33898 0.22599 0.33898 0.79096 0 1.0169l-3.8418 2.1469c-0.33898 0.22599-0.90395 0-0.90395-0.45198z"/>
+ <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/tab-new-symbolic.svg b/src/other/firefox/common/icons/tab-new-symbolic.svg
index 91182e05..203281ad 100644
--- a/src/other/firefox/common/icons/tab-new-symbolic.svg
+++ b/src/other/firefox/common/icons/tab-new-symbolic.svg
@@ -1,4 +1,4 @@
-<svg width="16.009" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect x="1" y="8" width="13" height="1" ry="0" fill="#333" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.0817"/>
- <rect transform="rotate(90)" x="2" y="-8" width="13" height="1" ry="0" fill="#333" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.0817"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <rect x="1" y="8" width="13" height="1" ry="0"/>
+ <rect transform="rotate(90)" x="2" y="-8" width="13" height="1" ry="0"/>
 </svg>
diff --git a/src/other/firefox/common/icons/tab-sync-symbolic-light.svg b/src/other/firefox/common/icons/tab-sync-symbolic-light.svg
deleted file mode 100644
index a22b39cc..00000000
--- a/src/other/firefox/common/icons/tab-sync-symbolic-light.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <path d="m2 2c-1.108 0-2 0.892-2 2v8c0 1.108 0.892 2 2 2h6.7617c-0.20691-0.31135-0.37421-0.64727-0.49805-1h-6.2637c-0.554 0-1-0.446-1-1l5e-5 -5h14v0.75977c0.37755 0.25248 0.7147 0.56065 1 0.91406v-4.6738c0-1.108-0.892-2-2-2h-12zm0 1h12c0.554 0 1 0.446 1 1v2h-7v-1h-7v-1c0-0.554 0.446-1 1-1z" fill="#dfdfdf"/>
- <path d="m12.5 8.0215c-1.933 0-3.5 1.567-3.5 3.5s1.567 3.5 3.5 3.5 3.5-1.567 3.5-3.5-1.567-3.5-3.5-3.5zm-0.013672 0.97852a2.5 2.5 0 0 1 1.8848 0.8418l-0.89844 0.51953a1.5 1.5 0 0 0-1.7227-0.16016 1.5 1.5 0 0 0-0.72461 1.5723l-0.89453 0.51758a2.5 2.5 0 0 1 1.1191-2.957 2.5 2.5 0 0 1 1.2363-0.33398zm2.3828 1.709a2.5 2.5 0 0 1-1.1191 2.957 2.5 2.5 0 0 1-3.1211-0.50781l0.89844-0.51953a1.5 1.5 0 0 0 1.7227 0.16016 1.5 1.5 0 0 0 0.72461-1.5723l0.89453-0.51758z" fill="#dfdfdf"/>
-</svg>
diff --git a/src/other/firefox/common/icons/tab-sync-symbolic.svg b/src/other/firefox/common/icons/tab-sync-symbolic.svg
index 50ab7992..c34ba87f 100644
--- a/src/other/firefox/common/icons/tab-sync-symbolic.svg
+++ b/src/other/firefox/common/icons/tab-sync-symbolic.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <path d="m2 2c-1.108 0-2 0.892-2 2v8c0 1.108 0.892 2 2 2h6.7617c-0.20691-0.31135-0.37421-0.64727-0.49805-1h-6.2637c-0.554 0-1-0.446-1-1l5e-5 -5h14v0.75977c0.37755 0.25248 0.7147 0.56065 1 0.91406v-4.6738c0-1.108-0.892-2-2-2h-12zm0 1h12c0.554 0 1 0.446 1 1v2h-7v-1h-7v-1c0-0.554 0.446-1 1-1z" fill="#363636"/>
- <path d="m12.5 8.0215c-1.933 0-3.5 1.567-3.5 3.5s1.567 3.5 3.5 3.5 3.5-1.567 3.5-3.5-1.567-3.5-3.5-3.5zm-0.013672 0.97852a2.5 2.5 0 0 1 1.8848 0.8418l-0.89844 0.51953a1.5 1.5 0 0 0-1.7227-0.16016 1.5 1.5 0 0 0-0.72461 1.5723l-0.89453 0.51758a2.5 2.5 0 0 1 1.1191-2.957 2.5 2.5 0 0 1 1.2363-0.33398zm2.3828 1.709a2.5 2.5 0 0 1-1.1191 2.957 2.5 2.5 0 0 1-3.1211-0.50781l0.89844-0.51953a1.5 1.5 0 0 0 1.7227 0.16016 1.5 1.5 0 0 0 0.72461-1.5723l0.89453-0.51758z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m2 2c-1.108 0-2 0.892-2 2v8c0 1.108 0.892 2 2 2h6.7617c-0.20691-0.31135-0.37421-0.64727-0.49805-1h-6.2637c-0.554 0-1-0.446-1-1l5e-5 -5h14v0.75977c0.37755 0.25248 0.7147 0.56065 1 0.91406v-4.6738c0-1.108-0.892-2-2-2h-12zm0 1h12c0.554 0 1 0.446 1 1v2h-7v-1h-7v-1c0-0.554 0.446-1 1-1z"/>
+ <path d="m12.5 8.0215c-1.933 0-3.5 1.567-3.5 3.5s1.567 3.5 3.5 3.5 3.5-1.567 3.5-3.5-1.567-3.5-3.5-3.5zm-0.013672 0.97852a2.5 2.5 0 0 1 1.8848 0.8418l-0.89844 0.51953a1.5 1.5 0 0 0-1.7227-0.16016 1.5 1.5 0 0 0-0.72461 1.5723l-0.89453 0.51758a2.5 2.5 0 0 1 1.1191-2.957 2.5 2.5 0 0 1 1.2363-0.33398zm2.3828 1.709a2.5 2.5 0 0 1-1.1191 2.957 2.5 2.5 0 0 1-3.1211-0.50781l0.89844-0.51953a1.5 1.5 0 0 0 1.7227 0.16016 1.5 1.5 0 0 0 0.72461-1.5723l0.89453-0.51758z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/toggle-right-sidebar-symbolic.svg b/src/other/firefox/common/icons/toggle-right-sidebar-symbolic.svg
index 7feef895..b4af8af9 100644
--- a/src/other/firefox/common/icons/toggle-right-sidebar-symbolic.svg
+++ b/src/other/firefox/common/icons/toggle-right-sidebar-symbolic.svg
@@ -1,8 +1,8 @@
-<svg width="4.2333mm" height="4.2333mm" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg">
- <g transform="translate(0 -3.3407e-5)" fill="#333333">
-  <path d="m3.7042 0.52917c0.29316 0 0.52917 0.23601 0.52917 0.52917v2.3812c0 0.29316-0.23601 0.52917-0.52917 0.52917h-3.175c-0.29316 0-0.52917-0.23601-0.52917-0.52917v-2.3812c0-0.29316 0.23601-0.52917 0.52917-0.52917zm0 0.26458h-3.175c-0.14658 0-0.26458 0.118-0.26458 0.26458v2.3812c0 0.14658 0.118 0.26458 0.26458 0.26458h3.175c0.14658 0 0.26458-0.118 0.26458-0.26458v-2.3812c0-0.14658-0.118-0.26458-0.26458-0.26458z" color="#363636" stroke-width=".26458"/>
-  <rect transform="scale(-1,1)" x="-2.6458" y=".79375" width=".26458" height="2.9104" ry="0" color="#363636" stroke-width=".26458"/>
-  <g stroke-linecap="round" stroke-linejoin="round" stroke-width=".52917">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g transform="translate(0 -3.3407e-5)">
+  <path d="m3.7042 0.52917c0.29316 0 0.52917 0.23601 0.52917 0.52917v2.3812c0 0.29316-0.23601 0.52917-0.52917 0.52917h-3.175c-0.29316 0-0.52917-0.23601-0.52917-0.52917v-2.3812c0-0.29316 0.23601-0.52917 0.52917-0.52917zm0 0.26458h-3.175c-0.14658 0-0.26458 0.118-0.26458 0.26458v2.3812c0 0.14658 0.118 0.26458 0.26458 0.26458h3.175c0.14658 0 0.26458-0.118 0.26458-0.26458v-2.3812c0-0.14658-0.118-0.26458-0.26458-0.26458z"/>
+  <rect transform="scale(-1,1)" x="-2.6458" y=".79375" width=".26458" height="2.9104" ry="0"/>
+  <g>
    <rect x="2.9104" y="1.0583" width=".79375" height=".26458"/>
    <rect x="2.9104" y="1.5875" width=".79375" height=".26458"/>
    <rect x="2.9104" y="2.1167" width=".79375" height=".26458"/>
diff --git a/src/other/firefox/common/icons/toggle-sidebar-symbolic.svg b/src/other/firefox/common/icons/toggle-sidebar-symbolic.svg
index e4fd74a7..69d1cf78 100644
--- a/src/other/firefox/common/icons/toggle-sidebar-symbolic.svg
+++ b/src/other/firefox/common/icons/toggle-sidebar-symbolic.svg
@@ -1,11 +1,3 @@
-<svg width="4.2333mm" height="4.2333mm" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg">
- <g fill="#333">
-  <path d="m0.52917 0.52917c-0.29316 0-0.52917 0.23601-0.52917 0.52917v2.3812c0 0.29316 0.23601 0.52917 0.52917 0.52917h3.175c0.29316 0 0.52917-0.23601 0.52917-0.52917v-2.3812c0-0.29316-0.23601-0.52917-0.52917-0.52917zm0 0.26458h3.175c0.14658 0 0.26458 0.118 0.26458 0.26458v2.3812c0 0.14658-0.118 0.26458-0.26458 0.26458h-3.175c-0.14658 0-0.26458-0.118-0.26458-0.26458v-2.3812c0-0.14658 0.118-0.26458 0.26458-0.26458z" color="#363636" stroke-width=".26458"/>
-  <rect x="1.5875" y=".79375" width=".26458" height="2.9104" ry="0" color="#363636" stroke-width=".26458"/>
-  <g stroke-linecap="round" stroke-linejoin="round" stroke-width=".52917">
-   <rect transform="scale(-1,1)" x="-1.3229" y="1.0583" width=".79375" height=".26458"/>
-   <rect transform="scale(-1,1)" x="-1.3229" y="1.5875" width=".79375" height=".26458" stroke-width=".52917"/>
-   <rect transform="scale(-1,1)" x="-1.3229" y="2.1167" width=".79375" height=".26458"/>
-  </g>
- </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m1.9999 2c-1.108 0-2 0.89199-2 2v9c0 1.108 0.89199 2 2 2h12c1.108 0 2-0.892 2-2v-9c0-1.108-0.892-2-2-2zm0 1h4v11h-4c-0.554 0-1-0.446-1-1v-9c0-0.554 0.446-1 1-1zm5 0h7c0.554 0 1 0.446 1 1v9c0 0.554-0.446 1-1 1h-7zm-5 1v1h3v-1zm0 2v1h3v-1zm0 2v1h3v-1z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/tool-profiler.svg b/src/other/firefox/common/icons/tool-profiler.svg
index 1e2b8dc5..f3c82a25 100644
--- a/src/other/firefox/common/icons/tool-profiler.svg
+++ b/src/other/firefox/common/icons/tool-profiler.svg
@@ -1,5 +1,5 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 1.7656 4.9883l0.78125-0.62695a7 7 0 0 1-1.5469-4.3613 7 7 0 0 1 7-7 7 7 0 0 1 7 7 7 7 0 0 1-1.5469 4.3613l0.78125 0.62695a8 8 0 0 0 1.7656-4.9883 8 8 0 0 0-8-8z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width="54" style="paint-order:stroke fill markers"/>
- <path d="m8 10a2 2 0 0 0-2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0-2-2zm0 1a1 1 0 0 1 1 1 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width="54" style="paint-order:stroke fill markers"/>
- <rect transform="rotate(30)" x="12.428" y="-.6077" width="1" height="6" rx=".5" ry=".5" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width="54" style="paint-order:stroke fill markers"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 1.7656 4.9883l0.78125-0.62695a7 7 0 0 1-1.5469-4.3613 7 7 0 0 1 7-7 7 7 0 0 1 7 7 7 7 0 0 1-1.5469 4.3613l0.78125 0.62695a8 8 0 0 0 1.7656-4.9883 8 8 0 0 0-8-8z"/>
+ <path d="m8 10a2 2 0 0 0-2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0-2-2zm0 1a1 1 0 0 1 1 1 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1z"/>
+ <rect transform="rotate(30)" x="12.428" y="-.6077" width="1" height="6" rx=".5" ry=".5"/>
 </svg>
diff --git a/src/other/firefox/common/icons/tracking-protection.svg b/src/other/firefox/common/icons/tracking-protection.svg
index 7372a29a..59f558c5 100644
--- a/src/other/firefox/common/icons/tracking-protection.svg
+++ b/src/other/firefox/common/icons/tracking-protection.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" fill="none" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <path d="m8 0.35156a1.0001 1.0001 0 0 0-0.37109 0.072266l-5 2a1.0001 1.0001 0 0 0-0.62891 0.92773v7c0 0.91667 0.49969 1.6132 1.0547 2.2012s1.2307 1.0936 1.8945 1.5312c1.3276 0.87537 2.6328 1.4727 2.6328 1.4727a1.0001 1.0001 0 0 0 0.83594 0s1.3052-0.59728 2.6328-1.4727c0.66379-0.43769 1.3395-0.9433 1.8945-1.5312 0.555-0.58795 1.0547-1.2845 1.0547-2.2012v-7a1.0001 1.0001 0 0 0-0.62891-0.92773l-5-2a1.0001 1.0001 0 0 0-0.37109-0.072266zm0 1 5 2v7c0 2-5 4.2969-5 4.2969v-13.297z" fill="#333333"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8 0.35156a1.0001 1.0001 0 0 0-0.37109 0.072266l-5 2a1.0001 1.0001 0 0 0-0.62891 0.92773v7c0 0.91667 0.49969 1.6132 1.0547 2.2012s1.2307 1.0936 1.8945 1.5312c1.3276 0.87537 2.6328 1.4727 2.6328 1.4727a1.0001 1.0001 0 0 0 0.83594 0s1.3052-0.59728 2.6328-1.4727c0.66379-0.43769 1.3395-0.9433 1.8945-1.5312 0.555-0.58795 1.0547-1.2845 1.0547-2.2012v-7a1.0001 1.0001 0 0 0-0.62891-0.92773l-5-2a1.0001 1.0001 0 0 0-0.37109-0.072266zm0 1 5 2v7c0 2-5 4.2969-5 4.2969v-13.297z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/user-home-symbolic.svg b/src/other/firefox/common/icons/user-home-symbolic.svg
index a4861f9b..f39d8859 100644
--- a/src/other/firefox/common/icons/user-home-symbolic.svg
+++ b/src/other/firefox/common/icons/user-home-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16.023" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path class="ColorScheme-Text" d="m8 1.0059c-0.12781 0-0.25558 0.04855-0.35352 0.14648l-7.0703 7.0723c-0.19587 0.19587-0.19587 0.51116 0 0.70703s0.51116 0.19587 0.70703 0l0.7168-0.7168v5.7852c0 1.108 0.892 2 2 2h8c1.108 0 2-0.892 2-2v-5.7852l0.7168 0.7168c0.19587 0.19587 0.51116 0.19587 0.70703 0s0.19587-0.51116 0-0.70703l-7.0703-7.0723c-0.097934-0.097934-0.22571-0.14648-0.35352-0.14648zm0 1.209 5 5v6.7852c0 0.554-0.446 1-1 1h-2v-3c0-1.108-0.892-2-2-2s-2 0.892-2 2v3h-2c-0.554 0-1-0.446-1-1v-6.7852z" color="#363636" fill="#333"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8 1.0059c-0.12781 0-0.25558 0.04855-0.35352 0.14648l-7.0703 7.0723c-0.19587 0.19587-0.19587 0.51116 0 0.70703s0.51116 0.19587 0.70703 0l0.7168-0.7168v5.7852c0 1.108 0.892 2 2 2h8c1.108 0 2-0.892 2-2v-5.7852l0.7168 0.7168c0.19587 0.19587 0.51116 0.19587 0.70703 0s0.19587-0.51116 0-0.70703l-7.0703-7.0723c-0.097934-0.097934-0.22571-0.14648-0.35352-0.14648zm0 1.209 5 5v6.7852c0 0.554-0.446 1-1 1h-2v-3c0-1.108-0.892-2-2-2s-2 0.892-2 2v3h-2c-0.554 0-1-0.446-1-1v-6.7852z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/user-not-tracked-dark.svg b/src/other/firefox/common/icons/user-not-tracked-dark.svg
deleted file mode 100644
index 8d0b3dda..00000000
--- a/src/other/firefox/common/icons/user-not-tracked-dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16.001" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m8.0022 2.0391c3.7697 0.00458 7.0699 2.3668 8.0076 5.7305 0.04385 0.15695 0.04385 0.32157 0 0.47852-0.38075 1.3513-1.1472 2.5362-2.168 3.4746l-0.71092-0.71094c0.87632-0.81542 1.5396-1.8343 1.8691-3.0039-0.82083-2.9444-3.7-5.0038-6.9998-5.0078-0.86331 5.345e-4 -1.694 0.14902-2.4706 0.41016l-0.75975-0.75977c0.99998-0.39229 2.0938-0.61063 3.2304-0.61133h0.00195zm-5.8456 2.2402 0.71092 0.71094c-0.87531 0.81512-1.5379 1.8332-1.8672 3.002 0.82083 2.9444 3.7 5.0038 6.9998 5.0078 0.86241-5.24e-4 1.6928-0.1476 2.4687-0.4082l0.75779 0.75781c-0.99908 0.3917-2.0912 0.61064-3.2265 0.61133h-0.00195c-3.7697-0.0046-7.0699-2.3668-8.0076-5.7305-0.044219-0.15757-0.044219-0.3229 0-0.48047 0.38038-1.35 1.1468-2.5331 2.166-3.4707zm5.8437 0.7207c1.6569 0 2.9999 1.3431 2.9999 3-0.0011 0.26196-0.03661 0.52264-0.10547 0.77539l-3.6717-3.6718c0.25346-0.06837 0.5148-0.10317 0.77732-0.10352zm-2.8944 2.2285 3.6678 3.6679c-0.2522 0.06803-0.51221 0.10283-0.77342 0.10352-1.6569 0-2.9999-1.3431-2.9999-3 0.0015-0.26065 0.036949-0.51999 0.10547-0.77148z" fill="#dfdfdf" stroke-width=".99999"/>
- <rect transform="matrix(-.70711 -.70711 -.70711 .70711 0 0)" x="-19.314" y="-.49958" width="16" height="1" ry="0" fill="#dfdfdf"/>
-</svg>
diff --git a/src/other/firefox/common/icons/user-not-tracked.svg b/src/other/firefox/common/icons/user-not-tracked.svg
index 0e95acf8..63dab17c 100644
--- a/src/other/firefox/common/icons/user-not-tracked.svg
+++ b/src/other/firefox/common/icons/user-not-tracked.svg
@@ -1,6 +1,6 @@
-<svg width="16" height="16.001" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g transform="matrix(-.90463 0 0 .83333 15.237 1.3333)" fill="#363636">
-  <path transform="matrix(1.1054 0 0 1.2 -.84343 -1.6)" d="m7.998 2.0391c-3.7698 0.00458-7.0701 2.3668-8.0078 5.7305-0.043852 0.15695-0.043852 0.32157 0 0.47852 0.38076 1.3513 1.1472 2.5362 2.168 3.4746l0.71094-0.71094c-0.87634-0.81542-1.5396-1.8343-1.8691-3.0039 0.82085-2.9444 3.7001-5.0038 7-5.0078 0.86333 5.345e-4 1.694 0.14902 2.4707 0.41016l0.75977-0.75977c-1-0.39229-2.0938-0.61063-3.2305-0.61133h-0.00195zm5.8457 2.2402-0.71094 0.71094c0.87533 0.81512 1.5379 1.8332 1.8672 3.002-0.82085 2.9444-3.7001 5.0038-7 5.0078-0.86243-5.24e-4 -1.6928-0.1476-2.4688-0.4082l-0.75781 0.75781c0.9991 0.3917 2.0912 0.61064 3.2266 0.61133h0.00195c3.7698-0.0046 7.0701-2.3668 8.0078-5.7305 0.04422-0.15757 0.04422-0.3229 0-0.48047-0.38039-1.35-1.1468-2.5331-2.166-3.4707zm-5.8438 0.7207c-1.6569 0-3 1.3431-3 3 0.00115 0.26196 0.03661 0.52264 0.10547 0.77539l3.6718-3.6718c-0.25347-0.06837-0.51481-0.10317-0.77734-0.10352zm2.8945 2.2285-3.6679 3.6679c0.25221 0.06803 0.51222 0.10283 0.77344 0.10352 1.6569 0 3-1.3431 3-3-0.0015-0.26065-0.03695-0.51999-0.10547-0.77148z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g transform="matrix(-.90463 0 0 .83333 15.237 1.3333)">
+  <path transform="matrix(1.1054 0 0 1.2 -.84343 -1.6)" d="m7.998 2.0391c-3.7698 0.00458-7.0701 2.3668-8.0078 5.7305-0.043852 0.15695-0.043852 0.32157 0 0.47852 0.38076 1.3513 1.1472 2.5362 2.168 3.4746l0.71094-0.71094c-0.87634-0.81542-1.5396-1.8343-1.8691-3.0039 0.82085-2.9444 3.7001-5.0038 7-5.0078 0.86333 5.345e-4 1.694 0.14902 2.4707 0.41016l0.75977-0.75977c-1-0.39229-2.0938-0.61063-3.2305-0.61133h-0.00195zm5.8457 2.2402-0.71094 0.71094c0.87533 0.81512 1.5379 1.8332 1.8672 3.002-0.82085 2.9444-3.7001 5.0038-7 5.0078-0.86243-5.24e-4 -1.6928-0.1476-2.4688-0.4082l-0.75781 0.75781c0.9991 0.3917 2.0912 0.61064 3.2266 0.61133h0.00195c3.7698-0.0046 7.0701-2.3668 8.0078-5.7305 0.04422-0.15757 0.04422-0.3229 0-0.48047-0.38039-1.35-1.1468-2.5331-2.166-3.4707zm-5.8438 0.7207c-1.6569 0-3 1.3431-3 3 0.00115 0.26196 0.03661 0.52264 0.10547 0.77539l3.6718-3.6718c-0.25347-0.06837-0.51481-0.10317-0.77734-0.10352zm2.8945 2.2285-3.6679 3.6679c0.25221 0.06803 0.51222 0.10283 0.77344 0.10352 1.6569 0 3-1.3431 3-3-0.0015-0.26065-0.03695-0.51999-0.10547-0.77148z"/>
  </g>
- <rect transform="matrix(-.70711 -.70711 -.70711 .70711 0 0)" x="-19.314" y="-.49958" width="16" height="1" ry="0" fill="#363636"/>
+ <rect transform="matrix(-.70711 -.70711 -.70711 .70711 0 0)" x="-19.314" y="-.49958" width="16" height="1" ry="0"/>
 </svg>
diff --git a/src/other/firefox/common/icons/view-fullscreen-symbolic.svg b/src/other/firefox/common/icons/view-fullscreen-symbolic.svg
index 5e255ec3..3c95b27d 100644
--- a/src/other/firefox/common/icons/view-fullscreen-symbolic.svg
+++ b/src/other/firefox/common/icons/view-fullscreen-symbolic.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m3 1c-1.108 0-2 0.892-2 2v3h1v-3c0-0.554 0.446-1 1-1h3v-1h-3zm7 0v1h3c0.554 0 1 0.446 1 1v3h1v-3c0-1.108-0.892-2-2-2h-3zm-9 9v3c0 1.108 0.892 2 2 2h3v-1h-3c-0.554 0-1-0.446-1-1v-3h-1zm13 0v3c0 0.554-0.446 1-1 1h-3v1h3c1.108 0 2-0.892 2-2v-3h-1z" fill="#333" stroke-linecap="square" stroke-width="2"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 1c-1.108 0-2 0.892-2 2v3h1v-3c0-0.554 0.446-1 1-1h3v-1h-3zm7 0v1h3c0.554 0 1 0.446 1 1v3h1v-3c0-1.108-0.892-2-2-2h-3zm-9 9v3c0 1.108 0.892 2 2 2h3v-1h-3c-0.554 0-1-0.446-1-1v-3h-1zm13 0v3c0 0.554-0.446 1-1 1h-3v1h3c1.108 0 2-0.892 2-2v-3h-1z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/view-more-horizontal-symbolic.svg b/src/other/firefox/common/icons/view-more-horizontal-symbolic.svg
index 6c54fac3..600327f0 100644
--- a/src/other/firefox/common/icons/view-more-horizontal-symbolic.svg
+++ b/src/other/firefox/common/icons/view-more-horizontal-symbolic.svg
@@ -1,5 +1,5 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g class="ColorScheme-Text" color="#363636" fill="#333">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g>
   <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z"/>
   <circle cx="4" cy="8" r="1"/>
   <circle cx="8" cy="8" r="1"/>
diff --git a/src/other/firefox/common/icons/view-refresh-symbolic.svg b/src/other/firefox/common/icons/view-refresh-symbolic.svg
index e443de4f..9beb55da 100644
--- a/src/other/firefox/common/icons/view-refresh-symbolic.svg
+++ b/src/other/firefox/common/icons/view-refresh-symbolic.svg
@@ -1,5 +1,5 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#363636">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g>
   <path d="m8 3a6 6 0 0 0-6 6 6 6 0 0 0 6 6 6 6 0 0 0 6-6h-1a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5z"/>
   <path d="m8.1719 0.67188-0.70703 0.70703 2.1211 2.1211-2.1211 2.1211 0.70703 0.70703 2.8281-2.8281-0.70703-0.70703z"/>
   <rect x="8" y="3" width="2" height="1"/>
diff --git a/src/other/firefox/common/icons/view-restore-symbolic.svg b/src/other/firefox/common/icons/view-restore-symbolic.svg
index b505414a..c7536be8 100644
--- a/src/other/firefox/common/icons/view-restore-symbolic.svg
+++ b/src/other/firefox/common/icons/view-restore-symbolic.svg
@@ -1,4 +1,4 @@
-<svg width="16.014" height="16.01" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m7 16v-7h-7v1h5.293l-5.293 5.293v0.70703h0.70703l5.293-5.293v5.293h1z" fill="#333" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8708"/>
- <path d="m9 0v7h7v-1h-5.293l5.293-5.293v-0.70703h-0.70703l-5.293 5.293v-5.293h-1z" fill="#333" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8708"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m7 16v-7h-7v1h5.293l-5.293 5.293v0.70703h0.70703l5.293-5.293v5.293h1z"/>
+ <path d="m9 0v7h7v-1h-5.293l5.293-5.293v-0.70703h-0.70703l-5.293 5.293v-5.293h-1z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/window-close-symbolic-light.svg b/src/other/firefox/common/icons/window-close-symbolic-light.svg
deleted file mode 100644
index 34e63cc9..00000000
--- a/src/other/firefox/common/icons/window-close-symbolic-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m4.5352 3.9355c-0.15337 1e-7 -0.30631 0.05826-0.42383 0.17578-0.23504 0.23504-0.23504 0.61261 0 0.84766l3.041 3.041-3.041 3.041c-0.23504 0.23504-0.23504 0.61261 0 0.84766 0.23504 0.23504 0.61261 0.23504 0.84766 0l3.041-3.041 3.041 3.041c0.23504 0.23504 0.61261 0.23504 0.84766 0 0.23504-0.23504 0.23504-0.61261 0-0.84766l-3.041-3.041 3.041-3.041c0.23504-0.23504 0.23504-0.61261 0-0.84766s-0.61261-0.23504-0.84766 0l-3.041 3.041-3.041-3.041c-0.11752-0.11752-0.27046-0.17578-0.42383-0.17578z" fill="#fff"/>
-</svg>
diff --git a/src/other/firefox/common/icons/window-close-symbolic.svg b/src/other/firefox/common/icons/window-close-symbolic.svg
index a2ccfc2e..2ccdeca6 100644
--- a/src/other/firefox/common/icons/window-close-symbolic.svg
+++ b/src/other/firefox/common/icons/window-close-symbolic.svg
@@ -1,4 +1,3 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <title>Gnome Symbolic Icons</title>
- <path d="m4.5352 3.9355c-0.15337 1e-7 -0.30631 0.05826-0.42383 0.17578-0.23504 0.23504-0.23504 0.61261 0 0.84766l3.041 3.041-3.041 3.041c-0.23504 0.23504-0.23504 0.61261 0 0.84766 0.23504 0.23504 0.61261 0.23504 0.84766 0l3.041-3.041 3.041 3.041c0.23504 0.23504 0.61261 0.23504 0.84766 0 0.23504-0.23504 0.23504-0.61261 0-0.84766l-3.041-3.041 3.041-3.041c0.23504-0.23504 0.23504-0.61261 0-0.84766s-0.61261-0.23504-0.84766 0l-3.041 3.041-3.041-3.041c-0.11752-0.11752-0.27046-0.17578-0.42383-0.17578z" fill="#333" stroke-linecap="square" stroke-width="2.0153"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m4.5352 3.9355c-0.15337 1e-7 -0.30631 0.05826-0.42383 0.17578-0.23504 0.23504-0.23504 0.61261 0 0.84766l3.041 3.041-3.041 3.041c-0.23504 0.23504-0.23504 0.61261 0 0.84766 0.23504 0.23504 0.61261 0.23504 0.84766 0l3.041-3.041 3.041 3.041c0.23504 0.23504 0.61261 0.23504 0.84766 0 0.23504-0.23504 0.23504-0.61261 0-0.84766l-3.041-3.041 3.041-3.041c0.23504-0.23504 0.23504-0.61261 0-0.84766s-0.61261-0.23504-0.84766 0l-3.041 3.041-3.041-3.041c-0.11752-0.11752-0.27046-0.17578-0.42383-0.17578z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/window-maximize-symbolic.svg b/src/other/firefox/common/icons/window-maximize-symbolic.svg
index e0b8cc7b..b8e13f12 100644
--- a/src/other/firefox/common/icons/window-maximize-symbolic.svg
+++ b/src/other/firefox/common/icons/window-maximize-symbolic.svg
@@ -1,3 +1,3 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg">
-    <path d="M4 4v8h8V4zm1 1h6v6H5z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal" color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+    <path d="M4 4v8h8V4zm1 1h6v6H5z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/window-minimize-symbolic.svg b/src/other/firefox/common/icons/window-minimize-symbolic.svg
index 428001f8..13c895cb 100644
--- a/src/other/firefox/common/icons/window-minimize-symbolic.svg
+++ b/src/other/firefox/common/icons/window-minimize-symbolic.svg
@@ -1,3 +1,3 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg">
-    <path d="M4 10v1h8v-1z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal" color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+    <path d="M4 10v1h8v-1z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/window-new-symbolic.svg b/src/other/firefox/common/icons/window-new-symbolic.svg
index ac5d4f4b..47dbc065 100644
--- a/src/other/firefox/common/icons/window-new-symbolic.svg
+++ b/src/other/firefox/common/icons/window-new-symbolic.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h5.7617a4.5 4.5 0 0 1-0.49805-1h-5.2637c-0.554 0-1-0.446-1-1v-8c0-0.554 0.446-1 1-1h10c0.554 0 1 0.446 1 1v3.2637a4.5 4.5 0 0 1 1 0.49609v-5.7598c0-1.108-0.892-2-2-2h-10z" fill="#363636"/>
- <path d="m12.5 9c-1.933 0-3.5 1.567-3.5 3.5s1.567 3.5 3.5 3.5 3.5-1.567 3.5-3.5-1.567-3.5-3.5-3.5zm-0.5 1h1v2h2v1h-2v2h-1v-2h-2v-1h2z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h5.7617a4.5 4.5 0 0 1-0.49805-1h-5.2637c-0.554 0-1-0.446-1-1v-8c0-0.554 0.446-1 1-1h10c0.554 0 1 0.446 1 1v3.2637a4.5 4.5 0 0 1 1 0.49609v-5.7598c0-1.108-0.892-2-2-2h-10z"/>
+ <path d="m12.5 9c-1.933 0-3.5 1.567-3.5 3.5s1.567 3.5 3.5 3.5 3.5-1.567 3.5-3.5-1.567-3.5-3.5-3.5zm-0.5 1h1v2h2v1h-2v2h-1v-2h-2v-1h2z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/window-restore-symbolic.svg b/src/other/firefox/common/icons/window-restore-symbolic.svg
index 03be1d94..8d56314c 100644
--- a/src/other/firefox/common/icons/window-restore-symbolic.svg
+++ b/src/other/firefox/common/icons/window-restore-symbolic.svg
@@ -1,5 +1,3 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <title>Gnome Symbolic Icons</title>
- <path d="m4 6v6h6v-6zm1 1h4v4h-4z" color="#000000" color-rendering="auto" dominant-baseline="auto" enable-background="accumulate" fill="#363636" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
- <path d="m6 4v1h5v5h1v-6z" color="#000000" color-rendering="auto" dominant-baseline="auto" enable-background="accumulate" fill="#363636" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m4 6v6h6v-6zm1 1h4v4h-4z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/zoom-in-symbolic.svg b/src/other/firefox/common/icons/zoom-in-symbolic.svg
index 473ed972..7df06505 100644
--- a/src/other/firefox/common/icons/zoom-in-symbolic.svg
+++ b/src/other/firefox/common/icons/zoom-in-symbolic.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m7 5v3h-3v1h3v3h1v-3h3v-1h-3v-3z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.1851"/>
- <path d="M 7.4628906,1 A 7.5,7.5 0 0 0 0,8.5 7.5,7.5 0 0 0 7.5,16 7.5,7.5 0 0 0 15,8.5 7.5,7.5 0 0 0 7.5,1 7.5,7.5 0 0 0 7.4628906,1 Z M 7.5,2 A 6.5,6.5 0 0 1 14,8.5 6.5,6.5 0 0 1 7.5,15 6.5,6.5 0 0 1 1,8.5 6.5,6.5 0 0 1 7.5,2 Z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.0016"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m7 5v3h-3v1h3v3h1v-3h3v-1h-3v-3z"/>
+ <path d="M 7.4628906,1 A 7.5,7.5 0 0 0 0,8.5 7.5,7.5 0 0 0 7.5,16 7.5,7.5 0 0 0 15,8.5 7.5,7.5 0 0 0 7.5,1 7.5,7.5 0 0 0 7.4628906,1 Z M 7.5,2 A 6.5,6.5 0 0 1 14,8.5 6.5,6.5 0 0 1 7.5,15 6.5,6.5 0 0 1 1,8.5 6.5,6.5 0 0 1 7.5,2 Z"/>
 </svg>
diff --git a/src/other/firefox/common/icons/zoom-out-symbolic.svg b/src/other/firefox/common/icons/zoom-out-symbolic.svg
index adc86051..85310f18 100644
--- a/src/other/firefox/common/icons/zoom-out-symbolic.svg
+++ b/src/other/firefox/common/icons/zoom-out-symbolic.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m7.4629 1a7.5 7.5 0 0 0-7.4629 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0-7.5-7.5 7.5 7.5 0 0 0-0.037109 0zm0.037109 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1-6.5 6.5 6.5 6.5 0 0 1-6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.0016"/>
- <path d="m4 8h7v1h-7z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.0016"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m7.4629 1a7.5 7.5 0 0 0-7.4629 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0-7.5-7.5 7.5 7.5 0 0 0-0.037109 0zm0.037109 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1-6.5 6.5 6.5 6.5 0 0 1-6.5-6.5 6.5 6.5 0 0 1 6.5-6.5z"/>
+ <path d="m4 8h7v1h-7z"/>
 </svg>
diff --git a/src/other/firefox/common/parts/custom-icons.css b/src/other/firefox/common/parts/custom-icons.css
deleted file mode 100644
index e6b8de2f..00000000
--- a/src/other/firefox/common/parts/custom-icons.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Replace icons */
-
-@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-
-/* Back button */
-#nav-bar #back-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/go-previous-symbolic?size=dialog") !important;;
-}
-
-/* Forward button */
-#nav-bar #forward-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/go-next-symbolic?size=dialog") !important;
-}
-
-/* Popovers subview menu arrow */
-.PanelUI-subView .subviewbutton-nav::after {
-	content: "" !important;
-	filter: var(--gnome-icons-hack-filter);
-	background: url("moz-icon://stock/pan-start-symbolic?size=dialog");
-	background-size: contain;
-	height: 16px;
-	width: 16px;
-	margin-top: -2px !important;
-}
-
-/* Popovers subview back button */
-.subviewbutton-back {
-	list-style-image: url("moz-icon://stock/pan-start-symbolic?size=dialog") !important;
-}
-.subviewbutton-back .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-}
diff --git a/src/other/firefox/common/parts/headerbar.css b/src/other/firefox/common/parts/headerbar.css
index 01d9bc5c..27397c5c 100644
--- a/src/other/firefox/common/parts/headerbar.css
+++ b/src/other/firefox/common/parts/headerbar.css
@@ -23,14 +23,12 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 	background: none !important;
 	-moz-appearance: none !important;
 	border-radius: 8px !important;
-	margin: 8px 2px !important;
-	padding: 0 10px !important;
+	margin: 0 2px !important;
+	padding: 0 4px !important;
 	max-height: 32px !important;
 	min-height: 32px !important;
 	min-width: 32px !important;
-	color: var(--gnome-toolbar-color) !important;
 	transition: background 200ms;
-	--toolbarbutton-inner-padding: 0 !important;
 }
 
 :root:-moz-window-inactive #nav-bar toolbarbutton:not(#urlbar-zoom-button) {
@@ -80,26 +78,6 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 	border-color: var(--gnome-inactive-button-border-color) !important;
 }
 
-/* Buttons with margins */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button) {
-	margin: 0 2px !important;
-}
-
-#nav-bar #back-button:not(#hack),
-#nav-bar #forward-button:not(#hack) {
-	padding: 0 4px !important;
-	width: 34px !important;
-	min-width: 34px !important;
-}
-
-#nav-bar #forward-button:not(#hack) {
-	margin-left: 0 !important;
-}
-
-#nav-bar #back-button:not(#hack) {
-	margin-right: 1px !important;
-}
-
 /* Headerbar entries */
 #nav-bar #searchbar,
 #urlbar #urlbar-input-container,
diff --git a/src/other/firefox/common/parts/icons.css b/src/other/firefox/common/parts/icons.css
index 08f01a46..d4cdcbfc 100644
--- a/src/other/firefox/common/parts/icons.css
+++ b/src/other/firefox/common/parts/icons.css
@@ -8,6 +8,62 @@
   }
 }
 
+/* Icons color */
+.toolbarbutton-icon:not([class*="identity-color-"] .toolbarbutton-icon),
+menuitem:not([class*='identity']) .menu-iconic-left .menu-iconic-icon,
+.urlbar-page-action:not([readeractive]),
+.urlbar-icon,
+#blocked-permissions-container > .blocked-permission-icon,
+.button-icon:not(#hack),
+.bookmark-item[container],
+.notification-anchor-icon,
+.protections-popup-category::after,
+.protections-popup-footer-icon,
+#identity-popup-mainView .subviewbutton-nav::after,
+.widget-overflow-list .subviewbutton-nav::after,
+.PanelUI-subView .subviewbutton-nav::after,
+#identity-popup[connection^="secure"] .identity-popup-security-connection,
+.panel-info-button > image,
+.menu-right,
+.expander-down > .button-box,
+#sidebar-switcher-arrow,
+#sidebar-icon,
+#viewButton .button-menu-dropmarker,
+.menulist-label-box:after,
+.expander-up > .button-box,
+#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] > #identity-icon,
+.searchbar-search-icon,
+.textbox-search-sign,
+treechildren::-moz-tree-twisty,
+treechildren::-moz-tree-image,
+.item.client .item-twisty-container,
+menuitem[type="checkbox"],
+menuitem[type="checkbox"][checked="true"],
+menuitem[type="radio"],
+menuitem[type="radio"][checked="true"],
+.tab-icon-overlay,
+.tab-throbber::before,
+.tab-icon-stack::before,
+.close-icon:not(.tab-close-button),
+button.close::before,
+#urlbar-search-mode-indicator-close,
+#tracking-protection-icon,
+#identity-icon,
+#permissions-granted-icon,
+#downloads-indicator-icon,
+.textbox-search-clear,
+.urlbarView-type-icon,
+radio > .radio-check,
+link[href="chrome://global/skin/dropmarker.css"] + image {
+	fill: var(--gnome-toolbar-icon-fill) !important;
+	-moz-context-properties: fill;
+}
+.urlbar-icon:-moz-window-inactive,
+#urlbar:-moz-window-inactive image,
+.toolbarbutton-icon:-moz-window-inactive {
+	opacity: 0.5 !important;
+}
+
 /* Cursors autoscroller fix */
 .autoscroller {
 	--panel-background: transparent !important;
@@ -135,7 +191,7 @@ treechildren::-moz-tree-twisty {
 	background-image: url("../icons/pan-down-symbolic.svg") !important;
 }
 treechildren::-moz-tree-twisty(selected, focus, open) {
-	list-style-image: url("../icons/pan-down-symbolic-light.svg") !important;
+	list-style-image: url("../icons/pan-down-symbolic.svg") !important;
 }
 treechildren::-moz-tree-image(title, container),
 treechildren::-moz-tree-image(title, open) {
@@ -147,10 +203,10 @@ treechildren::-moz-tree-image(query, OrganizerQuery_history____v) {
 }
 
 .sidebar-panel[lwt-sidebar-brighttext] .sidebar-placesTreechildren::-moz-tree-twisty {
-	list-style-image: url("../icons/pan-end-symbolic-light.svg") !important;
+	list-style-image: url("../icons/pan-end-symbolic.svg") !important;
 }
 .sidebar-panel[lwt-sidebar-brighttext] .sidebar-placesTreechildren::-moz-tree-twisty(open) {
-	list-style-image: url("../icons/pan-down-symbolic-light.svg") !important;
+	list-style-image: url("../icons/pan-down-symbolic.svg") !important;
 }
 /* Sidebar: History: clock icon */
 #historyTree treechildren::-moz-tree-image {
@@ -239,12 +295,12 @@ menu[disabled] > .menu-right {
 	list-style-image: url("../icons/toggle-right-sidebar-symbolic.svg");
 }
 /* Back button */
-#nav-bar #back-button .toolbarbutton-icon,
+#back-button,
 #context-back {
 	list-style-image: url("../icons/go-previous-symbolic.svg") !important;
 }
 /* Forward button */
-#nav-bar #forward-button .toolbarbutton-icon,
+#forward-button,
 #context-forward,
 #urlbar-go-button,
 .search-go-button {
@@ -518,14 +574,10 @@ menu[disabled] > .menu-right {
 toolbarbutton#easyscreenshot_mozillaonline_com-BAP {
 	--webextension-menupanel-image: url("../icons/screenshot-symbolic.svg") !important;
 	--webextension-menupanel-image-2x: url("../icons/screenshot-symbolic.svg") !important;
-	--webextension-menupanel-image-light: url("../icons/screenshot-symbolic-light.svg") !important;
-	--webextension-menupanel-image-2x-light: url("../icons/screenshot-symbolic-light.svg") !important;
 	--webextension-menupanel-image-dark: url("../icons/screenshot-symbolic.svg") !important;
 	--webextension-menupanel-image-2x-dark: url("../icons/screenshot-symbolic.svg") !important;
 	--webextension-toolbar-image: url("../icons/screenshot-symbolic.svg") !important;
 	--webextension-toolbar-image-2x: url("../icons/screenshot-symbolic.svg") !important;
-	--webextension-toolbar-image-light: url("../icons/screenshot-symbolic-light.svg") !important;
-	--webextension-toolbar-image-2x-light: url("../icons/screenshot-symbolic-light.svg") !important;
 	--webextension-toolbar-image-dark: url("../icons/screenshot-symbolic.svg") !important;
 	--webextension-toolbar-image-2x-dark: url("../icons/screenshot-symbolic.svg") !important;
 }
@@ -533,14 +585,10 @@ toolbarbutton#easyscreenshot_mozillaonline_com-BAP {
 toolbarbutton#cpmanager_mozillaonline_com-BAP {
 	--webextension-menupanel-image: url("../icons/tab-restore-symbolic.svg") !important;
 	--webextension-menupanel-image-2x: url("../icons/tab-restore-symbolic.svg") !important;
-	--webextension-menupanel-image-light: url("../icons/tab-restore-symbolic-light.svg") !important;
-	--webextension-menupanel-image-2x-light: url("../icons/tab-restore-symbolic-light.svg") !important;
 	--webextension-menupanel-image-dark: url("../icons/tab-restore-symbolic.svg") !important;
 	--webextension-menupanel-image-2x-dark: url("../icons/tab-restore-symbolic.svg") !important;
 	--webextension-toolbar-image: url("../icons/tab-restore-symbolic.svg") !important;
 	--webextension-toolbar-image-2x: url("../icons/tab-restore-symbolic.svg") !important;
-	--webextension-toolbar-image-light: url("../icons/tab-restore-symbolic-light.svg") !important;
-	--webextension-toolbar-image-2x-light: url("../icons/tab-restore-symbolic-light.svg") !important;
 	--webextension-toolbar-image-dark: url("../icons/tab-restore-symbolic.svg") !important;
 	--webextension-toolbar-image-2x-dark: url("../icons/tab-restore-symbolic.svg") !important;
 }
@@ -652,215 +700,3 @@ treechildren::-moz-tree-image {
 	padding-inline: 0 !important;
 }
 
-/* Invert icons color in dark variant */
-@media (prefers-color-scheme: dark) {
-	.PanelUI-subView .subviewbutton-nav::after,
-	.protections-popup-category::after,
-	.identity-popup-content-blocking-category::after,
-	#identity-popup-security-expander .button-icon,
-	.subviewbutton-back .toolbarbutton-icon,
-
-	.menu-right,
-
-	#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon,
-	#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] #identity-icon,
-	.searchbar-search-icon,
-	#search-box .textbox-search-sign,
-
-	.menulist-label-box:after,
-	.expander-down image,
-	.expander-up image,
-	#sidebar-switcher-arrow,
-	#viewButton .button-menu-dropmarker,
-
-	menuitem[type="checkbox"] .menu-iconic-icon,
-	menuitem[type="radio"] .menu-iconic-icon,
-
-	.close-icon:not(.tab-close-button) image,
-	.identity-popup-permission-remove-button .button-icon,
-
-	:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon,
-	:root[tabsintitlebar] #titlebar #titlebar-close .toolbarbutton-icon,
-	:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-max .toolbarbutton-icon,
-	:root[tabsintitlebar] #titlebar #titlebar-max .toolbarbutton-icon,
-	:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min .toolbarbutton-icon,
-	:root[tabsintitlebar] #titlebar #titlebar-min .toolbarbutton-icon,
-	:root[tabsintitlebar][inFullscreen] #window-controls #restore-button .toolbarbutton-icon,
-
-	.popup-notification-icon[popupid="web-notifications"], .desktop-notification-icon,
-
-	#import-button .toolbarbutton-icon,
-	#panic-button .toolbarbutton-icon,
-	#open-file-button .toolbarbutton-icon,
-	#save-page-button .toolbarbutton-icon,
-	#characterencoding-button .toolbarbutton-icon,
-	#library-button .toolbarbutton-icon,
-	#privatebrowsing-button .toolbarbutton-icon,
-	#sidebar-button:-moz-locale-dir(ltr):not([positionend]) .toolbarbutton-icon,
-	#sidebar-button:-moz-locale-dir(rtl)[positionend] .toolbarbutton-icon,
-	#sidebar-button .toolbarbutton-icon,
-	#nav-bar #back-button .toolbarbutton-icon,
-	#context-back .menu-iconic-icon,
-	#nav-bar #forward-button .toolbarbutton-icon,
-	#context-forward .menu-iconic-icon,
-	#PanelUI-menu-button .toolbarbutton-icon,
-	#new-tab-button .toolbarbutton-icon,
-	.tabs-newtab-button .toolbarbutton-icon,
-	#tabs-newtab-button .toolbarbutton-icon,
-	#TabsToolbar .toolbarbutton-icon,
-	#home-button .toolbarbutton-icon,
-	#preferences-button .toolbarbutton-icon,
-	#fullscreen-button .toolbarbutton-icon,
-	#appMenu-fullscreen-button .toolbarbutton-icon,
-	#zoom-out-button .toolbarbutton-icon,
-	#appMenu-zoomReduce-button .toolbarbutton-icon,
-	#zoom-in-button .toolbarbutton-icon,
-	#appMenu-zoomEnlarge-button .toolbarbutton-icon,
-	#developer-button .toolbarbutton-icon,
-	#email-link-button .toolbarbutton-icon,
-	#print-button .toolbarbutton-icon,
-	#add-ons-button .toolbarbutton-icon,
-	#unified-extensions-button .toolbarbutton-icon,
-	#find-button .toolbarbutton-icon,
-	#bookmarks-menu-button .toolbarbutton-icon,
-	#history-panelmenu .toolbarbutton-icon,
-	#alltabs-button .toolbarbutton-icon,
-	#cut-button .toolbarbutton-icon,
-	#appMenu-cut-button .toolbarbutton-icon,
-	#copy-button .toolbarbutton-icon,
-	#appMenu-copy-button .toolbarbutton-icon,
-	#paste-button .toolbarbutton-icon,
-	#appMenu-paste-button .toolbarbutton-icon,
-	#nav-bar-overflow-button .toolbarbutton-icon,
-	#reload-button .toolbarbutton-icon,
-	.downloadIconRetry > .button-box > .button-icon,
-	#context-reload .menu-iconic-icon,
-	#stop-button .toolbarbutton-icon,
-	.downloadIconCancel > .button-box > .button-icon,
-	#context-stop .menu-iconic-icon,
-	#sync-button .toolbarbutton-icon,
-	#new-window-button .toolbarbutton-icon,
-	#mozcn-mobile-bookmarks-button .toolbarbutton-icon,
-	#bookmarks-toolbar-button .toolbarbutton-icon,
-	#bookmarks-toolbar-placeholder .toolbarbutton-icon,
-	#screenshot-button .toolbarbutton-icon,
-	#scrollbutton-up .toolbarbutton-icon,
-	#scrollbutton-down .toolbarbutton-icon,
-	#downloads-button .toolbarbutton-icon,
-	#downloads-indicator-anchor,
-	#tracking-protection-icon,
-	#pageActionButton,
-	#permissions-granted-icon,
-	#tracking-protection-icon-animatable-image,
-	#reader-mode-button > .urlbar-icon,
-	#picture-in-picture-button > .urlbar-icon,
-	.persistent-storage-icon,
-	#star-button:not([starred]),
-	#context-bookmarkpage:not([starred]) .menu-iconic-icon,
-	#geo-sharing-icon[sharing], .geo-icon,
-	.blocked-permission-icon.popup-icon,
-	#webrtc-sharing-icon[sharing="screen"],
-	.screen-icon,
-	.screen-icon.blocked-permission-icon,
-	#webrtc-sharing-icon[sharing="microphone"],
-	.microphone-icon,
-	.plugin-icon, .autoplay-media-icon,
-	.popup-notification-icon[popupid="drmContentPlaying"], .drm-icon,
-	#identity-box[pageproxystate="valid"].verifiedDomain #identity-icon,
-	#identity-box[pageproxystate="valid"].mixedActiveBlocked #identity-icon,
-	#identity-box[pageproxystate="valid"].weakCipher #identity-icon,
-	#identity-box[pageproxystate="valid"].mixedDisplayContent #identity-icon,
-	#identity-box[pageproxystate="valid"].mixedDisplayContentLoadedActiveBlocked #identity-icon,
-	#identity-box[pageproxystate="valid"].certUserOverridden #identity-icon,
-	#identity-box[pageproxystate="valid"].certErrorPage #identity-icon,
-	#identity-box[pageproxystate="valid"].notSecure #identity-icon,
-	#identity-box[pageproxystate="valid"].mixedActiveContent #identity-icon,
-	#identity-box[pageproxystate="valid"].httpsOnlyErrorPage #identity-icon,
-	#identity-box[pageproxystate="valid"].localResource #identity-icon,
-	.bookmark-item[container] .toolbarbutton-icon,
-	.menu-iconic.bookmark-item[container] .menu-iconic-icon,
-	.panel-info-button > image,
-	#password-notification-icon,
-	#firefox-view-button .toolbarbutton-icon,
-	#profiler-button-button > .toolbarbutton-icon {
-		filter: invert(60%) brightness(150%);
-	}
-
-	.tab-icon-overlay[activemedia-blocked] {
-		list-style-image: url("../icons/tab-audio-blocked-small-light.svg") !important;
-	}
-
-	.tab-icon-overlay[soundplaying] {
-		list-style-image: url("../icons/audio-playing-symbolic-light.svg") !important;
-	}
-
-	.tab-icon-overlay[muted] {
-		list-style-image: url("../icons/audio-muted-symbolic-light.svg") !important;
-	}
-
-	#urlbar-go-button,
-	search-go-button {
-		list-style-image: url("../icons/go-next-symbolic-light.svg") !important;
-	}
-
-	#save-to-pocket-button,
-	#pocket-button, #pageAction-panel-pocket {
-		list-style-image: url("../icons/save-to-pocket-light.svg") !important;
-	}
-
-	#save-to-pocket-button[open="true"], #save-to-pocket-button[pocketed="true"] {
-		list-style-image: url("../icons/save-to-pocket-open-light.svg") !important;
-	}
-
-	#mo-url2qr-icon {
-		list-style-image: url("../icons/url2qr-icon-light.svg") !important;
-	}
-
-	/* Tree views */
-	treechildren::-moz-tree-twisty,
-	.item.client .item-twisty-container {
-		list-style-image: url("../icons/pan-end-symbolic-light.svg") !important;
-		width: 16px !important;
-		height: 16px !important;
-	}
-	.item.client .item-twisty-container {
-		background-image: url("../icons/pan-end-symbolic-light.svg") !important;
-	}
-	treechildren::-moz-tree-twisty(open) {
-		list-style-image: url("../icons/pan-down-symbolic-light.svg") !important;
-	}
-	.item.client.closed .item-twisty-container {
-		background-image: url("../icons/pan-down-symbolic-light.svg") !important;
-	}
-
-	treechildren::-moz-tree-image(title, container),
-	treechildren::-moz-tree-image(title, open) {
-		list-style-image: url("../icons/folder-symbolic-light.svg") !important;
-	}
-	treechildren::-moz-tree-image(title, query, dayContainer),
-	treechildren::-moz-tree-image(query, OrganizerQuery_history____v) {
-		list-style-image: url("../icons/preferences-system-time-symbolic-light.svg") !important;
-	}
-
-	.tabbrowser-tab[image="chrome://global/skin/icons/info.svg"]:not([busy]):not([progress]):not([crashed]) .tab-icon-stack > .tab-icon-image {
-		list-style-image: url("../icons/info-symbolic-light.svg") !important;
-	}
-
-	#sidebar-box[sidebarcommand="viewTabsSidebar"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon,
-	.urlbarView-row[source="tabs"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon,
-	#urlbar-engine-one-off-item-tabs {
-		list-style-image: url("../icons/tab-sync-symbolic-light.svg") !important;
-	}
-
-	#sidebar-box[sidebarcommand="viewHistorySidebar"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon,
-	.urlbarView-row[source="history"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon,
-	#urlbar-engine-one-off-item-history {
-		list-style-image: url("../icons/preferences-system-time-symbolic-light.svg") !important;
-	}
-
-	/* Fix for extensions icons */
-	.webextension-browser-action {
-		list-style-image: var(--webextension-menupanel-image-light, inherit) !important;
-	}
-}
-