diff --git a/src/other/firefox/Monterey/parts/popups.css b/src/other/firefox/Monterey/parts/popups.css
index 48a6f73..1be1008 100644
--- a/src/other/firefox/Monterey/parts/popups.css
+++ b/src/other/firefox/Monterey/parts/popups.css
@@ -5,19 +5,17 @@
 
 /* Style menus */
 menupopup {
-	-moz-appearance: none !important;
-	background: var(--gnome-menu-background) !important;
-	border: 1px solid var(--gnome-menu-border-color) !important;
-	border-radius: 10px !important;
-	padding: 6px 0 !important;
-	color: var(--gnome-toolbar-color) !important;
-	box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important;
+	--panel-background: var(--gnome-menu-background) !important;
+	--panel-border-color: var(--gnome-menu-border-color) !important;
+	--arrowpanel-border-radius: 12px !important;
+	--arrowpanel-background: var(--gnome-menu-background) !important;
+	--arrowpanel-border-color: var(--gnome-menu-border-color) !important;
 }
 
-#PlacesToolbar menupopup {
+#PlacesToolbar menupopup[placespopup="true"]::part(content), #PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), #PlacesToolbar menupopup {
 	background: none !important;
-	padding: 3px 6px 8px !important;
-	margin: 0 0 0 -8px !important;
+	padding: 3px 4px 6px !important;
+	margin: 0 0 0 -12px !important;
 	border: none !important;
 	box-shadow: none !important;
 }
@@ -42,11 +40,6 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover {
 	background: transparent !important;
 }
 
-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;
diff --git a/src/other/firefox/WhiteSur/parts/popups.css b/src/other/firefox/WhiteSur/parts/popups.css
index 48a6f73..1be1008 100644
--- a/src/other/firefox/WhiteSur/parts/popups.css
+++ b/src/other/firefox/WhiteSur/parts/popups.css
@@ -5,19 +5,17 @@
 
 /* Style menus */
 menupopup {
-	-moz-appearance: none !important;
-	background: var(--gnome-menu-background) !important;
-	border: 1px solid var(--gnome-menu-border-color) !important;
-	border-radius: 10px !important;
-	padding: 6px 0 !important;
-	color: var(--gnome-toolbar-color) !important;
-	box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important;
+	--panel-background: var(--gnome-menu-background) !important;
+	--panel-border-color: var(--gnome-menu-border-color) !important;
+	--arrowpanel-border-radius: 12px !important;
+	--arrowpanel-background: var(--gnome-menu-background) !important;
+	--arrowpanel-border-color: var(--gnome-menu-border-color) !important;
 }
 
-#PlacesToolbar menupopup {
+#PlacesToolbar menupopup[placespopup="true"]::part(content), #PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), #PlacesToolbar menupopup {
 	background: none !important;
-	padding: 3px 6px 8px !important;
-	margin: 0 0 0 -8px !important;
+	padding: 3px 4px 6px !important;
+	margin: 0 0 0 -12px !important;
 	border: none !important;
 	box-shadow: none !important;
 }
@@ -42,11 +40,6 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover {
 	background: transparent !important;
 }
 
-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;
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 7395565..c5d0636 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1618,7 +1618,7 @@ headerbar {
     margin-bottom: 8px;
   }
 
-  menubutton.popup, {
+  menubutton.popup {
     margin-top: 0;
     margin-bottom: 0;
   }
@@ -1642,7 +1642,7 @@ headerbar {
   // Reset linking entrys
   .linked:not(.vertical) > entry {
     @include entry(header-normal);
-    margin: 8px ($container_padding/2 + 1px);
+    margin: 8px ($container_padding / 2 + 1px);
     padding: 0 $container_padding * 2;
     border-radius: $bt_radius;
     border: none;
@@ -3453,7 +3453,7 @@ listview.view {
   color: $fg_color;
   background-color: transparent;
 
-  popover.menu & { padding: 0; }
+  popover.menu & { padding: $container_padding / 2; }
 }
 
 %row_activatable {
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index b3deae7..7a179a5 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -2458,7 +2458,7 @@ window.background.csd {
 }
 
 //
-// Archive Manager
+// Archive Manager (File roller)
 //
 window.background.csd {
   > grid.horizontal > paned.horizontal {