diff --git a/src/other/firefox/Monterey/colors/dark-adaptive.css b/src/other/firefox/Monterey/colors/dark-adaptive.css
index a099f62d..9c65d05e 100644
--- a/src/other/firefox/Monterey/colors/dark-adaptive.css
+++ b/src/other/firefox/Monterey/colors/dark-adaptive.css
@@ -36,10 +36,10 @@
 
 	/* Popups */
 	--gnome-menu-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
-	--gnome-menu-border-color: light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-menu-border-color: rgba(0,0,0,.15);
 	--gnome-popover-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
 	--gnome-popover-border-color: light-dark(rgba(0,0,0,.15), #000000);
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), 0 0 0 1px light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3);
 	--gnome-popover-button-hover-background: color-mix(in srgb, currentColor 10%, transparent);
 	--gnome-popover-button-active-background: color-mix(in srgb, currentColor 15%, transparent);
 	--gnome-popover-separator-color: color-mix(in srgb, currentColor 8%, transparent);
diff --git a/src/other/firefox/Monterey/colors/dark.css b/src/other/firefox/Monterey/colors/dark.css
index db91b785..c274881c 100644
--- a/src/other/firefox/Monterey/colors/dark.css
+++ b/src/other/firefox/Monterey/colors/dark.css
@@ -32,10 +32,10 @@
 
 	/* Popups */
 	--gnome-menu-background: rgba(51, 51, 51, 0.95);
-	--gnome-menu-border-color: #070707;
+	--gnome-menu-border-color: rgba(0, 0, 0, 0.75);
 	--gnome-popover-background: rgba(51, 51, 51, 0.95);
-	--gnome-popover-border-color: #070707;
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.75);
+	--gnome-popover-border-color: rgba(0, 0, 0, 0.75);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3);
 	--gnome-popover-button-hover-background: rgba(255, 255, 255, 0.1);
 	--gnome-popover-button-active-background: rgba(255, 255, 255, 0.15);
 	--gnome-popover-separator-color: rgba(255, 255, 255, 0.08);
diff --git a/src/other/firefox/Monterey/colors/light-adaptive.css b/src/other/firefox/Monterey/colors/light-adaptive.css
index 6aec02da..0a9c16c9 100644
--- a/src/other/firefox/Monterey/colors/light-adaptive.css
+++ b/src/other/firefox/Monterey/colors/light-adaptive.css
@@ -35,10 +35,10 @@
 
 	/* Popups */
 	--gnome-menu-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
-	--gnome-menu-border-color: light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-menu-border-color: rgba(0,0,0,.15);
 	--gnome-popover-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
 	--gnome-popover-border-color: light-dark(rgba(0,0,0,.15), #000000);
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 0 0 1px light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15);
 	--gnome-popover-button-hover-background: color-mix(in srgb, currentColor 10%, transparent);
 	--gnome-popover-button-active-background: color-mix(in srgb, currentColor 20%, transparent);
 	--gnome-popover-separator-color: color-mix(in srgb, currentColor 10%, transparent);
diff --git a/src/other/firefox/Monterey/colors/light.css b/src/other/firefox/Monterey/colors/light.css
index d8c7fdc9..ec19dfeb 100644
--- a/src/other/firefox/Monterey/colors/light.css
+++ b/src/other/firefox/Monterey/colors/light.css
@@ -31,10 +31,10 @@
 
 	/* Popups */
 	--gnome-menu-background: rgba(255, 255, 255, 0.95);
-	--gnome-menu-border-color: #cdc7c2;
+	--gnome-menu-border-color: rgba(0, 0, 0, 0.12);
 	--gnome-popover-background: rgba(255, 255, 255, 0.95);
-	--gnome-popover-border-color: #cdc7c2;
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 0 0 1px rgba(0, 0, 0, 0.12);
+	--gnome-popover-border-color: rgba(0, 0, 0, 0.12);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15);
 	--gnome-popover-button-hover-background: rgba(0, 0, 0, 0.1);
 	--gnome-popover-button-active-background: rgba(0, 0, 0, 0.2);
 	--gnome-popover-separator-color: rgba(0, 0, 0, 0.1);
diff --git a/src/other/firefox/WhiteSur/colors/dark-adaptive.css b/src/other/firefox/WhiteSur/colors/dark-adaptive.css
index 9d962f20..9dce9979 100644
--- a/src/other/firefox/WhiteSur/colors/dark-adaptive.css
+++ b/src/other/firefox/WhiteSur/colors/dark-adaptive.css
@@ -35,10 +35,10 @@
 
 	/* Popups */
 	--gnome-menu-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
-	--gnome-menu-border-color: rgba(0, 0, 0, 0.75);
+	--gnome-menu-border-color: rgba(0,0,0,.15);
 	--gnome-popover-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
-	--gnome-popover-border-color: rgba(0, 0, 0, 0.75);
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.75);
+	--gnome-popover-border-color: light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3);
 	--gnome-popover-button-hover-background: color-mix(in srgb, currentColor 10%, transparent);
 	--gnome-popover-button-active-background: color-mix(in srgb, currentColor 15%, transparent);
 	--gnome-popover-separator-color: color-mix(in srgb, currentColor 8%, transparent);
diff --git a/src/other/firefox/WhiteSur/colors/dark.css b/src/other/firefox/WhiteSur/colors/dark.css
index df7eb1db..89d64ba2 100644
--- a/src/other/firefox/WhiteSur/colors/dark.css
+++ b/src/other/firefox/WhiteSur/colors/dark.css
@@ -32,10 +32,10 @@
 
 	/* Popups */
 	--gnome-menu-background: rgba(51, 51, 51, 0.95);
-	--gnome-menu-border-color: #070707;
+	--gnome-menu-border-color: rgba(0, 0, 0, 0.75);
 	--gnome-popover-background: rgba(51, 51, 51, 0.95);
-	--gnome-popover-border-color: #070707;
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.75);
+	--gnome-popover-border-color: rgba(0, 0, 0, 0.75);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3);
 	--gnome-popover-button-hover-background: rgba(255, 255, 255, 0.1);
 	--gnome-popover-button-active-background: rgba(255, 255, 255, 0.15);
 	--gnome-popover-separator-color: rgba(255, 255, 255, 0.08);
diff --git a/src/other/firefox/WhiteSur/colors/light-adaptive.css b/src/other/firefox/WhiteSur/colors/light-adaptive.css
index caeb8527..9e72ef43 100644
--- a/src/other/firefox/WhiteSur/colors/light-adaptive.css
+++ b/src/other/firefox/WhiteSur/colors/light-adaptive.css
@@ -34,10 +34,10 @@
 
 	/* Popups */
 	--gnome-menu-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
-	--gnome-menu-border-color: light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-menu-border-color: rgba(0,0,0,.15);
 	--gnome-popover-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
 	--gnome-popover-border-color: light-dark(rgba(0,0,0,.15), #000000);
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 0 0 1px light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15);
 	--gnome-popover-button-hover-background: color-mix(in srgb, currentColor 10%, transparent);
 	--gnome-popover-button-active-background: color-mix(in srgb, currentColor 20%, transparent);
 	--gnome-popover-separator-color: color-mix(in srgb, currentColor 10%, transparent);
diff --git a/src/other/firefox/WhiteSur/colors/light.css b/src/other/firefox/WhiteSur/colors/light.css
index c4ee8e61..f882214a 100644
--- a/src/other/firefox/WhiteSur/colors/light.css
+++ b/src/other/firefox/WhiteSur/colors/light.css
@@ -30,10 +30,10 @@
 
 	/* Popups */
 	--gnome-menu-background: rgba(255, 255, 255, 0.95);
-	--gnome-menu-border-color: #cfcfcf;
+	--gnome-menu-border-color: rgba(0, 0, 0, 0.12);
 	--gnome-popover-background: rgba(255, 255, 255, 0.95);
-	--gnome-popover-border-color: #cfcfcf;
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 0 0 1px rgba(0, 0, 0, 0.12);
+	--gnome-popover-border-color: rgba(0, 0, 0, 0.12);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15);
 	--gnome-popover-button-hover-background: rgba(0, 0, 0, 0.1);
 	--gnome-popover-button-active-background: rgba(0, 0, 0, 0.2);
 	--gnome-popover-separator-color: rgba(0, 0, 0, 0.1);
diff --git a/src/other/firefox/common/parts/popups.css b/src/other/firefox/common/parts/popups.css
index d379e81f..e22eb094 100644
--- a/src/other/firefox/common/parts/popups.css
+++ b/src/other/firefox/common/parts/popups.css
@@ -9,7 +9,7 @@ menupopup, panel {
 	--panel-background: var(--gnome-menu-background) !important;
 	--panel-border-radius: 12px !important;
 	--panel-padding: 6px !important;
-	--panel-shadow: var(--gnome-popover-shadow) !important;
+	--panel-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-popover-border-color) !important;
 	/* --panel-shadow-margin: 3px 8px 13px !important; */
 	--panel-separator-color: var(--gnome-popover-separator-color) !important;
 	--panel-border-color: transparent !important;
@@ -20,19 +20,23 @@ menupopup, panel {
 	padding: 2px 4px 9px !important;
 }
 
+menupopup {
+	--panel-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-menu-border-color) !important;
+}
+
 .panel-arrowcontent {
 	border: none !important;
 }
 
 @media (prefers-color-scheme: dark) {
-menupopup, panel {
-	--panel-border-color: rgba(255, 255, 255, 0.06) !important;
-	--arrowpanel-border-color: rgba(255, 255, 255, 0.06) !important;
-}
+	menupopup, panel {
+		--panel-border-color: rgba(255, 255, 255, 0.06) !important;
+		--arrowpanel-border-color: rgba(255, 255, 255, 0.06) !important;
+	}
 
-.panel-arrowcontent {
-	border: 1px solid rgba(255, 255, 255, 0.06) !important;
-}
+	.panel-arrowcontent {
+		border: 1px solid rgba(255, 255, 255, 0.06) !important;
+	}
 }
 
 menupopup label {