Attachment 42917 Details for Bug 13696 – Bug 13696: Pass the classes to use for icons to the templates

[patch] Bug 13696: Pass the classes to use for icons to the templates

Bug-13696-Pass-the-classes-to-use-for-icons-to-the.patch (text/plain), 118.01 KB, created by Jonathan Druart on 2015-09-28 12:27:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-09-28 12:27:23 UTC

Size: 118.01 KB

patch

obsolete

>From 1c65a0a7e6c013043806c042a87b0e8f80f00b84 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 28 Sep 2015 13:26:14 +0100
>Subject: [PATCH] Bug 13696: Pass the classes to use for icons to the templates
>
>---
> C4/Auth.pm                                             |  2 ++
> .../prog/en/includes/acquisitions-toolbar.inc          | 10 +++++-----
> .../prog/en/includes/auth-finder-search.inc            |  4 ++--
> .../prog/en/includes/authorities-toolbar.inc           | 12 ++++++------
> .../prog/en/includes/budgets-admin-toolbar.inc         |  8 ++++----
> .../intranet-tmpl/prog/en/includes/cat-toolbar.inc     | 16 ++++++++--------
> .../intranet-tmpl/prog/en/includes/checkouts-table.inc |  8 ++++----
> .../intranet-tmpl/prog/en/includes/members-toolbar.inc | 12 ++++++------
> .../intranet-tmpl/prog/en/includes/patron-toolbar.inc  |  4 ++--
> .../intranet-tmpl/prog/en/includes/quotes-toolbar.inc  |  6 +++---
> .../prog/en/includes/quotes-upload-toolbar.inc         |  4 ++--
> .../intranet-tmpl/prog/en/includes/reports-toolbar.inc |  6 +++---
> .../prog/en/includes/rotating-collections-toolbar.inc  |  6 +++---
> .../intranet-tmpl/prog/en/includes/serials-toolbar.inc | 18 +++++++++---------
> .../prog/en/includes/virtualshelves-toolbar.inc        | 10 +++++-----
> .../intranet-tmpl/prog/en/modules/acqui/basket.tt      | 14 +++++++-------
> .../intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 10 +++++-----
> .../intranet-tmpl/prog/en/modules/acqui/booksellers.tt |  4 ++--
> .../intranet-tmpl/prog/en/modules/acqui/invoices.tt    |  8 ++++----
> .../intranet-tmpl/prog/en/modules/acqui/supplier.tt    |  4 ++--
> .../prog/en/modules/admin/aqbudgetperiods.tt           | 10 +++++-----
> .../prog/en/modules/admin/auth_tag_structure.tt        |  2 +-
> .../prog/en/modules/admin/authorised_values.tt         |  4 ++--
> .../intranet-tmpl/prog/en/modules/admin/authtypes.tt   |  2 +-
> .../prog/en/modules/admin/biblio_framework.tt          |  2 +-
> .../intranet-tmpl/prog/en/modules/admin/branches.tt    |  4 ++--
> .../intranet-tmpl/prog/en/modules/admin/categorie.tt   |  2 +-
> .../intranet-tmpl/prog/en/modules/admin/cities.tt      |  2 +-
> .../prog/en/modules/admin/classsources.tt              |  4 ++--
> .../intranet-tmpl/prog/en/modules/admin/currency.tt    |  2 +-
> .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt   |  2 +-
> .../prog/en/modules/admin/marctagstructure.tt          |  2 +-
> .../prog/en/modules/admin/matching-rules.tt            |  2 +-
> .../intranet-tmpl/prog/en/modules/admin/oai_sets.tt    |  2 +-
> .../prog/en/modules/admin/patron-attr-types.tt         |  2 +-
> .../intranet-tmpl/prog/en/modules/admin/printers.tt    |  2 +-
> .../prog/en/modules/admin/systempreferences.tt         |  2 +-
> .../prog/en/modules/admin/z3950servers.tt              |  4 ++--
> .../prog/en/modules/authorities/authorities.tt         |  4 ++--
> .../intranet-tmpl/prog/en/modules/basket/basket.tt     | 14 +++++++-------
> .../intranet-tmpl/prog/en/modules/catalogue/results.tt |  6 +++---
> .../prog/en/modules/cataloguing/addbiblio.tt           |  8 ++++----
> .../prog/en/modules/cataloguing/addbooks.tt            |  6 +++---
> .../intranet-tmpl/prog/en/modules/circ/circulation.tt  |  2 +-
> .../intranet-tmpl/prog/en/modules/circ/offline.tt      |  4 ++--
> .../prog/en/modules/course_reserves/course-details.tt  |  6 +++---
> .../prog/en/modules/course_reserves/course-reserves.tt |  2 +-
> .../prog/en/modules/members/purchase-suggestions.tt    |  2 +-
> .../intranet-tmpl/prog/en/modules/patron_lists/list.tt |  2 +-
> .../prog/en/modules/patron_lists/lists.tt              |  8 ++++----
> .../prog/en/modules/reports/dictionary.tt              |  2 +-
> .../prog/en/modules/reports/guided_reports_start.tt    | 12 ++++++------
> .../prog/en/modules/serials/serials-search.tt          | 12 ++++++------
> .../prog/en/modules/suggestion/suggestion.tt           |  6 +++---
> .../intranet-tmpl/prog/en/modules/tools/koha-news.tt   |  2 +-
> .../intranet-tmpl/prog/en/modules/tools/letter.tt      |  2 +-
> .../prog/en/modules/virtualshelves/shelves.tt          |  6 +++---
> koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 10 +++++-----
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt  | 12 ++++++------
> 59 files changed, 174 insertions(+), 172 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index ef0c585..bc17421 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -369,7 +369,9 @@ sub get_template_and_user {
>     my $https = $in->{query}->https();
>     my $using_https = ( defined $https and $https ne 'OFF' ) ? 1 : 0;
> 
>+        warn ( C4::Context->preference("IconTheme") eq 'Font-Awesome' ? 'fa fa-fw fa' : 'icon');
>     $template->param(
>+        icon_theme_classes => ( C4::Context->preference("IconTheme") eq 'Font-Awesome' ? 'fa fa-fw fa' : 'icon'),
>         "BiblioDefaultView" . C4::Context->preference("BiblioDefaultView") => 1,
>         EnhancedMessagingPreferences                                       => C4::Context->preference('EnhancedMessagingPreferences'),
>         GoogleJackets                                                      => C4::Context->preference("GoogleJackets"),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
>index c0007d1..c59e451 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
>@@ -10,7 +10,7 @@ function confirm_deletion() {
> <div id="toolbar" class="btn-toolbar">
>     [% IF ( booksellerid ) %]
>         <div class="btn-group">
>-        <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><i class="icon-plus"></i> New
>+        <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><i class="[% icon_theme_classes %]-plus"></i> New
>         <span class="caret"></span>
>         </a>
>         <ul class="dropdown-menu">
>@@ -26,15 +26,15 @@ function confirm_deletion() {
>         </ul>
>         </div>
>             [% IF ( CAN_user_acquisition_vendors_manage ) %]
>-                <div class="btn-group"><a class="btn btn-small" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&amp;op=enter"><i class="icon-pencil"></i> Edit vendor</a></div>
>+                <div class="btn-group"><a class="btn btn-small" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&amp;op=enter"><i class="[% icon_theme_classes %]-pencil"></i> Edit vendor</a></div>
>                 [% UNLESS ( basketcount OR subscriptioncount ) %]
>-                    <div class="btn-group"><a class="btn btn-small" id="deletesupplier" href="javascript:confirm_deletion()"><i class="icon-remove"></i> Delete vendor</a></div>
>+                    <div class="btn-group"><a class="btn btn-small" id="deletesupplier" href="javascript:confirm_deletion()"><i class="[% icon_theme_classes %]-remove"></i> Delete vendor</a></div>
>                 [% END %]
>             [% END %]
>             [% IF CAN_user_acquisition_order_receive && basketcount %]
>-                <div class="btn-group"><a class="btn btn-small" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]"><i class="icon-inbox"></i> Receive shipments</a></div>
>+                <div class="btn-group"><a class="btn btn-small" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]"><i class="[% icon_theme_classes %]-inbox"></i> Receive shipments</a></div>
>             [% END %]
>         [% ELSE %]
>-            <div class="btn-group"><a class="btn btn-small" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="icon-plus"></i> New vendor</a></div>
>+            <div class="btn-group"><a class="btn btn-small" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="[% icon_theme_classes %]-plus"></i> New vendor</a></div>
>         [% END %]
> </div>
>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 9adbc7f..3063cc6 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
>@@ -106,8 +106,8 @@ function finderjumpfull(page)
> </script>
> 
> <div id="toolbar" class="btn-toolbar">
>-    <div class="btn-group"><a href="#" id="clear" class="btn btn-small"><i class="icon-remove-sign"></i> Clear field</a></div>
>-    <div class="btn-group"><a href="#" id="createnew" class="btn btn-small"><i class="icon-plus"></i> Create new authority</a></div>
>+    <div class="btn-group"><a href="#" id="clear" class="btn btn-small"><i class="[% icon_theme_classes %]-remove-sign"></i> Clear field</a></div>
>+    <div class="btn-group"><a href="#" id="createnew" class="btn btn-small"><i class="[% icon_theme_classes %]-plus"></i> Create new authority</a></div>
> </div>
> <form name="f" method="get" action="auth_finder.pl">
>             <input type="hidden" name="source" value="[% source %]" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
>index b460cdc..fce286e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
>@@ -28,15 +28,15 @@
> 
> [% IF ( authid ) %]
>     [% IF ( CAN_user_editauthorities ) %]
>-        <div class="btn-group"><a class="btn btn-small" id="editAuth" href="authorities.pl?authid=[% authid %]"><i class="icon-pencil"></i> Edit</a></div>
>-        <div class="btn-group"><a class="btn btn-small" id="dupAuth" href="authorities.pl?authid=[% authid %]&amp;op=duplicate"><i class="icon-copy"></i> Duplicate</a></div>
>+        <div class="btn-group"><a class="btn btn-small" id="editAuth" href="authorities.pl?authid=[% authid %]"><i class="[% icon_theme_classes %]-pencil"></i> Edit</a></div>
>+        <div class="btn-group"><a class="btn btn-small" id="dupAuth" href="authorities.pl?authid=[% authid %]&amp;op=duplicate"><i class="[% icon_theme_classes %]-copy"></i> Duplicate</a></div>
>         [% UNLESS ( count ) %]
>-            <div class="btn-group"><a href="#" class="btn btn-small" id="delAuth"><i class="icon-remove"></i> Delete</a></div>
>+            <div class="btn-group"><a href="#" class="btn btn-small" id="delAuth"><i class="[% icon_theme_classes %]-remove"></i> Delete</a></div>
>         [% END %]
>     [% END %]
> 
>     <div class="btn-group">
>-        <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><i class="icon-download-alt"></i> Save
>+        <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><i class="[% icon_theme_classes %]-download-alt"></i> Save
>         <span class="caret"></span>
>         </a>
>         <ul class="dropdown-menu">
>@@ -50,7 +50,7 @@
> 
> [% IF ( CAN_user_editauthorities ) %]
>     <div class="btn-group">
>-        <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><i class="icon-plus"></i> New authority
>+        <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><i class="[% icon_theme_classes %]-plus"></i> New authority
>         <span class="caret"></span>
>         </a>
>         <ul class="dropdown-menu">
>@@ -60,7 +60,7 @@
>         </ul>
>     </div>
>     <div class="btn-group">
>-        <a class="btn btn-small" id="z3950submit" href="#"><i class="icon-search"></i> New from Z39.50</a>
>+        <a class="btn btn-small" id="z3950submit" href="#"><i class="[% icon_theme_classes %]-search"></i> New from Z39.50</a>
>     </div>
> [% END %]
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
>index d36c2ca..24011be 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
>@@ -1,7 +1,7 @@
> <div id="toolbar" class="btn-toolbar">
>     [% IF ( budget_period_id ) %]
>         <div class="btn-group">
>-            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New <span class="caret"></span></button>
>+            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="[% icon_theme_classes %]-plus"></i> New <span class="caret"></span></button>
>                 <ul class="dropdown-menu">
>                     <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">New budget</a></li>
>                     [% IF ( budget_period_locked || !CAN_user_acquisition_budget_add_del ) %]
>@@ -14,7 +14,7 @@
>         </div>
> 
>         <div class="btn-group">
>-            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-pencil"></i> Edit <span class="caret"></span></button>
>+            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="[% icon_theme_classes %]-pencil"></i> Edit <span class="caret"></span></button>
>                 <ul class="dropdown-menu">
>                     <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&amp;budget_period_id=[% budget_period_id %]">Edit budget [% budget_period_description %]</a></li>
>                     <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&amp;budget_period_id=[% budget_period_id %]">Duplicate budget [% budget_period_description %]</a></li>
>@@ -22,7 +22,7 @@
>         </div>
> 
>         <div class="btn-group">
>-            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-pencil"></i> Planning <span class="caret"></span></button>
>+            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="[% icon_theme_classes %]-pencil"></i> Planning <span class="caret"></span></button>
>                 <ul class="dropdown-menu">
>                     [% IF ( CAN_user_acquisition_planning_manage ) %]
>                     <li>
>@@ -55,7 +55,7 @@
>         </div>
> 
>     [% ELSE %]
>-        <div class="btn-group"><a class="btn btn-small" id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form"><i class="icon-plus"></i> New budget</a></div>
>+        <div class="btn-group"><a class="btn btn-small" id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form"><i class="[% icon_theme_classes %]-plus"></i> New budget</a></div>
>     [% END %]
> 
> </div>
>\ No newline at end of file
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
>index ee39f31..c793b70 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
>@@ -136,7 +136,7 @@
> [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ||
> CAN_user_serials_create_subscription ) %]
>     <div class="btn-group">
>-    <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New <span class="caret"></span></button>
>+    <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="[% icon_theme_classes %]-plus"></i> New <span class="caret"></span></button>
>         <ul class="dropdown-menu">
>             [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
>              <li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New record</a></li>
>@@ -161,7 +161,7 @@ CAN_user_serials_create_subscription ) %]
> 
> [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel ) or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
>     <div class="btn-group">
>-    <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-pencil"></i> Edit <span class="caret"></span></button>
>+    <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="[% icon_theme_classes %]-pencil"></i> Edit <span class="caret"></span></button>
>         <ul class="dropdown-menu">
>             [% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
>             <li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&amp;frameworkcode=[% current_framework %]&amp;op=">Edit record</a></li>
>@@ -218,7 +218,7 @@ CAN_user_serials_create_subscription ) %]
> [% END %]
> 
>     <div class="btn-group">
>-    <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-download-alt"></i> Save <span class="caret"></span></button>
>+    <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="[% icon_theme_classes %]-download-alt"></i> Save <span class="caret"></span></button>
>     <ul class="dropdown-menu">
>         <li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&amp;op=export&amp;bib=[% biblionumber %]">BIBTEX</a></li>
>         <li><a href="/cgi-bin/koha/catalogue/export.pl?format=dc&amp;op=export&amp;bib=[% biblionumber %]">Dublin Core (XML)</a></li>
>@@ -240,19 +240,19 @@ CAN_user_serials_create_subscription ) %]
>     </ul>
>     </div>
> [% ELSIF ( virtualshelves ) %]
>-    <div class="btn-group"><a id="addtoshelf" class="btn btn-small"><i class="icon-list"></i> Add to list</a> </div>
>+    <div class="btn-group"><a id="addtoshelf" class="btn btn-small"><i class="[% icon_theme_classes %]-list"></i> Add to list</a> </div>
> [% ELSIF ( intranetbookbag ) %]
>-    <div class="btn-group"><a id="addtocart" class="btn btn-small"><i class="icon-shopping-cart"></i> Add to cart</a> </div>
>+    <div class="btn-group"><a id="addtocart" class="btn btn-small"><i class="[% icon_theme_classes %]-shopping-cart"></i> Add to cart</a> </div>
> [% END %]
> 
>-    <div class="btn-group"><a id="printbiblio" class="btn btn-small"><i class="icon-print"></i> Print</a></div>
>+    <div class="btn-group"><a id="printbiblio" class="btn btn-small"><i class="[% icon_theme_classes %]-print"></i> Print</a></div>
> 
> [% IF ( CAN_user_reserveforothers ) %]
>     [% UNLESS ( norequests ) %]
>         [% IF ( holdfor ) %]
>             <div class="btn-group">
>                 <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
>-                    <i class="icon-hold"></i>
>+                    <i class="[% icon_theme_classes %]-hold"></i>
>                     Place hold
>                     <span class="caret"></span>
>                 </button>
>@@ -262,7 +262,7 @@ CAN_user_serials_create_subscription ) %]
>                 </ul>
>             </div>
>         [% ELSE %]
>-            <div class="btn-group"><a id="placehold" class="btn btn-small" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]"><i class="icon-hold"></i> Place hold</a></div>
>+            <div class="btn-group"><a id="placehold" class="btn btn-small" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]"><i class="[% icon_theme_classes %]-hold"></i> Place hold</a></div>
>         [% END %]
>     [% END %]
> [% END %]
>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 7c2e7a9..d61634d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>@@ -2,7 +2,7 @@
>     [% IF ( issuecount ) %]
>         <div id="issues-table-loading-message">
>             <p>
>-                <a id="issues-table-load-now-button" href="#" class="btn"><i class="icon-book"></i> Show checkouts</a>
>+                <a id="issues-table-load-now-button" href="#" class="btn"><i class="[% icon_theme_classes %]-book"></i> Show checkouts</a>
>             </p>
>         </div>
>         <form name="issues" action="/cgi-bin/koha/tools/export.pl" method="post" class="checkboxed">
>@@ -41,8 +41,8 @@
>                             <input type="checkbox" name="override_limit" id="override_limit" value="1" />
>                         [% END %]
>                     [% END %]
>-                    <button class="btn" id="RenewCheckinChecked"><i class="icon-check"></i> Renew or check in selected items</button>
>-                    <button class="btn" id="RenewAll"><i class="icon-book"></i> Renew all</button>
>+                    <button class="btn" id="RenewCheckinChecked"><i class="[% icon_theme_classes %]-check"></i> Renew or check in selected items</button>
>+                    <button class="btn" id="RenewAll"><i class="[% icon_theme_classes %]-book"></i> Renew all</button>
>                 </fieldset>
> 
>                 [% IF ( exports_enabled ) %]
>@@ -61,7 +61,7 @@
>                         <input type="hidden" id="output_format" name="output_format" value="iso2709" />
>                         <input type="hidden" id="dont_export_item" name="dont_export_item" value="0" />
>                         <input type="hidden" id="record_type" name="record_type" value="bibs" />
>-                        <button class="btn btn-small" id="export_submit"><i class="icon-download-alt"></i> Export</button>
>+                        <button class="btn btn-small" id="export_submit"><i class="[% icon_theme_classes %]-download-alt"></i> Export</button>
>                     </fieldset>
>                 [% END %]
>             </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>index 70edbc0..12a3183 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>@@ -135,28 +135,28 @@ function searchToHold(){
>         [% ELSE %]
>             <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">
>         [% END %]
>-        <i class="icon-pencil"></i> Edit</a>
>+        <i class="[% icon_theme_classes %]-pencil"></i> Edit</a>
>     [% END %]
> 
>     [% IF ( CAN_user_borrowers ) %]
>         [% IF ( adultborrower AND activeBorrowerRelationship ) %]
>-            <a id="addchild" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]"><i class="icon-plus"></i> Add child</a>
>+            <a id="addchild" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]"><i class="[% icon_theme_classes %]-plus"></i> Add child</a>
>         [% END %]
>         [% IF ( CAN_user_borrowers ) %]
>-            <a id="changepassword" class="btn btn-small" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="icon-lock"></i> Change password</a>
>+            <a id="changepassword" class="btn btn-small" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="[% icon_theme_classes %]-lock"></i> Change password</a>
>         [% END %]
>-        <a id="duplicate" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]"><i class="icon-copy"></i>Duplicate</a>
>+        <a id="duplicate" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]"><i class="[% icon_theme_classes %]-copy"></i>Duplicate</a>
>     [% END %]
> 
>     <div class="btn-group">
>-        <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-print"></i> Print <span class="caret"></span></button>
>+        <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="[% icon_theme_classes %]-print"></i> Print <span class="caret"></span></button>
>             <ul class="dropdown-menu">
>                 [% IF ( CAN_user_borrowers ) %]<li><a id="printsummary" href="#">Print summary</a></li>[% END %]
>                 <li><a id="printslip" href="#">Print slip</a></li>
>                 <li><a id="printquickslip" href="#">Print quick slip</a></li>
>             </ul>
>     </div>
>-    <a id="searchtohold" class="btn btn-small" href="#"><i class="icon-search"></i> Search to hold</a>
>+    <a id="searchtohold" class="btn btn-small" href="#"><i class="[% icon_theme_classes %]-search"></i> Search to hold</a>
>     <div class="btn-group">
>         <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>
>             <ul class="dropdown-menu">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
>index 2df6cec..385fdea 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
>@@ -4,13 +4,13 @@
> [% UNLESS ( no_add ) %]
> <div id="toolbar" class="btn-toolbar">
>     <div class="btn-group">
>-        <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New patron <span class="caret"></span></button>
>+        <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="[% icon_theme_classes %]-plus"></i> New patron <span class="caret"></span></button>
>             <ul class="dropdown-menu">
>                 [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=[% category.categorycode %]">[% category.description %]</a></li>[% END %]
>             </ul>
>     </div>
>     [% IF CAN_user_tools_manage_patron_lists %]
>-        <a class="btn btn-small" href="/cgi-bin/koha/patron_lists/lists.pl"><i class="icon-edit"></i>Patron lists</a>
>+        <a class="btn btn-small" href="/cgi-bin/koha/patron_lists/lists.pl"><i class="[% icon_theme_classes %]-edit"></i>Patron lists</a>
>     [% END %]
> </div>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc
>index 9b8f37f..ef11b31 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc
>@@ -1,5 +1,5 @@
> <div id="toolbar" class="btn-toolbar">
>-        <div class="btn-group"><a class="btn btn-small" id="add_quote" href="#"><i class="icon-plus"></i> Add quote</a></div>
>-        <div class="btn-group"><a class="btn btn-small" id="delete_quote" href="#"><i class="icon-remove"></i> Delete quote(s)</a></div>
>-        <div class="btn-group"><a class="btn btn-small" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="icon-folder-open"></i> Import quotes</a></div>
>+        <div class="btn-group"><a class="btn btn-small" id="add_quote" href="#"><i class="[% icon_theme_classes %]-plus"></i> Add quote</a></div>
>+        <div class="btn-group"><a class="btn btn-small" id="delete_quote" href="#"><i class="[% icon_theme_classes %]-remove"></i> Delete quote(s)</a></div>
>+        <div class="btn-group"><a class="btn btn-small" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="[% icon_theme_classes %]-folder-open"></i> Import quotes</a></div>
> </div>
>\ No newline at end of file
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc
>index ef3fd3d..379ebbb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc
>@@ -1,4 +1,4 @@
> <div id="toolbar" class="btn-toolbar" style="visibility: hidden; position: absolute">
>-        <div class="btn-group"><a class="btn btn-small" id="save_quotes" href="#"><i class="icon-hdd"></i> Save quotes</a></div>
>-        <div class="btn-group"><a class="btn btn-small" id="delete_quote" href="#"><i class="icon-remove"></i> Delete quote(s)</a></div>
>+        <div class="btn-group"><a class="btn btn-small" id="save_quotes" href="#"><i class="[% icon_theme_classes %]-hdd"></i> Save quotes</a></div>
>+        <div class="btn-group"><a class="btn btn-small" id="delete_quote" href="#"><i class="[% icon_theme_classes %]-remove"></i> Delete quote(s)</a></div>
> </div>
>\ No newline at end of file
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
>index b7e7a79..18636e2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
>@@ -1,7 +1,7 @@
> <div id="toolbar" class="btn-toolbar">
>     [% IF ( CAN_user_reports_create_reports ) %]
>         <div class="btn-group">
>-            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New report <span class="caret"></span></button>
>+            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="[% icon_theme_classes %]-plus"></i> New report <span class="caret"></span></button>
>             <ul class="dropdown-menu">
>                 <li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">New guided report</a> </li>
>                 <li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">New SQL report</a> </li>
>@@ -14,7 +14,7 @@
>             [% IF ( CAN_user_reports_create_reports ) %]
>                 <div class="btn-group">
>                     <a id="editreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Edit%20SQL">
>-                        <i class="icon-pencil"></i> Edit
>+                        <i class="[% icon_theme_classes %]-pencil"></i> Edit
>                     </a>
>                 </div>
>             [% END %]
>@@ -23,7 +23,7 @@
>         [% UNLESS ( errors ) # Unless there are errors saving a report %]
>             <div class="btn-group">
>                 <a id="runreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Run%20this%20report">
>-                    <i class="icon-play"></i> Run report
>+                    <i class="[% icon_theme_classes %]-play"></i> Run report
>                 </a>
>             </div>
>         [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc
>index 321d179..00aad1d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc
>@@ -1,6 +1,6 @@
>             <div id="toolbar" class="btn-toolbar">
>                 <div class="btn-group">
>-                    <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="icon-plus"></i> New collection</a>
>+                    <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="[% icon_theme_classes %]-plus"></i> New collection</a>
>                 </div>
> 
>                 [% IF ( colId ) %]
>@@ -8,10 +8,10 @@
>                         <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId %]">Transfer</a>
>                     </div>
>                     <div class="btn-group">
>-                        <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% colId %]"><i class="icon-pencil"></i> Edit</a>
>+                        <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% colId %]"><i class="[% icon_theme_classes %]-pencil"></i> Edit</a>
>                     </div>
>                     <div class="btn-group">
>-                        <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% colId %]"><i class="icon-remove"></i> Delete</a>
>+                        <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% colId %]"><i class="[% icon_theme_classes %]-remove"></i> Delete</a>
>                     </div>
>                 [% END %]
>             </div>
>\ No newline at end of file
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
>index f1d6547..4ba4f52 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
>@@ -39,16 +39,16 @@
>     <div id="toolbar" class="btn-toolbar">
>         [% IF CAN_user_serials_create_subscription %]
>             [% IF biblionumber_for_new_subscription %]
>-                <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="icon-plus"></i> New subscription</a></div>
>+                <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="[% icon_theme_classes %]-plus"></i> New subscription</a></div>
>             [% ELSE %]
>-                <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="icon-plus"></i> New subscription</a></div>
>+                <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="[% icon_theme_classes %]-plus"></i> New subscription</a></div>
>             [% END %]
>         [% END %]
> 
>         [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
>             [% UNLESS ( cannotedit ) %]
>                 <div class="btn-group">
>-                    <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-pencil"></i> Edit <span class="caret"></span></button>
>+                    <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="[% icon_theme_classes %]-pencil"></i> Edit <span class="caret"></span></button>
>                         <ul class="dropdown-menu">
>                             [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
>                             <li> [% END %]
>@@ -67,16 +67,16 @@
> 
>         [% IF not cannotedit or CAN_user_serials_receive_serials %]
>             [% IF CAN_user_serials_renew_subscription and not closed %]
>-                <div class="btn-group"><a id="renew" class="btn btn-small" href="#" onclick="popup([% subscriptionid %])"><i class="icon-refresh"></i> Renew</a></div>
>+                <div class="btn-group"><a id="renew" class="btn btn-small" href="#" onclick="popup([% subscriptionid %])"><i class="[% icon_theme_classes %]-refresh"></i> Renew</a></div>
>             [% END %]
>             [% IF CAN_user_serials_receive_serials and not closed %]
>-                <div class="btn-group"><a id="receive" class="btn btn-small" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid %]&amp;serstatus=1,3"><i class="icon-inbox"></i> Receive</a></div>
>+                <div class="btn-group"><a id="receive" class="btn btn-small" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid %]&amp;serstatus=1,3"><i class="[% icon_theme_classes %]-inbox"></i> Receive</a></div>
>             [% END %]
>             [% UNLESS cannotedit %]
>                 [% IF closed %]
>-                    <div class="btn-group"><a id="reopen" class="btn btn-small" href="#"><i class="icon-repeat"></i> Reopen</a></div>
>+                    <div class="btn-group"><a id="reopen" class="btn btn-small" href="#"><i class="[% icon_theme_classes %]-repeat"></i> Reopen</a></div>
>                 [% ELSE %]
>-                    <div class="btn-group"><a id="close" class="btn btn-small" href="#"><i class="icon-remove-circle"></i> Close</a></div>
>+                    <div class="btn-group"><a id="close" class="btn btn-small" href="#"><i class="[% icon_theme_classes %]-remove-circle"></i> Close</a></div>
>                 [% END %]
>             [% END %]
>         [% END %]
>@@ -84,9 +84,9 @@
> [% ELSIF CAN_user_serials_create_subscription %]
>     <div id="toolbar" class="btn-toolbar">
>         [% IF ( biblionumber_for_new_subscription ) %]
>-            <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="icon-plus"></i> New subscription</a></div>
>+            <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="[% icon_theme_classes %]-plus"></i> New subscription</a></div>
>         [% ELSE %]
>-            <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="icon-plus"></i> New subscription</a></div>
>+            <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="[% icon_theme_classes %]-plus"></i> New subscription</a></div>
>         [% END %]
>     </div>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
>index 1e00cc4..46dd7a2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
>@@ -27,12 +27,12 @@
> </script>
> 
> <div id="toolbar" class="btn-toolbar">
>-    <div class="btn-group"><a id="newshelf" class="btn btn-small" href="/cgi-bin/koha/virtualshelves/shelves.pl?shelves=1"><i class="icon-plus"></i> New list</a></div>
>+    <div class="btn-group"><a id="newshelf" class="btn btn-small" href="/cgi-bin/koha/virtualshelves/shelves.pl?shelves=1"><i class="[% icon_theme_classes %]-plus"></i> New list</a></div>
> 
>     [% IF ( viewshelf ) %]
>         [% IF ( manageshelf ) %]
>         <div class="btn-group">
>-            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-pencil"></i> Edit <span class="caret"></span></button>
>+            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="[% icon_theme_classes %]-pencil"></i> Edit <span class="caret"></span></button>
>                 <ul class="dropdown-menu">
>                     <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?shelfnumber=[% shelfnumber %]&amp;op=modif&amp;display=viewshelf">Edit list</a></li>
>                     [% IF ( showprivateshelves ) %]
>@@ -45,7 +45,7 @@
>         [% END %]
> 
>         <div class="btn-group">
>-            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-download"></i> Download list <span class="caret"></span></button>
>+            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="[% icon_theme_classes %]-download"></i> Download list <span class="caret"></span></button>
>                 <ul class="dropdown-menu">
>                     <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=iso2709&amp;shelfid=[% shelfnumber %]">iso2709</a></li>
>                     <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=ris&amp;shelfid=[% shelfnumber %]">RIS</a></li>
>@@ -55,7 +55,7 @@
>                     [% END %]
>                 </ul>
>         </div>
>-        <div class="btn-group"><a class="btn btn-small" href="#" id="sendlist"><i class="icon-envelope"></i> Send list</a></div>
>-        <div class="btn-group"><a class="btn btn-small" id="printlist" target="_blank" href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=[% shelfnumber %]&amp;print=1"><i class="icon-print"></i> Print list</a></div>
>+        <div class="btn-group"><a class="btn btn-small" href="#" id="sendlist"><i class="[% icon_theme_classes %]-envelope"></i> Send list</a></div>
>+        <div class="btn-group"><a class="btn btn-small" id="printlist" target="_blank" href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=[% shelfnumber %]&amp;print=1"><i class="[% icon_theme_classes %]-print"></i> Print list</a></div>
>     [% END %]
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>index de16aa0..d00c0ed 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -162,20 +162,20 @@
>             [% UNLESS ( closedate ) %]
>                 <div id="toolbar" class="btn-toolbar">
>                     [% IF active %]
>-                        <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-small" data-toggle="modal"><i class="icon-plus"></i> Add to basket</a></div>
>+                        <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-small" data-toggle="modal"><i class="[% icon_theme_classes %]-plus"></i> Add to basket</a></div>
>                     [% END %]
>-                    <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;op=add_form" class="btn btn-small" id="basketheadbutton"><i class="icon-pencil"></i> Edit basket</a></div>
>+                    <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;op=add_form" class="btn btn-small" id="basketheadbutton"><i class="[% icon_theme_classes %]-pencil"></i> Edit basket</a></div>
>                     [%# FIXME This action should not be available for everyone %]
>-                    <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-small" data-toggle="modal" id="delbasketbutton"><i class="icon-remove"></i> Delete this basket</a></div>
>+                    <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-small" data-toggle="modal" id="delbasketbutton"><i class="[% icon_theme_classes %]-remove"></i> Delete this basket</a></div>
>                    [% IF ( unclosable ) %]
>                     [% ELSIF ( uncertainprices ) %]
>                         <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&amp;owner=1" class="btn btn-small" id="uncertpricesbutton">Uncertain prices</a></div>
>                     [% ELSE %]
>                         <div class="btn-group">
>-                            <a href="[% script_name %]?op=close&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="closebutton"><i class="icon-remove-sign"></i> Close this basket</a>
>+                            <a href="[% script_name %]?op=close&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="closebutton"><i class="[% icon_theme_classes %]-remove-sign"></i> Close this basket</a>
>                         </div>
>                     [% END %]
>-                        <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="icon-download"></i> Export this basket as CSV</a></div>
>+                        <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="[% icon_theme_classes %]-download"></i> Export this basket as CSV</a></div>
>                 </div>
> 
>                 <div class="modal hide" id="deleteBasketModal" tabindex="-1" role="dialog" aria-labelledby="delbasketModalLabel" aria-hidden="true">
>@@ -210,8 +210,8 @@
>             [% ELSE %]
>                 [% UNLESS ( grouped ) %]
>                 <div id="toolbar" class="btn-toolbar">
>-                    <div class="btn-group"><a href="#" class="btn btn-small" id="reopenbutton"><i class="icon-refresh"></i> Reopen this basket</a></div>
>-                    <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="icon-download"></i> Export this basket as CSV</a></div>
>+                    <div class="btn-group"><a href="#" class="btn btn-small" id="reopenbutton"><i class="[% icon_theme_classes %]-refresh"></i> Reopen this basket</a></div>
>+                    <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="[% icon_theme_classes %]-download"></i> Export this basket as CSV</a></div>
>                 </div>
>                 [% END %]
>             [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>index 74bedcb..5ed50e0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>@@ -141,12 +141,12 @@ function submitForm(form) {
>                 [% IF ( grouping ) %]
>                     [% IF (closedbg) %]
>                         <div id="toolbar" class="btn-toolbar">
>-                            <div class="btn-group"><a href="[% script_name %]?op=reopen&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]&amp;mode=singlebg" class="btn btn-small" id="reopenbutton"><i class="icon-download"></i> Reopen this basket group</a></div>
>-                            <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="icon-download"></i> Export this basket group as CSV</a></div>
>-                            <div class="btn-group"><a href="[% script_name %]?op=print&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="icon-download"></i> Print this basket group in PDF</a></div>
>+                            <div class="btn-group"><a href="[% script_name %]?op=reopen&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]&amp;mode=singlebg" class="btn btn-small" id="reopenbutton"><i class="[% icon_theme_classes %]-download"></i> Reopen this basket group</a></div>
>+                            <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="[% icon_theme_classes %]-download"></i> Export this basket group as CSV</a></div>
>+                            <div class="btn-group"><a href="[% script_name %]?op=print&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="[% icon_theme_classes %]-download"></i> Print this basket group in PDF</a></div>
>                         </div>
>                     [% ELSE %]
>-                        <div class="btn-group"><a href="[% script_name %]?op=delete&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="delbutton"><i class="icon-remove"></i> Delete basket group</a></div>
>+                        <div class="btn-group"><a href="[% script_name %]?op=delete&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="delbutton"><i class="[% icon_theme_classes %]-remove"></i> Delete basket group</a></div>
>                     [% END %]
>                     [% IF (name && closedbg) %]
>                         <h1>Basket group [% name %] ([% basketgroupid %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
>@@ -301,7 +301,7 @@ function submitForm(form) {
>                     </div>
>                 [% ELSE %]
>                     <div id="toolbar" class="btn-toolbar">
>-                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="newbasketgroup"><i class="icon-plus"></i> New basket group</a></div>
>+                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="newbasketgroup"><i class="[% icon_theme_classes %]-plus"></i> New basket group</a></div>
>                     </div>
>                     <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
>                     <div id="basket_groups" class="toptabs">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>index 8312cb2..f696bbe 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>@@ -82,13 +82,13 @@ $(document).ready(function() {
>                 <span class="action">
>                     [% IF ( CAN_user_acquisition_order_manage ) %]
>                         [% IF ( supplier.active ) %]
>-                            <a class="btn btn-small" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&amp;op=add_form"><i class="icon-plus"></i> New basket</a>
>+                            <a class="btn btn-small" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&amp;op=add_form"><i class="[% icon_theme_classes %]-plus"></i> New basket</a>
>                         [% ELSE %]
>                             (inactive)
>                         [% END %]
>                     [% END %]
>                         [% IF ( supplier.loop_basket.size ) %]
>-                    <a class="btn btn-small" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid %]"><i class="icon-inbox"></i> Receive shipment</a>
>+                    <a class="btn btn-small" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid %]"><i class="[% icon_theme_classes %]-inbox"></i> Receive shipment</a>
>                         [% END %]
>                 </span>
>                 <div class="baskets">
>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 519cfee..563c94f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>@@ -151,14 +151,14 @@ $(document).ready(function() {
>                              Actions <b class="caret"></b>
>                           </a>
>                           <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid %]">
>-                              <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid %]"><i class="icon-search"></i> Details</a></li>
>+                              <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid %]"><i class="[% icon_theme_classes %]-search"></i> Details</a></li>
>                             [% IF invoice.closedate %]
>-                                <li><a href="invoice.pl?op=reopen&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="icon-refresh"></i> Reopen</a></li>
>+                                <li><a href="invoice.pl?op=reopen&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="[% icon_theme_classes %]-refresh"></i> Reopen</a></li>
>                             [% ELSE %]
>-                                <li><a href="invoice.pl?op=close&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="icon-remove-sign"></i> Close</a></li>
>+                                <li><a href="invoice.pl?op=close&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="[% icon_theme_classes %]-remove-sign"></i> Close</a></li>
>                             [% END %]
>                             [% UNLESS invoice.receivedbiblios || invoice.receiveditems %]
>-                                <li><a href="invoice.pl?op=delete&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="icon-remove"></i> Delete</a></li>
>+                                <li><a href="invoice.pl?op=delete&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="[% icon_theme_classes %]-remove"></i> Delete</a></li>
>                             [% END %]
>                           </ul>
>                       </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>index 5bf8e61..0d6e3d0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>@@ -45,7 +45,7 @@
>             [% END %]
>             <input type="hidden" class="contact_claimissues_hidden" name="contact_claimissues" value="[% contact.claimissues %]"></input>
>         </li>
>-        [% IF contact.id %]<li><button class="btn delete-contact"><i class="icon-remove"></i> Delete contact</li>[% END %]
>+        [% IF contact.id %]<li><button class="btn delete-contact"><i class="[% icon_theme_classes %]-remove"></i> Delete contact</li>[% END %]
>     </ol>
> [% END %]
> 
>@@ -204,7 +204,7 @@ function delete_contact(ev) {
>                     [% INCLUDE edit_contact %]
>                 </fieldset>
>             [% END %]
>-            <button id="add-contact" class="btn"><i class="icon-plus"></i> Add another contact</button>
>+            <button id="add-contact" class="btn"><i class="[% icon_theme_classes %]-plus"></i> Add another contact</button>
>         </fieldset>
>     </div>
>         <div class="yui-g">
>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 5d7918d..99faa1d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>@@ -8,19 +8,19 @@
>         </a>
>         <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetmenu_[% block_budget_id %]">
>               <li>
>-                  <a href="[% script_name %]?op=add_form&amp;budget_period_id=[% block_budget_id |html %]"><i class="icon-pencil"></i> Edit</a>
>+                  <a href="[% script_name %]?op=add_form&amp;budget_period_id=[% block_budget_id |html %]"><i class="[% icon_theme_classes %]-pencil"></i> Edit</a>
>               </li>
>               <li>
>-                  <a href="[% script_name %]?op=delete_confirm&amp;budget_period_id=[% block_budget_id %]"><i class="icon-remove"></i> Delete</a>
>+                  <a href="[% script_name %]?op=delete_confirm&amp;budget_period_id=[% block_budget_id %]"><i class="[% icon_theme_classes %]-remove"></i> Delete</a>
>               </li>
>               <li>
>-                  <a href="[% script_name %]?op=duplicate_form&amp;budget_period_id=[% block_budget_id %]"><i class="icon-copy"></i> Duplicate</a>
>+                  <a href="[% script_name %]?op=duplicate_form&amp;budget_period_id=[% block_budget_id %]"><i class="[% icon_theme_classes %]-copy"></i> Duplicate</a>
>               </li>
>               <li>
>-                  <a href="[% script_name %]?op=close_form&amp;budget_period_id=[% block_budget_id %]"><i class="icon-remove-sign"></i> Close</a>
>+                  <a href="[% script_name %]?op=close_form&amp;budget_period_id=[% block_budget_id %]"><i class="[% icon_theme_classes %]-remove-sign"></i> Close</a>
>               </li>
>               <li>
>-                  <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% block_budget_id %]"><i class="icon-plus"></i> Add fund</a>
>+                  <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% block_budget_id %]"><i class="[% icon_theme_classes %]-plus"></i> Add fund</a>
>               </li>
>         </ul>
>     </div>
>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 0480bf5..65164b1 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
>@@ -181,7 +181,7 @@
> [% IF ( else ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <div class="btn-group"><a class="btn btn-small" id="newtag" href="/cgi-bin/koha/admin/auth_tag_structure.pl?op=add_form&amp;authtypecode=[% authtypecode %]"><i class="icon-plus"></i> New tag</a></div>
>+    <div class="btn-group"><a class="btn btn-small" id="newtag" href="/cgi-bin/koha/admin/auth_tag_structure.pl?op=add_form&amp;authtypecode=[% authtypecode %]"><i class="[% icon_theme_classes %]-plus"></i> New tag</a></div>
> </div>
> 
> <h2>Select an authority framework</h2>
>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 7dae71e..7e72e01 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
>@@ -183,8 +183,8 @@ $(document).ready(function() {
> [% IF ( else ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a id="addauth" class="btn btn-small" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;category=[% category %]"><i class="icon-plus"> </i> New authorized value for [% category %]</a>
>-    <a id="addcat" class="btn btn-small" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form"><i class="icon-plus"> </i> New category</a>
>+    <a id="addauth" class="btn btn-small" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;category=[% category %]"><i class="[% icon_theme_classes %]-plus"> </i> New authorized value for [% category %]</a>
>+    <a id="addcat" class="btn btn-small" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form"><i class="[% icon_theme_classes %]-plus"> </i> New category</a>
> </div>
> 
> <h1>Authorized values</h1>
>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 3fbc439..3307887 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>@@ -105,7 +105,7 @@
> [% IF ( else ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a id="authtype" class="btn btn-small" href="[% script_name %]?op=add_form"><i class="icon-plus"></i> New authority type</a>
>+    <a id="authtype" class="btn btn-small" href="[% script_name %]?op=add_form"><i class="[% icon_theme_classes %]-plus"></i> New authority type</a>
> </div>
> 
> <h1>Authority types</h1>
>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 791e971..4f7f818 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
>@@ -101,7 +101,7 @@
> 
> [% IF ( else ) %]
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-small" id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form"><i class="icon-plus"></i> New framework</a>
>+    <a class="btn btn-small" id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form"><i class="[% icon_theme_classes %]-plus"></i> New framework</a>
> </div>
> [% END %]
> 
>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 887b81f..d464285 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>@@ -80,8 +80,8 @@ tinyMCE.init({
> 	<div class="yui-b">
> 	[% IF ( else ) %]
>     <div id="toolbar" class="btn-toolbar">
>-        <a class="btn btn-small" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add"><i class="icon-plus"></i> New library</a>
>-        <a class="btn btn-small" id="newcategory" href="/cgi-bin/koha/admin/branches.pl?op=editcategory"><i class="icon-plus"></i> New group</a>
>+        <a class="btn btn-small" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add"><i class="[% icon_theme_classes %]-plus"></i> New library</a>
>+        <a class="btn btn-small" id="newcategory" href="/cgi-bin/koha/admin/branches.pl?op=editcategory"><i class="[% icon_theme_classes %]-plus"></i> New group</a>
>     </div>
> [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
>index 92a6a28..0c0644e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
>@@ -324,7 +324,7 @@
> [% IF ( else ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-small" id="newcategory" href="/cgi-bin/koha/admin/categorie.pl?op=add_form"><i class="icon-plus"></i> New category</a>
>+    <a class="btn btn-small" id="newcategory" href="/cgi-bin/koha/admin/categorie.pl?op=add_form"><i class="[% icon_theme_classes %]-plus"></i> New category</a>
> </div>
> 
> <h2>Patron category administration</h2>
>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 3404483..0616812 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>@@ -112,7 +112,7 @@
> [% IF ( else ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-small" id="newcity" href="[% script_name %]?op=add_form"><i class="icon-plus"></i> New city</a>
>+    <a class="btn btn-small" id="newcity" href="[% script_name %]?op=add_form"><i class="[% icon_theme_classes %]-plus"></i> New city</a>
> </div>
> 
> 	<h2>Cities</h2>
>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 8c40153..89dde44 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>@@ -227,8 +227,8 @@ function CheckRuleForm(f) {
> [% IF ( display_lists ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-small" id="newsource" href="[% script_name %]?op=add_source"><i class="icon-plus"></i> New classification source</a>
>-    <a class="btn btn-small" id="newrule" href="[% script_name %]?op=add_sort_rule"><i class="icon-plus"></i> New filing rule</a>
>+    <a class="btn btn-small" id="newsource" href="[% script_name %]?op=add_source"><i class="[% icon_theme_classes %]-plus"></i> New classification source</a>
>+    <a class="btn btn-small" id="newrule" href="[% script_name %]?op=add_sort_rule"><i class="[% icon_theme_classes %]-plus"></i> New filing rule</a>
> </div>
> 
> <h2>Classification sources</h2>
>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 57c38cf..0f7b19f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>@@ -64,7 +64,7 @@
>     <div class="yui-b">
> [% IF ( else ) %]
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-small" id="newcurrency" href="[% script_name %]?op=add_form"><i class="icon-plus"></i> New currency</a>
>+    <a class="btn btn-small" id="newcurrency" href="[% script_name %]?op=add_form"><i class="[% icon_theme_classes %]-plus"></i> New currency</a>
> </div>
> [% END %]
> 
>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 a3d8af4..95317b8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>@@ -82,7 +82,7 @@ Item types administration
> 	<div class="yui-b">
> 	
> [% IF ( else ) %]<div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-small" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="icon-plus"></i> New item type</a>
>+    <a class="btn btn-small" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="[% icon_theme_classes %]-plus"></i> New item type</a>
> </div>[% END %]
> 
> [% FOREACH message IN messages %]
>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 fc8f463..9a9212d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>@@ -53,7 +53,7 @@ $(document).ready(function() {
> 
> [% IF ( else ) %]
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-small" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;frameworkcode=[% frameworkcode %]"><i class="icon-plus"></i> New tag</a>
>+    <a class="btn btn-small" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;frameworkcode=[% frameworkcode %]"><i class="[% icon_theme_classes %]-plus"></i> New tag</a>
> </div>[% END %]
> 
> <h1>MARC Framework for [% IF ( frameworkcode ) %][% frameworktext %] ([% frameworkcode %])[% ELSE %]default MARC framework[% END %]</h1>
>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 816dada..1e13b7c 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
>@@ -545,7 +545,7 @@ function CheckRuleForm(f) {
> [% IF ( display_list ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-small" id="newrule" href="[% script_name %]?op=add_matching_rule"><i class="icon-plus"></i> New record matching rule</a>
>+    <a class="btn btn-small" id="newrule" href="[% script_name %]?op=add_matching_rule"><i class="[% icon_theme_classes %]-plus"></i> New record matching rule</a>
> </div>
> 
> <h2>Record matching rules</h2>
>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 02eaf39..f43fbbd 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
>@@ -71,7 +71,7 @@ function delDescField(minusButton) {
>         [% ELSE %]
> 
>         <div id="toolbar" class="btn-toolbar">
>-            <a class="btn btn-small" id="newoaiset" href="/cgi-bin/koha/admin/oai_sets.pl?op=new"><i class="icon-plus"></i> New set</a>
>+            <a class="btn btn-small" id="newoaiset" href="/cgi-bin/koha/admin/oai_sets.pl?op=new"><i class="[% icon_theme_classes %]-plus"></i> New set</a>
>         </div>
> 
>         <h2>OAI sets</h2>
>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 d2873cd..1c71bd9 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
>@@ -262,7 +262,7 @@ function CheckAttributeTypeForm(f) {
> [% IF ( display_list ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-small" id="newrule" href="[% script_name %]?op=add_attribute_type"><i class="icon-plus"></i> New patron attribute type</a>
>+    <a class="btn btn-small" id="newrule" href="[% script_name %]?op=add_attribute_type"><i class="[% icon_theme_classes %]-plus"></i> New patron attribute type</a>
> </div>
> 
> <h2>Patron attribute types</h2>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
>index 0e77e8b..48ebff2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
>@@ -148,7 +148,7 @@
> [% IF ( else ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-small" id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form"><i class="icon-plus"></i> New printer</a>
>+    <a class="btn btn-small" id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form"><i class="[% icon_theme_classes %]-plus"></i> New printer</a>
> </div>
> 
> <h2>Printers</h2>
>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 03f1b29..5bbfdb2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>@@ -308,7 +308,7 @@
>     [% IF ( else ) %]
> 
>     <div id="toolbar" class="btn-toolbar">
>-        <a class="btn btn-small" id="newstopword" href="[% script_name %]?op=add_form"><i class="icon-plus"></i> New preference</a>
>+        <a class="btn btn-small" id="newstopword" href="[% script_name %]?op=add_form"><i class="[% icon_theme_classes %]-plus"></i> New preference</a>
>     </div>
> 
>     [% IF ( tab != 'local_use' ) %]
>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 0ff1b09..4a35a16 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>@@ -209,8 +209,8 @@
> 
> [% IF op == 'list' %]
>     <div id="toolbar" class="btn-toolbar">
>-        <a id="newserver" class="btn btn-small" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="icon-plus"></i> New Z39.50 server</a>
>-        <a id="newserver" class="btn btn-small" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="icon-plus"></i> New SRU server</a>
>+        <a id="newserver" class="btn btn-small" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="[% icon_theme_classes %]-plus"></i> New Z39.50 server</a>
>+        <a id="newserver" class="btn btn-small" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="[% icon_theme_classes %]-plus"></i> New SRU server</a>
>     </div>
>     <h3>Z39.50/SRU servers administration</h3>
>     [% IF id %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
>index d6b3a2e..cffe822 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
>@@ -204,9 +204,9 @@ function confirmnotdup(redirect){
>     <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" />
> 
>     <div id="toolbar" class="btn-toolbar">
>-        <div class="btn-group"><a href="#" id="addauth" class="btn btn-small" accesskey="w"><i class="icon-hdd"></i> Save</a></div>
>+        <div class="btn-group"><a href="#" id="addauth" class="btn btn-small" accesskey="w"><i class="[% icon_theme_classes %]-hdd"></i> Save</a></div>
>         <div class="btn-group">
>-            <a class="btn btn-small" id="z3950submit" href="#"><i class="icon-search"></i> Z39.50 search</a>
>+            <a class="btn btn-small" id="z3950submit" href="#"><i class="[% icon_theme_classes %]-search"></i> Z39.50 search</a>
>         </div>
>     </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>index 847088c..57c1c89 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>@@ -109,10 +109,10 @@ function batchDelete(){
> <h1>Your cart</h1>
> 
> <div id="toolbar" class="btn-toolbar">
>-    [% IF ( verbose ) %]<a href="basket.pl" class="btn btn-small" onclick="showLess(); return false;"><i class="icon-zoom-out"></i> Brief display</a>[% ELSE %]<a href="basket.pl" class="btn btn-small" onclick="showMore(); return false;"><i class="icon-zoom-in"></i> More details</a>[% END %]
>-    <a class="btn btn-small" href="basket.pl" onclick="sendBasket(); return false;"><i class="icon-envelope"></i> Send</a>
>+    [% IF ( verbose ) %]<a href="basket.pl" class="btn btn-small" onclick="showLess(); return false;"><i class="[% icon_theme_classes %]-zoom-out"></i> Brief display</a>[% ELSE %]<a href="basket.pl" class="btn btn-small" onclick="showMore(); return false;"><i class="[% icon_theme_classes %]-zoom-in"></i> More details</a>[% END %]
>+    <a class="btn btn-small" href="basket.pl" onclick="sendBasket(); return false;"><i class="[% icon_theme_classes %]-envelope"></i> Send</a>
>     <div class="btn-group">
>-        <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#" id="downloadcart"><i class="icon-download-alt"></i> Download <span class="caret"></span> </a>
>+        <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#" id="downloadcart"><i class="[% icon_theme_classes %]-download-alt"></i> Download <span class="caret"></span> </a>
>         <ul class="dropdown-menu">
>             <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&amp;bib_list=[% bib_list %]">iso2709</a></li>
>             <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=ris&amp;bib_list=[% bib_list %]">RIS</a></li>
>@@ -124,7 +124,7 @@ function batchDelete(){
>     </div>
>     [% IF CAN_user_tools_records_batchmod %]
>       <div class="btn-group">
>-        <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#" id="actioncart"><i class="icon-play"></i> Actions <span class="caret"></span> </a>
>+        <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#" id="actioncart"><i class="[% icon_theme_classes %]-play"></i> Actions <span class="caret"></span> </a>
>         <ul class="dropdown-menu">
>           [% IF CAN_user_tools_records_batchmod %]
>             <li><a href="/cgi-bin/koha/tools/batch_record_modification.pl?op=list&amp;bib_list=[% bib_list %]&amp;type=biblio">Modify</a></li>
>@@ -132,9 +132,9 @@ function batchDelete(){
>         </ul>
>       </div>
>     [% END %]
>-    <a class="btn btn-small" href="basket.pl" onclick="printBasket(); return false;"><i class="icon-print"></i> Print</a>
>-    <a class="btn btn-small" href="basket.pl" onclick="delBasket('popup'); return false;"><i class="icon-trash"></i> Empty and close</a>
>-    <a class="btn btn-small close" href="basket.pl"><i class="icon-remove-sign"></i> Hide window</a>
>+    <a class="btn btn-small" href="basket.pl" onclick="printBasket(); return false;"><i class="[% icon_theme_classes %]-print"></i> Print</a>
>+    <a class="btn btn-small" href="basket.pl" onclick="delBasket('popup'); return false;"><i class="[% icon_theme_classes %]-trash"></i> Empty and close</a>
>+    <a class="btn btn-small close" href="basket.pl"><i class="[% icon_theme_classes %]-remove-sign"></i> Hide window</a>
> </div>
>         [% END %]
> 
>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 4b1c94b..296c15a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>@@ -318,7 +318,7 @@ var holdForPatron = function () {
>                 [% IF ( CAN_user_reserveforothers && DisplayMultiPlaceHold ) %]
>                 [% IF ( holdfor ) %]
>                     <div id="placeholdc" class="btn-group">
>-                        <button class="btn btn-mini placehold"><i class="icon-hold"></i> Place hold</button>
>+                        <button class="btn btn-mini placehold"><i class="[% icon_theme_classes %]-hold"></i> Place hold</button>
>                         <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
>                         <span class="caret"></span>
>                         </button>
>@@ -330,11 +330,11 @@ var holdForPatron = function () {
>                         </ul>
>                     </div>
>                 [% ELSE %]
>-                    <div id="placeholdc" class="btn-group"><a class="btn btn-mini placehold" href="#"><i class="icon-hold"></i> Place hold</a></div>
>+                    <div id="placeholdc" class="btn-group"><a class="btn btn-mini placehold" href="#"><i class="[% icon_theme_classes %]-hold"></i> Place hold</a></div>
>                 [% END %]
>                 [% END %]
> 
>-                [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] <div class="btn-group"><a class="btn btn-mini" id="z3950submit" href="#"><i class="icon-search"></i> Z39.50/SRU search</a></div>[% END %]
>+                [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] <div class="btn-group"><a class="btn btn-mini" id="z3950submit" href="#"><i class="[% icon_theme_classes %]-search"></i> Z39.50/SRU search</a></div>[% END %]
>             </div>
>         </div>
>     [% IF ( stopwords_removed ) %]<div><p class="tip">Ignored the following common words: "[% stopwords_removed %]"<p></div>[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>index 3bc00d5..ef9f44b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>@@ -440,11 +440,11 @@ function Changefwk(FwkList) {
>     [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
>         [% IF (circborrowernumber) %][%# fast cataloging must lead to items %]
>             
>-            <div class="btn-group"><a href="#" id="saveanditems" class="btn btn-small"><i class="icon-hdd"></i> Save</a></div>
>+            <div class="btn-group"><a href="#" id="saveanditems" class="btn btn-small"><i class="[% icon_theme_classes %]-hdd"></i> Save</a></div>
>         [% ELSE %]
>             
>             <div class="btn-group">
>-                <button class="btn btn-small" id="saverecord"><i class="icon-hdd"></i> Save</button>
>+                <button class="btn btn-small" id="saverecord"><i class="[% icon_theme_classes %]-hdd"></i> Save</button>
>                 <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
>                 <span class="caret"></span>
>                 </button>
>@@ -457,11 +457,11 @@ function Changefwk(FwkList) {
>         [% END %]
>     [% ELSE %]
>         
>-        <div class="btn-group"><a href="#" id="saveandview" class="btn btn-small"><i class="icon-hdd"></i> Save</a></div>
>+        <div class="btn-group"><a href="#" id="saveandview" class="btn btn-small"><i class="[% icon_theme_classes %]-hdd"></i> Save</a></div>
>     [% END %]
> 
>     [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
>-        <div class="btn-group"><a class="btn btn-small" href="#" id="z3950search"><i class="icon-search"></i> Z39.50/SRU search</a></div>
>+        <div class="btn-group"><a class="btn btn-small" href="#" id="z3950search"><i class="[% icon_theme_classes %]-search"></i> Z39.50/SRU search</a></div>
>         [% IF (biblionumber) %]
>             [% IF ( BiblioDefaultViewmarc ) %]
>                 <div class="btn-group">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>index affa0fe..e1c311d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>@@ -71,7 +71,7 @@
> [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
>   <div id="toolbar" class="btn-toolbar">
>         <div class="btn-group">
>-            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New record <span class="caret"></span></button>
>+            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="[% icon_theme_classes %]-plus"></i> New record <span class="caret"></span></button>
>             <ul class="dropdown-menu">
>                 <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li>
>                 [% FOREACH frameworkcodeloo IN frameworkcodeloop %]
>@@ -80,7 +80,7 @@
>             </ul>
>         </div>
>         <div class="btn-group">
>-            <button class="btn btn-small" id="z3950search"><i class="icon-search"></i> New from Z39.50/SRU</button>
>+            <button class="btn btn-small" id="z3950search"><i class="[% icon_theme_classes %]-search"></i> New from Z39.50/SRU</button>
>             <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
>                 <span class="caret"></span>
>             </button>
>@@ -92,7 +92,7 @@
>             </ul>
>         </div>
>     [% IF ( total ) %]
>-        <div class="btn-group"><button type="submit" class="btn btn-small merge-items"><i class="icon-merge"></i> Merge selected</button></div>
>+        <div class="btn-group"><button type="submit" class="btn btn-small merge-items"><i class="[% icon_theme_classes %]-merge"></i> Merge selected</button></div>
>     [% END %]
>   </div>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index 064e308..d75a39c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -759,7 +759,7 @@ No patron matched <span class="ex">[% message %]</span>
>                    [% END %]
> 
>                    <br/>
>-                   <a class="btn btn-small" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="icon-ban-circle"></i> View restrictions</a>
>+                   <a class="btn btn-small" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="[% icon_theme_classes %]-ban-circle"></i> View restrictions</a>
>                     [% IF (noissues && borrowernumber && CAN_user_circulate_force_checkout) %]
>                         <span class="override_debarment">
>                             <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&amp;borrowernumber=[% borrowernumber %]" class="btn btn-small">Override restriction temporarily</a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
>index b8a679d8..d203b41 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
>@@ -620,9 +620,9 @@ $(document).ready(function () {
>             <div id="offline-sync" style="display: none;" class="yui-b offline-sync">
>                 <div id="toolbar" class="btn-toolbar">
>                     [% IF (AllowOfflineCirculation) %]
>-                        <a href="#" id="download-records" class="btn btn-small"><i class="icon-arrow-down"></i>Download records</a>
>+                        <a href="#" id="download-records" class="btn btn-small"><i class="[% icon_theme_classes %]-arrow-down"></i>Download records</a>
>                     [% END %]
>-                    <a href="#" id="upload-transactions" class="btn btn-small"><i class="icon-arrow-up"></i>Upload transactions</a>
>+                    <a href="#" id="upload-transactions" class="btn btn-small"><i class="[% icon_theme_classes %]-arrow-up"></i>Upload transactions</a>
>                 </div>
>                 <div class="yui-g">
>                     <h1>Offline circulation</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>index 4930a11..e97e969 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>@@ -45,9 +45,9 @@
>             [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %]
>             <div id="toolbar">
>                 <ul class="toolbar">
>-                    [% IF CAN_user_coursereserves_add_reserves %]<li><a class="btn btn-small" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]"><i class="icon-plus"></i> Add reserves</a></li>[% END %]
>-                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-small" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]"><i class="icon-pencil"></i> Edit course</a></li>[% END %]
>-                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-small" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&amp;action=del"><i class="icon-remove"></i> Delete course</a></li>[% END %]
>+                    [% IF CAN_user_coursereserves_add_reserves %]<li><a class="btn btn-small" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]"><i class="[% icon_theme_classes %]-plus"></i> Add reserves</a></li>[% END %]
>+                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-small" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]"><i class="[% icon_theme_classes %]-pencil"></i> Edit course</a></li>[% END %]
>+                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-small" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&amp;action=del"><i class="[% icon_theme_classes %]-remove"></i> Delete course</a></li>[% END %]
>                 </ul>
>             </div>
>             [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>index a8ab677..cee5120 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>@@ -30,7 +30,7 @@ $(document).ready(function() {
>                     <div id="toolbar">
>                         <ul class="toolbar">
>                             [% IF ( CAN_user_coursereserves_manage_courses ) %]
>-                            <li><a class="btn btn-small" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl"><i class="icon-plus"></i> New course</a></li>
>+                            <li><a class="btn btn-small" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl"><i class="[% icon_theme_classes %]-plus"></i> New course</a></li>
>                             [% END %]
>                         </ul>
>                     </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>index 3bc8885..71d9089 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>@@ -35,7 +35,7 @@
>                 <h2>Purchase suggestions</h2>
> 
>                 <div id="toolbar" class="btn-toolbar">
>-                    <a class="btn btn-small" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&amp;suggestedby=[% borrowernumber %]&amp;redirect=purchase_suggestions&amp;borrowernumber=[% borrowernumber %]"><i class="icon-plus"></i> New purchase suggestion</a>
>+                    <a class="btn btn-small" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&amp;suggestedby=[% borrowernumber %]&amp;redirect=purchase_suggestions&amp;borrowernumber=[% borrowernumber %]"><i class="[% icon_theme_classes %]-plus"></i> New purchase suggestion</a>
>                 </div>
> 
>                 [% IF suggestions %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>index 0436d3d..cc07ceb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>@@ -102,7 +102,7 @@ $(document).ready(function() {
>                 <span class="checkall"><a id="CheckAll" href="#">Select all</a></span> |
>                 <span class="clearall"><a id="CheckNone" href="#">Clear all</a></span> |
>                 <div class="btn-group">
>-                    <button class="btn btn-mini list-remove" type="submit"><i class="icon-remove-sign"></i> Remove selected</button>
>+                    <button class="btn btn-mini list-remove" type="submit"><i class="[% icon_theme_classes %]-remove-sign"></i> Remove selected</button>
>                 </div>
>             </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>index dc1160a..15c1f78 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>@@ -34,7 +34,7 @@
>         <h1>Your patron lists</h1>
> 
>         <div class="btn-group">
>-            <a class="btn btn-small" href="add-modify.pl"><i class="icon-plus"></i> New patron list</a>
>+            <a class="btn btn-small" href="add-modify.pl"><i class="[% icon_theme_classes %]-plus"></i> New patron list</a>
>         </div>
> 
>         <table id="patron-lists-table">
>@@ -55,17 +55,17 @@
>                         <td>[% l.patron_list_patrons_rs.count || 0 %]</td>
>                         <td>
>                             <a class="btn btn-mini" href="list.pl?patron_list_id=[% l.patron_list_id %]">
>-                                <i class="icon-plus-sign"></i> Add patrons <i class="icon-user"></i>
>+                                <i class="[% icon_theme_classes %]-plus-sign"></i> Add patrons <i class="[% icon_theme_classes %]-user"></i>
>                             </a>
>                         </td>
>                         <td>
>                             <a class="btn btn-mini" href="add-modify.pl?patron_list_id=[% l.patron_list_id %]">
>-                                <i class="icon-edit"></i> Edit
>+                                <i class="[% icon_theme_classes %]-edit"></i> Edit
>                             </a>
>                         </td>
>                         <td>
>                             <a class="btn btn-mini" href="delete.pl?patron_list_id=[% l.patron_list_id %]" onclick='return ConfirmDelete("[% l.name | html %]")'>
>-                                <i class="icon-trash"></i> Delete
>+                                <i class="[% icon_theme_classes %]-trash"></i> Delete
>                             </a>
>                         </td>
>                     </tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>index d26cabf..6fad5e5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>@@ -34,7 +34,7 @@
> [% IF ( start_dictionary ) %]
>     <div id="toolbar">
>         <ul class="toolbar">
>-            <li><a id="newdictionary" class="btn btn-small" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="icon-plus"></i> New definition</a></li>
>+            <li><a id="newdictionary" class="btn btn-small" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="[% icon_theme_classes %]-plus"></i> New definition</a></li>
>         </ul>
>     </div>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>index 283a1cf..0f9d1b2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>@@ -351,15 +351,15 @@ canned reports and writing custom SQL reports.</p>
>                                    Actions <b class="caret"></b>
>                                 </a>
>                                 <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id %]">
>-                                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Show%20SQL"><i class="icon-search"></i> Show</a></li>
>+                                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Show%20SQL"><i class="[% icon_theme_classes %]-search"></i> Show</a></li>
>                                     [% IF ( CAN_user_reports_create_reports ) %]
>-                                        <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Edit%20SQL"><i class="icon-pencil"></i> Edit</a></li>
>-                                        <li><a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri %]"><i class="icon-copy"></i> Duplicate</a></li>
>+                                        <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Edit%20SQL"><i class="[% icon_theme_classes %]-pencil"></i> Edit</a></li>
>+                                        <li><a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri %]"><i class="[% icon_theme_classes %]-copy"></i> Duplicate</a></li>
>                                     [% END %]
>-                                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Run%20this%20report"><i class="icon-play"></i> Run</a></li>
>-                                    <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]"><i class="icon-time"></i> Schedule</a></li>
>+                                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Run%20this%20report"><i class="[% icon_theme_classes %]-play"></i> Run</a></li>
>+                                    <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]"><i class="[% icon_theme_classes %]-time"></i> Schedule</a></li>
>                                     [% IF ( CAN_user_reports_create_reports ) %]
>-                                        <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Delete%20Saved"><i class="icon-remove"></i> Delete</a></li>
>+                                        <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Delete%20Saved"><i class="[% icon_theme_classes %]-remove"></i> Delete</a></li>
>                                     [% END %]
>                                 </ul>
>                             </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>index 3b97849..64cc1cf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>@@ -201,22 +201,22 @@
>                                         [% ELSE %]
>                                             [% IF ( subscription.routingedit ) %]
>                                                 <li>
>-                                                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="icon-pencil"></i> Edit routing list ([% subscription.routingedit %])</a>
>+                                                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="[% icon_theme_classes %]-pencil"></i> Edit routing list ([% subscription.routingedit %])</a>
>                                                 </li>
>                                             [% ELSE %]
>                                                 <li>
>-                                                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new"> <i class="icon-plus"></i> New routing list</a>
>+                                                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new"> <i class="[% icon_theme_classes %]-plus"></i> New routing list</a>
>                                                 </li>
>                                             [% END %]
>                                         [% END %]
>                                     [% END # IF ( routing && CAN_user_serials_routing ) %]
> 
>                                     <li>
>-                                        <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="icon-list-alt"></i> Issue history</a>
>+                                        <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="[% icon_theme_classes %]-list-alt"></i> Issue history</a>
>                                     </li>
>                                     [% IF ( CAN_user_serials_receive_serials ) %]
>                                         <li>
>-                                            <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7"> <i class="icon-inbox"></i> Serial receive</a>
>+                                            <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7"> <i class="[% icon_theme_classes %]-inbox"></i> Serial receive</a>
>                                         </li>
>                                     [% END %]
>                                 </ul>
>@@ -294,13 +294,13 @@
>                                     [% IF ( routing && CAN_user_serials_routing ) %]
>                                         [% UNLESS ( subscription.cannotedit ) %]
>                                             <li>
>-                                                <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=reopen&amp;routing=[% subscription.routing %]&amp;searched=1&amp;title_filter=[% title_filter | uri %]&amp;ISSN_filter=[% ISSN_filter | uri %]&amp;EAN_filter=[% EAN_filter | uri %]&amp;published_filter=[% publisher_filter | uri %]&amp;bookseller_filter=[% bookseller_filter | uri %]&amp;branch_filter=[% branch_filter | uri %]" id="reopensub"> <i class="icon-repeat"></i> Reopen</a>
>+                                                <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=reopen&amp;routing=[% subscription.routing %]&amp;searched=1&amp;title_filter=[% title_filter | uri %]&amp;ISSN_filter=[% ISSN_filter | uri %]&amp;EAN_filter=[% EAN_filter | uri %]&amp;published_filter=[% publisher_filter | uri %]&amp;bookseller_filter=[% bookseller_filter | uri %]&amp;branch_filter=[% branch_filter | uri %]" id="reopensub"> <i class="[% icon_theme_classes %]-repeat"></i> Reopen</a>
>                                             </li>
>                                         [% END %]
>                                     [% END # IF ( routing && CAN_user_serials_routing ) %]
> 
>                                     <li>
>-                                        <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="icon-list-alt"></i> Issue history</a>
>+                                        <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="[% icon_theme_classes %]-list-alt"></i> Issue history</a>
>                                     </li>
> 
>                                 </ul>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>index b3fedc4..e3bf811 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>@@ -198,8 +198,8 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
>     <div class="yui-b">
> 
>     <div id="toolbar" class="btn-toolbar">
>-        <a class="btn btn-small" id="editsuggestion" href="suggestion.pl?op=edit&amp;suggestionid=[% suggestionid %]"><i class="icon-pencil"></i> Edit</a>
>-        <a class="btn btn-small" id="deletesuggestion" href="suggestion.pl?op=delete&amp;edit_field=[% suggestionid %]"><i class="icon-remove"></i> Delete</a>
>+        <a class="btn btn-small" id="editsuggestion" href="suggestion.pl?op=edit&amp;suggestionid=[% suggestionid %]"><i class="[% icon_theme_classes %]-pencil"></i> Edit</a>
>+        <a class="btn btn-small" id="deletesuggestion" href="suggestion.pl?op=delete&amp;edit_field=[% suggestionid %]"><i class="[% icon_theme_classes %]-remove"></i> Delete</a>
>     </div>
> 
>     <fieldset class="rows">
>@@ -449,7 +449,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
> 
> [% IF ( op_else ) %]
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-small" id="newsuggestion" href="suggestion.pl?op=add"><i class="icon-plus"></i> New purchase suggestion</a>
>+    <a class="btn btn-small" id="newsuggestion" href="suggestion.pl?op=add"><i class="[% icon_theme_classes %]-plus"></i> New purchase suggestion</a>
> </div>
> 
> <h1>Suggestions management</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
>index af28ee8..509380f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
>@@ -65,7 +65,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div>
>         <div class="dialog alert">Error: Required news title missing!</div>
>     [% END %]
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-small" id="newentry" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;lang=[% lang %]"><i class="icon-plus"></i> New entry</a>
>+    <a class="btn btn-small" id="newentry" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;lang=[% lang %]"><i class="[% icon_theme_classes %]-plus"></i> New entry</a>
> </div>
> [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>index 1d4bfbc..03db658 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>@@ -174,7 +174,7 @@ $(document).ready(function() {
>       </p>
>     [% END %]
>       <div id="toolbar" class="btn-toolbar">
>-          <button type="submit" class="btn btn-small" id="newnotice"><i class="icon-plus"></i> New notice</button>
>+          <button type="submit" class="btn btn-small" id="newnotice"><i class="[% icon_theme_classes %]-plus"></i> New notice</button>
>         <input type="hidden" id="op" name="op" />
>       </div>
>     </form>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>index 066d7fd..1cfe246 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>@@ -376,12 +376,12 @@ function placeHold () {
>         <span class="addto">| </span>
>         &nbsp;
>         [% IF ( CAN_user_reserveforothers && DisplayMultiPlaceHold ) %]
>-            <div class="btn-group"><button class="btn btn-mini placehold"><i class="icon-hold"></i> Place hold</button></div>
>+            <div class="btn-group"><button class="btn btn-mini placehold"><i class="[% icon_theme_classes %]-hold"></i> Place hold</button></div>
>         [% END %]
>         [% IF ( allowremovingitems ) %]
>-            <div class="btn-group"><button type="submit" class="btn btn-mini list-remove"><i class="icon-remove-sign"></i> Remove selected</button></div>
>+            <div class="btn-group"><button type="submit" class="btn btn-mini list-remove"><i class="[% icon_theme_classes %]-remove-sign"></i> Remove selected</button></div>
>         [% END %]
>-        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<div class="btn-group"><button type="submit" class="btn btn-mini merge-items"><i class="icon-merge"></i> Merge selected</button></div>[% END %]
>+        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<div class="btn-group"><button type="submit" class="btn btn-mini merge-items"><i class="[% icon_theme_classes %]-merge"></i> Merge selected</button></div>[% END %]
>         </div>
>     [% END %]
> </div>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>index 1ccd2be..4e67da3 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>@@ -35,7 +35,7 @@
>                         [% END %]
>                         [% IF ( Koha.Preference( 'virtualshelves' ) == 1 ) %]
>                             <li class="dropdown">
>-                                <a href="#" title="Show lists" class="dropdown-toggle" id="listsmenu" data-toggle="dropdown" role="button"><i class="icon-list icon-white"></i> <span class="listslabel">Lists</span> <b class="caret"></b></a>
>+                                <a href="#" title="Show lists" class="dropdown-toggle" id="listsmenu" data-toggle="dropdown" role="button"><i class="[% icon_theme_classes %]-list icon-white"></i> <span class="listslabel">Lists</span> <b class="caret"></b></a>
>                                 <ul aria-labelledby="listsmenu" role="menu" class="dropdown-menu">
>                                     [% IF ( pubshelves ) %]
>                                             <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?display=publicshelves" tabindex="-1" role="menuitem"><strong>Public lists</strong></a></li>
>@@ -69,7 +69,7 @@
>                     </ul> 
>                     [% IF Koha.Preference( 'virtualshelves' ) == 1 %]<div id="listsDetails"></div>[% END %]
>                     [% IF Koha.Preference( 'opacuserlogin' ) == 1 || EnableOpacSearchHistory %]
>-                        <a id="user-menu-trigger" class="pull-right" href="#"><i class="icon-user"></i> <span class="caret"></span></a>
>+                        <a id="user-menu-trigger" class="pull-right" href="#"><i class="[% icon_theme_classes %]-user"></i> <span class="caret"></span></a>
>                         <div id="members">
>                             <ul class="nav pull-right">
>                                 [% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'top' %]
>@@ -77,7 +77,7 @@
>                                         [% IF ( languages_loop && opaclanguagesdisplay ) %]
>                                             [% UNLESS ( one_language_enabled ) %]
>                                             <li class="dropdown">
>-                                              <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"><i class="icon-flag icon-white"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a>
>+                                              <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"><i class="[% icon_theme_classes %]-flag icon-white"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a>
>                                               <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu">
>                                               [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
>                                                   [% IF ( languages_loo.group_enabled ) %]
>@@ -85,7 +85,7 @@
>                                                           [% 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 %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]&nbsp;<i class="icon-ok"></i></a></li>
>+                                                                  <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]&nbsp;<i class="[% icon_theme_classes %]-ok"></i></a></li>
>                                                                   [% ELSE %]
>                                                                   <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem" class="listmenulink"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]</a></li>
>                                                                   [% END %]
>@@ -94,7 +94,7 @@
>                                                       [% 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 %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]&nbsp;<i class="icon-ok"></i></a></li>
>+                                                              <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]&nbsp;<i class="[% icon_theme_classes %]-ok"></i></a></li>
>                                                               [% ELSE %]
>                                                               <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem" class="listmenulink">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
>                                                               [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>index b5bc8d2..763cfac 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -591,11 +591,11 @@
>                                                         [% IF RESERVE.suspend %]
>                                                             <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
>                                                                 <input type="hidden" name="reserve_id" value="[% RESERVE.reserve_id %]" />
>-                                                                <button class="btn btn-link" type="submit" name="submit"><i class="icon-play"></i> Resume</button>
>+                                                                <button class="btn btn-link" type="submit" name="submit"><i class="[% icon_theme_classes %]-play"></i> Resume</button>
>                                                             </form>
>                                                         [% ELSE %]
>                                                             [% IF AutoResumeSuspendedHolds %]
>-                                                                <a class="btn btn-link js-show" href="#suspendModal[% RESERVE.reserve_id %]" role="button" data-toggle="modal"><i class="icon-pause"></i> Suspend</a>
>+                                                                <a class="btn btn-link js-show" href="#suspendModal[% RESERVE.reserve_id %]" role="button" data-toggle="modal"><i class="[% icon_theme_classes %]-pause"></i> Suspend</a>
>                                                                 [% # hold suspend modal form %]
>                                                                 <div id="suspendModal[% RESERVE.reserve_id %]" class="modal-nojs" tabindex="-1" role="dialog" aria-labelledby="suspendModal[% RESERVE.reserve_id %]Label" aria-hidden="true">
>                                                                     <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
>@@ -624,7 +624,7 @@
>                                                             [% ELSE %]
>                                                                 <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
>                                                                     <input type="hidden" name="reserve_id" value="[% RESERVE.reserve_id %]" />
>-                                                                    <button class="btn btn-link" type="submit" name="submit"><i class="icon-pause"></i> Suspend</button>
>+                                                                    <button class="btn btn-link" type="submit" name="submit"><i class="[% icon_theme_classes %]-pause"></i> Suspend</button>
>                                                                 </form>
>                                                             [% END # / IF AutoResumeSuspendedHolds %]
>                                                         [% END # / IF RESERVE.suspend %]
>@@ -636,7 +636,7 @@
>                                                     <form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
>                                                     <input type="hidden" name="biblionumber" value="[% RESERVE.biblionumber %]" />
>                                                     <input type="hidden" name="reserve_id" value="[% RESERVE.reserve_id %]" />
>-                                                    <button type="submit" name="submit" class="btn btn-mini btn-danger" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);"><i class="icon-remove icon-white"></i> Cancel</button></form>
>+                                                    <button type="submit" name="submit" class="btn btn-mini btn-danger" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);"><i class="[% icon_theme_classes %]-remove icon-white"></i> Cancel</button></form>
>                                                 [% END %]
>                                             </td>
>                                         </tr>
>@@ -647,7 +647,7 @@
>                             [% IF SuspendHoldsOpac %]
>                                 <div>
>                                     <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
>-                                        <button type="submit" name="submit" class="btn" onclick="return confirmDelete(MSG_CONFIRM_SUSPEND_HOLDS);"><i class="icon-pause"></i> Suspend all holds</button>
>+                                        <button type="submit" name="submit" class="btn" onclick="return confirmDelete(MSG_CONFIRM_SUSPEND_HOLDS);"><i class="[% icon_theme_classes %]-pause"></i> Suspend all holds</button>
>                                         <input type="hidden" name="suspend" value="1" />
> 
>                                         [% IF AutoResumeSuspendedHolds %]
>@@ -660,7 +660,7 @@
>                                 <br/>
>                                 <div>
>                                     <form action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
>-                                        <button type="submit" name="submit" class="btn" onclick="return confirmDelete(MSG_CONFIRM_RESUME_HOLDS);"><i class="icon-play"></i> Resume all suspended holds</button>
>+                                        <button type="submit" name="submit" class="btn" onclick="return confirmDelete(MSG_CONFIRM_RESUME_HOLDS);"><i class="[% icon_theme_classes %]-play"></i> Resume all suspended holds</button>
>                                         <input type="hidden" name="suspend" value="0" />
>                                     </form>
>                                 </div>
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 13696: 35829 | 35881 | 36432 | 36433 | 36434 | 42916 | 42917 | 42931 | 42933 | 42934 | 44012 | 44037 | 44038 | 44039