diff --git a/src/other/firefox/Monterey/parts/popups.css b/src/other/firefox/Monterey/parts/popups.css
index dd98504..b70b6d5 100644
--- a/src/other/firefox/Monterey/parts/popups.css
+++ b/src/other/firefox/Monterey/parts/popups.css
@@ -74,7 +74,7 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover {
 panel[type="arrow"] {
 	appearance: none !important;
 	background-color: transparent !important;
-	margin-top: 8px !important;
+	margin: 12px -24px 0 !important;
 }
 
 /* Style popovers */
diff --git a/src/other/firefox/WhiteSur/parts/popups.css b/src/other/firefox/WhiteSur/parts/popups.css
index dd98504..b70b6d5 100644
--- a/src/other/firefox/WhiteSur/parts/popups.css
+++ b/src/other/firefox/WhiteSur/parts/popups.css
@@ -74,7 +74,7 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover {
 panel[type="arrow"] {
 	appearance: none !important;
 	background-color: transparent !important;
-	margin-top: 8px !important;
+	margin: 12px -24px 0 !important;
 }
 
 /* Style popovers */
diff --git a/src/other/firefox/WhiteSur/parts/toolbox.css b/src/other/firefox/WhiteSur/parts/toolbox.css
index 745056e..32489b2 100644
--- a/src/other/firefox/WhiteSur/parts/toolbox.css
+++ b/src/other/firefox/WhiteSur/parts/toolbox.css
@@ -18,24 +18,31 @@
 	fill: var(--gnome-toolbar-color);
 }
 
-#nav-bar, #PersonalToolbar, #toolbar-menubar {
+#nav-bar, #PersonalToolbar, #toolbar-menubar, .notificationbox-stack {
 	border: 0 !important;
 	color: var(--gnome-toolbar-color);
 	background: var(--gnome-toolbar-background) !important;
 	border-bottom: none !important;
 }
+
 #TabsToolbar {
 	border: 0 !important;
 	background: var(--gnome-tabstoolbar-background) !important;
 	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
 	box-shadow: inset 0 1px var(--gnome-toolbar-border-color) !important;
 }
+
 findbar {
 	border: 0 !important;
 	background: var(--gnome-findbar-background) !important;
 	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
 }
-#nav-bar:-moz-window-inactive,
+
+.container.infobar {
+	background: var(--gnome-browser-before-load-background) !important;
+}
+
+#nav-bar:-moz-window-inactive, .notificationbox-stack:-moz-window-inactive,
 #PersonalToolbar:-moz-window-inactive, #toolbar-menubar:-moz-window-inactive,
 #TabsToolbar:-moz-window-inactive, findbar:-moz-window-inactive {
 	background: var(--gnome-inactive-toolbar-background) !important;
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index 4d6ff6e..92e87fe 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -90,9 +90,21 @@ $flap_sidebar_size: 240px;
   }
 
   .nautilus-list-view.view {
-    listview.view > row.activatable {
-      border-radius: $bt_radius;
-      @extend %row_activatable;
+    padding: 0;
+    margin: 0;
+    border-spacing: 0;
+
+    listview.view {
+      padding: 0;
+      margin: 0;
+      border-spacing: 0;
+
+      > row.activatable {
+        padding: 0;
+        margin: 0;
+        border-radius: $bt_radius;
+        @extend %row_activatable;
+      }
     }
   }