diff --git a/src/other/firefox/Monterey/parts/headerbar-urlbar.css b/src/other/firefox/Monterey/parts/headerbar-urlbar.css
index b9d86c9d..44e73a67 100644
--- a/src/other/firefox/Monterey/parts/headerbar-urlbar.css
+++ b/src/other/firefox/Monterey/parts/headerbar-urlbar.css
@@ -36,7 +36,8 @@ toolbarspring {
 
 #urlbar-container,
 #wrapper-urlbar-container,
-#urlbar #urlbar-input-container {
+#urlbar #urlbar-input-container,
+#urlbar .urlbar-input-container {
 	padding: 0 !important;
 	width: 360px !important;
 	min-width: 360px !important;
@@ -61,7 +62,8 @@ toolbarspring {
 	height: auto !important;
 	max-height: unset !important;
 }
-#urlbar[breakout][breakout-extend] #urlbar-input-container {
+#urlbar[breakout][breakout-extend] #urlbar-input-container,
+#urlbar[breakout][breakout-extend] .urlbar-input-container {
 	height: 32px !important;
 	max-height: 32px !important;
 	padding: 0 !important;
@@ -145,6 +147,11 @@ toolbarspring {
 	margin-left: 6px !important;
 }
 
+#identity-box[pageproxystate="invalid"] > .identity-box-button,
+#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] > .identity-box-button {
+	padding-inline: 6px !important;
+}
+
 /* URL bar and Search bar */
 #urlbar[focused] .urlbar-textbox-container {
 	margin: -1px !important;
@@ -168,11 +175,6 @@ toolbarspring {
 	fill-opacity: 1 !important;
 }
 
-#identity-box {
-	margin: 3px 2px !important;
-	border-radius: 5px !important;
-}
-
 #notification-popup-box {
 	height: 26px !important;
 	border-radius: 5px !important;
@@ -187,6 +189,11 @@ toolbarspring {
 	border-radius: 5px !important;
 }
 
+#identity-box {
+	margin: 3px 2px !important;
+	border-radius: 5px !important;
+}
+
 #identity-box:hover {
 	background: var(--gnome-headerbar-button-hover-background) !important;
 }
diff --git a/src/other/firefox/Monterey/parts/tabsbar-alt.css b/src/other/firefox/Monterey/parts/tabsbar-alt.css
index f76e1efc..e245e019 100644
--- a/src/other/firefox/Monterey/parts/tabsbar-alt.css
+++ b/src/other/firefox/Monterey/parts/tabsbar-alt.css
@@ -49,7 +49,7 @@ tab > stack {
 
 .tab-background {
 	margin: 0 !important;
-	transition: all 200ms;
+	transition: background 200ms;
 	margin-block: 0 !important;
 }
 
diff --git a/src/other/firefox/Monterey/theme-alt.css b/src/other/firefox/Monterey/theme-alt.css
index 251260ea..7380aabc 100644
--- a/src/other/firefox/Monterey/theme-alt.css
+++ b/src/other/firefox/Monterey/theme-alt.css
@@ -32,4 +32,5 @@
 #customization-container {
 	background-color: var(--gnome-browser-before-load-background) !important;
 	color: var(--gnome-toolbar-color) !important;
+	background-image: none !important;
 }
diff --git a/src/other/firefox/Monterey/theme.css b/src/other/firefox/Monterey/theme.css
index 1fcf53fb..d8128bbd 100644
--- a/src/other/firefox/Monterey/theme.css
+++ b/src/other/firefox/Monterey/theme.css
@@ -32,4 +32,5 @@
 #customization-container {
 	background-color: var(--gnome-browser-before-load-background) !important;
 	color: var(--gnome-toolbar-color) !important;
+	background-image: none !important;
 }
diff --git a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
index ebbc5077..61d2c2ca 100644
--- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
+++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
@@ -2,13 +2,6 @@
 
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-#urlbar {
-	--urlbar-height: 32px !important;
-	--urlbar-container-height: 32px !important;
-	--urlbar-toolbar-height: 32px !important;
-	--urlbar-inner-padding: 0 !important;
-}
-
 /* Center the URL bar */
 toolbarspring {
 	max-width: 10000px !important;
@@ -16,23 +9,34 @@ toolbarspring {
 
 /* URL bar */
 #urlbar {
+	--urlbar-height: 32px !important;
+	--urlbar-container-height: 32px !important;
+	--urlbar-toolbar-height: 32px !important;
+	--urlbar-inner-padding: 0 !important;
 	box-shadow: none !important;
+	border: none !important;
+	padding: 0 !important;
+	padding-block: 0 !important;
+	padding-inline: 0 !important;
 }
 
 #urlbar-background {
 	box-shadow: none !important;
-	border: 0 !important;
+	border: none !important;
 	background: transparent !important;
 	border-radius: 8px !important;
 	padding: 0 !important;
 }
 
-#urlbar:-moz-window-inactive {
-	border-color: var(--gnome-inactive-headerbar-background) !important;
+#urlbar-input-container,
+.urlbar-input-container {
+	border: none !important;
+	padding: 0 3px !important;
+	background: transparent !important;
 }
 
-#urlbar #urlbar-input-container {
-	padding: 0 !important;
+#urlbar:-moz-window-inactive {
+	border-color: var(--gnome-inactive-headerbar-background) !important;
 }
 
 #urlbar[breakout][breakout-extend] {
@@ -49,10 +53,10 @@ toolbarspring {
 	max-height: unset !important;
 }
 
-#urlbar[breakout][breakout-extend] #urlbar-input-container {
+#urlbar[breakout][breakout-extend] #urlbar-input-container,
+#urlbar[breakout][breakout-extend] > .urlbar-input-container {
 	height: 32px !important;
 	max-height: 32px !important;
-	padding: 0 !important;
 }
 
 #urlbar-input {
@@ -149,6 +153,11 @@ toolbarspring {
 	margin-left: 6px !important;
 }
 
+#identity-box[pageproxystate="invalid"] > .identity-box-button,
+#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] > .identity-box-button {
+	padding-inline: 6px !important;
+}
+
 /* URL bar and Search bar */
 #urlbar[focused] .urlbar-textbox-container {
 	margin: -1px !important;
@@ -174,11 +183,6 @@ toolbarspring {
 	fill-opacity: 1 !important;
 }
 
-#identity-box {
-	margin: 3px 2px !important;
-	border-radius: 5px !important;
-}
-
 #notification-popup-box {
 	height: 26px !important;
 	width: 28px !important;
@@ -203,6 +207,11 @@ toolbarspring {
 	padding: 5px 6px !important;
 }
 
+#identity-box {
+	margin: 3px 2px !important;
+	border-radius: 5px !important;
+}
+
 #identity-box:hover {
 	background: var(--gnome-headerbar-button-hover-background) !important;
 }
diff --git a/src/other/firefox/WhiteSur/theme.css b/src/other/firefox/WhiteSur/theme.css
index d575b2b0..428bac54 100644
--- a/src/other/firefox/WhiteSur/theme.css
+++ b/src/other/firefox/WhiteSur/theme.css
@@ -32,4 +32,5 @@
 #customization-container {
 	background-color: var(--gnome-browser-before-load-background) !important;
 	color: var(--gnome-toolbar-color) !important;
+	background-image: none !important;
 }
diff --git a/src/other/firefox/common/parts/entries.css b/src/other/firefox/common/parts/entries.css
index bf8ceab7..c7ac8a10 100644
--- a/src/other/firefox/common/parts/entries.css
+++ b/src/other/firefox/common/parts/entries.css
@@ -71,10 +71,6 @@
 	padding: 0 !important;
 	margin: 0 3px !important;
 }
-#urlbar-input-container {
-	background: transparent !important;
-	border: 0 !important;
-}
 #urlbar, #searchbar {
 	margin: 0 3px !important;
 	padding: 0 !important;
diff --git a/src/other/firefox/common/parts/headerbar.css b/src/other/firefox/common/parts/headerbar.css
index 0b4b3eae..dbb4d739 100644
--- a/src/other/firefox/common/parts/headerbar.css
+++ b/src/other/firefox/common/parts/headerbar.css
@@ -91,7 +91,8 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 
 /* Headerbar entries */
 #nav-bar #searchbar,
-#urlbar #urlbar-input-container {
+#urlbar #urlbar-input-container,
+#urlbar .urlbar-input-container {
 	-moz-appearance: none !important;
 	background: var(--gnome-urlbar-background) !important;
 	border: none !important;
@@ -105,18 +106,22 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 }
 
 :root:-moz-window-inactive #nav-bar #searchbar,
-:root:-moz-window-inactive #urlbar #urlbar-input-container {
+:root:-moz-window-inactive #urlbar #urlbar-input-container,
+:root:-moz-window-inactive #urlbar .urlbar-input-container {
 	background: var(--gnome-inactive-urlbar-background) !important;
 }
 
 #nav-bar #searchbar:hover,
-#urlbar #urlbar-input-container:hover {
+#urlbar #urlbar-input-container:hover,
+#urlbar .urlbar-input-container:hover {
 	box-shadow: inset 0 0 0 1px var(--gnome-hover-urlbar-border-color) !important;
 	transition-duration: 100ms;
 }
 
 #urlbar[breakout][breakout-extend] #urlbar-input-container,
-#urlbar[breakout][breakout-extend] #urlbar-input-container:hover {
+#urlbar[breakout][breakout-extend] #urlbar-input-container:hover,
+#urlbar[breakout][breakout-extend] .urlbar-input-container,
+#urlbar[breakout][breakout-extend] .urlbar-input-container:hover {
 	background: none !important;
 	box-shadow: none !important;
 	padding: 0 3px !important;