diff --git a/src/other/firefox/Monterey/colors/dark-adaptive.css b/src/other/firefox/Monterey/colors/dark-adaptive.css
index 5cdd2a91..a099f62d 100644
--- a/src/other/firefox/Monterey/colors/dark-adaptive.css
+++ b/src/other/firefox/Monterey/colors/dark-adaptive.css
@@ -75,10 +75,10 @@
 	--gnome-inactive-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.0);
 	--gnome-button-suggested-action-background: linear-gradient(to top, #155099 2px, #15539e);
 	--gnome-button-suggested-action-border-color: #0f3b71;
-	--gnome-button-suggested-action-border-accent-color: #092444;
+	--gnome-button-suggested-action-border-accent-color: #092444;;
 	--gnome-button-suggested-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
 	--gnome-button-suggested-action-hover-background: linear-gradient(to top, #155099, #1655a2 1px);
-	--gnome-button-suggested-action-active-background: #103e75;
+	--gnome-button-suggested-action-active-background: linear-gradient(to top, #103e75, #103e75 1px);
 	--gnome-button-suggested-action-active-border-color: #0f3b71;
 	--gnome-button-suggested-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.05);
 	--gnome-button-destructive-action-background: linear-gradient(to top, #ae151c 2px, #b2161d);
@@ -86,7 +86,7 @@
 	--gnome-button-destructive-action-border-accent-color: #570b0e;
 	--gnome-button-destructive-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-button-destructive-action-hover-background: linear-gradient(to top, #ae151c, #b7161d 1px);
-	--gnome-button-destructive-action-active-background: #8a1116;
+	--gnome-button-destructive-action-active-background: linear-gradient(to top, #8a1116, #8a1116 1px);
 	--gnome-button-destructive-action-active-border-color: #851015;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 
diff --git a/src/other/firefox/Monterey/colors/dark.css b/src/other/firefox/Monterey/colors/dark.css
index f3a0c956..db91b785 100644
--- a/src/other/firefox/Monterey/colors/dark.css
+++ b/src/other/firefox/Monterey/colors/dark.css
@@ -71,7 +71,7 @@
 	--gnome-button-suggested-action-border-accent-color: #092444;;
 	--gnome-button-suggested-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
 	--gnome-button-suggested-action-hover-background: linear-gradient(to top, #155099, #1655a2 1px);
-	--gnome-button-suggested-action-active-background: #103e75;
+	--gnome-button-suggested-action-active-background: linear-gradient(to top, #103e75, #103e75 1px);
 	--gnome-button-suggested-action-active-border-color: #0f3b71;
 	--gnome-button-suggested-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.05);
 	--gnome-button-destructive-action-background: linear-gradient(to top, #ae151c 2px, #b2161d);
@@ -79,7 +79,7 @@
 	--gnome-button-destructive-action-border-accent-color: #570b0e;
 	--gnome-button-destructive-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-button-destructive-action-hover-background: linear-gradient(to top, #ae151c, #b7161d 1px);
-	--gnome-button-destructive-action-active-background: #8a1116;
+	--gnome-button-destructive-action-active-background: linear-gradient(to top, #8a1116, #8a1116 1px);
 	--gnome-button-destructive-action-active-border-color: #851015;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 
diff --git a/src/other/firefox/Monterey/colors/light-adaptive.css b/src/other/firefox/Monterey/colors/light-adaptive.css
index 8df4aeeb..6aec02da 100644
--- a/src/other/firefox/Monterey/colors/light-adaptive.css
+++ b/src/other/firefox/Monterey/colors/light-adaptive.css
@@ -77,7 +77,7 @@
 	--gnome-button-suggested-action-border-accent-color: #15539e;
 	--gnome-button-suggested-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-button-suggested-action-hover-background: linear-gradient(to top, #3584e4, #3987e5 1px);
-	--gnome-button-suggested-action-active-background: #1961b9;
+	--gnome-button-suggested-action-active-background: linear-gradient(to top, #1961b9, #1961b9 1px);
 	--gnome-button-suggested-action-active-border-color: #1b6acb;
 	--gnome-button-suggested-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 	--gnome-button-destructive-action-background: linear-gradient(to top, #ce1921 2px, #e01b24);
@@ -85,7 +85,7 @@
 	--gnome-button-destructive-action-border-accent-color: #851015;
 	--gnome-button-destructive-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-button-destructive-action-hover-background: linear-gradient(to top, #e01b24, #e41c26 1px);
-	--gnome-button-destructive-action-active-background: #a0131a;
+	--gnome-button-destructive-action-active-background: linear-gradient(to top, #a0131a, #a0131a 1px);
 	--gnome-button-destructive-action-active-border-color: #b2161d;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 
diff --git a/src/other/firefox/Monterey/colors/light.css b/src/other/firefox/Monterey/colors/light.css
index 528658a2..d8c7fdc9 100644
--- a/src/other/firefox/Monterey/colors/light.css
+++ b/src/other/firefox/Monterey/colors/light.css
@@ -70,7 +70,7 @@
 	--gnome-button-suggested-action-border-accent-color: #15539e;
 	--gnome-button-suggested-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-button-suggested-action-hover-background: linear-gradient(to top, #3584e4, #3987e5 1px);
-	--gnome-button-suggested-action-active-background: #1961b9;
+	--gnome-button-suggested-action-active-background: linear-gradient(to top, #1961b9, #1961b9 1px);
 	--gnome-button-suggested-action-active-border-color: #1b6acb;
 	--gnome-button-suggested-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 	--gnome-button-destructive-action-background: linear-gradient(to top, #ce1921 2px, #e01b24);
@@ -78,7 +78,7 @@
 	--gnome-button-destructive-action-border-accent-color: #851015;
 	--gnome-button-destructive-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-button-destructive-action-hover-background: linear-gradient(to top, #e01b24, #e41c26 1px);
-	--gnome-button-destructive-action-active-background: #a0131a;
+	--gnome-button-destructive-action-active-background: linear-gradient(to top, #a0131a, #a0131a 1px);
 	--gnome-button-destructive-action-active-border-color: #b2161d;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 
diff --git a/src/other/firefox/WhiteSur/colors/dark-adaptive.css b/src/other/firefox/WhiteSur/colors/dark-adaptive.css
index a0f4d2f3..9d962f20 100644
--- a/src/other/firefox/WhiteSur/colors/dark-adaptive.css
+++ b/src/other/firefox/WhiteSur/colors/dark-adaptive.css
@@ -74,10 +74,10 @@
 	--gnome-inactive-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.0);
 	--gnome-button-suggested-action-background: linear-gradient(to top, #155099 2px, #15539e);
 	--gnome-button-suggested-action-border-color: #0f3b71;
-	--gnome-button-suggested-action-border-accent-color: #092444;
+	--gnome-button-suggested-action-border-accent-color: #092444;;
 	--gnome-button-suggested-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
 	--gnome-button-suggested-action-hover-background: linear-gradient(to top, #155099, #1655a2 1px);
-	--gnome-button-suggested-action-active-background: #103e75;
+	--gnome-button-suggested-action-active-background: linear-gradient(to top, #103e75, #103e75 1px);
 	--gnome-button-suggested-action-active-border-color: #0f3b71;
 	--gnome-button-suggested-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.05);
 	--gnome-button-destructive-action-background: linear-gradient(to top, #ae151c 2px, #b2161d);
@@ -85,7 +85,7 @@
 	--gnome-button-destructive-action-border-accent-color: #570b0e;
 	--gnome-button-destructive-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-button-destructive-action-hover-background: linear-gradient(to top, #ae151c, #b7161d 1px);
-	--gnome-button-destructive-action-active-background: #8a1116;
+	--gnome-button-destructive-action-active-background: linear-gradient(to top, #8a1116, #8a1116 1px);
 	--gnome-button-destructive-action-active-border-color: #851015;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 
diff --git a/src/other/firefox/WhiteSur/colors/dark.css b/src/other/firefox/WhiteSur/colors/dark.css
index 5c2a3c9d..df7eb1db 100644
--- a/src/other/firefox/WhiteSur/colors/dark.css
+++ b/src/other/firefox/WhiteSur/colors/dark.css
@@ -71,7 +71,7 @@
 	--gnome-button-suggested-action-border-accent-color: #092444;;
 	--gnome-button-suggested-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
 	--gnome-button-suggested-action-hover-background: linear-gradient(to top, #155099, #1655a2 1px);
-	--gnome-button-suggested-action-active-background: #103e75;
+	--gnome-button-suggested-action-active-background: linear-gradient(to top, #103e75, #103e75 1px);
 	--gnome-button-suggested-action-active-border-color: #0f3b71;
 	--gnome-button-suggested-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.05);
 	--gnome-button-destructive-action-background: linear-gradient(to top, #ae151c 2px, #b2161d);
@@ -79,7 +79,7 @@
 	--gnome-button-destructive-action-border-accent-color: #570b0e;
 	--gnome-button-destructive-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-button-destructive-action-hover-background: linear-gradient(to top, #ae151c, #b7161d 1px);
-	--gnome-button-destructive-action-active-background: #8a1116;
+	--gnome-button-destructive-action-active-background: linear-gradient(to top, #8a1116, #8a1116 1px);
 	--gnome-button-destructive-action-active-border-color: #851015;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 
diff --git a/src/other/firefox/WhiteSur/colors/light-adaptive.css b/src/other/firefox/WhiteSur/colors/light-adaptive.css
index a5d8a149..caeb8527 100644
--- a/src/other/firefox/WhiteSur/colors/light-adaptive.css
+++ b/src/other/firefox/WhiteSur/colors/light-adaptive.css
@@ -76,7 +76,7 @@
 	--gnome-button-suggested-action-border-accent-color: #15539e;
 	--gnome-button-suggested-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-button-suggested-action-hover-background: linear-gradient(to top, #3584e4, #3987e5 1px);
-	--gnome-button-suggested-action-active-background: #1961b9;
+	--gnome-button-suggested-action-active-background: linear-gradient(to top, #1961b9, #1961b9 1px);
 	--gnome-button-suggested-action-active-border-color: #1b6acb;
 	--gnome-button-suggested-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 	--gnome-button-destructive-action-background: linear-gradient(to top, #ce1921 2px, #e01b24);
@@ -84,7 +84,7 @@
 	--gnome-button-destructive-action-border-accent-color: #851015;
 	--gnome-button-destructive-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-button-destructive-action-hover-background: linear-gradient(to top, #e01b24, #e41c26 1px);
-	--gnome-button-destructive-action-active-background: #a0131a;
+	--gnome-button-destructive-action-active-background: linear-gradient(to top, #a0131a, #a0131a 1px);
 	--gnome-button-destructive-action-active-border-color: #b2161d;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 
diff --git a/src/other/firefox/WhiteSur/colors/light.css b/src/other/firefox/WhiteSur/colors/light.css
index 3e0c7bb3..c4ee8e61 100644
--- a/src/other/firefox/WhiteSur/colors/light.css
+++ b/src/other/firefox/WhiteSur/colors/light.css
@@ -69,7 +69,7 @@
 	--gnome-button-suggested-action-border-accent-color: #15539e;
 	--gnome-button-suggested-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-button-suggested-action-hover-background: linear-gradient(to top, #3584e4, #3987e5 1px);
-	--gnome-button-suggested-action-active-background: #1961b9;
+	--gnome-button-suggested-action-active-background: linear-gradient(to top, #1961b9, #1961b9 1px);
 	--gnome-button-suggested-action-active-border-color: #1b6acb;
 	--gnome-button-suggested-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 	--gnome-button-destructive-action-background: linear-gradient(to top, #ce1921 2px, #e01b24);
@@ -77,7 +77,7 @@
 	--gnome-button-destructive-action-border-accent-color: #851015;
 	--gnome-button-destructive-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
 	--gnome-button-destructive-action-hover-background: linear-gradient(to top, #e01b24, #e41c26 1px);
-	--gnome-button-destructive-action-active-background: #a0131a;
+	--gnome-button-destructive-action-active-background: linear-gradient(to top, #a0131a, #a0131a 1px);
 	--gnome-button-destructive-action-active-border-color: #b2161d;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 
diff --git a/src/other/firefox/common/parts/buttons.css b/src/other/firefox/common/parts/buttons.css
index 14c913ef..e7c63ffc 100644
--- a/src/other/firefox/common/parts/buttons.css
+++ b/src/other/firefox/common/parts/buttons.css
@@ -350,7 +350,7 @@ button.popup-notification-primary-button:active,
 .identity-popup-permission-remove-button,
 #PanelUI-panic-view-button {
 	color: white !important;
-	background-color: var(--gnome-button-destructive-action-background) !important;
+	background-image: var(--gnome-button-destructive-action-background) !important;
 	border-color: var(--gnome-button-destructive-action-border-color) !important;
 	border-bottom-color: var(--gnome-button-destructive-action-border-accent-color) !important;
 	box-shadow: var(--gnome-button-destructive-action-box-shadow) !important;
diff --git a/src/other/firefox/common/parts/popups.css b/src/other/firefox/common/parts/popups.css
index e30b31e6..d336ac00 100644
--- a/src/other/firefox/common/parts/popups.css
+++ b/src/other/firefox/common/parts/popups.css
@@ -220,22 +220,23 @@ menuitem, menupopup menu,
 }
 
 /* Menu buttons disabled */
-menuitem[disabled="true"], menupopup menu[disabled="true"],
+menupopup menu[disabled="true"],
 .subviewbutton[disabled="true"],
 .subviewbutton:not(#appMenu-fxa-label2)[disabled="true"],
 .toolbarbutton-1[disabled="true"],
 .protections-popup-category[disabled="true"],
 .identity-popup-content-blocking-category[disabled="true"] {
-	opacity: 1 !important;
-	color: var(--gnome-inactive-toolbar-color) !important;
+	opacity: 0.35 !important;
 	background-image: none !important;
 	background-color: transparent !important;
-	border-color: var(--gnome-button-disabled-border-color) !important;
-	box-shadow: none !important;
 }
 
 menuitem[disabled="true"] {
+	opacity: 1 !important;
+	color: var(--gnome-inactive-toolbar-color) !important;
 	background-image: var(--gnome-button-disabled-background) !important;
+	border-color: var(--gnome-button-disabled-border-color) !important;
+	box-shadow: none !important;
 }
 
 menuitem[disabled="true"][_moz-menuactive], menupopup menu[disabled="true"][_moz-menuactive] {
@@ -252,6 +253,7 @@ menupopup menu:not([disabled="true"]):is(:hover, [_moz-menuactive]),
 .identity-popup-content-blocking-category:not([disabled="true"]):hover,
 #PlacesToolbar .bookmark-item:is(:hover, [open], [_moz-menuactive]),
 #downloadsPanel-mainView .download-state:hover {
+	background-image: none !important;
 	background-color: var(--gnome-popover-button-hover-background) !important;
 }
 
@@ -263,6 +265,7 @@ menupopup menu:not([disabled="true"]):is(:hover, [_moz-menuactive]),
 .identity-popup-content-blocking-category:not([disabled="true"]):active,
 #PlacesToolbar .bookmark-item:is(:active, [open], [_moz-menuactive]),
 #downloadsPanel-mainView .download-state:active {
+	background-image: none !important;
 	background-color: var(--gnome-popover-button-active-background) !important;
 }