diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 6d03d1a310..a46c61d051 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -132,17 +132,36 @@ aside {
 
     fieldset {
         &.brief {
-            margin: 0 0 1em 0;
             padding: .4em .7em;
 
+            button + button,
+            input + input {
+                margin-left: 5px;
+            }
+
             fieldset {
-                margin: 0;
-                padding: .5em 0;
+                border-width: 1px;
+                border-radius: 0;
+                margin: 0 0 .5em 0;
+                padding: .5em;
 
                 legend {
                     font-size: 95%;
                     margin: 0;
                 }
+
+                &.action {
+                    margin-left: 0;
+                    padding: .5em 0;
+                }
+            }
+
+            input, select {
+                height: calc(1.5em + .75rem + 2px);
+            }
+
+            label {
+                margin: .5em 0 0 0;
             }
 
             li {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
index 67daf85bdd..e43000df35 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -156,9 +156,9 @@
                 <legend>Search orders</legend>
         [% END %]
             [% INCLUDE 'filter-orders.inc' %]
+            <input type="hidden" name="do_search" value="1" />
+            <fieldset class="action"><input type="submit" value="Search" /></fieldset>
         </fieldset>
-        <input type="hidden" name="do_search" value="1" />
-        <fieldset class="action"><input type="submit" value="Search" /></fieldset>
     </form>
 [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index 1d2609b0ac..962d7cc3ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -119,14 +119,14 @@
                 <form method="get" id="searchform">
                   <input type="hidden" id="firstletter_filter" value="" />
                   <fieldset class="brief">
-                    <h3>Filters</h3>
+                    <h3>Search patrons</h3>
                     <ol>
                       <li>
-                        <label for="searchmember_filter">Search:</label>
+                        <label for="searchmember_filter">Search for:</label>
                         <input type="text" id="searchmember_filter" value="[% searchmember | html %]"/>
                       </li>
                       <li>
-                        <label for="searchfieldstype_filter">Search fields:</label>
+                        <label for="searchfieldstype_filter">Search field:</label>
                         <select name="searchfieldstype" id="searchfieldstype_filter">
                             [% pref_fields = Koha.Preference('DefaultPatronSearchFields').split(',') %]
                             [% default_fields = [ 'standard', 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
@@ -155,7 +155,7 @@
                         </select>
                       </li>
                       <li>
-                        <label for="categorycode_filter">Category:</label>
+                        <label for="categorycode_filter">Patron category:</label>
                         [% SET categories = Categories.all() %]
                         <select id="categorycode_filter">
                           <option value="">Any</option>