diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 5f4f1d1ceaa6..e2c6b92c38e4 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -259,6 +259,7 @@
   }
 
   function showSearch() {
+    $('#search').typeahead('setQuery', '');
     $('#search-form').show();
     $('#navbar-options').hide();
     if (window.hasOwnProperty('searchData')) {
@@ -289,7 +290,6 @@
   }
 
   function hideSearch() {
-    $('#search').typeahead('setQuery', '');
     $('#search-form').hide();
     $('#navbar-options').show();
   }
@@ -331,7 +331,7 @@
       showSignUp();
     @endif
 
-    $('ul.navbar-settings, ul.navbar-history').hover(function () {
+    $('ul.navbar-settings, ul.navbar-search').hover(function () {
         if ($('.user-accounts').css('display') == 'block') {
             $('.user-accounts').dropdown('toggle');
         }
@@ -403,7 +403,7 @@
 
         <div class="btn-group user-dropdown">
           <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
-            <div id="myAccountButton" class="ellipsis" style="max-width:{{ Utils::isPro() && ! Utils::isTrial() ? '100' : '70' }}px">
+            <div id="myAccountButton" class="ellipsis" style="max-width:{{ Utils::isPro() && ! Utils::isTrial() ? '130' : '100' }}px">
                 @if (session(SESSION_USER_ACCOUNTS) && count(session(SESSION_USER_ACCOUNTS)))
                     {{ Auth::user()->account->getDisplayName() }}
                 @else
@@ -473,10 +473,10 @@
       </ul>
 
 
-      <ul class="nav navbar-nav navbar-right navbar-history"> 
+      <ul class="nav navbar-nav navbar-right navbar-search"> 
         <li class="dropdown">
-          <a href="{{ Utils::getLastURL() }}" class="dropdown-toggle">
-            <span class="glyphicon glyphicon-time" title="{{ trans('texts.history') }}"/>
+          <a href="#" onclick="showSearch()">
+            <span class="glyphicon glyphicon-search" title="{{ trans('texts.search') }}"/>
           </a>
           <ul class="dropdown-menu">	        		        	
             @if (count(Session::get(RECENTLY_VIEWED)) == 0)
@@ -491,19 +491,11 @@
           </ul>
         </li>
       </ul>
-
-      <ul class="nav navbar-nav navbar-right navbar-settings"> 
-        <li class="dropdown">
-          <a href="#" onclick="showSearch()">
-            <span class="glyphicon glyphicon-search" title="{{ trans('texts.search') }}"/>
-          </a>
-        </li>
-      </ul>
       </div>
 
       <form id="search-form" class="navbar-form navbar-right" role="search" style="display:none">
         <div class="form-group">
-          <input type="text" id="search" style="width: 300px;padding-top:0px;padding-bottom:0px" 
+          <input type="text" id="search" style="width: 240px;padding-top:0px;padding-bottom:0px" 
             class="form-control" placeholder="{{ trans('texts.search') }}">
         </div>
       </form>