diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl
index 49e2ca6..79963e9 100644
--- a/templates/groups/details.tpl
+++ b/templates/groups/details.tpl
@@ -102,7 +102,11 @@
 				</h3>
 			</div>
 			<div class="panel-body">
-				<input class="form-control" type="text" component="groups/members/invite" placeholder="[[groups:invited.search]]"/><br/>
+				<div class="input-group">
+					<input class="form-control" type="text" component="groups/members/invite" placeholder="[[groups:invited.search]]"/>
+					<span class="input-group-addon search-button"><i class="fa fa-search"></i></span>
+				</div><br />
+				
 				<table component="groups/invited" class="table table-striped table-hover">
 					<!-- IF !group.invited.length -->
 					<div class="alert alert-info">[[groups:invited.none]]</div>
diff --git a/templates/partials/groups/memberlist.tpl b/templates/partials/groups/memberlist.tpl
index 99a1ccd..221e1c8 100644
--- a/templates/partials/groups/memberlist.tpl
+++ b/templates/partials/groups/memberlist.tpl
@@ -1,4 +1,8 @@
-<input class="form-control" type="text" component="groups/members/search" placeholder="[[global:search]]"/><br/>
+<div class="input-group">
+	<input class="form-control" type="text" component="groups/members/search" placeholder="[[global:search]]"/>
+	<span class="input-group-addon search-button"><i class="fa fa-search"></i></span>
+</div><br />
+
 <table component="groups/members" class="table table-striped table-hover" data-nextstart="{group.membersNextStart}">
 	<!-- BEGIN members -->
 	<tr data-uid="{group.members.uid}">
diff --git a/templates/tags.tpl b/templates/tags.tpl
index b3a2784..0008025 100644
--- a/templates/tags.tpl
+++ b/templates/tags.tpl
@@ -6,7 +6,7 @@
 		<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>
+				<span class="input-group-addon search-button"><i class="fa fa-search"></i></span>
 			</div>
 		</div>
 	</div>