diff --git a/src/other/firefox/WhiteSur/parts/toolbox.css b/src/other/firefox/WhiteSur/parts/toolbox.css
index a2c64011..24e406ec 100644
--- a/src/other/firefox/WhiteSur/parts/toolbox.css
+++ b/src/other/firefox/WhiteSur/parts/toolbox.css
@@ -18,6 +18,14 @@
 	fill: var(--gnome-toolbar-color);
 }
 
+toolbar .toolbarbutton-1 {
+	> .toolbarbutton-icon,
+	> .toolbarbutton-text,
+	> .toolbarbutton-badge-stack {
+		border-radius: 0 !important;
+	}
+}
+
 #nav-bar, #PersonalToolbar, #toolbar-menubar, .notificationbox-stack {
 	border: 0 !important;
 	color: var(--gnome-toolbar-color);
diff --git a/src/other/firefox/common/parts/headerbar.css b/src/other/firefox/common/parts/headerbar.css
index f4cc64b0..85feb879 100644
--- a/src/other/firefox/common/parts/headerbar.css
+++ b/src/other/firefox/common/parts/headerbar.css
@@ -33,9 +33,9 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 	background: none !important;
 }
 
-#nav-bar .toolbaritem-combined-buttons {
+#nav-bar .toolbaritem-combined-buttons:not(.unified-extensions-item) {
 	padding: 0 !important;
-	margin: 0 !important;
+	margin: 0 2px !important;
 	border-radius: 8px !important;
 	background: var(--gnome-headerbar-button-combined-background) !important;
 }