diff --git a/src/other/firefox/Monterey/colors/dark.css b/src/other/firefox/Monterey/colors/dark.css
index 9fb379d4..809f8fad 100644
--- a/src/other/firefox/Monterey/colors/dark.css
+++ b/src/other/firefox/Monterey/colors/dark.css
@@ -119,14 +119,14 @@
 	--gnome-switch-hover-background: #525252;
 	--gnome-switch-active-background: #606060;
 	--gnome-switch-border-color: transparent;
-	--gnome-switch-slider-background: linear-gradient(to bottom, #3c3c3c 20%, #353535 90%);
-	--gnome-switch-slider-border-color: #111111;
+	--gnome-switch-slider-background: #ffffff;
+	--gnome-switch-slider-border-color: transparent;
 	--gnome-switch-slider-box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-switch-pressed-background: #315bef;
 	--gnome-switch-pressed-hover-background: #5073f1;
 	--gnome-switch-pressed-active-background: #6584f3;
-	--gnome-switch-active-border-color: #030c17;
-	--gnome-switch-active-slider-border-color: #030c17;
+	--gnome-switch-active-border-color: transparent;
+	--gnome-switch-active-slider-border-color: transparent;
 
 	/* Dirty hacks for replaced symbolic icons, they load from
 	 * /usr/share/icons/<theme>/ and on some systems they need to be
diff --git a/src/other/firefox/Monterey/colors/light.css b/src/other/firefox/Monterey/colors/light.css
index 9d3f18ee..081d66f7 100644
--- a/src/other/firefox/Monterey/colors/light.css
+++ b/src/other/firefox/Monterey/colors/light.css
@@ -118,11 +118,11 @@
 	--gnome-switch-hover-background: #a0a0a0;
 	--gnome-switch-active-background: #929292;
 	--gnome-switch-border-color: transparent;
-	--gnome-switch-slider-background: linear-gradient(to bottom, white 10%, white 90%);
-	--gnome-switch-slider-border-color: #b8b8b8;
+	--gnome-switch-slider-background: #ffffff;
+	--gnome-switch-slider-border-color: transparent;
 	--gnome-switch-slider-box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
-	--gnome-switch-active-border-color: #185fb4;
-	--gnome-switch-active-slider-border-color: #185fb4;
+	--gnome-switch-active-border-color: transparent;
+	--gnome-switch-active-slider-border-color: transparent;
 	--gnome-switch-pressed-background: #315bef;
 	--gnome-switch-pressed-hover-background: #5073f1;
 	--gnome-switch-pressed-active-background: #6584f3;
diff --git a/src/other/firefox/Monterey/parts/tabsbar-alt.css b/src/other/firefox/Monterey/parts/tabsbar-alt.css
index c23c2d54..8ea016ac 100644
--- a/src/other/firefox/Monterey/parts/tabsbar-alt.css
+++ b/src/other/firefox/Monterey/parts/tabsbar-alt.css
@@ -7,19 +7,19 @@
 }
 
 /* Fix tabs bar icon sizes */
-#TabsToolbar {
-	padding: 0 0 6px 0 !important;
+#TabsToolbar tab {
+	margin-bottom: 6px !important;
 }
 
 /* Tabs bar height */
 #tabbrowser-tabs,
 #tabbrowser-tabs arrowscrollbox {
-	height: 36px !important;
 	min-height: 36px !important;
 	--tab-min-height: 36px !important;
 }
 
 .tab-background, .tab-stack {
+	height: 36px !important;
 	min-height: 36px !important;
 }
 
diff --git a/src/other/firefox/WhiteSur/colors/dark.css b/src/other/firefox/WhiteSur/colors/dark.css
index 4af61bd8..f174542d 100644
--- a/src/other/firefox/WhiteSur/colors/dark.css
+++ b/src/other/firefox/WhiteSur/colors/dark.css
@@ -118,14 +118,14 @@
 	--gnome-switch-hover-background: #525252;
 	--gnome-switch-active-background: #606060;
 	--gnome-switch-border-color: transparent;
-	--gnome-switch-slider-background: linear-gradient(to bottom, #3c3c3c 20%, #353535 90%);
-	--gnome-switch-slider-border-color: #111111;
+	--gnome-switch-slider-background: #ffffff;
+	--gnome-switch-slider-border-color: transparent;
 	--gnome-switch-slider-box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-switch-pressed-background: #315bef;
 	--gnome-switch-pressed-hover-background: #5073f1;
 	--gnome-switch-pressed-active-background: #6584f3;
-	--gnome-switch-active-border-color: #030c17;
-	--gnome-switch-active-slider-border-color: #030c17;
+	--gnome-switch-active-border-color: transparent;
+	--gnome-switch-active-slider-border-color: transparent;
 
 	/* Dirty hacks for replaced symbolic icons, they load from
 	 * /usr/share/icons/<theme>/ and on some systems they need to be
diff --git a/src/other/firefox/WhiteSur/colors/light.css b/src/other/firefox/WhiteSur/colors/light.css
index b462af41..36a43d0d 100644
--- a/src/other/firefox/WhiteSur/colors/light.css
+++ b/src/other/firefox/WhiteSur/colors/light.css
@@ -116,11 +116,11 @@
 	--gnome-switch-hover-background: #a0a0a0;
 	--gnome-switch-active-background: #929292;
 	--gnome-switch-border-color: transparent;
-	--gnome-switch-slider-background: linear-gradient(to bottom, white 10%, white 90%);
-	--gnome-switch-slider-border-color: #b8b8b8;
+	--gnome-switch-slider-background: #ffffff;
+	--gnome-switch-slider-border-color: transparent;
 	--gnome-switch-slider-box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
-	--gnome-switch-active-border-color: #185fb4;
-	--gnome-switch-active-slider-border-color: #185fb4;
+	--gnome-switch-active-border-color: transparent;
+	--gnome-switch-active-slider-border-color: transparent;
 	--gnome-switch-pressed-background: #315bef;
 	--gnome-switch-pressed-hover-background: #5073f1;
 	--gnome-switch-pressed-active-background: #6584f3;
diff --git a/src/other/firefox/common/hide-single-tab.css b/src/other/firefox/common/hide-single-tab.css
index eaad1a57..91eac011 100644
--- a/src/other/firefox/common/hide-single-tab.css
+++ b/src/other/firefox/common/hide-single-tab.css
@@ -1,9 +1,5 @@
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#tabbrowser-tabs {
-	--tab-min-height: 0 !important;
-}
-
 #tabbrowser-tabs tab:only-of-type,
 #TabsToolbar #alltabs-button {
 	display: none !important;
@@ -12,3 +8,9 @@
 .tab-background, .tab-stack {
 	min-height: 0 !important;
 }
+
+#tabbrowser-tabs,
+#tabbrowser-tabs arrowscrollbox {
+	min-height: 0 !important;
+	--tab-min-height: 0 !important;
+}
diff --git a/src/other/firefox/common/pages/common.css b/src/other/firefox/common/pages/common.css
new file mode 100644
index 00000000..8ec21120
--- /dev/null
+++ b/src/other/firefox/common/pages/common.css
@@ -0,0 +1,44 @@
+@media (prefers-color-scheme: dark) {
+  :host,
+  :root {
+    --in-content-page-background: rgb(29,29,29) !important;
+    --in-content-page-color: rgb(253,253,253) !important;
+
+    --in-content-box-background: rgb(36, 36, 36) !important;
+    --in-content-box-background-odd: rgba(250,250,250,0.05) !important;
+    --in-content-box-info-background: rgba(250,250,250,0.15) !important;
+
+    --in-content-border-color: rgba(250,250,250,0.2) !important;
+    --in-content-border-hover: rgba(250,250,250,0.3) !important;
+
+    --in-content-icon-color: rgb(252,252,252) !important;
+
+    --in-content-primary-button-text-color: rgb(255,255,255) !important;
+    --in-content-primary-button-background: var(--theme-primary-color) !important;
+    --in-content-primary-button-background-hover: var(--theme-primary-hover-color) !important;
+    --in-content-primary-button-background-active: var(--theme-primary-active-color) !important;
+
+    --in-content-table-background: rgb(35, 35, 35) !important;
+
+    scrollbar-color: rgba(250,250,250,.4) rgba(22,22,22,.3) !important;
+  }
+
+  @media not (prefers-contrast) {
+    :root[dialogroot],
+    :host(dialog) {
+      --in-content-page-background: #424242 !important;
+    }
+  }
+}
+
+.toggle-button {
+  --toggle-background-color: var(--gnome-switch-background) !important;
+  --toggle-background-color-hover: var(--gnome-switch-hover-background) !important;
+  --toggle-background-color-active: var(--gnome-switch-active-background) !important;
+  --toggle-background-color-pressed: var(--gnome-switch-pressed-background) !important;
+  --toggle-background-color-pressed-hover: var(--gnome-switch-pressed-hover-background) !important;
+  --toggle-background-color-pressed-active: var(--gnome-switch-pressed-active-background) !important;
+  --toggle-border-color: var(--gnome-switch-border-color) !important;
+  --toggle-dot-background-color: var(--gnome-switch-slider-background) !important;
+  --toggle-dot-background-color-on-pressed: var(--gnome-switch-slider-background) !important;
+}