diff --git a/src/Jackett/Content/custom.js b/src/Jackett/Content/custom.js
index 3bc75e2ad..b7a076d8c 100644
--- a/src/Jackett/Content/custom.js
+++ b/src/Jackett/Content/custom.js
@@ -719,7 +719,7 @@ function showSearch(selectedIndexer) {
     });
 
     $('#jackett-search-perform').click(function () {
-        if ($('#jackett-search-perform').text().trim() !== 'Search trackers') {
+        if ($('#jackett-search-perform span').hasClass("spinner")) {
             // We are searchin already
             return;
         }
@@ -733,13 +733,13 @@ function showSearch(selectedIndexer) {
         $('#searchResults div.dataTables_filter input').val("");
         clearSearchResultTable($('#searchResults'));
         var jqxhr = $.post("search", queryObj, function (data) {
-            $('#jackett-search-perform').html('Search trackers');
+            $('#jackett-search-perform').html($('#search-button-ready').html());
             var searchResults = $('#searchResults');
             searchResults.empty();
             var datatable = updateSearchResultTable(searchResults, data).search('').columns().search('').draw();
             searchResults.find('div.dataTables_filter input').focusWithoutScrolling();
         }).fail(function () {
-            $('#jackett-search-perform').html('Search trackers');
+            $('#jackett-search-perform').html($('#search-button-ready').html());
             doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
         });
     });
diff --git a/src/Jackett/Content/index.html b/src/Jackett/Content/index.html
index 4d691003b..c5d7f38cb 100644
--- a/src/Jackett/Content/index.html
+++ b/src/Jackett/Content/index.html
@@ -393,20 +393,18 @@
                     </div>
                     <div class="modal-body">
                         <p>You can search all configured indexers from this screen.</p>
-                        <label>Query</label>
+                        <label for="text">Query</label>
                         <input type="text" name="query" id="searchquery"/>
-                        <label>Category</label>
-                        <select name="category" id="searchCategory"></select>
-                        <label>Tracker</label>
+                        <label for="tracker">Tracker</label>
                         <select name="tracker" id="searchTracker">
                             <option value="">-- All --</option>
                             {{#each indexers}}
                             <option value="{{id}}">{{name}}</option>
                             {{/each}}
                         </select>
-                        <button id="jackett-search-perform" class="btn btn-success btn-sm">
-                            <i class="fa fa-search"></i> Search trackers<span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
-                        </button>
+                        <label for="category">Category</label>
+                        <select name="category" id="searchCategory"></select>
+                        <button id="jackett-search-perform" class="btn btn-success btn-sm"><span class="fa fa-search"></span></button>
                         <div id="searchResults"></div>
                     </div>
                     <div class="modal-footer">
@@ -588,6 +586,10 @@
         <span class="spinner glyphicon glyphicon-refresh"></span>
     </script>
 
+    <script id="search-button-ready" type="text/x-handlebars-template">
+        <span class="fa fa-search"></span>
+    </script>
+
     <script src="../custom.js"></script>
 </body>
 </html>