diff --git a/src/other/firefox/common/parts/headerbar.css b/src/other/firefox/common/parts/headerbar.css
index 90c32e37..55669c29 100644
--- a/src/other/firefox/common/parts/headerbar.css
+++ b/src/other/firefox/common/parts/headerbar.css
@@ -12,7 +12,7 @@
 }
 
 /* Headerbar buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button),
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton),
 toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 	border: none !important;
 	box-shadow: none !important;
diff --git a/src/other/firefox/common/parts/popups.css b/src/other/firefox/common/parts/popups.css
index 2b773beb..aa004c21 100644
--- a/src/other/firefox/common/parts/popups.css
+++ b/src/other/firefox/common/parts/popups.css
@@ -179,7 +179,6 @@ panelview {
 
 /* Style popovers menu buttons */
 menuitem, menupopup menu,
-.subviewbutton:not(#appMenu-fxa-label2, #downloadsHistory),
 .toolbarbutton-1,
 .protections-popup-footer-button,
 .protections-popup-category,
@@ -191,6 +190,18 @@ menuitem, menupopup menu,
 	font: menu !important;
 	padding: 0 6px !important;
 	min-height: 28px !important;
+	margin: 0 !important;
+}
+
+.subviewbutton,
+panelview toolbarbutton {
+	-moz-appearance: none !important;
+	border-radius: 6px !important;
+	color: var(--gnome-toolbar-color) !important;
+	font: menu !important;
+	min-height: 28px !important;
+  padding: 3px 6px !important;
+  margin: 0 !important;
 }
 
 #downloadsHistory {
@@ -209,14 +220,13 @@ menuitem, menupopup menu,
 	--button-active-bgcolor: var(--gnome-popover-button-active-background) !important;
 }
 
-.subviewbutton,
 .protections-popup-footer-button,
 .protections-popup-category,
 .identity-popup-content-blocking-category,
 #PlacesToolbar menupopup[placespopup="true"] .bookmark-item,
 .openintabs-menuitem,
 .widget-overflow-list .toolbarbutton-1 {
-	padding: 5px !important;
+	padding: 3px 6px !important;
 	margin: 0 !important;
 }