From 4d99e18102c2647a9b1d66b2185c3f45825ed86d Mon Sep 17 00:00:00 2001
From: Solene Desvaux <sdesvaux@biblibre.com>
Date: Thu, 30 Jun 2022 11:26:53 +0200
Subject: [PATCH] Bug 30952: correction includes

---
 .../prog/css/src/staff-global.scss            |  12 +-
 .../includes/acquisitions-add-to-basket.inc   |  20 +-
 .../prog/en/includes/acquisitions-search.inc  |   6 +-
 .../prog/en/includes/auth-finder-search.inc   |   2 +-
 .../prog/en/includes/borrower_debarments.inc  |   2 +-
 .../en/includes/budgets-active-currency.inc   |   2 +-
 .../en/includes/category-out-of-age-limit.inc |   2 +-
 .../prog/en/includes/checkouts-table.inc      |   2 +-
 .../en/includes/contracts-admin-search.inc    |   1 +
 .../prog/en/includes/html_helpers.inc         |   2 +-
 .../prog/en/includes/intranet-bottom.inc      |   6 +-
 .../prog/en/includes/langmenu-staff-top.inc   |   8 +-
 .../prog/en/includes/letters-search.inc       |   8 +-
 .../prog/en/includes/lis-search.inc           |  10 +-
 .../prog/en/includes/noadd-warnings.inc       |   4 +-
 .../prog/en/includes/patron-return-claims.inc |   8 +-
 .../prog/en/includes/patron-search-header.inc |  89 ++-
 .../prog/en/includes/patron_messages.inc      |   2 +-
 .../prog/en/includes/patronfields.inc         |   2 +-
 .../prog/en/includes/patrons-admin-search.inc |   2 +-
 .../prog/en/includes/subscriptions-search.inc |  28 +-
 .../prog/en/modules/acqui/addorderiso2709.tt  |  28 +-
 .../prog/en/modules/acqui/duplicate_orders.tt |  16 +-
 .../prog/en/modules/acqui/invoices.tt         | 536 ++++++------------
 .../prog/en/modules/acqui/neworderempty.tt    |  24 +-
 .../en/modules/acqui/newordersubscription.tt  |   4 +-
 .../prog/en/modules/acqui/z3950_search.tt     |   6 +-
 .../prog/en/modules/catalogue/results.tt      |  10 +-
 .../prog/en/modules/cataloguing/additem.tt    |  25 +-
 .../prog/en/modules/circ/reserveratios.tt     | 143 ++---
 .../en/modules/members/member-password.tt     |   4 -
 .../prog/en/modules/members/search.tt         |   2 +-
 .../prog/en/modules/tools/upload-images.tt    |   2 +-
 33 files changed, 450 insertions(+), 568 deletions(-)

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 f9d7162869..8c271f99bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -483,6 +483,14 @@ div {
     height: 500px;
 }
 
+#filtres{
+    width: 100%;
+    display: block;
+    position: absolute;
+    left: 0px;
+    height: 500px;
+}
+
 button {
     //@include default-button;
 
@@ -1161,7 +1169,7 @@ ul {
     //height: 50px;
 
     li {
-        list-style-type: disc;
+        list-style-type: none;
 
         input {
             &.submit {
@@ -4496,7 +4504,7 @@ nav {
                     background-color: transparent;
                     //font-weight: bold;
                     text-decoration: none;
-                
+                    color: #71B443;
                 }
             }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc
index 0fecc7788c..1b1d2eaaef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc
@@ -7,21 +7,21 @@
                 <label>From an existing record:
                     <input type="text" name="q" size="25" />
                 </label>
-                <input type="submit" class="submit principal" id="searchtoorder" data-booksellerid="[% booksellerid | html %]" data-basketno="[% basketno | html %]" value="Submit" />
+                <input type="submit" class="principal" id="searchtoorder" data-booksellerid="[% booksellerid | html %]" data-basketno="[% basketno | html %]" value="Submit" />
             </form>
         </li>
-        <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a suggestion</a></li>
-        <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a subscription</a></li>
-        <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a new (empty) record</a></li>
-        <li><a href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basketno | uri %]">From existing orders (copy)</a></li>
-        <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From an external source</a></li>
-        <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"> From a new file</a></li>
-        <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]"> From a staged file</a></li>
-        [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From titles with highest hold ratios</a></li>[% END %]
+        <li><a id="lientype" href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a suggestion</a></li>
+        <li><a id="lientype" href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a subscription</a></li>
+        <li><a id="lientype" href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a new (empty) record</a></li>
+        <li><a id="lientype" href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basketno | uri %]">From existing orders (copy)</a></li>
+        <li><a id="lientype" href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From an external source</a></li>
+        <li><a id="lientype" href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"> From a new file</a></li>
+        <li><a id="lientype" href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]"> From a staged file</a></li>
+        [% IF ( CAN_user_circulate ) %]<li><a id="lientype" href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From titles with highest hold ratios</a></li>[% END %]
       </ul>
     [% ELSE %]
         <div class="dialog alert">
-          <p>You can't create any orders unless you first <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget and a fund</a>.</p>
+          <p>You can't create any orders unless you first <a id="lientype" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget and a fund</a>.</p>
         </div>
     [% END %]
 </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
index c20bb93eb2..d53ec64665 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
@@ -13,11 +13,11 @@
             <input type="text" id="title" style="display:inline;left: 125px;" class="focus" placeholder="Title" name="title" size="13" value="[% title | html %]" />
             <input type="text" id="searchsupplier" style="display:inline" class="focus" placeholder="Vendor" name="name" size="13" value="[% name | html %]" />
             <input type="hidden" id="do_search" name="do_search" value="do" />
-            <span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span>
-            <span class="filteraction" id="filteraction_on"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span>
+            <span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" class="toggle_element" data-element="#filtres,.filteraction">[-]</a></span>
+            <span class="filteraction" id="filteraction_on"> <a href="#" class="toggle_element" data-element="#filtres,.filteraction">[+]</a></span>
             <input value="" class="submit" id="submit" type="submit" />
                         
-            <p class="plus" id="filters" style="display:none">
+            <p class="plus" id="filtres" style="display:none">
                 <input type="text" style="right: 260px" placeholder="Basket" name="basket" id="basket" />
                 <input type="text" placeholder="Invoice number" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
             </p>
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 3ef66e1f9c..4aee275871 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
@@ -158,6 +158,6 @@
             </ol>
         </fieldset>
         [% END %]
-        <fieldset class="action"> <input type="submit" value="Search" class="submit principal" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a>
+        <fieldset class="action"> <input type="submit" value="Search" class="principal" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a>
         </fieldset>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
index 0519084585..9e4a3863f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
@@ -52,7 +52,7 @@
         </table>
     [% END %]
     [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
-        <p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
+        <p><a href="#" class="lientype" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
         <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
             <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
             <input type="hidden" name="action" value="add" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
index dfa669022d..da957379c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
@@ -6,7 +6,7 @@
     <div class="dialog alert">
         <h3>No active currency is defined</h3>
         [% IF CAN_user_acquisition_currencies_manage %]
-            <p><a href="/cgi-bin/koha/admin/currency.pl">Please specify an active currency.</a></p>
+            <p><a id="lientype" href="/cgi-bin/koha/admin/currency.pl">Please specify an active currency.</a></p>
         [% ELSE %]
             <p>Your administrator must specify an active currency.</p>
         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc
index 09a39bb293..f75e892e68 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc
@@ -1,5 +1,5 @@
 <li>
     <span class="circ-hlt">Patron's age is incorrect for their category.</span>
     Ages allowed are [% age_low | html %]-[% age_high | html %].
-    <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | uri %]&amp;step=3" class="btn btn-default btn-xs">Change category</a>
+    <a id="lientype" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | uri %]&amp;step=3" class="btn btn-default btn-xs">Change category</a>
 </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
index 6ea6120e20..e3b04aba1f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
@@ -3,7 +3,7 @@
     [% IF ( issuecount ) %]
         <div id="issues-table-loading-message">
             <p>
-                <a id="issues-table-load-now-button" href="#" class="btn btn-default"><i class="fa fa-book"></i> Show checkouts</a>
+                <a id="issues-table-load-now-button" href="#" class="btn btn-default lientype"><i class="fa fa-book"></i> Show checkouts</a>
             </p>
         </div>
         <form name="issues" action="/cgi-bin/koha/tools/export.pl" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
index 9972462d50..c247070c4c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
@@ -9,6 +9,7 @@
 	</div>
 
     [% INCLUDE 'patron-search-box.inc' %]
+    
     [% INCLUDE 'catalogue-search-box.inc' %]
 
 	<ul id="taille">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
index a991f0ce50..2ef879215b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
@@ -211,7 +211,7 @@
     [% IF display_columns_selection %][%# Needs js/pages/batchMod.js %]
         [% IF checkboxes_edit OR checkboxes_delete %]
             <div id="toolbar">
-                <a id="selectallbutton" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="clearallbutton" href="#"><i class="fa fa-remove"></i> Clear all</a> | <a id="clearonloanbutton" href="#">Clear on loan</a>
+                <a id="selectallbutton" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="clearallbutton" class="lienype" href="#"><i class="fa fa-remove"></i> Clear all</a> | <a id="clearonloanbutton" class="lientype" href="#">Clear on loan</a>
             </div>
         [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
index 27ba415943..7e437ee7ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -11,7 +11,7 @@
 
             [% IF ( languages_loo.group_enabled ) %]
             [% IF ( languages_loo.plural ) %]
-                <li class="dropdown"><a class="dropdown-toggle dropup" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag | html %]" href="#">
+                <li class="dropdown"><a class="dropdown-toggle dropup lientype" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag | html %]" href="#">
                     [% IF ( languages_loo.native_description ) %]
                         [% languages_loo.native_description | html %]
                     [% ELSE %]
@@ -31,7 +31,7 @@
                 [% IF ( sublanguages_loo.sublanguage_current ) %]
                     <li class="navbar-text"> <span class="currentlanguage disabled">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</span></li>
                 [% ELSE %]
-                <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a></li>
+                <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]" id="lientype"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a></li>
         [% END %]
                 [% END %]
 
@@ -49,7 +49,7 @@
                         [% END %]
                     </li>
                 [% ELSE %]
-                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]">
+                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]" id=" lientype">
                         [% IF ( languages_loo.native_description ) %]
                             [% languages_loo.native_description | html %]
                         [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc
index 34f0e5ebf3..9e707eed97 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc
@@ -9,18 +9,18 @@
                 [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
                     [% IF ( sublanguages_loo.enabled ) %]
                         [% IF ( sublanguages_loo.sublanguage_current ) %]
-                            <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]&nbsp;<i class="fa fa-check"></i></a></li>
+                            <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" id="lientype" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]&nbsp;<i class="fa fa-check"></i></a></li>
                         [% ELSE %]
-                            <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a></li>
+                            <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"  tabindex="-1" id="lientype" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a></li>
                         [% END %]
                     [% END # / IF sublanguages_loo.enabled %]
                 [% END # / FOREACH sublanguages_loo %]
             [% ELSE %]
                 [% IF ( languages_loo.group_enabled ) %]
                     [% IF ( languages_loo.current ) %]
-                        <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]&nbsp;<i class="fa fa-check"></i></a></li>
+                        <li role="presentation"><a href="#" tabindex="-1" id="lientype" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]&nbsp;<i class="fa fa-check"></i></a></li>
                     [% ELSE %]
-                        <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li>
+                        <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]" id="lientype"  tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li>
                     [% END %]
                 [% END # / IF languages_loo.current %]
             [% END # / IF ( languages_loo.plural ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
index 42a8805303..e8166b3171 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -2,10 +2,10 @@
 
 <div id="header_search" class="fold">
         <div id="notices_search" class="residentsearch">
-                <form action="/cgi-bin/koha/tools/letter.pl" method="post">
-                        <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="" placeholder="Search existing notices"/>
-                        <input type="submit" class="submit" id="submit" name="search" value="" />
-                </form>
+            <form action="/cgi-bin/koha/tools/letter.pl" method="post">
+                <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="" placeholder="Search existing notices"/>
+                <input type="submit" class="submit" id="submit" name="search" value="" />
+            </form>
         </div>
 
         [% INCLUDE 'patron-search-box.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc
index ab96350259..8fe83059d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc
@@ -37,14 +37,6 @@
         </form>
     </div>
 
-    <div id="search_search" class="residentsearch">
-        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-            <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Enter search keyords" />
-            <input value="" type="submit" id="submit" />
-        </form>
-    </div>
-    [% END %]
-
     [% INCLUDE 'catalogue-search-box.inc' %]
 
     <ul id="taille">
@@ -56,7 +48,7 @@
         <span id="button_1" class="buttonsearch active">Check-out</span>
         <span id="button_2" class="buttonsearch">Check-in</span>
         <span id="button_3" class="buttonsearch">Renew</span>
-        <span id="button_5" class="buttonsearch active">Search catalog</span>
+        <span id="button_4" class="buttonsearch active">Search catalog</span>
     </ul>
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc
index e0fdc2a6ae..64a0a68a3b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc
@@ -2,10 +2,10 @@
     <div class="dialog alert">
         <h3>Cannot add patron</h3>
         [% IF ( no_branches ) %]
-            <p><strong>There are no libraries defined. </strong>[% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/branches.pl">Please add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>
+            <p><strong>There are no libraries defined. </strong>[% IF ( CAN_user_parameters ) %]<a id="lientype" href="/cgi-bin/koha/admin/branches.pl">Please add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>
         [% END %]
         [% IF ( no_categories ) %]
-            <p><strong>There are no patron categories defined. </strong>[% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/categories.pl">Please add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.[% END %]</p>
+            <p><strong>There are no patron categories defined. </strong>[% IF ( CAN_user_parameters ) %]<a id="lientype" href="/cgi-bin/koha/admin/categories.pl">Please add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.[% END %]</p>
         [% END %]
     </div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-return-claims.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-return-claims.inc
index b2ad9700a9..4875d74cc2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-return-claims.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-return-claims.inc
@@ -1,11 +1,11 @@
 <div id="return-claims">
     <p id="return-claims-controls">
         [% IF ( patron.return_claims.resolved.count > 0 || patron.return_claims.unresolved.count > 0 ) %]
-            <a id="show_all_claims" class="ctrl_link" href="#">Show all [% patron.return_claims.count | html %] claim(s)</a>
-            <a id="show_unresolved_claims" class="ctrl_link disabled" href="#">Show [% patron.return_claims.unresolved.count | html %] unresolved claims</a>
+            <a id="show_all_claims" class="ctrl_link lientype" href="#">Show all [% patron.return_claims.count | html %] claim(s)</a>
+            <a id="show_unresolved_claims" class="ctrl_link disabled lientype" href="#">Show [% patron.return_claims.unresolved.count | html %] unresolved claims</a>
         [% ELSE %]
-            <a id="show_all_claims" class="ctrl_link" href="#"></a>
-            <a id="show_unresolved_claims" class="ctrl_link disabled" href="#"></a>
+            <a id="show_all_claims" class="ctrl_link lientype" href="#"></a>
+            <a id="show_unresolved_claims" class="ctrl_link disabled lientype" href="#"></a>
         [% END %]
     </p>
   <table id="return-claims-table" class="table table-bordered table-striped">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc
index 25df9b3cc3..a36f469db1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc
@@ -1,5 +1,74 @@
+[% USE Koha %]
+[% USE Branches %]
+[% USE Categories %]
+[% USE raw %]
+[% PROCESS 'html_helpers.inc' %]
+[% PROCESS 'patronfields.inc' %]
+
 <div id="header_search" class="fold">
 
+    <div id="patron_search" class="residentsearch">
+        <form action="/cgi-bin/koha/members/member.pl" method="post">
+            <div class="autocomplete">
+                <input id="searchmember" data-toggle="tooltip" size="25" placeholder="Enter patron card number or partial name" class="head-searchbox focus" name="searchmember" type="text" value="[% searchmember | html %]" autocomplete="off" />
+                <input type="hidden" name="quicksearch" value="1" />
+                <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span>
+                <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span>
+                <input value="" class="submit" id="submit" type="submit" />
+            </div>
+
+            <p class="plus" id="filters" style="display:none">
+                <select name="searchfieldstype" id="searchfieldstype" style="position: relative;bottom: 5px;">
+                    <option disabled selected hidden>Search fields:</option>
+                [% pref_fields = Koha.Preference('DefaultPatronSearchFields').split(',') %]
+                [% default_fields = [ 'standard', 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
+                [% search_options = default_fields.merge(pref_fields).unique %]
+                [% FOREACH s_o IN search_options %]
+                    [% display_name = PROCESS patron_fields name=s_o %]
+                    [% NEXT IF !display_name.length %]
+                    [% IF searchfieldstype == s_o %]
+                        <option selected="selected" value="[% s_o | html %]">[% display_name | $raw %]</option>
+                    [% ELSE %]
+                        <option value="[% s_o | html %]">[% display_name | $raw %]</option>
+                    [% END %]
+                [% END %]
+                </select>
+
+                <select name="searchtype" id="searchtype" style="position: relative;bottom: 5px;">
+                [% IF searchtype == 'start_with' %]
+                    <option selected="selected" value='start_with'>Starts with</option>
+                    <option value='contain'>Contains</option>
+                [% ELSE %]
+                    <option value='start_with'>Starts with</option>
+                    <option selected="selected" value='contain'>Contains</option>
+                [% END %]
+                </select>
+
+                [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %]
+                <select name="branchcode_filter" id="branchcode" style="position: relative;bottom: 5px;">
+                    <option disabled selected hidden>Library:</option>
+                    [% IF branches.size != 1 %]
+                    <option value="">Any</option>
+                    [% END %]
+                    [% PROCESS options_for_libraries libraries => branches %]
+                </select>
+
+                [% SET categories = Categories.all() %]
+                <select name="categorycode_filter" id="categorycode" style="position: relative;bottom: 5px;">
+                    <option disabled selected hidden>Category:</option>
+                    <option value="">Any</option>
+                    [% FOREACH category IN categories %]
+                        [% IF category.categorycode == categorycode_filter %]
+                            <option value="[% category.categorycode | html %]" selected="selected">[% category.description | html %]</option>
+                        [% ELSE %]
+                            <option value="[% category.categorycode | html %]">[% category.description | html %]</option>
+                        [% END %]
+                    [% END %]
+                </select>
+            </p>
+        </form>
+    </div>
+
     [% INCLUDE 'patron-search-box.inc' %]
 
     [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
@@ -21,15 +90,17 @@
     [% INCLUDE 'catalogue-search-box.inc' %]
 
     <ul id="taille">
-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
-        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
-
-        <span id="button_1" class="buttonsearch active">Check out</span>
-        <span id="button_2" class="buttonsearch">Check in</span>
-        <span id="button_3" class="buttonsearch">Renew</span>
-        <span id="button_4" class="buttonsearch">Search catalog</span>
+        <li><a id="icon_1" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_4" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
+
+        <span id="button_1" class="buttonsearch active">Search patrons</span>
+        <span id="button_2" class="buttonsearch active">Check out</span>
+        <span id="button_3" class="buttonsearch">Check in</span>
+        <span id="button_4" class="buttonsearch">Renew</span>
+        <span id="button_5" class="buttonsearch">Search catalog</span>
     </ul>
 </div><!-- /header_search -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
index 94051502e6..e2253d94dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
@@ -21,7 +21,7 @@
                 <span class="circ-hlt">Expiration:</span>
                 <span>Patron's card will expire soon.</span>
                 <span>Patron's card expires on [% expiry | $KohaDates %]</span>
-                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a>
+                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y" id="lientype">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a>
             </li>
         [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc
index 416a5ae26c..7edc5c9082 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc
@@ -1,6 +1,6 @@
 [%- BLOCK patron_fields -%]
      [%- SWITCH name -%]
-     [%- CASE standard -%]<span>Standard</span>
+     [%- CASE 'standard' -%]<span>Standard</span>
      [%- CASE 'borrowernumber' -%]<span>Borrowernumber</span>
      [%- CASE 'cardnumber' -%]<span>Card number</span>
      [%- CASE 'surname' -%]<span>Surname</span>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
index 2a6fe7b17e..53ae7f05eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -3,7 +3,7 @@
 
 	<div id="patron_category_search" class="residentsearch">
         <form action="[% script_name | html %]" method="post">
-            <input class="head-searchbox focus" type="text" name="description" value="[% searchfield | html %]" placeholder="Search by patron category name:" />
+            <input class="head-searchbox focus" type="text" name="description" value="[% searchfield | html %]" placeholder="Search by patron category name" />
             <input type="submit" class="submit" id="submit" name="search" value="" />
         </form>
 	</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
index 7fdea9c933..13e83a90a2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
@@ -2,38 +2,38 @@
 <div id="advsearch">
     <form action="" method="get">
         <fieldset class="brief">
-        <a href="#" class="toggle_element" data-element="#advsearch_form">Advanced search</a>
+        <a href="#" class="toggle_element" id="lientype" data-element="#advsearch_form">Advanced search</a>
             <div id="advsearch_form" style="display:none">
             <ol>
               <li>
-                <label for="issn">ISSN:</label>
-                <input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter | html %]" />
+                <p for="issn">ISSN:
+                <input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter | html %]" /></p>
               </li>
               <li>
-                <label for="title">Title:</label>
-                <input type="text" id="title" name="title_filter" value="[% title_filter | html %]" />
+                <p for="title">Title:
+                <input type="text" id="title" name="title_filter" value="[% title_filter | html %]" /></p>
               </li>
               [% IF Koha.Preference( 'marcflavour' ) == "UNIMARC" %]
               <li>
-                <label for="ean">EAN:</label>
-                <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter | html %]" />
+                <p for="ean">EAN:
+                <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter | html %]" /></p>
               </li>
               [% END %]
               <li>
-                <label for="publisher">Publisher:</label>
-                <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" />
+                <p for="publisher">Publisher:
+                <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" /></p>
               </li>
               <li>
-                <label for="supplier">Vendor:</label>
-                <input type="text" id="supplier" name="supplier_filter" value="[% supplier_filter | html %]" />
+                <p for="supplier">Vendor:
+                <input type="text" id="supplier" name="supplier_filter" value="[% supplier_filter | html %]" /></p>
               </li>
               <li>
-                <label for="branch">Library:</label>
+                <p for="branch">Library:
                 <select id="branch" name="branch_filter">
                   <option value="">All</option>
                   [%# FIXME Should not we filter the libraries? %]
                   [% PROCESS options_for_libraries libraries => Branches.all( selected => branch_filter, unfiltered => 1 ) %]
-                </select>
+                </select></p>
               </li>
             </ol>
             <input type="hidden" name="searched" value="1" />
@@ -44,7 +44,7 @@
                 <input type="hidden" name="basketno" value="[% basketno | html %]" />
             [% END %]
             <fieldset class="action">
-              <input type="submit" value="Search" />
+              <input type="submit" class="principal" value="Search" />
             </fieldset>
             </div>
         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index ef3c426b70..d783844d65 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -64,12 +64,13 @@
                 [% END %]
 
                 [% IF ( batch_details ) %]
-                    <h1>
+                    <h2>
                         Add orders from [% comments | html %]
                         ([% file_name | html %] staged on [% upload_timestamp | $KohaDates  with_hours => 1 %])
-                    </h1>
+                    </h2>
                     <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
                         <div id="tabs" class="toptabs">
+                        <div id="searchresults">
                             <ul>
                                 <li><a href="#records_to_import">Select to import</a></li>
                                 <li><a href="#items_info" class="items_info">Item information</a></li>
@@ -117,15 +118,15 @@
 
                                 [% FOREACH biblio IN biblio_list %]
                                     <fieldset class="biblio unselected rows" style="float:none;">
-                                        <legend>
+                                        <h3>
                                             <label for="record_[% biblio.import_record_id | html %]" style="width:auto;">
                                                 <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id | html %]" value="[% biblio.import_record_id | html %]" />
                                                 <span class="citation">[% biblio.citation | html %]</span>
                                             </label>
                                             <span class="links" style="font-weight: normal;">
-                                                ( <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | uri %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% biblio.import_record_id | html %]" class="previewData">Card</a> | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;breedingid=[% biblio.import_record_id | html %]&amp;import_batch_id=[% biblio.import_batch_id | html %]&amp;biblionumber=[% biblio.match_biblionumber | html %]">Add order</a> )
+                                                ( <a id="lientype" href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | uri %]" class="previewData">MARC</a> | <a id="lientype" href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% biblio.import_record_id | html %]" class="previewData">Card</a> | <a id="lientype" href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;breedingid=[% biblio.import_record_id | html %]&amp;import_batch_id=[% biblio.import_batch_id | html %]&amp;biblionumber=[% biblio.match_biblionumber | html %]">Add order</a> )
                                             </span>
-                                        </legend>
+                                        </h3>
                                         <div style="float:left">
                                             <ol>
                                                 <li class="status">
@@ -201,7 +202,7 @@
                                             [% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %]
                                             [% FOREACH item IN biblio.iteminfos %]
                                                 <fieldset>
-                                                    <legend>Item record [% item.item_id | html %]</legend>
+                                                    <h3>Item record [% item.item_id | html %]</h3>
                                                     <ol>
                                                         <li>
                                                             <label for="homebranch_item_[% item.item_id | html %]">homebranch</label>
@@ -354,7 +355,7 @@
 
                                 [% IF ( items ) %]
                                     <fieldset class="rows" style="float:none;">
-                                        <legend>Item</legend>
+                                        <h3>Item</h3>
                                         [% IF ( NoACQframework ) %]
                                             <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
                                         [% END %]
@@ -406,7 +407,7 @@
                             <div id="accounting_details">
                                 <p>Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):</p>
                                 <fieldset class="rows" style="float:none;">
-                                    <legend>Accounting details</legend>
+                                    <h3>Accounting details</h3>
                                     <ol>
                                         <li>
                                             <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
@@ -466,15 +467,16 @@
                                     </ol>
                                 </fieldset> <!-- /.rows -->
                             </div> <!-- /#accounting_details -->
-                        </div> <!-- /#tabs -->
+                        </div></div> <!-- /#tabs -->
 
                         <fieldset class="action">
-                            <input id="add_order" type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
+                            <input id="add_order" type="submit" class="principal" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
                         </fieldset>
                     </form> <!-- /#Aform -->
                 [% ELSE # IF ( batch_details ) %]
                     <div>
-                        <h1>Choose the file to add to the basket</h1>
+                        <h2>Choose the file to add to the basket</h2>
+                        <div id="searchresults">
                         <table id="files">
                             <thead>
                                 <tr>
@@ -513,13 +515,13 @@
                                         </td>
                                         <td>[% batch_lis.num_records | html %]</td>
                                         <td class="actions">
-                                            <a href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add orders</a>
+                                            <a id="lientype" href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add orders</a>
                                         </td>
                                     </tr>
                                 [% END # /FOREACH batch_lis %]
                             </tbody>
                         </table> <!-- /#files -->
-                    </div>
+                    </div></div>
                 [% END # /IF ( batch_details ) %]
             </div> [% # /div.col-sm-6 %]
         </div> [% # /div.row %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
index a7b5b2ab2d..d1c39d1a67 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
@@ -58,13 +58,13 @@ Acquisitions &rsaquo; Koha
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-<h1>Duplicate existing orders</h1>
+<h2>Duplicate existing orders</h2>
 [% INCLUDE 'blocking_errors.inc' %]
 
 [% IF op == 'search' || op == 'select' %]
 <form action="/cgi-bin/koha/acqui/duplicate_orders.pl" method="post">
     <fieldset class="rows">
-        <legend>
+        <h3>
             [% IF op == 'search' %]
                 <span>Search orders</span>
             [% ELSE %]
@@ -72,14 +72,14 @@ Acquisitions &rsaquo; Koha
             [% END %]
             <span class="toggle_orders_filters" id="show_orders_filters"><a href="#">[+]</a></span>
             <span class="toggle_orders_filters" id="hide_orders_filters"><a href="#">[-]</a></span>
-        </legend>
+        </h3>
         <div id="orders_filters">
             [% INCLUDE 'filter-orders.inc' %]
             <input type="hidden" name="op" value="select" />
             <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
 
             <input type="hidden" name="ordernumbers" value="[% ordernumbers.join(',') | html %]" />
-            <fieldset class="action"><input type="submit" value="Search" /></fieldset>
+            <fieldset class="action"><input type="submit" class="principal" value="Search" /></fieldset>
         </div>
     </fieldset>
 </form>
@@ -184,7 +184,7 @@ Acquisitions &rsaquo; Koha
         <fieldset class="action">
             <input type="hidden" name="op" value="batch_edit" />
             <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
-            <button type="submit" class="btn btn-default go_to_batch_edit">Next <i class="fa fa-fw fa-arrow-right"></i></button>
+            <button type="submit" class="btn btn-default go_to_batch_edit principal">Next <i class="fa fa-fw fa-arrow-right"></i></button>
         </fieldset>
         </form>
     </div>
@@ -195,7 +195,7 @@ Acquisitions &rsaquo; Koha
     <div id="accounting_details">
       <p>Duplicate all the orders with the following accounting details:</p>
       <fieldset class="rows" style="float:none;">
-          <legend>Accounting details</legend>
+          <h3>Accounting details</h3>
           <div class="hint" style="margin: 1em 1em 0">Check boxes to duplicate the original values</div>
           <ol>
               <li>
@@ -265,7 +265,7 @@ Acquisitions &rsaquo; Koha
         <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
         <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
         <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
-        <button type="submit" class="btn btn-default">Duplicate orders</button>
+        <button type="submit" class="btn btn-default principal">Duplicate orders</button>
         <a class="cancel" href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno | html %]">Cancel</a>
     </fieldset>
 </form>
@@ -297,7 +297,7 @@ Acquisitions &rsaquo; Koha
             [% END %]
             </tbody>
         </table>
-        <a class="btn btn-default" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"><i class="fa fa-fw fa-arrow-left"></i> Return to the basket</a
+        <a class="btn btn-default" id="lientype" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"><i class="fa fa-fw fa-arrow-left"></i> Return to the basket</a
     [% ELSE %]
         <span>No order has been duplicated. Maybe something wrong happened?</span>
     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
index 9dbe84713c..9563c49155 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -28,14 +28,12 @@
             <a href="#" aria-current="page">Invoices</a>
         </li>
     </ol>
-
-    <ol>
-        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
-    </ol>
-
-    <ol>
-        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
-    </ol>
+        <ol>
+            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
+        </ol>
+        <ol>
+            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
+        </ol>
 </nav>
 
 <div class="main container-fluid">
@@ -102,7 +100,7 @@
                   <td>
 
                       <div class="btn-group dropup">
-                          <a class="btn btn-default btn-xs dropdown-toggle" id="invoiceactions[% invoice.invoiceid | html %]" role="button" data-toggle="dropdown" href="#">
+                          <a class="btn btn-default btn-xs dropdown-toggle lientype" id="invoiceactions[% invoice.invoiceid | html %]" role="button" data-toggle="dropdown" href="#">
                              Actions <b class="caret"></b>
                           </a>
                           <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid | html %]">
@@ -112,365 +110,178 @@
                                     <li><a href="invoice.pl?op=reopen&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen</a></li>
                                 [% END %]
                             [% ELSE %]
-                                [% SET tab = 'opened' %]
+                                [% IF CAN_user_acquisition_edit_invoices %]
+                                    <li><a href="invoice.pl?op=close&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close</a></li>
+                                [% END %]
                             [% END %]
-                            <input type="checkbox" style="vertical-align: middle;" id="show_only_subscription_[% tab | html %]" class="show_only_subscription" data-tableid="[% tab | html %]resultst"/>
-                            <label for="show_only_subscription_[% tab | html %]">
-                                Show only subscriptions
-                            </label>
-                            <p><a id="CheckAll[% tab | html %]table" data-cb="[% tab | html %]" class="checkall" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="UncheckAll[% tab | html %]table" data-cb="[% tab | html %]" class="uncheckall" href="#"><i class="fa fa-remove"></i> Clear all</a></p>
-                            <table id="[% tab | html %]resultst" class="result">
-                                <thead>
-                                    <tr>
-                                        [% IF CAN_user_acquisition_merge_invoices %]
-                                            <th>&nbsp;</th>
-                                        [% END %]
-                                        <th>&nbsp;</th>
-                                        <th>Invoice number</th>
-                                        <th>Vendor</th>
-                                        <th>Shipment date</th>
-                                        <th>Billing date</th>
-                                        <th>Received bibliographic records</th>
-                                        <th>Received items</th>
-                                        <th>Status</th>
-                                        <th>&nbsp;</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    [% FOREACH invoice IN invoices %]
-                                        <tr data-invoiceid="[% invoice.invoiceid | html %]" data-booksellerid="[% invoice.booksellerid | html %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost | html %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid | html %]" data-closedate="[% invoice.closedate | $KohaDates %]">
-                                            [% IF CAN_user_acquisition_merge_invoices %]
-                                                <td>[% invoice.is_linked_to_subscriptions | html %]</td>
-                                            [% END %]
-                                            <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td>
-                                            <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td>
-                                            <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td>
-                                            <td data-order="[% invoice.shipmentdate | html %]">
-                                                [% invoice.shipmentdate | $KohaDates %]
-                                            </td>
-                                            <td data-order="[% invoice.billingdate | html %]">
-                                                [% invoice.billingdate | $KohaDates %]
-                                            </td>
-                                            <td>[% invoice.receivedbiblios | html %]</td>
-                                            <td>[% invoice.receiveditems | html %]</td>
-                                            <td>
-                                                [% IF invoice.closedate %]
-                                                    Closed on [% invoice.closedate | $KohaDates %]
-                                                [% ELSE %]
-                                                    Open
-                                                [% END %]
-                                            </td>
-                                            <td>
-
-                                                <div class="btn-group dropup">
-                                                    <a class="btn btn-default btn-xs dropdown-toggle" id="invoiceactions[% invoice.invoiceid | html %]" role="button" data-toggle="dropdown" href="#">
-                                                        Actions <b class="caret"></b>
-                                                    </a>
-                                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid | html %]">
-                                                        <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]"><i class="fa fa-search"></i> Details</a></li>
-                                                        [% IF invoice.closedate %]
-                                                            [% IF CAN_user_acquisition_reopen_closed_invoices %]
-                                                                <li><a href="invoice.pl?op=reopen&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen</a></li>
-                                                            [% END %]
-                                                        [% ELSE %]
-                                                            [% IF CAN_user_acquisition_edit_invoices %]
-                                                                <li><a href="invoice.pl?op=close&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close</a></li>
-                                                            [% END %]
-                                                        [% END # /IF invoice.closedate %]
-                                                        [% UNLESS invoice.receivedbiblios || invoice.receiveditems %]
-                                                            [% IF CAN_user_acquisition_delete_invoices %]
-                                                                <li><a href="invoice.pl?op=delete&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]" class="delete_invoice"><i class="fa fa-trash"></i> Delete</a></li>
-                                                            [% END %]
-                                                        [% END %]
-                                                    </ul>
-                                                </div> <!-- /.btn-group dropup -->
-                                            </td>
-                                        </tr>
-                                    [% END # /FOREACH invoice %]
-                                </tbody>
-                            </table> <!-- /#[% tab | html %]resultst -->
-
-                            [% IF CAN_user_acquisition_merge_invoices %]
-                                [% IF tab == 'closed' %]
-                                    <a class="btn btn-default merge" id="merge_closed" href="#merge_invoices" data-table="closedresultst"><i class="fa fa-compress"></i> Merge selected invoices</a>
-                                    <a class="btn btn-default" id="open_sel" href="#reopen_selected" data-table="closedresultst" data-op="reopen" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen selected invoices</a>
-                                [% ELSE  %]
-                                    <a class="btn btn-default merge" id="merge_open" href="#merge_invoices" data-table="openedresultst"><i class="fa fa-compress"></i> Merge selected invoices</a>
-                                    <a class="btn btn-default" id="close_sel" href="#close_selected" data-table="openedresultst" data-op="close" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close selected invoices</a>
-                                [% END # /IF tab == 'closed' %]
-                            [% END # /IF CAN_user_acquisition_merge_invoices %]
-                        [% END # /BLOCK invoices_table %]
-
-                        <div id="invoicestabs" class="toptabs">
-                            <ul class="nav nav-tabs" role="tablist">
-                                <li role="presentation" class="active"><a href="#opened" aria-controls="opened" role="tab" data-toggle="tab">Open invoices ([% openedinvoices.size || 0 | html %])</a></li>
-                                <li role="presentation"><a href="#closed" aria-controls="closed" role="tab" data-toggle="tab">Closed invoices ([% closedinvoices.size || 0 | html %]) </a></li>
-                            </ul>
-                            <div class="tab-content">
-                                <div id="opened" role="tabpanel" class="tab-pane active">
-                                    [% IF openedinvoices %]
-                                        [% INCLUDE invoices_table invoices = openedinvoices %]
-                                    [% ELSE %]
-                                        <div class="dialog message">
-                                            <p>Your search returned no open invoices.</p>
-                                        </div>
-                                    [% END %]
-                                </div> <!-- /#opened -->
-                                <div id="closed" role="tabpanel" class="tab-pane">
-                                    [% IF closedinvoices %]
-                                        [% INCLUDE invoices_table invoices = closedinvoices closed = 1 %]
-                                    [% ELSE %]
-                                        <div class="dialog message">
-                                            <p>Your search returned no closed invoices.</p>
-                                        </div>
-                                    [% END %]
-                                </div> <!-- /#closed -->
-                            </div> <!-- /.tab-content -->
-                        </div> <!-- /#invoicestabs -->
-
-
-                        <div id="merge_invoices">
-                            <form id="merge_invoice_form" action="/cgi-bin/koha/acqui/invoice.pl" method="post">
-                                <fieldset class="rows">
-                                    <ol>
-                                        <li><h2>Merge invoices</h2></li>
-                                        <li>
-                                            <table id="merge_table">
-                                                <thead>
-                                                    <tr>
-                                                        <th>Invoice number</th>
-                                                        <th>Shipment date</th>
-                                                        <th>Billing date</th>
-                                                        <th>Shipment cost</th>
-                                                    </tr>
-                                                </thead>
-                                                <tbody>
-                                                </tbody>
-                                            </table>
-                                        </li>
-
-                                        <li>
-                                            <label for="merge_invoicenumber" class="required">Invoice number:</label>
-                                            <input type="text" size="10" id="merge_invoicenumber" name="invoicenumber" value="" class="required" required="required" />
-                                            <span class="required">Required</span>
-                                        </li>
+                            [% UNLESS invoice.receivedbiblios || invoice.receiveditems %]
+                                [% IF CAN_user_acquisition_delete_invoices %]
+                                    <li><a href="invoice.pl?op=delete&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]" class="delete_invoice"><i class="fa fa-trash"></i> Delete</a></li>
+                                [% END %]
+                            [% END %]
+                          </ul>
+                      </div>
+                  </td>
+                </tr>
+              [% END %]
+            </tbody>
+          </table>
+          [% IF CAN_user_acquisition_merge_invoices %]
+              [% IF tab == 'closed' %]
+                <a class="btn btn-default merge lientype" id="merge_closed" href="#merge_invoices" data-table="closedresultst"><i class="fa fa-compress"></i> Merge selected invoices</a>
+                <a class="btn btn-default lientype" id="open_sel" href="#reopen_selected" data-table="closedresultst" data-op="reopen" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen selected invoices</a>
+              [% ELSE  %]
+                <a class="btn btn-default merge lientype" id="merge_open" href="#merge_invoices" data-table="openedresultst"><i class="fa fa-compress"></i> Merge selected invoices</a>
+                <a class="btn btn-default lientype" id="close_sel" href="#close_selected" data-table="openedresultst" data-op="close" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close selected invoices</a>
+              [% END %]
+          [% END %] <!-- invoices_table -->
+        [% END %]
+              <div id="invoicestabs" class="toptabs" style="clear:both;">
+                  <ul class="ui-tabs-nav">
+                      <li><a href="#opened">Open invoices ([% openedinvoices.size || 0 | html %])</a></li>
+                      <li><a href="#closed">Closed invoices ([% closedinvoices.size || 0 | html %]) </a></li>
+                  </ul>
+                  <div id="opened">
+                      [% IF openedinvoices %]
+                        [% INCLUDE invoices_table invoices = openedinvoices %]
+                    [% ELSE %]
+                        <div class="dialog message">
+                            <p>Your search returned no open invoices.</p>
+                        </div>
+                    [% END %]
+                  </div> <!-- opened -->
+                  <div id="closed">
+                      [% IF closedinvoices %]
+                        [% INCLUDE invoices_table invoices = closedinvoices closed = 1 %]
+                    [% ELSE %]
+                        <div class="dialog message">
+                            <p>Your search returned no closed invoices.</p>
+                        </div>
+                    [% END %]
+                </div> <!-- closed -->
+              </div> <!-- invoicestabs -->
 
-                                        <li>
-                                            <label for="merge_shipmentdate">Shipment date:</label>
-                                            <input type="text" size="10" id="merge_shipmentdate" name="shipmentdate" value="" class="flatpickr" />
-                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                                        </li>
 
-                                        <li>
-                                            <label for="merge_billingdate">Billing date:</label>
-                                            <input type="text" size="10" id="merge_billingdate" name="billingdate" value="" class="flatpickr" />
-                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                                        </li>
+                <div id="merge_invoices">
+                    <form id="merge_invoice_form" action="/cgi-bin/koha/acqui/invoice.pl" method="post">
+                    <fieldset class="rows">
+                        <ol>
+                        <li><h2>Merge invoices</h2></li>
+                        <li><table id="merge_table">
+                            <thead><tr><th>Invoice number</th><th>Shipment date</th><th>Billing date</th><th>Shipment cost</th></tr></thead>
+                            <tbody>
+                            </tbody>
+                        </table></li>
+                        <li><label for="merge_invoicenumber" class="required">Invoice number:</label>
+                                <input type="text" size="10" id="merge_invoicenumber" name="invoicenumber" value="" class="required" required="required" />
+                                <span class="required">Required</span>
+                                </li>
+                        <li>
+                            <label for="merge_shipmentdate">Shipment date:</label>
+                            <input type="text" size="10" id="merge_shipmentdate" name="shipmentdate" value="" class="flatpickr" />
+                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+                        </li>
 
-<<<<<<< HEAD
-                                        <li>
-                                            <label for="merge_shipmentcost">Shipment cost:</label>
-                                            <input type="text" size="10" id="merge_shipmentcost" name="shipmentcost" value="" />
-                                        </li>
-                                        <li>
-                                            <label for="merge_shipment_budgetid">Fund:</label>
-                                            <select id="merge_shipment_budgetid" name="shipment_budget_id">
-                                                <option value="">No fund</option>
-                                                [% FOREACH budget IN budgets_loop %]
-                                                    <option value="[% budget.budget_id | html %]">[% budget.budget_name | html %]</option>
-                                                [% END %]
-                                            </select>
-                                        </li>
+                        <li>
+                            <label for="merge_billingdate">Billing date:</label>
+                            <input type="text" size="10" id="merge_billingdate" name="billingdate" value="" class="flatpickr" />
+                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+                        </li>
 
-                                        <li>
-                                            <span class="label">Status:</span> <span id="merge_status"></span>
-                                        </li>
-                                        <li>
-                                            <input type="submit" value="Merge" />
-                                        </li>
-                                    </ol>
-                                    <input type="hidden" name="op" value="mod" />
-                                    <input type="hidden" id="merge_invoiceid" name="invoiceid" value="" />
-                                </fieldset> <!-- /.rows -->
-                            </form> <!-- /#merge_invoice_form -->
-                        </div> <!-- /#merge_invoices -->
-                    [% ELSE # IF invoices %]
-                        <p>Sorry, but there are no results for your search.</p>
-                        <p>Search was:
-                            <ul>
-                                [% IF ( invoicenumber ) %]
-                                    <li>Invoice number: [% invoicenumber | html %]</li>
-                                [% END %]
-                                [% IF booksellerid %]
-                                    <li>Vendor: [% suppliername | html %]</li>
-                                [% END %]
-                                [% IF shipmentdatefrom %]
-                                    <li>
-                                        Shipment date:
-                                        [% IF shipmentdateto %]
-                                            From [% shipmentdatefrom | $KohaDates %]
-                                            To [% shipmentdateto | $KohaDates %]
-                                        [% ELSE %]
-                                            All since [% shipmentdatefrom | $KohaDates %]
-                                        [% END %]
-                                    </li>
-                                [% ELSE %]
-                                    [% IF shipmentdateto %]
-                                        <li>
-                                            Shipment date:
-                                            All until [% shipmentdateto | $KohaDates %]
-                                        </li>
-                                    [% END %]
-                                [% END %]
-                                [% IF billingdatefrom %]
-                                    <li>
-                                        Billing date:
-                                        [% IF billingdateto %]
-                                            From [% billingdatefrom | $KohaDates %]
-                                            To [% billingdateto | $KohaDates %]
-                                        [% ELSE %]
-                                            All since [% billingdatefrom | $KohaDates %]
-                                        [% END %]
-                                    </li>
-                                [% ELSE %]
-                                    [% IF billingdateto %]
-                                        <li>
-                                            Billing date:
-                                            All until [% billingdateto | $KohaDates %]
-                                        </li>
-                                    [% END %]
+                      <li><label for="merge_shipmentcost">Shipment cost:</label>
+                              <input type="text" size="10" id="merge_shipmentcost" name="shipmentcost" value="" /></li>
+                      <li><label for="merge_shipment_budgetid">Fund:</label>
+                              <select id="merge_shipment_budgetid" name="shipment_budget_id">
+                                  <option value="">No fund</option>
+                                [% FOREACH budget IN budgets_loop %]
+                                    <option value="[% budget.budget_id | html %]">[% budget.budget_name | html %]
+                                    </option>
                                 [% END %]
-                                [% IF ( isbneanissn ) %]
-                                    <li>ISBN/EAN/ISSN: [% isbneanissn | html %]</li>
-                                [% END %]
-                                [% IF ( title ) %]
-                                    <li>Title: [% title | html %]</li>
-                                [% END %]
-                                [% IF ( author ) %]
-                                    <li>Author: [% author | html %]</li>
-                                [% END %]
-                                [% IF ( publisher ) %]
-                                    <li>Publisher: [% publisher | html %]</li>
-                                [% END %]
-                                [% IF ( publicationyear ) %]
-                                    <li>Publication year: [% publicationyear | html %]</li>
-                                [% END %]
-                                [% IF ( branch ) %]
-                                    <li>Library: [% Branches.GetName( branch ) | html %]</li>
-                                [% END %]
-                            </ul>
-                        </p>
-                    [% END # /IF invoices %]
+                              </select></li>
+
+                      <li><span class="label">Status:</span> <span id="merge_status"></span></li>
+                      <li><input type="submit" value="Merge" /></li>
+                      </ol>
+                      <input type="hidden" name="op" value="mod" />
+                      <input type="hidden" id="merge_invoiceid" name="invoiceid" value="" />
+                  </fieldset>
+                  </form>
+              </div>
+        [% ELSE %]
+          <p>Sorry, but there are no results for your search.</p>
+          <p>Search was:
+            <ul>
+              [% IF ( invoicenumber ) %]
+                <li>Invoice number: [% invoicenumber | html %]</li>
+              [% END %]
+              [% IF booksellerid %]
+                <li>Vendor: [% suppliername | html %]</li>
+              [% END %]
+              [% IF shipmentdatefrom %]
+                <li>Shipment date:
+                [% IF shipmentdateto %]
+                  From [% shipmentdatefrom | $KohaDates %]
+                  To [% shipmentdateto | $KohaDates %]
                 [% ELSE %]
-                    <p>Use the search form on the left to find invoices.</p>
-                [% END %]<!-- do_search -->
-            </main>
-        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+                  All since [% shipmentdatefrom | $KohaDates %]
+                [% END %]
+                </li>
+              [% ELSE %]
+                [% IF shipmentdateto %]
+                  <li>Shipment date:
+                    All until [% shipmentdateto | $KohaDates %]
+                  </li>
+                [% END %]
+              [% END %]
+              [% IF billingdatefrom %]
+                <li>Billing date:
+                [% IF billingdateto %]
+                  From [% billingdatefrom | $KohaDates %]
+                  To [% billingdateto | $KohaDates %]
+                [% ELSE %]
+                  All since [% billingdatefrom | $KohaDates %]
+                [% END %]
+                </li>
+              [% ELSE %]
+                [% IF billingdateto %]
+                  <li>Billing date:
+                    All until [% billingdateto | $KohaDates %]
+                  </li>
+                [% END %]
+              [% END %]
+              [% IF ( isbneanissn ) %]
+                <li>ISBN/EAN/ISSN: [% isbneanissn | html %]</li>
+              [% END %]
+              [% IF ( title ) %]
+                <li>Title: [% title | html %]</li>
+              [% END %]
+              [% IF ( author ) %]
+                <li>Author: [% author | html %]</li>
+              [% END %]
+              [% IF ( publisher ) %]
+                <li>Publisher: [% publisher | html %]</li>
+              [% END %]
+              [% IF ( publicationyear ) %]
+                <li>Publication year: [% publicationyear | html %]</li>
+              [% END %]
+              [% IF ( branch ) %]
+                <li>Library: [% Branches.GetName( branch ) | html %]</li>
+              [% END %]
+            </ul>
+          </p>
+        [% END %]<!-- invoices -->
+      [% ELSE %]
+        <p>Use the search form on the left to find invoices.</p>
+      [% END %]<!-- do_search -->
+    </main>
+</div> <!-- /.col-sm-10.col-sm-push-2 -->
 
-        <div class="col-sm-2 col-sm-pull-10">
-            <aside>
-                <form action="" method="get">
-                    <fieldset class="sidebar brief">
-                        <h3>Search filters</h3>
-                        <ol>
-                            <li>
-                                <label for="invoicenumber">Invoice number</label>
-                                <input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber | html %]"
-                                    class="focus" />
-                            </li>
-                            <li>
-                                <label for="supplier">Vendor:</label>
-                                <select id="supplier" name="supplierid">
-                                    <option value="">All</option>
-                                    [% FOREACH supplier IN suppliers_loop %]
-                                        [% IF ( supplier.selected ) %]
-                                            <option selected="selected" value="[% supplier.booksellerid | html %]">[% supplier.suppliername | html %]</option>
-                                        [% ELSE %]
-                                            <option value="[% supplier.booksellerid | html %]">[% supplier.suppliername | html %]</option>
-                                        [% END %]
-                                    [% END %]
-                                </select>
-                            </li>
-                            <li>
-                                <fieldset class="brief">
-                                    <legend>Shipment date</legend>
-                                    <ol>
-                                        <li>
-                                            <label for="shipmentdatefrom">From:</label>
-                                            <input type="text" id="shipmentdatefrom" name="shipmentdatefrom" size="10" value="[% shipmentdatefrom | $KohaDates %]" class="flatpickr" data-date_to="shipmentdateto" />
-                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                                        </li>
-                                        <li>
-                                            <label for="shipmentdateto">To:</label>
-                                            <input type="text" id="shipmentdateto" name="shipmentdateto" size="10" value="[% shipmentdateto | $KohaDates %]" class="flatpickr" />
-                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                                        </li>
-                                    </ol>
-                                </fieldset>
-                            </li>
-                            <li>
-                                <fieldset class="brief">
-                                    <legend>Billing date</legend>
-                                    <ol>
-                                        <li>
-                                            <label for="billingdatefrom">From:</label>
-                                            <input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom | $KohaDates %]" class="flatpickr" data-date_to="billingdateto" />
-                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                                        </li>
-                                        <li>
-                                            <label for="billingdateto">To:</label>
-                                            <input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto | $KohaDates %]" class="flatpickr" />
-                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                                        </li>
-                                    </ol>
-                                </fieldset>
-                            </li>
-                            <li>
-                                <label for="isbneanissn">ISBN / EAN / ISSN:</label>
-                                <input type="text" id="isbneanissn" name="isbneanissn" value="[% isbneanissn | html %]" />
-                            </li>
-                            <li>
-                                <label for="title">Title:</label>
-                                <input type="text" id="title" name="title" value="[% title | html %]" />
-                            </li>
-                            <li>
-                                <label for="author">Author:</label>
-                                <input type="text" id="author" name="author" value="[% author | html %]" />
-                            </li>
-                            <li>
-                                <label for="publisher">Publisher:</label>
-                                <input type="text" id="publisher" name="publisher" value="[% publisher | html %]" />
-                            </li>
-                            <li>
-                                <label for="publicationyear">Publication year:</label>
-                                <input type="text" id="publicationyear" name="publicationyear" value="[% publicationyear | html %]" />
-                            </li>
-                            <li>
-                                <label for="branch">Library:</label>
-                                <select id="branch" name="branch">
-                                    <option value="">All</option>
-                                    [%# FIXME Should not we filter the libraries %]
-                                    [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %]
-                                </select>
-                            </li>
-                        </ol>
-                        <fieldset class="action">
-                            <input type="submit" value="Search" />
-                        </fieldset>
-                    </fieldset> <!-- /.sidebar.brief -->
-                    <input type="hidden" name="op" id="op" value="do_search" />
-                </form>
-                [% INCLUDE 'acquisitions-menu.inc' %]
-            </aside>
-        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
-    </div> <!-- /.row -->
-=======
 <div class="col-sm-2 col-sm-pull-10">
 <aside>
 <div id="filters">
     <form action="" method="get">
       <fieldset class="sidebar brief">
-        <h4>Search filters</h4>
+        <h3>Search filters</h3>
         <ol>
           <li>
             <p for="invoicenumber">Invoice number
@@ -563,7 +374,6 @@
   </aside>
 </div> <!-- /.col-sm-2.col-sm-pull-10 -->
 </div> <!-- /.row -->
->>>>>>> Bug 30952: Search bar
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/acquisitions-menu.js") | $raw %]
@@ -571,19 +381,7 @@
     [% INCLUDE 'calendar.inc' %]
     <script>
         $(document).ready(function() {
-            $('[id^="CheckAll"]').click( function() {
-                var table_id = "#" + $(this).attr('data-cb') + "resultst";
-                $(table_id).find('.select-invoice[type="checkbox"]').each( function() {
-                    $(this).prop("checked" , true );
-                });
-            });
-            $('[id^="UncheckAll"]').click( function() {
-                var table_id = "#" + $(this).attr('data-cb') + "resultst";
-                $(table_id).find('.select-invoice[type="checkbox"]').each( function() {
-                    $(this).prop("checked" , false );
-                });
-            });
-
+            $('#invoicestabs').tabs();
             $(".delete_invoice").click(function(){
                 return confirmDelete(_("Are you sure you want to delete this invoice?"));
             });
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 0b12a4b6a1..42438b58e5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -61,20 +61,20 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-<h1>
+<h2>
     [% IF ( ordernumber ) %]
         Modify order line
     [% ELSE %]
         New order
     [% END %]
-</h1>
+</h2>
 
 <div class="dialog alert order_error" style="display:none"></div>
 
 [% IF ( basketno ) %]
     <div id="acqui_basket_summary">
     <fieldset class="rows">
-        <legend>Basket details</legend>
+        <h3>Basket details</h3>
         <ol>
         [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote | html %]</li>[% END %]
         [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
@@ -101,7 +101,7 @@
                 <input type="hidden" value="mod_basket" name="op" />
                 <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
             </li>
-            <fieldset class="action"><input type="submit" value="Change basketgroup" /></fieldset>
+            <fieldset class="action"><input type="submit" class="princial" value="Change basketgroup" /></fieldset>
         [% END %]
         </form>
         [% END %]
@@ -113,7 +113,7 @@
 <form action="/cgi-bin/koha/acqui/addorder.pl" method="post" class="validated noEnterSubmit" id="Aform" onsubmit="return Check(this);" >
 
     <fieldset class="rows">
-        <legend>Patrons</legend>
+        <h3>Patrons</h3>
         <ol>
             <li>
                 <span class="label">To notify on receiving:</span>
@@ -128,19 +128,19 @@
                     </ul>
                     <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids | html %]" />
                     <input type="hidden" id="op" name="op" value="mod_users" />
-                    <input type="button" id="add_user" onclick="UserSearchPopup();" value="Add user" />
+                    <input type="button" id="add_user" class="principal" onclick="UserSearchPopup();" value="Add user" />
                 </div>
             </li>
         </ol>
     </fieldset>
 
 <fieldset class="rows">
-        <legend>
+        <h3>
             Catalog details
             [% IF ( biblionumber ) %]
                 <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | uri %]"> Edit record</a></span>
             [% END %]
-        </legend>
+        </h3>
         [% UNLESS ( existing ) %]
         <input type="hidden" name="existing" value="no" />
         [% END %]
@@ -276,7 +276,7 @@
 
     [% IF ( suggestionid ) %]
         <fieldset class="rows">
-        <legend>Suggestion</legend>
+        <h3>Suggestion</h3>
         <ol>
           <li>
             <span class="label">Suggested by: </span>
@@ -318,7 +318,7 @@
       </div>
 
       <fieldset class="rows" id="itemfieldset">
-          <legend>Item</legend>
+          <h3>Item</h3>
           [% IF ( NoACQframework ) %]
               <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
           [% END %]
@@ -333,7 +333,7 @@
       [% END %][%# | html UNLESS subscriptionid %]
     [% END %][%# IF (AcqCreateItemOrdering) %]
     <fieldset class="rows">
-        <legend>Accounting details</legend>
+        <h3>Accounting details</h3>
         <ol>
             <li>
                 <label class="required" for="quantity">Quantity: </label>
@@ -500,7 +500,7 @@
     </fieldset>
     <fieldset class="action">
         <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
-        <input type="submit" value="Save" />
+        <input type="submit" class="principal" value="Save" />
         [% IF (suggestionid) %]
             <a class="cancel" href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">Cancel</a>
         [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
index 6c4708a858..00695d4517 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
@@ -49,7 +49,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-            <h1>Serials subscriptions</h1>
+            <h2>Serials subscriptions</h2>
             [% IF (done_searched) %]
                 <label for="show_only_renewed">
                     <input type="checkbox" style="vertical-align: middle;" id="show_only_renewed" />
@@ -119,8 +119,10 @@
 
 <div class="col-sm-2 col-sm-pull-10">
     <aside>
+    <div id="filters">
         [% INCLUDE 'subscriptions-search.inc' %]
         [% INCLUDE 'acquisitions-menu.inc' %]
+    
     </aside>
 </div> <!-- /.col-sm-2.col-sm-pull-10 -->
 </div> <!-- /.row -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index e010db3dce..a7497d8e7e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -89,7 +89,7 @@ tr.selected td {
     <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
     <div class="row">
     <div class="col-sm-6">
-    <h1>Order from external source</h1>
+    <h2>Order from external source</h2>
     <input type="hidden" name="op" id="op" value="do_search" />
 	    <fieldset class="rows">
          <ol>
@@ -153,7 +153,7 @@ tr.selected td {
 
 <div class="row">
     <div class="col-md-12">
-    <fieldset class="action"><input type="submit"  class="submit" value="Search" /> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Cancel</a></fieldset>
+    <fieldset class="action"><input type="submit"  class="principal" value="Search" /> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Cancel</a></fieldset>
     </div>
 </div>
 </form>
@@ -274,7 +274,7 @@ tr.selected td {
         [% IF ( show_nextbutton ) %]
             <input type="button" name="changepage_next" value="Next page" data-currentpage="[% current_page | html %]" />
         [% END %]
-        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page | html %]" size="4" type="text" /> <input type="submit" name="changepage_goto" value="Go" />
+        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page | html %]" size="4" type="text" /> <input type="submit" class="principal" name="changepage_goto" value="Go" />
     </form>
 
     [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 4948f8646f..34347d8203 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -176,7 +176,7 @@
 
                             [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
                                 <div class="btn-group">
-                                    <a class="btn btn-default btn-xs" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a>
+                                    <a class="btn btn-default btn-xs lientype" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a>
                                 </div>
                                 <div class="btn-group">
                                     <button type="button" id="results_batch_ops" class="btn btn-default btn-xs dropdown-toggle disabled" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -324,11 +324,13 @@
                     </div> <!-- /#searchheader -->
 
                 [% ELSE # /IF total %]
+                    <form method="post" name="fz3950" class="fz3950bigrpad">
+                        <div id="toolbar" class="btn-toolbar" style="background-color:transparent"><div>
+                            <button class="btn btn-default pat" type="button" id="z3950submit"><i class="fa fa-search"></i> Z39.50/SRU search</button>
+                        </div></div>
+                    </form>
 
                     <div id="searchheader">
-                        <form method="post" name="fz3950" class="fz3950bigrpad">
-                            <button class="btn btn-default" type="button" id="z3950submit"><i class="fa fa-search"></i> Z39.50/SRU search</button>
-                        </form>
                         <h3>No results found</h3>
                         [% IF ( searchdesc ) %]
                             <p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index bf61800ef3..579d87dd07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -61,7 +61,7 @@
         <div class="col-sm-12">
             <main>
                 [% INCLUDE 'blocking_errors.inc' %]
-<h1>Items for [% biblio.title | html %] [% IF ( biblio.author ) %] by [% biblio.author | html %][% END %] (Record #[% biblio.biblionumber | html %])</h1>
+<h2>Items for [% biblio.title | html %] [% IF ( biblio.author ) %] by [% biblio.author | html %][% END %] (Record #[% biblio.biblionumber | html %])</h2>
 
 [% IF ( barcode_not_unique ) %]<div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div>[% END %]
 [% IF ( no_next_barcode ) %]<div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div>[% END %]
@@ -73,6 +73,7 @@
 
 <div id="cataloguing_additem_itemlist">
     [% IF items %]
+    <div id="searchresults">
         [% SET date_fields = [ 'dateaccessioned', 'onloan', 'datelastseen', 'datelastborrowed', 'replacementpricedate' ] %]
         <div>
         <table id="itemst">
@@ -107,7 +108,7 @@
                     [% ELSE %]
                       <td>
                           <div class="btn-group dropup">
-                          <a class="btn btn-default btn-xs dropdown-toggle" id="itemactions[% item.itemnumber | html %]" role="button" data-toggle="dropdown" href="#">
+                          <a class="btn btn-default btn-xs dropdown-toggle lientype" id="itemactions[% item.itemnumber | html %]" role="button" data-toggle="dropdown" href="#">
                               Actions <b class="caret"></b>
                           </a>
                           <ul class="dropdown-menu" role="menu" aria-labelledby="itemactions[% item.itemnumber | html %]">
@@ -140,11 +141,14 @@
           </tbody>
         </table>
         </div>
+    </div>
     [% END %]
 
 <div class="row">
     <div class="col-sm-2">
+    <aside>
         [% INCLUDE 'biblio-view-menu.inc' %]
+    </aside>
     </div>
     <div class="col-sm-10">
 
@@ -155,11 +159,14 @@
         <input type="hidden" name="popup" value="1" />
     [% END %]
     <input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html %]" />
+
+
     [% IF op != 'saveitem' %]
         <h2 id="additema">Add item [% IF (circborrowernumber) %]<em>(fast cataloging)</em>[% END %]</h2>
     [% ELSE %]
         <h2 id="edititem">Edit item #[% itemnumber | html %][% IF ( barcode ) %] / Barcode [% barcode | html %][% END %]</h2>
     [% END %]
+
 	<fieldset class="rows">
         [% PROCESS subfields_for_item subfields => subfields %]
     </fieldset>
@@ -168,22 +175,22 @@
     [% END %]
 
 <fieldset class="action">    [% IF op != 'saveitem' %]
-    <input type="submit" name="phony_submit" value="phony_submit" id="phony_submit" style="display:none;" onclick="return false;" />
+    <input type="submit" class="principal" name="phony_submit" value="phony_submit" id= "phony_submit" style="display:none;" onclick="return false;" />
     <!-- Note : We use here a false submit button because we have several submit buttons and we don't want the user to believe they validated the adding of multiple items
 		when pressing the enter key, while in fact it is the first submit button that is validated, in our case the "add (single) item" button.
 		It is a bit tricky, but necessary in the sake of UI correctness.
     -->
     <span id="addsingle">
-        <input type="submit" name="add_submit" value="Add item" onclick="return Check(this.form)" />
-        <input type="submit" name="add_duplicate_submit" value="Add &amp; duplicate" onclick="return Check(this.form)" />
+        <input type="submit" name="add_submit" value="Add item" class="principal" onclick="return Check(this.form)" />
+        <input type="submit" name="add_duplicate_submit" class="principal" value="Add &amp; duplicate" onclick="return Check(this.form)" />
     </span>
     <span id="addmultiple">
-        <input type="button" name="add_multiple_copies" id="add_multiple_copies" value="Add multiple copies of this item" />
+        <input type="button" name="add_multiple_copies" class="principal" id="add_multiple_copies" value="Add multiple copies of this item" />
     </span>
     <fieldset id="add_multiple_copies_span">
         <label for="number_of_copies">Number of copies of this item to add: </label>
         <input type="text" id="number_of_copies" name="number_of_copies" value="" size="2" />
-        <input type="submit" id="add_multiple_copies_submit" name="add_multiple_copies_submit" value="Add" onclick="javascript:return Check(this.form) && CheckMultipleAdd(this.form.number_of_copies.value);" /> <a href="#" id="cancel_add_multiple" class="cancel">Cancel</a>
+        <input type="submit" id="add_multiple_copies_submit" class="principal" name="add_multiple_copies_submit" value="Add" onclick="javascript:return Check(this.form) && CheckMultipleAdd(this.form.number_of_copies.value);" /> <a href="#" id="cancel_add_multiple" class="cancel">Cancel</a>
         <div class="hint"><p>The barcode you enter will be incremented for each additional item.</p></div>
     </fieldset>
 
@@ -191,8 +198,8 @@
     [% IF op != 'add_item' %]
         <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
     [% END %]
-    <input type="submit" value="Save changes" onclick="return Check(this.form)">
-    <input type="button" id="addnewitem" value="Add a new item">
+    <input type="submit" class="principal" value="Save changes" onclick="return Check(this.form)">
+    <input type="button" class="lientype" id="addnewitem" value="Add a new item">
     <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Cancel</a>
     [% END %]</fieldset>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
index 36fac404de..5163045c83 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
@@ -20,7 +20,7 @@
 </head>
 
 <body id="circ_reserveratios" class="circ">
-[% INCLUDE 'header.inc'form=formulaire %]
+[% INCLUDE 'header.inc' form=formulaire %]
 
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
@@ -36,12 +36,12 @@
             </a>
         </li>
     </ol>
-    <ol>
-        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
-    </ol>
-    <ol>
-        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
-    </ol>
+        <ol>
+            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
+        </ol>
+        <ol>
+            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
+        </ol>
 </nav>
 
 <div class="main container-fluid">
@@ -49,7 +49,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-<h1>Hold ratios to calculate items needed</h1>
+<h2>Hold ratios to calculate items needed</h2>
    <h3>Calculated on [% todaysdate | $KohaDates %]. From [% from | $KohaDates %]
     to [% to | $KohaDates %]</h3>
 <p>These items have a hold ratio &ge; [% ratio | html %].</p>
@@ -119,78 +119,81 @@
                 <p>
                     [% IF ( reserveloo.thisratio_atleast1 ) %]
                         [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.copies_to_buy | html %] -->
-                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;rr_quantity_to_order=[% reserveloo.copies_to_buy | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% reserveloo.copies_to_buy | html %] to order</a>
+                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;rr_quantity_to_order=[% reserveloo.copies_to_buy | uri %]" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> [% reserveloo.copies_to_buy | html %] to order</a>
                         [% ELSE %]
                             <strong>[% reserveloo.copies_to_buy | html %] to order</strong>
                         [% END %]
                         [% IF ( reserveloo.pendingorders ) %]<br><strong>[% reserveloo.pendingorders | html %] pending</strong>[% END %]
                     [% ELSE %]
-                        <span>0 to order</span>
+                        0 to order
                     [% END %]
-                    </tbody>
-                </table>
-                [% ELSE %]
-                    <strong>No items found.</strong>
-                [% END %]
+                </p>
+            </td>
+        </tr>
+      [% END %]
+      </tbody>
+    </table>
+    [% ELSE %]
+        <strong>No items found.</strong>
+    [% END %]
 
             </main>
         </div> <!-- /.col-sm-10.col-sm-push-2 -->
 
         <div class="col-sm-2 col-sm-pull-10">
             <aside>
-                <div id="filters">
-                    <form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
-                        <fieldset class="brief">
-                            <h4>Refine results</h4>
-
-                            <fieldset>
-                                <ol>
-                                    <li>
-                                        <p>Hold ratio (greater than or equal to):
-                                        <input type="text" size="5" id="ratio" name="ratio" value="[% ratio | html %]" /></p>
-                                    </li>
-
-                                    <li class="checkbox">
-                                        <p>
-                                        [% IF include_ordered %]
-                                            <input id="include_ordered" name="include_ordered" type="checkbox" checked="checked"/>
-                                        [% ELSE %]
-                                            <input id="include_ordered" name="include_ordered" type="checkbox"/>
-                                        [% END %]
-                                        Include ordered</p>
-                                    </li>
-
-                                    <li class="checkbox">
-                                        <p>
-                                        [% IF include_suspended %]
-                                            <input id="include_suspended" name="include_suspended" type="checkbox" checked="checked"/>
-                                        [% ELSE %]
-                                            <input id="include_suspended" name="include_suspended" type="checkbox"/>
-                                        [% END %]
-                                        Include suspended</p>
-                                    </li>
-
-                                    <li>
-                                        <p>Start date:
-                                        <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" /></p>
-                                    </li>
-
-                                    <li>
-                                        <p>End date:
-                                        <input size="10" id="to" name="to" value="[% to | $KohaDates %]" type="text" class="flatpickr" /></p>
-                                    </li>
-                                </ol>
-                                <p>(inclusive)</p>
-                                <button type="submit" class="submit" id="principal">Go</button>
-                            </fieldset>
-                        </fieldset>
-
-                        [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]
-                        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
-                        <input type="hidden" name="basketno" value="[% basketno | html %]" />
-                        [% END %]
-                    </form>
-                </div>
+
+<form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
+<aside>
+<div id="filters">
+<fieldset class="brief">
+<h4>Refine results</h4>
+<ol>
+    <li>
+        <p for="ratio">Hold ratio (greater than or equal to):
+        <input type="text" size="5" id="ratio" name="ratio" value="[% ratio | html %]" /></p>
+    </li>
+
+    <li class="checkbox">
+        <p for="include_ordered">
+        [% IF include_ordered %]
+            <input id="include_ordered" name="include_ordered" type="checkbox" checked="checked"/>
+        [% ELSE %]
+            <input id="include_ordered" name="include_ordered" type="checkbox"/>
+        [% END %]  Include ordered</p>
+    </li>
+
+    <li class="checkbox">
+        <p for="include_suspended">
+        [% IF include_suspended %]
+            <input id="include_suspended" name="include_suspended" type="checkbox" checked="checked"/>
+        [% ELSE %]
+            <input id="include_suspended" name="include_suspended" type="checkbox"/>
+        [% END %]  Include suspended</p>
+    </li>
+
+    <li>
+        <p for="from">Start date:
+        <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" /></p>
+    </li>
+
+    <li>
+        <p for="to">End date:
+        <input size="10" id="to" name="to" value="[% to | $KohaDates %]" type="text" class="flatpickr" /></p>
+    </li>
+</ol>
+(inclusive)
+
+<fieldset class="action"><input type="submit" value="Go" class="principal"/></fieldset>
+</fieldset>
+</div>
+</aside>
+[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]
+<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
+<input type="hidden" name="basketno" value="[% basketno | html %]" />
+[% END %]
+</form>
+
             </aside>
         </div> <!-- /.col-sm-2.col-sm-pull-10 -->
      </div> <!-- /.row -->
@@ -200,7 +203,7 @@
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'columns_settings.inc' %]
     <script>
-        var table_settings = [% TablesSettings.GetTableSettings( 'circ', 'holdsratios', 'holds-ratios', 'json' ) | $raw %];
+        var columns_settings = [% TablesSettings.GetColumns( 'circ', 'holdsratios', 'holds-ratios', 'json' ) | $raw %];
         $(document).ready(function() {
             KohaTable("holdst", {
                 "aaSorting": [ [2,'desc'], [3,'asc'] ],
@@ -210,7 +213,7 @@
                     ],
                 "sPaginationType": "full",
                 "autoWidth": false
-            }, table_settings);
+            }, columns_settings);
        });
   </script>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
index a3dc21983e..c4e54cfb3c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
@@ -90,11 +90,7 @@
 	[% END %]
 
 
-<<<<<<< HEAD
-    <fieldset class="brief"><legend><h1>Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]</h1></legend>
-=======
     <fieldset class="brief"><h3>Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]</h3>
->>>>>>> Bug 30952: Search bar
 	<ol>
     <li><label for="newuserid">New username:</label>
     <input type="hidden" name="member" value="[% patron.borrowernumber | html %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% patron.userid | html %]" /></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt
index fecba041ea..0a8216028a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt
@@ -22,7 +22,7 @@
 
         [% PROCESS patron_search_table table_id => 'memberresultst' columns => columns %]
 
-        <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div>
+        <div id="closewindow"><a href="#" class="btn btn-default btn-default close cancel">Close</a></div>
 
     </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
index b818fc03e3..4e32afe4e0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
@@ -268,7 +268,7 @@
                             </fieldset>
 
                             <fieldset id="process_images" class="action">
-                                <button type="submit" class="btn btn-default btn-sm save_image">Process images</button>
+                                <button type="submit" class="btn btn-default btn-sm save_image principal">Process images</button>
                                 [% IF ( biblionumber ) %]
                                     <a class="cancel cancel_image" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Cancel</a>
                                 [% ELSE %]
-- 
2.17.1