diff --git a/src/other/firefox/Monterey/colors/dark-adaptive.css b/src/other/firefox/Monterey/colors/dark-adaptive.css
index 944e881d..5cdd2a91 100644
--- a/src/other/firefox/Monterey/colors/dark-adaptive.css
+++ b/src/other/firefox/Monterey/colors/dark-adaptive.css
@@ -30,9 +30,9 @@
 	--gnome-inactive-toolbar-border-color: color-mix(in srgb, currentColor 10%, transparent);
 
 	/* Sidebar */
-	--gnome-sidebar-background: var(--lwt-accent-color, #282828);
-	--gnome-inactive-sidebar-background: var(--lwt-accent-color, #282828);
-	--gnome-sidebar-border-color: color-mix(in srgb, var(--toolbar-color) 10%, var(--gnome-sidebar-background));
+	--gnome-sidebar-background: var(--lwt-sidebar-background-color, #282828);
+	--gnome-inactive-sidebar-background: var(--lwt-sidebar-background-color, #282828);
+	--gnome-sidebar-border-color: color-mix(in srgb, var(--lwt-text-color) 12%, var(--lwt-sidebar-background-color));
 
 	/* Popups */
 	--gnome-menu-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
@@ -53,18 +53,21 @@
 	--gnome-inactive-headerbar-box-shadow: color-mix(in srgb, currentColor 8%, transparent);
 
 	/* Buttons */
-	--gnome-button-background: color-mix(in srgb, #ffffff 15%, var(--toolbar-field-background-color));
+	--button-background-color: color-mix(in srgb, #ffffff 15%, var(--toolbar-field-background-color));
+	--button-background-hover-color: color-mix(in srgb, #ffffff 25%, var(--toolbar-field-background-color));
+	--button-background-active-color: color-mix(in srgb, #ffffff 35%, var(--toolbar-field-background-color));
+	--button-background-disabled-color: color-mix(in srgb, #ffffff 8%, var(--toolbar-field-background-color));
+
+	--gnome-button-background: linear-gradient(to top, var(--button-background-color) 0%, var(--button-background-color) 100%);
 	--gnome-button-border-color: color-mix(in srgb, #000000 35%, var(--toolbar-field-background-color));
 	--gnome-button-border-bottom-color: color-mix(in srgb, #000000 45%, var(--toolbar-field-background-color));
 	--gnome-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-	--gnome-button-hover-color: color-mix(in srgb, currentColor 10%, transparent);
-	--gnome-button-active-color: color-mix(in srgb, currentColor 20%, transparent);
-	--gnome-button-hover-background: color-mix(in srgb, #ffffff 25%, var(--toolbar-field-background-color));
-	--gnome-button-active-background: color-mix(in srgb, #ffffff 35%, var(--toolbar-field-background-color));
+	--gnome-button-hover-background: linear-gradient(to top, var(--button-background-hover-color) 0%, var(--button-background-hover-color) 100%);
+	--gnome-button-active-background: linear-gradient(to top, var(--button-background-active-color) 0%, var(--button-background-active-color) 100%);
 	--gnome-button-active-border-color: color-mix(in srgb, #000000 35%, var(--toolbar-field-background-color));
 	--gnome-button-active-bottom-border-color: color-mix(in srgb, #000000 45%, var(--toolbar-field-background-color));
 	--gnome-button-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-	--gnome-button-disabled-background: color-mix(in srgb, #ffffff 5%, var(--toolbar-field-background-color));
+	--gnome-button-disabled-background: linear-gradient(to top, var(--button-background-disabled-color) 0%, var(--button-background-disabled-color) 100%);
 	--gnome-button-disabled-border-color: color-mix(in srgb, #000000 35%, var(--toolbar-field-background-color));
 	--gnome-button-disabled-box-shadow: inset 0 1px rgba(255, 255, 255, 0.03);
 	--gnome-inactive-button-background: color-mix(in srgb, #ffffff 5%, var(--toolbar-field-background-color));
@@ -87,6 +90,8 @@
 	--gnome-button-destructive-action-active-border-color: #851015;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 
+	--gnome-button-hover-color: color-mix(in srgb, currentColor 10%, transparent);
+	--gnome-button-active-color: color-mix(in srgb, currentColor 20%, transparent);
 	--gnome-headerbar-button-combined-background: color-mix(in srgb, currentColor 6%, transparent);
 	--gnome-headerbar-button-hover-background: color-mix(in srgb, currentColor 12%, transparent);
 	--gnome-headerbar-button-active-background: color-mix(in srgb, currentColor 18%, transparent);
diff --git a/src/other/firefox/WhiteSur/colors/dark-adaptive.css b/src/other/firefox/WhiteSur/colors/dark-adaptive.css
index 149151b5..9fe5553d 100644
--- a/src/other/firefox/WhiteSur/colors/dark-adaptive.css
+++ b/src/other/firefox/WhiteSur/colors/dark-adaptive.css
@@ -52,7 +52,7 @@
 	--gnome-inactive-headerbar-box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
 
 	/* Buttons */
-	--gnome-button-background: color-mix(in srgb, #ffffff 15%, var(--toolbar-field-background-color));
+	--gnome-button-background: image(color-mix(in srgb, #ffffff 15%, var(--toolbar-field-background-color)));
 	--gnome-button-border-color: color-mix(in srgb, #000000 35%, var(--toolbar-field-background-color));
 	--gnome-button-border-bottom-color: color-mix(in srgb, #000000 45%, var(--toolbar-field-background-color));
 	--gnome-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
diff --git a/src/other/firefox/common/parts/buttons-fixes.css b/src/other/firefox/common/parts/buttons-fixes.css
index 00b8705e..9b0a9fab 100644
--- a/src/other/firefox/common/parts/buttons-fixes.css
+++ b/src/other/firefox/common/parts/buttons-fixes.css
@@ -16,30 +16,6 @@
 	font-weight: 400 !important;
 }
 
-/* Overrides: Make the back button the same as other buttons */
-:root:not([uidensity=compact]) #back-button {
-	border-radius: var(--toolbarbutton-border-radius) !important;
-}
-:root:not([uidensity=compact]) #back-button > .toolbarbutton-icon {
-	background-color: unset !important;
-	border: unset !important;
-	width: calc(2 * var(--toolbarbutton-inner-padding) + 16px) !important;
-	height: calc(2 * var(--toolbarbutton-inner-padding) + 16px) !important;
-	padding: var(--toolbarbutton-inner-padding) !important;
-	border-radius: var(--toolbarbutton-border-radius);
-	box-shadow: none !important;
-}
-:root:not([uidensity=compact]) #back-button:not([disabled]):not([open]):hover > .toolbarbutton-icon {
-	background-color: var(--toolbarbutton-hover-background) !important;
-	box-shadow: unset;
-	border-color: unset;
-}
-:root:not([uidensity=compact]) #back-button[open] > .toolbarbutton-icon,
-:root:not([uidensity=compact]) #back-button:not([disabled]):hover:active > .toolbarbutton-icon {
-	background-color: var(--toolbarbutton-active-background) !important;
-	border-color: unset;
-}
-
 /* Glitch customizing: Cut / Copy / Paste buttons' icons
  * :not(#hack) is there just to elevate rule priority */
 :root[customizing] #nav-bar > hbox toolbaritem toolbarbutton image:not(#hack) {
diff --git a/src/other/firefox/common/parts/sidebar.css b/src/other/firefox/common/parts/sidebar.css
index 08c4b26f..627455e7 100644
--- a/src/other/firefox/common/parts/sidebar.css
+++ b/src/other/firefox/common/parts/sidebar.css
@@ -13,6 +13,7 @@
 
 .sidebar-splitter {
 	width: 1px !important;
-	background-color: var(--gnome-sidebar-border-color) !important;
+	background-color: var(--gnome-sidebar-border-color, var(--gnome-toolbar-background)) !important;
+	background-image: linear-gradient(to top, var(--sidebar-background-color) 0%, var(--sidebar-background-color) 100%);
 	border: none !important;
 }