diff --git a/app/templates/base.html b/app/templates/base.html
index a9d3bc17..20d3a712 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -41,10 +41,14 @@
 				</ul>
 				<form class="form-inline my-2 my-lg-0" method="GET" action="/packages/">
 					{% if type %}<input type="hidden" name="type" value="{{ type }}" />{% endif %}
-					<input class="form-control" name="q" type="text"
-						placeholder="{% if query_hint %}{{ _('Search %(type)s', type=query_hint | lower) }}{% else %}{{ _('Search all packages') }}{% endif %}"
-						value="{{ query or ''}}">
-					<input class="btn btn-secondary my-2 my-sm-0 mr-sm-2" type="submit" value="{{ _('Search') }}" />
+					<div class="input-group mx-0 my-0">
+						<input class="form-control" name="q" type="text"
+							placeholder="{% if query_hint %}{{ _('Search %(type)s', type=query_hint | lower) }}{% else %}{{ _('Search all packages') }}{% endif %}"
+							value="{{ query or ''}}">
+						<button type="submit" class="btn btn-secondary" title="{{ _('Search') }}">
+							<i class="fas fa-search"></i>
+						</button>
+					</div>
 					<!-- <input class="btn btn-secondary my-2 my-sm-0"
 						data-toggle="tooltip" data-placement="bottom"
 						title="Go to the first found result for this query."