diff --git a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
index 24b9b21..351b8c8 100644
--- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
+++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
@@ -3,8 +3,10 @@
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 #urlbar {
-	--urlbar-height: 34.00px;
-	--urlbar-toolbar-height: 34.00px !important;
+	--urlbar-height: 32px !important;
+	--urlbar-container-height: 32px !important;
+	--urlbar-toolbar-height: 32px !important;
+	--urlbar-inner-padding: 0 !important;
 }
 
 /* Center the URL bar */
@@ -14,16 +16,19 @@ toolbarspring {
 
 /* URL bar */
 #urlbar {
+	margin-top: -2px !important;
 	box-shadow: none !important;
 	background: var(--gnome-popover-background) !important;
 	border-radius: 8px !important;
 	border: 1px solid transparent !important;
+	padding: 0 0 !important;
 }
 #urlbar-background {
 	box-shadow: none !important;
 	border: 0 !important;
 	background: transparent !important;
 	border-radius: 8px !important;
+	padding: 0 0 !important;
 }
 
 #urlbar:-moz-window-inactive {
@@ -38,6 +43,7 @@ toolbarspring {
 	top: 0 !important;
 	width: 100% !important;
 	z-index: 5 !important;
+	padding: 0 0 !important;
 }
 #urlbar[breakout][breakout-extend][open] {
 	height: auto !important;
diff --git a/src/other/firefox/WhiteSur/parts/headerbar.css b/src/other/firefox/WhiteSur/parts/headerbar.css
index 52258d3..95ce4f2 100644
--- a/src/other/firefox/WhiteSur/parts/headerbar.css
+++ b/src/other/firefox/WhiteSur/parts/headerbar.css
@@ -27,11 +27,13 @@
 	background: none !important;
 	-moz-appearance: none !important;
 	border-radius: 8px !important;
-	padding: 0 4px !important;
-	min-height: 28px !important;
-	min-width: 28px !important;
+	margin: 10px 2px !important;
+	padding: 0 10px !important;
+	max-height: 30px !important;
+	min-width: 32px !important;
 	color: var(--gnome-toolbar-color) !important;
 	transition: background 200ms;
+	--toolbarbutton-inner-padding: 0 !important;
 }
 
 /* Hover headerbar buttons */