diff --git a/src/other/firefox/Monterey/parts/headerbar-urlbar.css b/src/other/firefox/Monterey/parts/headerbar-urlbar.css
index 318c715..75f6f25 100644
--- a/src/other/firefox/Monterey/parts/headerbar-urlbar.css
+++ b/src/other/firefox/Monterey/parts/headerbar-urlbar.css
@@ -169,12 +169,6 @@ toolbarspring {
 	fill-opacity: 1 !important;
 }
 
-.urlbar-icon {
-	width: 28px !important;
-	height: 28px !important;
-	padding: 6px !important;
-}
-
 #page-action-buttons {
 	padding: 2px 0 !important;
 }
diff --git a/src/other/firefox/Monterey/parts/popups.css b/src/other/firefox/Monterey/parts/popups.css
index 7d44212..ce03ab9 100644
--- a/src/other/firefox/Monterey/parts/popups.css
+++ b/src/other/firefox/Monterey/parts/popups.css
@@ -3,13 +3,31 @@
 @import "popups-contents.css";
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
+menupopup {
+	--panel-background: transparent !important;
+	--panel-border-color: transparent !important;
+}
+
+panel {
+	--panel-background: var(--gnome-menu-background) !important;
+	--panel-border-color: var(--gnome-menu-border-color) !important;
+}
+
+:is(panel, menupopup)::part(content) {
+	border: none !important;
+}
+
+panelview {
+	padding: 12px !important;
+}
+
 /* Style menus */
 menupopup {
 	-moz-appearance: none !important;
 	background: var(--gnome-menu-background) !important;
 	border: 1px solid var(--gnome-menu-border-color) !important;
 	border-radius: 8px !important;
-	padding: 8px 0 !important;
+	padding: 6px 0 !important;
 	color: var(--gnome-toolbar-color) !important;
 	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important;
 }
@@ -25,6 +43,8 @@ menubar > menu > menupopup {
 menuitem, menupopup menu {
 	-moz-appearance: none !important;
 	padding: 4px 8px !important;
+	border: none !important;
+	box-shadow: none !important;
 }
 
 menuitem[type="checkbox"] image, menuitem[type="radio"] image {
@@ -45,16 +65,15 @@ panel[type=arrow] {
 .panel-header, .PanelUI-subView,
 .panel-subview-body, #widget-overflow-mainView, #protections-popup-footer,
 panelview {
-	border: 0 !important;
+	border: none !important;
 	background: transparent !important;
 }
 
 .panel-arrowcontent {
 	background: var(--gnome-popover-background) !important;
-	border: 1px solid !important;
-	border-color: var(--gnome-popover-border-color) !important;
+	border: 1px solid var(--gnome-popover-border-color) !important;
 	border-radius: 8px!important;
-	padding: 12px !important;
+	padding: 0 !important;
 	color: var(--gnome-toolbar-color) !important;
 }
 .panel-arrow {
diff --git a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
index e17f3bc..206e085 100644
--- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
+++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
@@ -156,12 +156,6 @@ toolbarspring {
 	fill-opacity: 1 !important;
 }
 
-.urlbar-icon {
-	width: 28px !important;
-	height: 28px !important;
-	padding: 6px !important;
-}
-
 #page-action-buttons {
 	padding: 2px 0 !important;
 }
diff --git a/src/other/firefox/WhiteSur/parts/popups.css b/src/other/firefox/WhiteSur/parts/popups.css
index 7d44212..6fc144c 100644
--- a/src/other/firefox/WhiteSur/parts/popups.css
+++ b/src/other/firefox/WhiteSur/parts/popups.css
@@ -3,13 +3,31 @@
 @import "popups-contents.css";
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
+menupopup {
+	--panel-background: transparent !important;
+	--panel-border-color: transparent !important;
+}
+
+panel {
+	--panel-background: var(--gnome-menu-background) !important;
+	--panel-border-color: var(--gnome-menu-border-color) !important;
+}
+
+:is(panel, menupopup)::part(content) {
+	border: none !important;
+}
+
+panelview {
+	padding: 12px !important;
+}
+
 /* Style menus */
 menupopup {
 	-moz-appearance: none !important;
 	background: var(--gnome-menu-background) !important;
 	border: 1px solid var(--gnome-menu-border-color) !important;
 	border-radius: 8px !important;
-	padding: 8px 0 !important;
+	padding: 6px 0 !important;
 	color: var(--gnome-toolbar-color) !important;
 	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important;
 }
@@ -54,7 +72,7 @@ panelview {
 	border: 1px solid !important;
 	border-color: var(--gnome-popover-border-color) !important;
 	border-radius: 8px!important;
-	padding: 12px !important;
+	padding: 0 !important;
 	color: var(--gnome-toolbar-color) !important;
 }
 .panel-arrow {