diff --git a/frappe/desk/page/desktop/desktop.css b/frappe/desk/page/desktop/desktop.css
index 8def3c5658..3ab4ff3c04 100644
--- a/frappe/desk/page/desktop/desktop.css
+++ b/frappe/desk/page/desktop/desktop.css
@@ -48,7 +48,6 @@
     width: auto;
 }
 .desktop-search-icon > .icon {
-    stroke: var(--ink-gray-4);
     stroke-width: 1px;
 }
 
diff --git a/frappe/desk/page/desktop/desktop.html b/frappe/desk/page/desktop/desktop.html
index 131cec9751..99033d9819 100644
--- a/frappe/desk/page/desktop/desktop.html
+++ b/frappe/desk/page/desktop/desktop.html
@@ -8,17 +8,22 @@
                 alt="{{ _("App Logo") |e }}"
             >
         </div>
-        <div class="desktop-search-wrapper input-group search-bar text-muted ">
-                <div id="navbar-modal-search">
-                    Search or type a command
-                </div>
-                <span class="desktop-search-icon">
-                    <svg class="icon icon-sm"><use href="#icon-search"></use></svg>
-                </span>
-        </div>
-        <span class="desktop-avatar" style="margin-left: -10px;">
+        <div class="flex">
+            <div class="desktop-search-wrapper input-group search-bar text-muted ">
+                <button
+                    id="navbar-modal-search"
+                    class="btn-reset"
+                    title="Search"
+                >
+                    <span class="desktop-search-icon">
+                        <svg class="icon icon-sm"><use href="#icon-search"></use></svg>
+                    </span>
+                </button>
+            </div>
+            <div class="desktop-avatar" style="margin-left: -10px;">
 
-        </span>
+            </div>
+        </div>
     </header>
     <div class="desktop-container">
     </div>
diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html
index 9410c876b5..c70a11e283 100644
--- a/frappe/public/js/frappe/ui/toolbar/navbar.html
+++ b/frappe/public/js/frappe/ui/toolbar/navbar.html
@@ -10,31 +10,17 @@
 			</a>
 			<ul class="nav navbar-nav d-none d-sm-flex" id="navbar-breadcrumbs"></ul>
 			<div class="collapse navbar-collapse justify-content-end">
-				<form class="form-inline fill-width justify-content-end" role="search" onsubmit="return false;">
-					{% if (frappe.boot.read_only) { %}
-						<span class="indicator-pill yellow no-indicator-dot read-only-banner" title="{%= __("Your site is undergoing maintenance or being updated.") %}">
-							{%= __("Read Only Mode") %}
-						</span>
-					{% } %}
-					{% if (frappe.boot.user.impersonated_by) { %}
-						<span class="indicator-pill red no-indicator-dot" title="{%= __("You are impersonating as another user.") %}">
-							{%= __("Impersonating {0}", [frappe.boot.user.name]) %}
-						</span>
-					{% } %}
-					<div class="input-group search-bar text-muted hidden">
-						<div
-							id="navbar-modal-search"
-							class=""
-							placeholder="Search for type a command"
-						>
-							{%= __('Search or type a command ({0})', [frappe.utils.is_mac() ? '⌘ + K' : 'Ctrl + K']) %}
-						</div>
-						<span class="search-icon">
-							<svg class="icon icon-sm"><use href="#icon-search"></use></svg>
-						</span>
-					</div>
-				</form>
 				<ul class="navbar-nav">
+					<li>
+						<button
+							id="navbar-modal-search"
+							class="btn-reset text-muted"
+						>
+							<span class="search-icon">
+								<svg class="icon icon-sm"><use href="#icon-search"></use></svg>
+							</span>
+						</button>
+					</li>
 					<li class="nav-item dropdown dropdown-notifications dropdown-mobile hidden">
 						<button
 							class="btn-reset nav-link notifications-icon text-muted"
diff --git a/frappe/public/scss/desk/breadcrumb.scss b/frappe/public/scss/desk/breadcrumb.scss
index 9b8fea5a95..32aea39f0e 100644
--- a/frappe/public/scss/desk/breadcrumb.scss
+++ b/frappe/public/scss/desk/breadcrumb.scss
@@ -48,7 +48,5 @@
 #navbar-modal-search {
 	border-radius: var(--border-radius-sm);
 	padding: var(--input-padding);
-	background-color: var(--control-bg);
 	width: 100%;
-	padding-left: 40px;
 }