diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
index 28775c9977..5b5a8828e8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
@@ -179,6 +179,14 @@
             </ol>
         </fieldset>
         [% END %]
-        <fieldset class="action"> <input type="submit" value="Search" class="submit" id="search" /> <input type="reset" id="clear-form" value="Clear form"> <a id="cancel" class="cancel close" href="#">Cancel</a>
-        </fieldset>
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="submit" class="btn btn-primary" id="search" value="Search" />
+                    <input type="reset" id="clear-form" class="btn btn-default" value="Clear form" />
+                    <button type="button" class="btn btn-default close_window">Close window</button>
+                </fieldset>
+            </div>
+        </nav>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
index 69dafe73de..1c6f801f2c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
@@ -8,17 +8,6 @@
     [% t("Koha") | html %]
 [% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<style>
-#clear-form {
-    border:0;
-    background:none;
-    color:#004d99;
-    padding-left:1em;
-}
-#clear-form:hover {
-    color:#538200;
-}
-</style>
 </head>
 
 <body id="auth_auth_finder" class="auth">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
index c063817a0f..ee21847f27 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
@@ -19,15 +19,6 @@
 .usefor li {
     list-style-type: none;
 }
-#clear-form {
-    border:0;
-    background:none;
-    color:#004d99;
-    padding-left:1em;
-}
-#clear-form:hover {
-    color:#538200;
-}
 </style>
 </head>
 
@@ -60,7 +51,11 @@
                 [% ELSE %]
                     
                 
-            </div><p>No results found</p>[% END %]
+            </div>
+            <div class="dialog message">
+                <p>No results found</p>
+            </div>
+            [% END %]
         </div>
         [% IF ( result ) %]<div id="resultlist">
             <table>