diff --git a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
index 5ed7d090..42098c0c 100644
--- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
+++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
@@ -210,61 +210,68 @@ toolbarspring {
 }
 
 #nav-bar #urlbar toolbarbutton#urlbar-searchmode-switcher:not(#urlbar-zoom-button):not(.subviewbutton):not(.titlebar-button):not(.close-button) {
-  appearance: none;
-  border-radius: 8px !important;
-  margin-left: -3px !important;
-  margin-inline-end: var(--urlbar-searchmodeswitcher-margin-inline-end);
-  padding-inline: var(--urlbar-searchmodeswitcher-inline-padding);
+	appearance: none;
+	border-radius: 5px !important;
+	margin-top: 3px !important;
+	margin-bottom: 3px !important;
+	margin-inline-start: 0 !important;
+	margin-inline-end: var(--urlbar-searchmodeswitcher-margin-inline-end);
+	padding-inline: var(--urlbar-searchmodeswitcher-inline-padding);
+	min-width: 50px !important;
+	min-height: 26px !important;
 
   &.close-button {
-      margin-left: 6px !important;
+	margin-left: 6px !important;
   }
 
   &:focus-visible {
-    outline: var(--focus-outline);
-    outline-offset: var(--focus-outline-inset);
+	outline: var(--focus-outline);
+	outline-offset: var(--focus-outline-inset);
   }
 
   &[open] {
-    background-color: var(--urlbar-box-focus-bgcolor) !important;
+	background-color: var(--urlbar-box-focus-bgcolor) !important;
   }
 
   /* No need space if page information icons such as lock and shield is shown */
   #urlbar[pageproxystate=valid] & {
-    margin-inline-end: 0;
+	margin-inline-end: 0;
   }
 
   #urlbar[searchmode] & {
-    background-color: var(--urlbar-box-bgcolor) !important;
-    margin-inline-end: 0 !important;
-    border-start-end-radius: 0 !important;
-    border-end-end-radius: 0 !important;
+	background-color: var(--urlbar-box-bgcolor) !important;
+	margin-inline-end: 0 !important;
+	border-start-end-radius: 0 !important;
+	border-end-end-radius: 0 !important;
+	min-width: 32px !important;
   }
 
   /* The background rule should match to #searchmode-switcher-chicklet */
   #urlbar[focused] & {
-    background-color: var(--urlbar-box-focus-bgcolor) !important;
+	background-color: var(--urlbar-box-focus-bgcolor) !important;
   }
 
   /* stylelint-disable media-query-no-invalid */
   @media (not -moz-pref("browser.urlbar.searchModeSwitcher.featureGate")) and
          (not -moz-pref("browser.urlbar.scotchBonnet.enableOverride")) {
-    display: none;
+	display: none;
   }
 }
 
 #searchmode-switcher-chicklet {
 	background-color: var(--urlbar-box-bgcolor);
-	border-start-end-radius: 8px !important;
-	border-end-end-radius: 8px !important;
+	border-start-end-radius: 5px !important;
+	border-end-end-radius: 5px !important;
 	align-items: center;
-	height: 100%;
+	height: 26px !important;
 	margin-inline-end: var(--urlbar-searchmodeswitcher-margin-inline-end);
 	display: none;
+	margin-top: 3px;
+	margin-bottom: 3px;
 }
 
 #urlbar-search-mode-indicator-close, #searchmode-switcher-close {
-      margin-left: 6px !important;
+	margin-left: 6px !important;
 }
 
 .urlbar-page-action {