diff --git a/templates/tags.tpl b/templates/tags.tpl
index 1235fee..b3a2784 100644
--- a/templates/tags.tpl
+++ b/templates/tags.tpl
@@ -2,7 +2,14 @@
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
 	<!-- IF tags.length -->
-	<input class="form-control" type="text" id="tag-search" placeholder="[[global:search]]"/>
+	<div class="row">
+		<div class="col-lg-12">
+			<div class="input-group">
+				<input type="text" class="form-control" placeholder="[[global:search]]" id="tag-search">
+				<span id="search-button" class="input-group-addon search-button"><i class="fa fa-search"></i></span>
+			</div>
+		</div>
+	</div>
 	<!-- ENDIF tags.length -->
 
 	<!-- IF !tags.length -->
diff --git a/templates/users.tpl b/templates/users.tpl
index cb29a4a..3d37d9a 100644
--- a/templates/users.tpl
+++ b/templates/users.tpl
@@ -6,7 +6,7 @@
 
 	<br />
 
-	<div class="search {search_display} well">
+	<div class="search {search_display}">
 		<div class="input-group">
 			<input class="form-control" id="search-user" type="text" placeholder="[[users:enter_username]]"/>
 			<span class="input-group-addon">