diff --git a/public/src/app.js b/public/src/app.js
index c04df7da9a..327b63b5d4 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -496,8 +496,10 @@ var socket,
 		} else {
 			if (allowGuestSearching) {
 				$('#search-button').removeClass("hide").show();
+				$('#mobile-search-button').removeClass("hide").show();
 			} else {
 				$('#search-button').addClass("hide").hide();
+				$('#mobile-search-button').addClass("hide").hide();
 			}
 
 			$('.nodebb-loggedin').hide();
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 72b0d3d28f..be0a49486d 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -54,23 +54,24 @@
 
 			<div class="navbar-collapse collapse navbar-ex1-collapse">
 				<ul id="main-nav" class="nav navbar-nav">
+
 					<li>
-						<a href="{relative_path}/recent"><i class="fa fa-fw fa-clock-o" title="[[global:header.recent]]"></i><span class="visible-xs-inline"> Recent Topics</span></a>
+						<a href="{relative_path}/recent"><i class="fa fa-fw fa-clock-o" title="[[global:header.recent]]"></i><span class="visible-xs-inline"> [[global:header.recent]]</span></a>
 					</li>
 					<li class="nodebb-loggedin">
-						<a href="{relative_path}/unread"><i id="unread-count" class="fa fa-fw fa-inbox" data-content="0" title="[[global:header.unread]]"></i><span class="visible-xs-inline"> Unread Topics</span></a>
+						<a href="{relative_path}/unread"><i id="unread-count" class="fa fa-fw fa-inbox" data-content="0" title="[[global:header.unread]]"></i><span class="visible-xs-inline"> [[global:header.unread]]</span></a>
 					</li>
 					<li>
-						<a href="{relative_path}/users"><i class="fa fa-fw fa-users" title="[[global:header.users]]"></i><span class="visible-xs-inline"> Users</span></a>
+						<a href="{relative_path}/users"><i class="fa fa-fw fa-users" title="[[global:header.users]]"></i><span class="visible-xs-inline"> [[global:header.users]]</span></a>
 					</li>
 					<li class="{adminDisplay}">
-						<a href="{relative_path}/admin"><i class="fa fa-fw fa-cogs" title="[[global:header.admin]]"></i><span class="visible-xs-inline"> Admin Panel</span></a>
+						<a href="{relative_path}/admin"><i class="fa fa-fw fa-cogs" title="[[global:header.admin]]"></i><span class="visible-xs-inline"> [[global:header.admin]]</span></a>
 					</li>
-					<!-- IF allowGuestSearching -->
+
 					<li class="visible-xs">
-						<a href="{relative_path}/search">[[global:header.search]] Search</a>
+						<a id="mobile-search-button" href="{relative_path}/search"><i class="fa fa-search" title="[[global:header.search]]"></i><span class="visible-xs-inline"> [[global:header.search]]</span></a>
 					</li>
-					<!-- ENDIF allowGuestSearching -->
+
 					<!-- BEGIN navigation -->
 					<li class="{navigation.class}">
 						<a href="{relative_path}{navigation.route}" title="{navigation.title}">
@@ -147,6 +148,7 @@
 							</div>
 						</form>
 					</li>
+
 					<li class="hidden-xs">
 						<a id="search-button" class="hide"><i class="fa fa-search"></i></a>
 					</li>