From 9a338f2178d7e5ffadc2e0a16cb4be1f65e9c06a Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 1 Nov 2022 18:58:30 +0000
Subject: [PATCH] Bug 32068: Consistent classes for primary buttons:
 Administration

This patch makes changes the button markup in Administration templates
so that all submit buttons and any buttons that should should be styled
as primary buttons have the Bootstrap class "btn btn-primary."

To test, apply the patch and view pages in Administration to confirm
that everything looks correct. In most cases there are no visible
changes.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../prog/en/modules/admin/additional-fields.tt            | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/admin-home.tt     | 2 +-
 .../prog/en/modules/admin/adveditorshortcuts.tt           | 2 +-
 .../prog/en/modules/admin/aqbudgetperiods.tt              | 6 +++---
 .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt      | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/aqcontract.tt     | 6 +++---
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt   | 6 +++---
 .../intranet-tmpl/prog/en/modules/admin/audio_alerts.tt   | 2 +-
 .../prog/en/modules/admin/auth_subfields_structure.tt     | 4 ++--
 .../prog/en/modules/admin/auth_tag_structure.tt           | 8 ++++----
 .../prog/en/modules/admin/authorised_values.tt            | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/authtypes.tt      | 2 +-
 .../prog/en/modules/admin/biblio_framework.tt             | 2 +-
 .../prog/en/modules/admin/branch_transfer_limits.tt       | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/cash_registers.tt | 4 ++--
 .../intranet-tmpl/prog/en/modules/admin/categories.tt     | 6 +++---
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt   | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/classsources.tt   | 6 +++---
 .../intranet-tmpl/prog/en/modules/admin/clone-rules.tt    | 2 +-
 .../prog/en/modules/admin/columns_settings.tt             | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/credit_types.tt   | 2 +-
 .../prog/en/modules/admin/curbside_pickup.tt              | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/debit_types.tt    | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt    | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/edi_accounts.tt   | 2 +-
 .../prog/en/modules/admin/edi_ean_accounts.tt             | 2 +-
 .../prog/en/modules/admin/item_circulation_alerts.tt      | 2 +-
 .../prog/en/modules/admin/items_search_field.tt           | 2 +-
 .../prog/en/modules/admin/items_search_fields.tt          | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt      | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/localization.tt   | 2 +-
 .../prog/en/modules/admin/marc_subfields_structure.tt     | 4 ++--
 .../prog/en/modules/admin/marctagstructure.tt             | 6 +++---
 .../intranet-tmpl/prog/en/modules/admin/matching-rules.tt | 4 ++--
 .../prog/en/modules/admin/oai_set_mappings.tt             | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/overdrive.tt      | 2 +-
 .../prog/en/modules/admin/patron-attr-types.tt            | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/preferences.tt    | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/restrictions.tt   | 4 ++--
 .../intranet-tmpl/prog/en/modules/admin/share_content.tt  | 6 +++---
 .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt    | 4 ++--
 .../intranet-tmpl/prog/en/modules/admin/sms_providers.tt  | 4 ++--
 .../intranet-tmpl/prog/en/modules/admin/smtp_servers.tt   | 4 ++--
 .../intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt | 2 +-
 .../prog/en/modules/admin/sru_modmapping_auth.tt          | 2 +-
 .../prog/en/modules/admin/systempreferences.tt            | 6 +++---
 .../prog/en/modules/admin/transport-cost-matrix.tt        | 2 +-
 .../prog/en/modules/admin/usage_statistics.tt             | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/z3950servers.tt   | 2 +-
 52 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
index c76d77df6f..ee40903272 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
@@ -222,7 +222,7 @@
                 [% END %]
                 <input type="hidden" name="tablename" value="[% tablename | html %]" />
                 <input type="hidden" name="op" value="add" />
-                <input type="submit" value="Save" />
+                <input type="submit" class="btn btn-primary" value="Save" />
                 <a href="?tablename=[% tablename | uri %]" class="cancel">Cancel</a>
             </fieldset>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index 4361c97116..79a6853e53 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -63,7 +63,7 @@
                     <p>Manage global system preferences like MARC flavor, date format, administrator email, and templates.</p>
                     <input type="hidden" name="op" value="search" />
                     <input type="text" name="searchfield" value="[% searchfield | html %]" />
-                    <input type="submit" name="ok" class="submit" value="Search" />
+                    <input type="submit" name="ok" class="btn btn-primary" value="Search" />
                 </fieldset>
                 </form>
             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
index b01b2851b8..9af7128fa4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
@@ -64,7 +64,7 @@
                        [% END %]
                        </table>
                        </fieldset>
-                       </fieldset class="action"><input type="submit" value="Save shortcuts"></fieldset>
+                       </fieldset class="action"><input type="submit" class="btn btn-primary" value="Save shortcuts"></fieldset>
                    </form>
                [% ELSE %]
                    <p>Enable the advanced cataloging editor ( EnableAdvancedCatalogingEditor system preference) to define keyboard shortcuts</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
index 63c8c664ba..2ed8069b0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -232,7 +232,7 @@
     </fieldset>
 
     <fieldset class="action">
-        <input type="submit" value="Save" />
+        <input type="submit" class="btn btn-primary" value="Save" />
         <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">Cancel</a>
     </fieldset>
 
@@ -306,7 +306,7 @@
     <fieldset class="action">
         <!-- "save changes" button -->
         <!-- ###################################### -->
-        <input type="submit" value="Save" />
+        <input type="submit" class="btn btn-primary" value="Save" />
         [% IF ( budget_period_id ) %]
             <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]" class="cancel">Cancel</a>
         [% ELSE %]
@@ -406,7 +406,7 @@
       <fieldset class="action">
           <input type="hidden" name="op" value="close_confirmed" />
           <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
-          <input type="submit" value="Move unreceived orders" />
+          <input type="submit" class="btn btn-primary" value="Move unreceived orders" />
           <a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Cancel</a>
       </fieldset>
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index 195c2a6564..4ae62099fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -407,7 +407,7 @@
     </fieldset>
 
     <fieldset class="action">
-        <input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a>
+        <input type="submit" class="btn btn-primary" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a>
         <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
     </fieldset>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
index c9a3c667d0..3ff7488ee1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -147,14 +147,14 @@
                             </ol>
                         </fieldset>
                         <fieldset class="action">
-                            <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]&amp;contractnumber=[% contractnumber | html %]">Cancel</a>
+                            <input type="submit" class="btn btn-primary" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]&amp;contractnumber=[% contractnumber | html %]">Cancel</a>
                         </fieldset>
                     </form>
             [% END %]
             [% IF ( add_validate ) %]
                 <h1>Data recorded</h1>
                 <form action="[% script_name | html %]" method="post">
-                    <input type="submit" value="OK" />
+                    <input type="submit" class="btn btn-primary" value="OK" />
                 </form>
             [% END %]
             [% IF ( delete_confirm ) %]
@@ -185,7 +185,7 @@
                 <h1>Contract deleted</h1>
                 <form action="[% script_name | html %]" method="post">
                     <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
-                    <input type="submit" value="OK" />
+                    <input type="submit" class="btn btn-primary" value="OK" />
                 </form>
             [% END %]
             [% IF ( else ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
index d5ac03b492..0c79852d07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
@@ -170,7 +170,7 @@
         <!-- <input STYLE="background: gray;"   type="submit" value="Save" disabled="disabled"/> -->
     [% ELSE %]
         <input type="hidden" name="op" value="save" />
-        <fieldset class="action"><input type="submit" value="Save"/></fieldset>
+        <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /></fieldset>
     [% END %]
 
 
@@ -255,7 +255,7 @@
     </li>
     </ol>
     <fieldset class="action">
-        <input type="submit" name="option_submit" value="Submit" />
+        <input type="submit" name="option_submit" class="btn btn-primary" value="Submit" />
         <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
     </fieldset>
 </fieldset>
@@ -279,7 +279,7 @@
             </select>
         </li>
     </ol>
-    <fieldset class="action">    <input type="submit" value="Submit"/>
+    <fieldset class="action">    <input type="submit" class="btn btn-primary" value="Submit" />
     <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
     <input type="hidden" name="report_name" value="[% report_name | html %]" />
     <input type="hidden" name="output" value="file" /></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
index 22879620cf..dc1ef0a9fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
@@ -83,7 +83,7 @@
                         </ol>
                     </fieldset>
                     <fieldset class="action">
-                            <input id="save-alert" type="submit" value="Submit" />
+                            <input type="submit" id="save-alert" class="btn btn-primary" value="Submit" />
                             <a href="#" id="cancel-edit" class="cancel cancel-edit">Cancel</a>
                     </fieldset>
                 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
index e2e0130dc9..9db4d0c8b7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
@@ -89,7 +89,7 @@
         <input type="hidden" name="op" value="add_validate" />
         <input type="hidden" name="tagfield" value="[% tagfield | html %]" />
         <input type="hidden" name="authtypecode" value="[% authtypecode | html %]" />
-        <fieldset class="action"><input type="submit" class="submit" value="Save changes" /> <a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;authtypecode=[% authtypecode | uri %]">Cancel</a></fieldset>
+        <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save changes" /> <a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;authtypecode=[% authtypecode | uri %]">Cancel</a></fieldset>
 
         [% BLOCK outputsubfield %][% FILTER collapse %]
             [% SWITCH ( subfieldanchor ) %]
@@ -371,7 +371,7 @@
     <fieldset class="action"><input type="hidden" name="op" value="add_form" />
     <input type="hidden" name="tagfield" value="[% edit_tagfield | html %]" />
     <input type="hidden" name="authtypecode" value="[% edit_authtypecode | html %]" />
-    <input type="submit" value="Edit subfields" />
+    <input type="submit" class="btn btn-primary" value="Edit subfields" />
     <a class="cancel" href="auth_tag_structure.pl?searchfield=[% tagfield | uri %]&amp;authtypecode=[% authtypecode | uri %]">Cancel</a></fieldset>
     </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
index 1fe94868e5..3083c15c2b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
@@ -222,7 +222,7 @@ Authority MARC framework &rsaquo; Administration &rsaquo; Koha
         </ol>
         </fieldset>
         <fieldset class="action">
-            <input type="submit" value="Submit" />
+            <input type="submit" class="btn btn-primary" value="Submit" />
             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]" class="cancel">Cancel</a>
         </fieldset>
     </form>
@@ -253,7 +253,7 @@ Authority MARC framework &rsaquo; Administration &rsaquo; Koha
     <form action="[% script_name | html %]" method="post">
     <input type="hidden" name="authtypecode" value="[% authtypecode | html %]" />
     <input type="hidden" name="searchfield" value="[% searchfield | html %]" />
-    <input type="submit" value="OK" class="submit" />
+    <input type="submit" value="OK" class="btn btn-primary" />
     </form></div>
 [% END %]
 [% IF ( authtype_create ) %]
@@ -271,7 +271,7 @@ Authority MARC framework &rsaquo; Administration &rsaquo; Koha
             [% END %]
         [% END %]
         </select>
-        <input type="submit" value="OK" class="submit" />
+        <input type="submit" value="OK" class="btn btn-primary" />
     </form>
 [% END %]
 
@@ -294,7 +294,7 @@ Authority MARC framework &rsaquo; Administration &rsaquo; Koha
     [% END %]
     </select>
     <input type="text" name="searchfield" value="[% searchfield | html %]" />
-    <input type="submit" value="OK" class="submit" />
+    <input type="submit" value="OK" class="btn btn-primary" />
 </form><br />
 <div id="pagertable_authtagstructure">
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
index fabd008a47..b35b415085 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
@@ -256,7 +256,7 @@
 
                         <fieldset class="action">
                             <input type="hidden" name="id" value="[% av.id | html %]" />
-                            <input type="submit" value="Save" />
+                            <input type="submit" class="btn btn-primary" value="Save" />
                             <a class="cancel" href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=[% category_name | url %]">Cancel</a>
                         </fieldset>
                     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
index b6c940a08d..5e7e18353a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
@@ -138,7 +138,7 @@ Authority types &rsaquo; Administration &rsaquo; Koha
             </ol>
         </fieldset>
         <fieldset class="action">
-            <input type="submit" value="Submit" />
+            <input type="submit" class="btn btn-primary" value="Submit" />
             <a class="cancel" href="/cgi-bin/koha/admin/authtypes.pl">Cancel</a>
         </fieldset>
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
index 570d36336f..ac75fff85a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
@@ -132,7 +132,7 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
             </ol>
         </fieldset>
         <fieldset class="action">
-            <input type="submit" value="Submit" class="submit" />
+            <input type="submit" value="Submit" class="btn btn-primary" />
         </fieldset>
     </form>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
index a1cd3f304e..9ada2725bf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
@@ -102,7 +102,7 @@
         <fieldset class="action">
             <input type="hidden" name="updateLimits" value="1" />
             <input type="hidden" name="branchcode" value="[% branchcode | html %]" />
-            <input type="submit" value="Save" />
+            <input type="submit" class="btn btn-primary" value="Save" />
             <a class="cancel" href="/cgi-bin/koha/admin/admin-home.pl">Cancel</a>
         </fieldset>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index e2737f1ac8..4e6baf37de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -305,7 +305,7 @@ Libraries &rsaquo; Administration &rsaquo; Koha
             </ol>
         </fieldset>
         <fieldset class="action">
-            <input type="submit" value="Submit" />
+            <input type="submit" class="btn btn-primary" value="Submit" />
             <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a>
         </fieldset>
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
index 363877d542..73a62f5ccc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
@@ -144,9 +144,9 @@ Cash registers &rsaquo; Administration &rsaquo; Koha
 
                    <fieldset class="action">
                        [% IF cash_register %]
-                       <input type="submit" value="Save" />
+                       <input type="submit" class="btn btn-primary" value="Save" />
                        [% ELSE %]
-                       <input type="submit" value="Add" />
+                       <input type="submit" class="btn btn-primary" value="Add" />
                        [% END %]
                        <a class="cancel" href="/cgi-bin/koha/admin/cash_registers.pl?op=list">Cancel</a>
                    </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
index 91be5a1c53..75f94e970a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
@@ -450,7 +450,7 @@
             </fieldset>
         [% END %]
         <fieldset class="action">
-            <input type="submit" value="Save" />
+            <input type="submit" class="btn btn-primary" value="Save" />
             <a href="/cgi-bin/koha/admin/categories.pl" class="cancel">Cancel</a>
         </fieldset>
     </form>
@@ -526,11 +526,11 @@
             </table>
             <fieldset class="action">
                 [% IF patrons_in_category > 0 %]
-                    <input type="submit" value="OK" />
+                    <input type="submit" class="btn btn-primary" value="OK" />
                 [% ELSE %]
                     <input type="hidden" name="op" value="delete_confirmed" />
                     <input type="hidden" name="categorycode" value="[% categorycode | html %]" />
-                    <input type="submit" value="Delete this category" />
+                    <input type="submit" class="btn btn-primary" value="Delete this category" />
                     <a class="cancel" href="/cgi-bin/koha/admin/categories.pl">Cancel</a>
                 [% END %]
             </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
index aa0d0d6b1c..c05f3d7992 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -132,7 +132,7 @@
         </fieldset>
 
         <fieldset class="action">
-            <input type="submit" value="Submit" />
+            <input type="submit" class="btn btn-primary" value="Submit" />
             <a class="cancel" href="/cgi-bin/koha/admin/cities.pl">Cancel</a>
         </fieldset>
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
index c4d3381568..cc25f25bdc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
@@ -210,7 +210,7 @@ Classification sources &rsaquo; Administration &rsaquo; Koha
     </ol>
   </fieldset>
   <fieldset class="action">
-    <input type="submit" value="Save" />
+    <input type="submit" class="btn btn-primary" value="Save" />
     <a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>
   </fieldset>
 </form>
@@ -256,7 +256,7 @@ Classification sources &rsaquo; Administration &rsaquo; Koha
     </ol>
   </fieldset>
     <fieldset class="action">
-        <input type="submit" value="Save" />
+        <input type="submit" class="btn btn-primary" value="Save" />
         <a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>
     </fieldset>
 </form>
@@ -330,7 +330,7 @@ Classification sources &rsaquo; Administration &rsaquo; Koha
     </ol>
   </fieldset>
     <fieldset class="action">
-        <input type="submit" value="Save" />
+        <input type="submit" class="btn btn-primary" value="Save" />
         <a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>
     </fieldset>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
index 889076da16..a640de6920 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
@@ -76,7 +76,7 @@
             [% IF ( frombranch ) %]<input type="hidden" name="frombranch" value="[% frombranch | html %]" />[% END %]
             </fieldset>
         [% END %]
-        <input type="submit" value="Submit" />
+        <input type="submit" class="btn btn-primary" value="Submit" />
     </form>
 
     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
index 30ee078718..294fa77af0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
@@ -140,7 +140,7 @@
                             </div>
                         [% END %]
                         <fieldset class="action">
-                            <input type="submit" value="Save" />
+                            <input type="submit" class="btn btn-primary" value="Save" />
                         </fieldset>
                     [% ELSE %]
                         There is no table to configure for this module.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
index 22d91dcd65..66588da1b7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
@@ -149,7 +149,7 @@
                         </fieldset>
 
                         <fieldset class="action">
-                            <button id="save_credit_type" class="btn btn-default">Save</button>
+                            <button id="save_credit_type" class="btn btn-primary">Save</button>
                             <a class="cancel" href="/cgi-bin/koha/admin/credit_types.pl">Cancel</a>
                         </fieldset>
                     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
index 1f4022963f..1f86ebf9b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
@@ -170,7 +170,7 @@
         <input type="hidden" name="op" value="save" />
 
         <fieldset class="action">
-            <input type="submit" value="Save configuration" />
+            <input type="submit" class="btn btn-primary" value="Save configuration" />
         </fieldset>
     </form>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
index 27846b3ea0..7719d10fac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
@@ -155,7 +155,7 @@
     </fieldset>
 
     <fieldset class="action">
-        <input type="submit" value="Submit" />
+        <input type="submit" class="btn btn-primary" value="Submit" />
         <a href="/cgi-bin/koha/admin/currency.pl" class="cancel">Cancel</a>
     </fieldset>
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
index 7a432b133a..518602ccbf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
@@ -140,7 +140,7 @@
                         </fieldset>
 
                         <fieldset class="action">
-                            <button id="save_debit_type" class="btn btn-default">Save</button>
+                            <button id="save_debit_type" class="btn btn-primary">Save</button>
                             <a class="cancel" href="/cgi-bin/koha/admin/debit_types.pl">Cancel</a>
                         </fieldset>
                     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
index ce3e8f2638..4e47aa340c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
@@ -139,7 +139,7 @@
         </fieldset>
 
         <fieldset class="action">
-            <input type="submit" value="Submit" />
+            <input type="submit" class="btn btn-primary" value="Submit" />
             <a class="cancel" href="/cgi-bin/koha/admin/desks.pl">Cancel</a>
         </fieldset>
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
index abb4b2836d..a2ba4f0501 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
@@ -266,7 +266,7 @@ EDI accounts &rsaquo; Administration &rsaquo; Koha
   </fieldset>
 
   <fieldset class="action">
-    <input type="submit" value="Submit" />
+    <input type="submit" class="btn btn-primary" value="Submit" />
     <a href="/cgi-bin/koha/admin/edi_accounts.pl" class="cancel">Cancel</a>
   </fieldset>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
index b585530da1..a6b27e7b63 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
@@ -140,7 +140,7 @@ Library EANs &rsaquo; Administration &rsaquo; Koha
   </fieldset>
 
   <fieldset class="action">
-    <input type="submit" value="Submit"/>
+    <input type="submit" class="btn btn-primary" value="Submit" />
     <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl" class="cancel">Cancel</a>
   </fieldset>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
index 3f12b56530..e067c194f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
@@ -80,7 +80,7 @@
     <option value="*">Default</option>
     [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %]
 </select>
-<input type="submit" name="pick" value="Pick" />
+<input type="submit" name="pick" class="btn btn-primary" value="Pick" />
 </form>
 </div>
                     <div class="col-sm-6">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
index 677e712dcb..7aa147d30b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
@@ -58,7 +58,7 @@
               </div>
             </fieldset>
             <fieldset class="action">
-                <input type="submit" value="Submit" />
+                <input type="submit" class="btn btn-primary" value="Submit" />
                 <a class="cancel" href="/cgi-bin/koha/admin/items_search_fields.pl">Cancel</a>
             </fieldset>
           </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
index f40f7e9a05..f89a480f94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
@@ -113,7 +113,7 @@
               <input type="hidden" name="op" value="add" />
             </fieldset>
             <fieldset class="action">
-              <input type="submit" value="Submit" />
+              <input type="submit" class="btn btn-primary" value="Submit" />
               <a href="#" class="cancel hide_form">Cancel</a>
             </fieldset>
           </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
index 0d57f6eb02..ee95cd7f1e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -432,7 +432,7 @@ Item types &rsaquo; Administration &rsaquo; Koha
         </fieldset>
 
         <fieldset class="action">
-            <input type="submit" value="Save changes" />
+            <input type="submit" class="btn btn-primary" value="Save changes" />
             <a href="/cgi-bin/koha/admin/itemtypes.pl" class="cancel">Cancel</a>
         </fieldset>
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
index 542547b5f3..dde2683174 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
@@ -42,7 +42,7 @@
             </li>
             <li>
                 <span class="label">&nbsp;</span>
-                <input type="submit" value="Add" />
+                <input type="submit" class="btn btn-primary" value="Add" />
             </li>
         </ol>
     </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
index 781511efd7..fb394993e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
@@ -345,7 +345,7 @@
                             </div><!-- /subfieldtabs -->
 
                             <fieldset class="action">
-                                <input type="submit" value="Save changes" /> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield  | uri %]&amp;frameworkcode=[% frameworkcode | uri %]" class="cancel">Cancel</a>
+                                <input type="submit" class="btn btn-primary" value="Save changes" /> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield  | uri %]&amp;frameworkcode=[% frameworkcode | uri %]" class="cancel">Cancel</a>
                             </fieldset>
                         </form>
                     [% END # /IF ( add_form ) %]
@@ -436,7 +436,7 @@
                             <fieldset class="action"><input type="hidden" name="op" value="add_form" />
                                 <input type="hidden" name="tagfield" value="[% edit_tagfield | html %]" />
                                 <input type="hidden" name="frameworkcode" value="[% edit_frameworkcode | html %]" />
-                                <input type="submit" value="Edit subfields" />
+                                <input type="submit" class="btn btn-primary" value="Edit subfields" />
                                 <a class="cancel" href="marctagstructure.pl?searchfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode | html %]">Cancel</a>
                             </fieldset>
                         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
index 35fa9b0c94..35695a81e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
@@ -185,7 +185,7 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
         (if you select a value here, the indicators will be limited to the authorized value list)</li>
 </ol></fieldset> 
     <fieldset class="action">
-        <input type="submit" value="Save changes" />
+        <input type="submit" class="btn btn-primary" value="Save changes" />
         <a class="cancel" href="[% script_name | url %]?frameworkcode=[% framework.frameworkcode | uri %]">Cancel</a>
     </fieldset>
     </form>
@@ -228,7 +228,7 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
             <option value="[% fw.frameworkcode | html %]">[% fw.frameworktext | html %]</option>
         [% END %]
         </select>
-        <input type="submit" value="OK" />
+        <input type="submit" class="btn btn-primary" value="OK" />
     </form>
 [% END %]
 
@@ -250,7 +250,7 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
                 [% END %]
             [% END %]
         </select>
-    <input type="submit" value="Search" />
+    <input type="submit" class="btn btn-primary" value="Search" />
 <p>        <label for="select_display">Display only used tags/subfields</label>
         [% IF ( select_display ) %]
             <input type="checkbox" name="select_display" id="select_display" value="True" checked="checked" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
index f1b89ae874..ea06752c99 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
@@ -418,9 +418,9 @@
                         </fieldset>
                         <fieldset class="action">
                             [% IF ( edit_matching_rule ) %]
-                                <input type="button" value="Save" onclick="CheckMatchingRuleForm(this.form)" />
+                                <input type="button" class="btn btn-primary" value="Save" onclick="CheckMatchingRuleForm(this.form)" />
                             [% ELSE %]
-                                <input type="button" value="Save" onclick="CheckMatchingRuleForm(this.form)" />
+                                <input type="button" class="btn btn-primary" value="Save" onclick="CheckMatchingRuleForm(this.form)" />
                             [% END %]
                             <a class="cancel" href="/cgi-bin/koha/admin/matching-rules.pl">Cancel</a>
                         </fieldset> <!-- /.action -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
index ae423dce1a..ac18f8c388 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
@@ -130,7 +130,7 @@
         <input type="hidden" name="id" value="[% id | html %]" />
         <input type="hidden" name="op" value="save" />
         <fieldset class="action">
-            <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a>
+            <input type="submit" class="btn btn-primary" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a>
         </fieldset>
       </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
index 2a2d429813..0e5277380a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
@@ -95,7 +95,7 @@
                     </ol>
                 </fieldset>
                 <fieldset class="action">
-                    <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a>
+                    <input type="submit" class="btn btn-primary" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a>
                 </fieldset>
             </form>
         [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
index 015349fae0..f616939da9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
@@ -62,7 +62,7 @@
                         </tbody>
                     </table>
                     <div class="action">
-                        <input type="submit" value="Submit" />
+                        <input type="submit" class="btn btn-primary" value="Submit" />
                     </div>
                 </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
index f1dc68b302..2a4e1e2ffc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
@@ -246,7 +246,7 @@ Patron attribute types &rsaquo; Administration &rsaquo; Koha
     </ol>
   </fieldset>
   <fieldset class="action">
-      <input type="submit" value="Save" />
+      <input type="submit" class="btn btn-primary" value="Save" />
     <a class="cancel" href="/cgi-bin/koha/admin/patron-attr-types.pl">Cancel</a>
   </fieldset>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
index 4b8ce6a85f..b219e44983 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
@@ -60,7 +60,7 @@
     <div class="prefs-tab">
     <h2>[% TAB.tab_title | html %] preferences</h2>
     <form action="/cgi-bin/koha/admin/preferences.pl" method="post">
-        [% UNLESS ( searchfield ) %]<div id="toolbar"><button class="save-all submit btn btn-primary" type="submit">Save all [% TAB.tab_title | html %] preferences</button></div>[% END %]
+        [% UNLESS ( searchfield ) %]<div id="toolbar"><button class="save-all btn btn-primary" type="submit">Save all [% TAB.tab_title | html %] preferences</button></div>[% END %]
         <input type="hidden" name="op" value="save" />
         <input type="hidden" name="tab" value="[% TAB.tab_id | html %]" />
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
index cc2be69146..5a225b2294 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
@@ -129,7 +129,7 @@
         </fieldset>
 
         <fieldset class="action">
-            <input type="submit" value="Save" />
+            <input type="submit" class="btn btn-primary" value="Save" />
             <a href="/cgi-bin/koha/admin/restrictions.pl" class="cancel">Cancel</a>
         </fieldset>
     </form>
@@ -147,7 +147,7 @@
             <fieldset class="action">
                 <input type="hidden" name="op" value="delete_confirmed" />
                 <input type="hidden" name="code" value="[% restriction.code | html %]" />
-                <input type="submit" value="Delete this restriction" />
+                <input type="submit" class="btn btn-primary" value="Delete this restriction" />
                 <a class="cancel" href="/cgi-bin/koha/admin/restrictions.pl">Cancel</a>
             </fieldset>
         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
index 2f405cde6c..29f03081cd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
@@ -105,7 +105,7 @@
                             </ol>
                             <fieldset class="action">
                                 <input type="hidden" name="op" value="save" />
-                                <input type="submit" value="Save" />
+                                <input type="submit" class="btn btn-primary" value="Save" />
                             </fieldset>
                         </fieldset>
                     </form>
@@ -129,7 +129,7 @@
                                 </ol>
                                 <fieldset class="action">
                                     <input type="hidden" name="op" value="reset" />
-                                    <input type="submit" value="Reset your token" />
+                                    <input type="submit" class="btn btn-primary" value="Reset your token" />
                                 </fieldset>
                             </fieldset>
                         </form>
@@ -149,7 +149,7 @@
                                 </ol>
                                 <fieldset class="action">
                                     <input type="hidden" name="op" value="send" />
-                                    <input type="submit" value="Send to Mana KB" />
+                                    <input type="submit" class="btn btn-primary" value="Send to Mana KB" />
                                 </fieldset>
                             </fieldset>
                         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index a850d9dff4..9ea9123daa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -97,7 +97,7 @@
                     <select name="tobranch" id="tobranch">
                         [% PROCESS options_for_libraries libraries => Branches.all( unfiltered => 1 ) %]
                     </select>
-                    <input type="submit" id="clone_rules" value="Clone" />
+                    <input type="submit" id="clone_rules" class="btn btn-primary" value="Clone" />
                 </form>
             [% END %]
         [% END %]
@@ -434,7 +434,7 @@
                     </td>
                     <td class="actions">
                         <input type="hidden" name="branch" value="[% current_branch | html %]"/>
-                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
+                        <button type="submit" class="btn btn-primary btn-xs"><i class="fa fa-save"></i> Save</button>
                         <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>
                     </td>
                     <td><input type="text" name="note" id="note" size="15" value="" maxlength="100"></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
index f3fe07a972..56c562dff3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
@@ -99,8 +99,8 @@
                             </ol>
                         </fieldset>
                         <fieldset class="action">
-                            <input type="submit" id="submit_save" value="Submit" />
-                            <input type="submit" value="Submit" id="submit_update" />
+                            <input type="submit" id="submit_save" class="btn btn-primary" value="Submit" />
+                            <input type="submit" id="submit_update" class="btn btn-primary" value="Submit" />
                             <a class="cancel cancel_edit" id="cancel" href="sms_providers.pl">Cancel</a>
                         </fieldset>
                     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
index b9d75e7815..1d7cd0e8d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
@@ -137,7 +137,7 @@
             </ol>
         </fieldset>
         <fieldset class="action">
-            <input type="submit" value="Submit" />
+            <input type="submit" class="btn btn-primary" value="Submit" />
             <a class="cancel" href="/cgi-bin/koha/admin/smtp_servers.pl">Cancel</a>
         </fieldset>
     </form>
@@ -219,7 +219,7 @@
             </ol>
         </fieldset>
         <fieldset class="action">
-            <input type="submit" value="Submit" />
+            <input type="submit" class="btn btn-primary" value="Submit" />
             <a class="cancel" href="/cgi-bin/koha/admin/smtp_servers.pl">Cancel</a>
         </fieldset>
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
index 7dc7efdaea..90e89c4b87 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
@@ -67,7 +67,7 @@
                 </div>
             </fieldset>
             <fieldset class="action">
-                <input type="submit" value="Save" class="submit" />
+                <input type="submit" class="btn btn-primary" value="Save" />
                 <a class="close cancel" href="#">Cancel</a>
             </fieldset>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
index 388c048b80..1dcca9ec84 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
@@ -64,7 +64,7 @@
                 </div>
             </fieldset>
             <fieldset class="action">
-                <input type="submit" value="Save" class="submit" />
+                <input type="submit" class="btn btn-primary" value="Save" />
                 <a class="close cancel" href="#">Cancel</a>
             </fieldset>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
index bfee4fc2b8..e731849019 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
@@ -211,7 +211,7 @@
                 [% END %]
                 </li>
         </ol></fieldset>
-        <fieldset class="action"><input type="submit" value="Save" /> 
+        <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" />
           [% IF ( return_tab ) %]
             <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl?tab=[% return_tab | html %]">Cancel</a>
           [% ELSE %]
@@ -293,7 +293,7 @@
         <h1>Data recorded</h1>
         
         <form action="[% script_name | html %]" method="post">
-        <input type="submit" value="OK" />
+        <input type="submit" class="btn btn-primary" value="OK" />
         </form>
     [% END %]
     
@@ -318,7 +318,7 @@
     [% IF ( delete_confirmed ) %]
         <h1>Data deleted</h1>
         <form action="[% script_name | html %]" method="post">
-            <input type="submit" value="Back to system preferences" />
+            <input type="submit" class="btn btn-primary" value="Back to system preferences" />
         </form>
     [% END %]
    
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
index 343b02c99e..a50d07491a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
@@ -99,7 +99,7 @@
                 </table>
             </fieldset>
             <fieldset class="action">
-                <input type="submit" value="Save" class="submit" /> <a href="/cgi-bin/koha/admin/transport-cost-matrix.pl" class="cancel">Cancel</a>
+                <input type="submit" class="btn btn-primary" value="Save" /> <a href="/cgi-bin/koha/admin/transport-cost-matrix.pl" class="cancel">Cancel</a>
             </fieldset>
         </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
index 1cef9df732..ba63168591 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
@@ -248,7 +248,7 @@
 
         <fieldset class="action">
             <input type="hidden" name="op" value="update" />
-            <input type="submit" value="Update your statistics usage" />
+            <input type="submit" class="btn btn-primary" value="Update your statistics usage" />
             <a class="cancel" href="/cgi-bin/koha/admin/usage_statistics.pl">Cancel</a>
         </fieldset>
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
index f7f8ad1d6f..0bd7b8a869 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@@ -201,7 +201,7 @@
         </ol>
         </fieldset>
 
-        <fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/z3950servers.pl">Cancel</a></fieldset>
+        <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/z3950servers.pl">Cancel</a></fieldset>
     </form>
 [% END %]
 
-- 
2.20.1