diff --git a/src/other/firefox/Monterey/parts/headerbar-urlbar.css b/src/other/firefox/Monterey/parts/headerbar-urlbar.css
index 85843f83..b9d86c9d 100644
--- a/src/other/firefox/Monterey/parts/headerbar-urlbar.css
+++ b/src/other/firefox/Monterey/parts/headerbar-urlbar.css
@@ -15,14 +15,9 @@ toolbarspring {
 
 /* URL bar */
 #urlbar {
-/*	margin-top: -1px !important;*/
 	box-shadow: none !important;
-	background: var(--gnome-popover-background) !important;
-	border-radius: 8px !important;
-	border: none !important;
-	padding: 0 !important;
-	max-width: 360px !important;
 }
+
 #urlbar-background {
 	box-shadow: none !important;
 	border: 0 !important;
@@ -32,10 +27,13 @@ toolbarspring {
 }
 
 #urlbar:-moz-window-inactive {
-	background: var(--gnome-inactive-urlbar-background) !important;
 	border-color: var(--gnome-inactive-headerbar-background) !important;
 }
 
+#urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background {
+	outline-color: transparent !important;
+}
+
 #urlbar-container,
 #wrapper-urlbar-container,
 #urlbar #urlbar-input-container {
@@ -57,7 +55,7 @@ toolbarspring {
 	width: 360px !important;
 	z-index: 5 !important;
 	padding: 0 !important;
-	border-radius: 10px !important;
+	border-radius: 8px !important;
 }
 #urlbar[breakout][breakout-extend][open] {
 	height: auto !important;
@@ -69,10 +67,6 @@ toolbarspring {
 	padding: 0 !important;
 }
 
-#urlbar[breakout][breakout-extend][open] #urlbar-background {
-	box-shadow: var(--gnome-urlbar-box-shadow) !important;
-}
-
 #urlbar-input {
 	text-align: center !important;
 	padding: 0 28px 0 0 !important;
@@ -80,10 +74,20 @@ toolbarspring {
 
 /* URL bar results */
 .urlbarView {
-	background: transparent !important;
+	background: var(--gnome-popover-background) !important;
 	color: var(--gnome-toolbar-color) !important;
-	margin: 0 !important;
+	margin: 6px 0 0 0 !important;
 	width: 100% !important;
+	position: absolute !important;
+	box-shadow: var(--gnome-urlbar-box-shadow) !important;
+	border-radius: 12px !important;
+	border: 0 !important;
+}
+
+@media (prefers-color-scheme: dark) {
+	.urlbarView {
+		border: 1px solid rgba(255, 255, 255, 0.1) !important;
+	}
 }
 
 .urlbarView-body-outer {
@@ -91,7 +95,7 @@ toolbarspring {
 	--item-padding-end: 0 !important;
 	max-height: 40vh !important;
 	overflow-x: auto;
-	padding: 0 8px !important;
+	padding: 0 6px !important;
 }
 
 .urlbarView-body-inner {
@@ -124,7 +128,7 @@ toolbarspring {
 	background: transparent !important;
 	box-shadow: none !important;
 	border: none !important;
-	padding: 0 0 !important;
+	padding: 0 !important;
 	min-height: 32px !important;
 	min-width: 32px !important;
 	margin: 0 !important;
diff --git a/src/other/firefox/Monterey/parts/tabsbar.css b/src/other/firefox/Monterey/parts/tabsbar.css
index a525eee2..680ab82e 100644
--- a/src/other/firefox/Monterey/parts/tabsbar.css
+++ b/src/other/firefox/Monterey/parts/tabsbar.css
@@ -18,10 +18,6 @@ tab > stack {
 	background-image: none !important;
 }
 
-.tabbrowser-tab {
-	margin: 1px 0 0 0 !important;
-}
-
 .tabbrowser-tab:not([visuallyselected="true"], [multiselected]), .tabbrowser-tab:-moz-lwtheme {
 	color: var(--gnome-tabbar-tab-color) !important;
 }
@@ -184,7 +180,7 @@ tab[selected]:-moz-window-inactive .tab-label {
 #TabsToolbar .toolbarbutton-1,
 #TabsToolbar #tabs-newtab-button,
 #TabsToolbar #new-tab-button {
-	margin: 1px 2px 0 !important;
+	margin: 0 2px !important;
 	padding: 0 10px !important;
 	max-height: 32px !important;
 	min-height: 32px !important;
@@ -215,10 +211,12 @@ tab[selected]:-moz-window-inactive .tab-label {
 }
 
 /* firefox-view-button */
-:root:not([privatebrowsingmode="temporary"]):not([firefoxviewhidden]) :is(#firefox-view-button, #wrapper-firefox-view-button) + #tabbrowser-tabs {
+:root:not([privatebrowsingmode="temporary"]):not([firefoxviewhidden]) :is(#firefox-view-button, #wrapper-firefox-view-button) {
+	display: none !important;
+}
+
+:root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs, :root[privatebrowsingmode]:not([firefoxviewhidden]) :is(toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button)) + #tabbrowser-tabs {
 	border-inline-start: none !important;
-	padding-inline-start: 0 !important;
-	margin-inline-start: -40px !important;
 }
 
 #firefox-view-button > .toolbarbutton-icon {
diff --git a/src/other/firefox/Monterey/parts/toolbox.css b/src/other/firefox/Monterey/parts/toolbox.css
index e4c3ede5..29951b7e 100644
--- a/src/other/firefox/Monterey/parts/toolbox.css
+++ b/src/other/firefox/Monterey/parts/toolbox.css
@@ -48,9 +48,9 @@ findbar:-moz-window-inactive,
 }
 
 #TabsToolbar {
-	margin-top: -41px !important;
+	margin-top: -40px !important;
+	margin-bottom: 8px !important;
 	padding: 0 !important;
-	margin-bottom: 6px !important;
 	background: none !important;
 	max-height: 42px !important;
 }
diff --git a/src/other/firefox/common/parts/buttons.css b/src/other/firefox/common/parts/buttons.css
index cabc6cad..160f8aef 100644
--- a/src/other/firefox/common/parts/buttons.css
+++ b/src/other/firefox/common/parts/buttons.css
@@ -296,8 +296,7 @@ button.close,
 #appMenu-popup .toolbaritem-combined-buttons:not(.unified-extensions-item) toolbarbutton:not(:last-of-type):not(#appMenu-zoomEnlarge-button),
 #context-navigation menuitem:not(:last-of-type),
 .findbar-container toolbarbutton.findbar-find-previous,
-.findbar-button:not(:last-of-type),
-.search-panel-one-offs .searchbar-engine-one-off-item:not(:last-child) {
+.findbar-button:not(:last-of-type) {
 	border-top-right-radius: 0 !important;
 	border-bottom-right-radius: 0 !important;
 	border-right-width: 1px !important;
@@ -309,8 +308,7 @@ button.close,
 #context-navigation menuitem:not(:first-of-type),
 .findbar-container toolbarbutton.findbar-find-previous,
 .findbar-container toolbarbutton.findbar-find-next,
-.findbar-button:not(:first-of-type),
-.search-panel-one-offs .searchbar-engine-one-off-item:not(:first-child) {
+.findbar-button:not(:first-of-type) {
 	border-top-left-radius: 0 !important;
 	border-bottom-left-radius: 0 !important;
 	border-left-width: 0 !important;