diff --git a/static/server/global_taskbar.html.part b/static/server/global_taskbar.html.part
index b19f852..d2b81be 100644
--- a/static/server/global_taskbar.html.part
+++ b/static/server/global_taskbar.html.part
@@ -1,13 +1,13 @@
 <span class="kiwix">
   <span id="kiwixtoolbar" class="ui-widget-header">
     <div class="kiwix_centered">
-      <div class="kiwix_searchform">
+      <div class="kiwix_searchform" style="margin: auto auto;float: none;">
         <form class="kiwixsearch" method="GET" action="__ROOT_LOCATION__/search" id="kiwixsearchform">
+          <label for="kiwixsearchbox" style="line-height: 30px;">&#x1f50d;</label>
           <input autocomplete="off" class="ui-autocomplete-input" id="kiwixsearchbox" name="pattern" type="text">
-          <input type="submit" value="&#x1f50d;">
         </form>
       </div>
     </div>
   </span>
 </span>
-<div style="display: block; height: 5em;"></div>
+<div style="display: block; height: 5em;"></div>
\ No newline at end of file
diff --git a/static/server/taskbar.css b/static/server/taskbar.css
index f0dfcdf..1efc6f3 100644
--- a/static/server/taskbar.css
+++ b/static/server/taskbar.css
@@ -39,6 +39,7 @@
 #kiwix_serve_taskbar_home_button button {
     overflow: hidden;
     text-overflow: ellipsis;
+    white-space: nowrap;
     max-width: 160px;
 }
 
@@ -51,7 +52,6 @@
     display: none;
 }
 
-
 #button_show_toggle:not(:checked)~label:after {
     content: '⌃';
     transform: rotate(180deg);
@@ -74,8 +74,9 @@
 label[for="button_show_toggle"]:after {
     transition: 0.1s;
     display: inline-block;
-    line-height: 21px;
     font-size: 30px;
+    line-height: 21px;
+    vertical-align: middle;
 }
 
 label[for="button_show_toggle"],
@@ -120,9 +121,10 @@ label[for=kiwixsearchbox] {
     z-index: 1;
     position: absolute;
     height: 100%;
-    left: 3px;
+    left: 5px;
     font-size: 90%;
     line-height: 26px;
+    vertical-align: middle;
 }
 
 /* Try to fix buggy stuff in jquery-ui autocomplete */