From a02bd4f71c25207b38908887bae50bdf1c450a3b Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Thu, 6 Aug 2020 17:29:54 +0000
Subject: [PATCH] Bug 25744: Replace <i> with <em> in staff interface

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/includes/borrower_debarments.inc       |  2 +-
 .../intranet-tmpl/prog/en/includes/holds_table.inc |  8 ++++----
 .../prog/en/includes/patron-article-requests.inc   |  2 +-
 .../intranet-tmpl/prog/en/includes/permissions.inc |  2 +-
 .../prog/en/modules/acqui/lateorders.tt            |  6 +++---
 .../prog/en/modules/acqui/newordersuggestion.tt    | 10 +++++-----
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  | 10 +++++-----
 .../prog/en/modules/admin/aqbudgetperiods.tt       |  2 +-
 .../prog/en/modules/admin/aqcontract.tt            |  2 +-
 .../en/modules/admin/auth_subfields_structure.tt   |  4 ++--
 .../prog/en/modules/admin/categories.tt            |  4 ++--
 .../en/modules/admin/marc_subfields_structure.tt   |  4 ++--
 .../en/modules/admin/preferences/cataloguing.pref  |  2 +-
 .../en/modules/admin/preferences/searching.pref    |  2 +-
 .../prog/en/modules/catalogue/MARCdetail.tt        |  2 +-
 .../prog/en/modules/catalogue/detail.tt            |  6 +++---
 .../prog/en/modules/catalogue/imageviewer.tt       |  4 ++--
 .../prog/en/modules/catalogue/issuehistory.tt      |  2 +-
 .../prog/en/modules/catalogue/labeledMARCdetail.tt |  2 +-
 .../prog/en/modules/catalogue/moredetail.tt        |  2 +-
 .../prog/en/modules/catalogue/stockrotation.tt     |  2 +-
 .../prog/en/modules/cataloguing/addbooks.tt        |  2 +-
 .../prog/en/modules/cataloguing/linkitem.tt        |  4 ++--
 .../prog/en/modules/cataloguing/moveitem.tt        |  6 +++---
 .../prog/en/modules/circ/circulation.tt            | 14 +++++++-------
 .../prog/en/modules/circ/pendingreserves.tt        |  4 ++--
 .../prog/en/modules/clubs/club-enrollments.tt      |  2 +-
 .../prog/en/modules/clubs/clubs-add-modify.tt      |  8 ++++----
 .../intranet-tmpl/prog/en/modules/clubs/clubs.tt   |  8 ++++----
 .../prog/en/modules/clubs/patron-enroll.tt         |  2 +-
 .../prog/en/modules/clubs/templates-add-modify.tt  |  4 ++--
 .../en/modules/course_reserves/add_items-step1.tt  |  2 +-
 .../en/modules/course_reserves/add_items-step2.tt  |  6 +++---
 .../en/modules/course_reserves/batch_add_items.tt  |  4 ++--
 .../en/modules/course_reserves/course-details.tt   | 12 ++++++------
 .../prog/en/modules/course_reserves/course.tt      |  2 +-
 .../prog/en/modules/members/memberentrygen.tt      |  2 +-
 .../prog/en/modules/members/moremember.tt          |  6 +++---
 .../prog/en/modules/plugins/plugins-home.tt        |  2 +-
 .../prog/en/modules/reserve/request.tt             |  2 +-
 .../en/modules/rotating_collections/addItems.tt    | 12 ++++++------
 .../rotating_collections/editCollections.tt        | 12 ++++++------
 .../rotating_collections/transferCollection.tt     |  4 ++--
 .../prog/en/modules/serials/routing-preview.tt     |  4 ++--
 .../prog/en/modules/serials/routing.tt             |  6 +++---
 .../prog/en/modules/serials/serials-collection.tt  |  4 ++--
 .../prog/en/modules/serials/serials-edit.tt        |  4 ++--
 .../prog/en/modules/serials/subscription-add.tt    |  4 ++--
 .../prog/en/modules/serials/subscription-detail.tt |  8 ++++----
 .../prog/en/modules/serials/viewalerts.tt          |  4 ++--
 .../prog/en/modules/suggestion/suggestion.tt       |  4 ++--
 .../intranet-tmpl/prog/en/modules/tags/list.tt     |  6 +++---
 .../modules/tools/marc_modification_templates.tt   |  4 ++--
 .../prog/en/modules/virtualshelves/shelves.tt      |  6 +++---
 54 files changed, 127 insertions(+), 127 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
index 8a0efadaa1..511a6b88a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
@@ -37,7 +37,7 @@
                 [% d.comment | $raw %]
 			    [% END %]
 			</td>
-                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
+                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <em>Indefinite</em> [% END %]</td>
                         <td>[% d.created | $KohaDates %]</td>
                         [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
                             <td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
index f3aed75062..fa8c1f6d3f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
@@ -151,7 +151,7 @@
                     </a>
                 [% ELSE %]
                     [% IF ( hold.item_level_hold ) %]
-                        <i>
+                        <em>
                             Only item
                             <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&amp;itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]">
                                 [% IF ( hold.barcodenumber ) %]
@@ -161,12 +161,12 @@
                                     No barcode
                                 [% END %]
                             </a>
-                        </i>
+                        </em>
                     [% ELSE %]
                         [% IF hold.itemtype %]
-                            <i>Next available [% ItemTypes.GetDescription( hold.itemtype ) | html %] item</i>
+                            <em>Next available [% ItemTypes.GetDescription( hold.itemtype ) | html %] item</em>
                         [% ELSE %]
-                            <i>Next available</i>
+                            <em>Next available</em>
                         [% END %]
 
                         <input type="hidden" name="itemnumber" value="" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc
index dca996ef96..25279adfc8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc
@@ -27,7 +27,7 @@
                             [% ar.item.enumchron | html %]
                         </a>
                         [% ar.biblio.author | html %]
-                        [% IF ar.itemnumber %] <i>(only [% ar.item.barcode | html %])</i>[% END %]
+                        [% IF ar.itemnumber %] <em>(only [% ar.item.barcode | html %])</em>[% END %]
                     </td>
 
                     <td class="article-request-created_on">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
index b8beb111ee..1d6f60be4e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
@@ -662,7 +662,7 @@
         <span class="permissioncode">([% name | html %])</span>
     [%- CASE 'upload_manage' -%]
         <span class="sub_permission upload_manage_subpermission">
-            Manage uploaded files (<i>Useless without upload_general_files</i>)
+            Manage uploaded files (<em>Useless without upload_general_files</em>)
         </span>
         <span class="permissioncode">([% name | html %])</span>
     [%- CASE 'access_files' -%]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 1c81debcab..30dcef50b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -99,11 +99,11 @@
             </td>
             <td>
                 <b>[% lateorder.biblio.title | html %]</b>
-                   [% IF ( lateorder.biblio.author ) %]<br/><i>Author:</i> [% lateorder.biblio.author | html %][% END %]
+                   [% IF ( lateorder.biblio.author ) %]<br/><em>Author:</em> [% lateorder.biblio.author | html %][% END %]
                    [% IF ( lateorder.biblio.biblioitem.publishercode ) %]
-                        <br/><i>Published by:</i> [% lateorder.biblio.biblioitem.publishercode | html %]
+                        <br/><em>Published by:</em> [% lateorder.biblio.biblioitem.publishercode | html %]
                         [% IF ( lateorder.biblio.biblioitem.publicationyear ) %]
-                            <i> in </i>[% lateorder.biblio.biblioitem.publicationyear | html %]
+                            <em> in </em>[% lateorder.biblio.biblioitem.publicationyear | html %]
                         [% END %]
                    [% END %]
             </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
index ec64d8120c..aefe8865e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
@@ -46,12 +46,12 @@
                     <p>[% suggestions_loo.title | html %] - [% suggestions_loo.author | html %]</p>
                     <p>
                         [% IF ( suggestions_loo.copyrightdate ) %]&copy; [% suggestions_loo.copyrightdate | html %] [% END %]
-                        [% IF ( suggestions_loo.volumedesc ) %]volume: <i>[% suggestions_loo.volumedesc | html %]</i> [% END %]
-                        [% IF ( suggestions_loo.isbn ) %]ISBN: <i>[% suggestions_loo.isbn | html %]</i> [% END %]
+                        [% IF ( suggestions_loo.volumedesc ) %]volume: <em>[% suggestions_loo.volumedesc | html %]</em> [% END %]
+                        [% IF ( suggestions_loo.isbn ) %]ISBN: <em>[% suggestions_loo.isbn | html %]</em> [% END %]
                         [% IF ( suggestions_loo.publishercode ) %]<br />published by: [% suggestions_loo.publishercode | html %] [% END %]
-                        [% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear | html %]</i> [% END %]
-                        [% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place | html %]</i> [% END %]
-                        [% IF ( suggestions_loo.note ) %]<p><i>([% suggestions_loo.note | html %])</i></p> [% END %]
+                        [% IF ( suggestions_loo.publicationyear ) %] in <em>[% suggestions_loo.publicationyear | html %]</em> [% END %]
+                        [% IF ( suggestions_loo.place ) %] in <em>[% suggestions_loo.place | html %]</em> [% END %]
+                        [% IF ( suggestions_loo.note ) %]<p><em>([% suggestions_loo.note | html %])</em></p> [% END %]
                     </p>
                 </td>
                 <td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index 36798c3a47..f454b6b662 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -18,11 +18,11 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
     [% IF datereceived %]
-        Receipt summary for <i>[% name | html %]</i>
+        Receipt summary for <em>[% name | html %]</em>
         [% IF ( invoice ) %]
-            <i>[ [% invoice | html %] ]</i>
+            <em>[ [% invoice | html %] ]</em>
         [% END %]
-        on <i>[% datereceived | $KohaDates %]</i>
+        on <em>[% datereceived | $KohaDates %]</em>
     [% ELSE %]
         Receive orders from [% name | html %]
     [% END %]
@@ -46,7 +46,7 @@
 	[% END %]
     <h1>
         [% IF datereceived %]
-            Receipt summary for <i>[% name | html %]</i> [% IF ( invoice ) %] <i> [ [% invoice | html %] ] </i>[% END %] on <i>[% datereceived | $KohaDates %]</i>
+            Receipt summary for <em>[% name | html %]</em> [% IF ( invoice ) %] <em> [ [% invoice | html %] ] </em>[% END %] on <em>[% datereceived | $KohaDates %]</em>
         [% ELSE %]
             Receive orders from [% name | html %]
         [% END %]
@@ -250,7 +250,7 @@
                 [% ELSE %]
                     <td colspan="6" class="total">(Tax exc.)</td>
                 [% END %]
-                <td colspan="3"><i>Subtotal for</i> [% key | html %]</td>
+                <td colspan="3"><em>Subtotal for</em> [% key | html %]</td>
                 <td>[% subtotal_for_funds.$key.ecost | $Price %]</td>
                 <td>[% subtotal_for_funds.$key.unitprice | $Price %]</td>
                 <td>&nbsp;</td>
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 d270976218..f3dbc3a6a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -189,7 +189,7 @@
     <!--  add or modify a budget period   -->
 
     [% IF ( budget_period_id ) %]
-        <h3>Modify budget <i>[% budget_period_description | html %]</i></h3>
+        <h3>Modify budget <em>[% budget_period_description | html %]</em></h3>
     [% ELSE %]
         <h3>Add budget</h3>
 	[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
index be66df0d45..b9319e204c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -108,7 +108,7 @@
             [% END %]
             [% IF ( delete_confirm ) %]
                     <div class="dialog alert">
-                        <h3>Confirm deletion of contract <i>[% contractname | html %]</i></h3>
+                        <h3>Confirm deletion of contract <em>[% contractname | html %]</em></h3>
                         <table>
                             <tr><th scope="row">Contract number:</th><td>[% contractnumber | html %]</td></tr>
                             <tr><th scope="row">Contract name:</th><td>[% contractname | html %]</td></tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
index 4e9f929dcb..e3638a24a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
@@ -280,14 +280,14 @@
         </td>
         <td>
             [% IF ( loo.subfield_ignored ) %]
-                    <i>[% loo.liblibrarian | html_entity %]</i>
+                    <em>[% loo.liblibrarian | html_entity %]</em>
             [% ELSE %]
                     [% loo.liblibrarian | html_entity %]
             [% END %]
         </td>
         <td>
             [% IF ( loo.subfield_ignored ) %]
-                    <i>subfield ignored</i>
+                    <em>subfield ignored</em>
             [% ELSE %]
                 <strong>Tab:</strong>[% loo.tab | html %],
                 [% IF ( loo.kohafield ) %] | <strong>Koha field:</strong> [% loo.kohafield | html %], [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
index 37c6687d33..0c836f418b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
@@ -162,7 +162,7 @@
                           [% END %]
                         [% END %]
                     </select>
-                    <span>Select <i>All libraries</i> if this category type must to be displayed all the time. Otherwise select libraries you want to associate with this value.
+                    <span>Select <em>All libraries</em> if this category type must to be displayed all the time. Otherwise select libraries you want to associate with this value.
                     </span>
                 </li>
                 <li>
@@ -332,7 +332,7 @@
                             <option value="forever">Forever</option>
                         [% END %]
                     </select>
-                    <span>Controls how long a patrons checkout history is kept for new patrons of this category. "Never" anonymizes checkouts on return, and "Forever" keeps a patron's checkout history indefinitely. When set to "Default", the amount of history kept is controlled by the cronjob <i>batch_anonymise.pl</i> which should be set up by your system administrator.</span>
+                    <span>Controls how long a patrons checkout history is kept for new patrons of this category. "Never" anonymizes checkouts on return, and "Forever" keeps a patron's checkout history indefinitely. When set to "Default", the amount of history kept is controlled by the cronjob <em>batch_anonymise.pl</em> which should be set up by your system administrator.</span>
                 </li>
                 <li>
                     <label for="exclude_from_local_holds_priority">Exclude from local holds priority:</label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
index 461ca663d6..cbb33c7db2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
@@ -290,14 +290,14 @@
     <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=[% loo.tagfield | uri %]&amp;frameworkcode=[% frameworkcode | uri %]#sub[% loo.tagsubfield | uri %]field">[% loo.tagsubfield | html %]</a></td>
     <td>
         [% IF ( loo.subfield_ignored ) %]
-            <i>[% loo.liblibrarian | html_entity %]</i>
+            <em>[% loo.liblibrarian | html_entity %]</em>
         [% ELSE %]
             [% loo.liblibrarian | html_entity %]
         [% END %]
     </td>
     <td>
         [% IF ( loo.subfield_ignored ) %]
-            <i>subfield ignored</i>
+            <em>subfield ignored</em>
         [% ELSE %]
             Tab:[% loo.tab | html %],
             [% IF ( loo.kohafield ) %] | Koha field: [% loo.kohafield | html %], [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
index 5812154acd..73e66fbc2f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
@@ -295,4 +295,4 @@ Cataloging:
             - "<br/>"
             - "All values of repeating tags and subfields will be printed with the given RIS tag."
             - "<br/>"
-            - "Use of TY ( record type ) as a key will <i>replace</i> the default TY with the field value of your choosing."
+            - "Use of TY ( record type ) as a key will <em>replace</em> the default TY with the field value of your choosing."
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
index fdc7e7f1a8..2e66eccef3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
@@ -71,7 +71,7 @@ Searching:
               choices:
                   yes: Include
                   no: "Don't include"
-            - "<i>see from</i> (non-preferred form) headings in bibliographic searches. Please note: you will need to reindex your bibliographic database when changing this preference."
+            - "<em>see from</em> (non-preferred form) headings in bibliographic searches. Please note: you will need to reindex your bibliographic database when changing this preference."
         -
             - pref: EnableSearchHistory
               default: 0
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
index 812fec2a9e..954a08b60f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
@@ -21,7 +21,7 @@
   [% IF ( unknownbiblionumber ) %]
     Unknown record
   [% ELSE %]
-    MARC details for <i>[% INCLUDE 'biblio-title.inc' %]</i>
+    MARC details for <em>[% INCLUDE 'biblio-title.inc' %]</em>
   [% END %]
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 7b22f2c36d..239f4f5b07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -50,7 +50,7 @@
   [% IF ( unknownbiblionumber ) %]
     <span class="unknownrecord">Unknown record</span>
   [% ELSE %]
-    <span class="titledetails">Details for <i>[% INCLUDE 'biblio-title.inc' %]</i></span>
+    <span class="titledetails">Details for <em>[% INCLUDE 'biblio-title.inc' %]</em></span>
   [% END %]
 </div>
 
@@ -790,8 +790,8 @@ Note that permanent location is a code, and location may be an authval.
                             [% suggestion.title | html %][% IF ( suggestion.author ) %], by [% suggestion.author | html %][% END %]</a>
                         <br />
                         [% IF ( suggestion.copyrightdate ) %]&copy; [% suggestion.copyrightdate | html %] [% END %]
-                        [% IF ( suggestion.volumedesc ) %]; Volume:<i>[% suggestion.volumedesc | html %]</i> [% END %]
-                        [% IF ( suggestion.isbn ) %]; ISBN:<i>[% suggestion.isbn | html %]</i> [% END %][% IF ( suggestion.publishercode ) %]; Published by [% suggestion.publishercode | html %] [% END %][% IF ( suggestion.publicationyear ) %] in <i>[% suggestion.publicationyear | html %]</i> [% END %][% IF ( suggestion.place ) %] in <i>[% suggestion.place | html %]</i> [% END %][% IF ( suggestion.collectiontitle ) %]; [% suggestion.collectiontitle | html %] [% END %][% IF ( suggestion.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestion.itemtype, 0 ) | html %] [% END %]<br />[% IF ( suggestion.note ) %]<div class="suggestion_note"><i class="fa fa-comment"></i> [% suggestion.note | html %]</div>[% END %]
+                        [% IF ( suggestion.volumedesc ) %]; Volume:<em>[% suggestion.volumedesc | html %]</em> [% END %]
+                        [% IF ( suggestion.isbn ) %]; ISBN:<em>[% suggestion.isbn | html %]</em> [% END %][% IF ( suggestion.publishercode ) %]; Published by [% suggestion.publishercode | html %] [% END %][% IF ( suggestion.publicationyear ) %] in <em>[% suggestion.publicationyear | html %]</em> [% END %][% IF ( suggestion.place ) %] in <em>[% suggestion.place | html %]</em> [% END %][% IF ( suggestion.collectiontitle ) %]; [% suggestion.collectiontitle | html %] [% END %][% IF ( suggestion.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestion.itemtype, 0 ) | html %] [% END %]<br />[% IF ( suggestion.note ) %]<div class="suggestion_note"><i class="fa fa-comment"></i> [% suggestion.note | html %]</div>[% END %]
                     </td>
                     <td>
                         <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestion.suggestedby | uri %]">[% INCLUDE 'patron-title.inc' patron => suggestion.suggester %]</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
index 712420d4e1..cac9877e04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
@@ -27,7 +27,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i>[% INCLUDE 'biblio-title.inc' %]</i></a> &rsaquo; Images</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><em>[% INCLUDE 'biblio-title.inc' %]</em></a> &rsaquo; Images</div>
 
 <div class="main container-fluid">
     <div class="row">
@@ -36,7 +36,7 @@
 
 [% INCLUDE 'cat-toolbar.inc' %]
 
-<h3>Images for <i>[% INCLUDE 'biblio-title.inc' %]</i></h3>
+<h3>Images for <em>[% INCLUDE 'biblio-title.inc' %]</em></h3>
 <h4>[% biblio.author | html %]</h4>
 
 [% IF ( LocalCoverImages == 1 ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
index f9dab560ce..5ab47ff454 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
@@ -15,7 +15,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Checkout history for <i>[% INCLUDE 'biblio-title.inc' %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Checkout history for <em>[% INCLUDE 'biblio-title.inc' %]</em></div>
 
 <div class="main container-fluid">
     <div class="row">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
index 01bd490a73..c55028421a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
@@ -24,7 +24,7 @@
 		[% IF ( unknownbiblionumber ) %]
 		  Unknown record
 		[% ELSE %]
-            MARC details for <i>[% bibliotitle | html %]</i>
+            MARC details for <em>[% bibliotitle | html %]</em>
 		[% END %]
 	</div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index 70c24014d9..0cbb7c3186 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -15,7 +15,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; [% INCLUDE 'biblio-default-view.inc' %]<i>[% INCLUDE 'biblio-title.inc' %]</i></a> &rsaquo; Item details</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; [% INCLUDE 'biblio-default-view.inc' %]<em>[% INCLUDE 'biblio-title.inc' %]</em></a> &rsaquo; Item details</div>
 
 <div class="main container-fluid">
     <div class="row">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
index 26d6604dbc..baf628d716 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
@@ -12,7 +12,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Stock rotation details for <i>[% INCLUDE 'biblio-title.inc' %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Stock rotation details for <em>[% INCLUDE 'biblio-title.inc' %]</em></div>
 
 <div class="main container-fluid">
     <div class="row">
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 366e2e88de..18a22be998 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -94,7 +94,7 @@
                                                 [% IF ( resultsloo.place ) %] ; [% resultsloo.place | html %][% END %]
                                                 [% IF ( resultsloo.pages ) %] - [% resultsloo.pages | html %][% END %]
                                                 [% IF ( resultsloo.item('size') ) %] ; [% resultsloo.item('size') | html %][% END %]
-                                                [% IF ( resultsloo.timestamp ) %] <i>(modified on [% resultsloo.timestamp | html %])</i>[% END %]
+                                                [% IF ( resultsloo.timestamp ) %] <em>(modified on [% resultsloo.timestamp | html %])</em>[% END %]
                                             </p>
                                         [% END %]
                                     </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
index 80ce64be7e..420f5fcd1e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
@@ -5,7 +5,7 @@
 <body id="catalog_linkitem" class="catalog">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>  &rsaquo; Link a host record to <i>[% bibliotitle | html %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>  &rsaquo; Link a host record to <em>[% bibliotitle | html %]</em></div>
 
 <div class="container-fluid">
     <div class="row">
@@ -22,7 +22,7 @@
     </form>
 [% ELSE %]
     [% IF ( success ) %]
-    <div class="dialog message">The item has successfully been linked to <i>[% bibliotitle | html %]</i>.</div>
+    <div class="dialog message">The item has successfully been linked to <em>[% bibliotitle | html %]</em>.</div>
 	<form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
 	    <input type="submit" value="OK" />
 	    <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
index 9dce4fcaf3..2c19604bf4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
@@ -6,7 +6,7 @@
 <body id="catalog_moveitem" class="catalog">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>  &rsaquo; Attach an item to <i>[% INCLUDE 'biblio-title.inc' %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>  &rsaquo; Attach an item to <em>[% INCLUDE 'biblio-title.inc' %]</em></div>
 
 <div class="main container-fluid">
     <div class="row">
@@ -66,7 +66,7 @@
                 </div>
             [% END %]
 
-            <div class="dialog message">The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %]<i>[% bibliotitle | html %]</i></a>.
+            <div class="dialog message">The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %]<em>[% bibliotitle | html %]</em></a>.
 			<p>
 			[% INCLUDE actions %]
                     <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>
@@ -94,7 +94,7 @@
 	    [% END %]
 
 		[% IF ( missingbarcode ) %]
-        <h3>Attach an item[% IF ( bibliotitle ) %] to <i>[% bibliotitle | html %]</i>[% END %]</h3>
+        <h3>Attach an item[% IF ( bibliotitle ) %] to <em>[% bibliotitle | html %]</em>[% END %]</h3>
 	    <fieldset id="barcode_fieldset">
 		<label for="barcode">Enter the barcode of the item to attach:</label>
 		    <p class="hint">The item you select will be moved to the target record.</p>
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 3be17a8051..cf9d5e4540 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -111,19 +111,19 @@
                                 [% END %]
 
                                 [% IF ( RENEW_ISSUE ) %]
-                                    <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) is currently checked out to this patron.  Renew?</li>
+                                    <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) is currently checked out to this patron.  Renew?</li>
                                 [% END %]
 
                                 [% IF ( RESERVE_WAITING ) %]
-                                    <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% reswaitingdate | $KohaDates %]</li>
+                                    <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% reswaitingdate | $KohaDates %]</li>
                                 [% END %]
 
                                 [% IF ( RESERVED ) %]
-                                    <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% resreservedate | $KohaDates %]</li>
+                                    <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% resreservedate | $KohaDates %]</li>
                                 [% END %]
 
                                 [% IF ( ISSUED_TO_ANOTHER ) %]
-                                    <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) is checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issued_borrowernumber | uri %]">[% issued_firstname | html %] [% issued_surname | html %]</a> ([% issued_cardnumber | html %]).
+                                    <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) is checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issued_borrowernumber | uri %]">[% issued_firstname | html %] [% issued_surname | html %]</a> ([% issued_cardnumber | html %]).
                                         [% IF CAN_user_circulate_force_checkout %]
                                             Check in and check out?
                                         [% END %]
@@ -727,13 +727,13 @@
 
                                             [% IF ( debarredcomment ) %]
                                                 with the explanation: <br/>
-                                                <i>
+                                                <em>
                                                     [% IF debarredcomment.search('OVERDUES_PROCESS') %]
                                                         Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | $raw | html_line_break %]
                                                     [% ELSE %]
                                                         [% debarredcomment | $raw | html_line_break %]
                                                     [% END %]
-                                                </i>
+                                                </em>
                                             [% END %]
                                             <br/>
                                             <a class="btn btn-default" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a>
@@ -827,7 +827,7 @@
                                                     [% IF message.manager_id %]
                                                         ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.manager_id | uri %]">[% message.get_column('manager_firstname') | html %] [% message.get_column('manager_surname') | html %]</a> )
                                                     [% END %]
-                                                    <i>"[% message.message | html %]"</i>
+                                                    <em>"[% message.message | html %]"</em>
                                                 </span>
                                                 [% IF message.branchcode == branch OR Koha.Preference('AllowAllMessageDeletion') %]
                                                     <a class="btn btn-link" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% message.message_id | html %]&amp;borrowernumber=[% message.borrowernumber | html %]" onclick="return confirm(MSG_CONFIRM_DELETE_MESSAGE);"><i class="fa fa-trash"></i> Delete</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index 71527fc4c9..94f5cc42d8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -242,9 +242,9 @@
 </ol>
 
 [% IF ( HoldsToPullEndDate ) %]
-    <p><i>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to [% HoldsToPullEndDate | html %] days ahead. Set other date ranges as needed.)</i></p>
+    <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to [% HoldsToPullEndDate | html %] days ahead. Set other date ranges as needed.)</em></p>
 [% ELSE %]
-    <p><i>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to today. Set other date ranges as needed.)</i></p>
+    <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to today. Set other date ranges as needed.)</em></p>
 [% END %]
 
 <fieldset class="action"><input type="submit" name="run_report" value="Submit" class="submit"/></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
index 56d46542df..f6bc52e61d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
@@ -19,7 +19,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-                <h1>Club enrollments for <i>[% club.name | html %]</i></h1>
+                <h1>Club enrollments for <em>[% club.name | html %]</em></h1>
 
                 <table id="enrollments-table">
                     <thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt
index 0179c81de7..cdfd13830a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt
@@ -19,9 +19,9 @@
 [% INCLUDE 'cat-search.inc' %]
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="clubs.pl">Patron clubs</a> &rsaquo;
     [% IF club %]
-        Modify club <i>[% club.name | html %]</i>
+        Modify club <em>[% club.name | html %]</em>
     [% ELSE %]
-        Create a new <i>[% club_template.name | html %]</i> club
+        Create a new <em>[% club_template.name | html %]</em> club
     [% END %]
 </div>
 
@@ -37,9 +37,9 @@
 
                     <legend>
                         [% IF club %]
-                            Modify club <i>[% club.name | html %]</i>
+                            Modify club <em>[% club.name | html %]</em>
                         [% ELSE %]
-                            Create a new <i>[% club_template.name | html %]</i> club
+                            Create a new <em>[% club_template.name | html %]</em> club
                         [% END %]
                     </legend>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
index 2258635d92..678a283c7f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
@@ -25,17 +25,17 @@
                 [% IF club_template %]
                     <div class="dialog message">
                         [% IF stored == 'updated' %]
-                            <p>Club template <i>[% club_template.name | html %]</i> was updated.</p>
+                            <p>Club template <em>[% club_template.name | html %]</em> was updated.</p>
                         [% ELSE %]
-                            <p>Club template <i>[% club_template.name | html %]</i> was saved.</p>
+                            <p>Club template <em>[% club_template.name | html %]</em> was saved.</p>
                         [% END %]
                     </div>
                 [% ELSIF club %]
                     <div class="dialog message">
                         [% IF stored == 'updated' %]
-                            <p>Club <i>[% club.name | html %]</i> was updated.</p>
+                            <p>Club <em>[% club.name | html %]</em> was updated.</p>
                         [% ELSE %]
-                            <p>Club <i>[% club.name | html %]</i> was saved.</p>
+                            <p>Club <em>[% club.name | html %]</em> was saved.</p>
                         [% END %]
                     </div>
                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
index 350e81ca29..4ff470620a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
@@ -2,7 +2,7 @@
 [% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %]
 
 <h3>
-    Enroll in <i>[% club.name | html %]</i>
+    Enroll in <em>[% club.name | html %]</em>
 </h3>
 
 <div class="container">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
index 21ec946db8..13aa40c195 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
@@ -23,7 +23,7 @@
 [% INCLUDE 'cat-search.inc' %]
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="clubs.pl">Patron clubs</a> &rsaquo;
     [% IF club_template %]
-        Modify club template <i>[% club_template.name | html %]</i>
+        Modify club template <em>[% club_template.name | html %]</em>
     [% ELSE %]
         Create a new club template
     [% END %]
@@ -38,7 +38,7 @@
 
                 <h2>
                     [% IF club_template %]
-                        Modify club template <i>[% club_template.name | html %]</i>
+                        Modify club template <em>[% club_template.name | html %]</em>
                     [% ELSE %]
                         Create a new club template
                     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
index fb8b71fd32..428e293713 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
@@ -7,7 +7,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Add reserves for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]">[% course.course_name | html %]</a></i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Add reserves for <em><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]">[% course.course_name | html %]</a></em></div>
 
 <div class="main container-fluid">
     <div class="row">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
index 3b3a89d038..870c0905d8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
@@ -10,7 +10,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo;[% IF is_edit || course_reserve %] Edit [% ELSE %] Reserve [% END %]<i><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | html %]">[% biblio.title | html %]</a></i> for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]">[% course.course_name | html %]</a></i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo;[% IF is_edit || course_reserve %] Edit [% ELSE %] Reserve [% END %]<em><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | html %]">[% biblio.title | html %]</a></em> for <em><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]">[% course.course_name | html %]</a></em></div>
 
 <div class="main container-fluid">
     <div class="row">
@@ -26,9 +26,9 @@
 
             <fieldset class="rows">
                 [% IF is_edit || course_reserve %]
-                    <legend>Edit <i>[% biblio.title | html %]</i> in <i>[% course.course_name | html %]</i></legend>
+                    <legend>Edit <em>[% biblio.title | html %]</em> in <em>[% course.course_name | html %]</em></legend>
                 [% ELSE %]
-                    <legend>Add <i>[% biblio.title | html %]</i> to <i>[% course.course_name | html %]</i></legend>
+                    <legend>Add <em>[% biblio.title | html %]</em> to <em>[% course.course_name | html %]</em></legend>
                 [% END %]
                 <ol>
                     <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
index c6445185f7..185141bb1e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
@@ -13,7 +13,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Add reserves for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]">[% course.course_name | html %]</a></i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Add reserves for <em><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]">[% course.course_name | html %]</a></em></div>
 
 <div class="main container-fluid">
     <div class="row">
@@ -105,7 +105,7 @@
                 </fieldset>
 
                 <p>
-                    Any items with existing course reserves will have their <i>on reserve</i> values updated.
+                    Any items with existing course reserves will have their <em>on reserve</em> values updated.
                 </p>
 
                 <fieldset class="action">
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 317a304a32..7e0b054387 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
@@ -24,7 +24,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Course details for <i>[% course.course_name | html %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Course details for <em>[% course.course_name | html %]</em></div>
 
     <div class="main container-fluid">
         <div class="row">
@@ -115,7 +115,7 @@
                                         (<strong>[% ItemTypes.GetDescription( cr.item.effective_itemtype) | html %]</strong>)
                                     [% END %]
                                 [% ELSE %]
-                                     <i>Unchanged</i>
+                                     <em>Unchanged</em>
                                      [% IF cr.item.itype %]
                                          ([% ItemTypes.GetDescription( cr.item.itype ) | html %])
                                      [% END %]
@@ -136,7 +136,7 @@
                                         [% END %]
                                      [% END %]
                                  [% ELSE %]
-                                     <i>Unchanged</i>
+                                     <em>Unchanged</em>
                                      [% IF cr.item.ccode %]
                                          ([% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) | html %])
                                      [% END %]
@@ -156,7 +156,7 @@
                                         [% END %]
                                     [% END %]
                                 [% ELSE %]
-                                    <i>Unchanged</i>
+                                    <em>Unchanged</em>
                                     [% IF cr.item.permanent_location %]
                                         ([% AuthorisedValues.GetByCode( 'LOC', cr.item.permanent_location ) | html %])
                                     [% END %]
@@ -176,7 +176,7 @@
                                         [% END %]
                                     [% END %]
                                 [% ELSE %]
-                                    <i>Unchanged</i>
+                                    <em>Unchanged</em>
                                     [% IF cr.item.homebranch %]
                                         ([% Branches.GetName( cr.item.homebranch ) | html %])
                                     [% END %]
@@ -196,7 +196,7 @@
                                         [% END %]
                                     [% END %]
                                 [% ELSE %]
-                                    <i>Unchanged</i>
+                                    <em>Unchanged</em>
                                     [% IF cr.item.holdingbranch %]
                                         ([% Branches.GetName( cr.item.holdingbranch ) | html %])
                                     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
index a47195d8bf..3a4b0abec1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
@@ -17,7 +17,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; [% IF course_name %] Edit <i>[% course_name | html %]</i> [% ELSE %] New course [% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; [% IF course_name %] Edit <em>[% course_name | html %]</em> [% ELSE %] New course [% END %]</div>
 
 [% IF ( departments ) %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index f0c235b7c6..2d2401ef43 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1260,7 +1260,7 @@ legend:hover {
                                                                 [% IF d.expiration %]
                                                                     [% d.expiration | $KohaDates %]
                                                                 [% ELSE %]
-                                                                    <i>Indefinite</i>
+                                                                    <em>Indefinite</em>
                                                                 [% END %]
                                                             </td>
                                                             <td>[% d.created | $KohaDates %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index dede8601fc..83ed8deeb1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -95,7 +95,7 @@
                                                 [% IF patron_message.manager_id %]
                                                     ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron_message.manager_id | uri %]">[% patron_message.get_column('manager_firstname') | html %] [% patron_message.get_column('manager_surname') | html %]</a> )
                                                 [% END %]
-                                                <i>"[% patron_message.message | html %]"</i>
+                                                <em>"[% patron_message.message | html %]"</em>
                                             </span>
                                             [% IF patron_message.branchcode == patron.branchcode OR Koha.Preference('AllowAllMessageDeletion') %]
                                                 <a class="btn btn-link" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% patron_message.message_id | html %]&amp;borrowernumber=[% patron_message.borrowernumber | html %]&amp;from=moremember" onclick="return confirm(MSG_CONFIRM_DELETE_MESSAGE);"><i class="fa fa-trash"></i> Delete</a>
@@ -128,13 +128,13 @@
                                             [% END %]
 
                                             [% IF ( patron.debarredcomment ) %]
-                                                with the explanation: <i>
+                                                with the explanation: <em>
                                                 [% IF patron.debarredcomment.search('OVERDUES_PROCESS') %]
                                                     Restriction added by overdues process [% patron.debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %]
                                                 [% ELSE %]
                                                     [% patron.debarredcomment | html_line_break %]
                                                 [% END %]
-                                                </i>
+                                                </em>
                                             [% END %]
                                             <a href="#reldebarments" id="view_restrictions">View restrictions</a>
                                         </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
index af9ea1ec54..14dc39b9ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
@@ -97,7 +97,7 @@
                             [% ELSIF method == 'intranet_catalog_biblio_enhancements' %]
                                 <div class="dialog message">No plugins that can enhance the intranet catalog biblio records are installed</div>
                             [% ELSE %]
-                                <div class="dialog message">Unknown plugin type <i>[% method | html %]</i></div>
+                                <div class="dialog message">Unknown plugin type <em>[% method | html %]</em></div>
                             [% END %]
                         [% END %]
                     [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 642b3d776f..57b6b1b9fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -517,7 +517,7 @@
                                 <h2 style="padding: 0 1em;">
                                     Place a hold on a specific item
                                     [% IF bibitemloo.force_hold_level == 'item' %]
-                                         <span class="error"><i>(Required)</i></span>
+                                         <span class="error"><em>(Required)</em></span>
                                     [% END %]
                                 </h2>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
index 644f2fbc0c..788c63d21e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
@@ -10,7 +10,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId | html %]">Collection <i>[% colTitle | html %]</i></a> &rsaquo; Add or remove items</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId | html %]">Collection <em>[% colTitle | html %]</em></a> &rsaquo; Add or remove items</div>
 
 <div class="main container-fluid">
     <div class="row">
@@ -24,14 +24,14 @@
                 </div>
               [% ELSE %]
               [% INCLUDE 'rotating-collections-toolbar.inc' %]
-              <h1>Collection <i>[% colTitle | html %]</i></h1>
+              <h1>Collection <em>[% colTitle | html %]</em></h1>
 
               [% IF ( previousActionAdd ) %]
                 [% IF ( addSuccess ) %]
                   <div class="dialog message">Item with barcode '[% barcode | html %]' added successfully</div>
                 [% ELSE %]
                   <div class="dialog alert">
-                    <p>Failed to add item with barcode <i>[% barcode | html %]</i>:
+                    <p>Failed to add item with barcode <em>[% barcode | html %]</em>:
                     <p>
                         [% IF failureMessage == "NO_ITEM" %]
                             No item with matching barcode found
@@ -49,10 +49,10 @@
 
               [% IF ( previousActionRemove ) %]
                 [% IF ( removeSuccess ) %]
-                  <div class="dialog message">Item with barcode <i>[% barcode | html %]</i> removed successfully</div>
+                  <div class="dialog message">Item with barcode <em>[% barcode | html %]</em> removed successfully</div>
                 [% ELSE %]
                   <div class="dialog alert">
-                    Failed to remove item with barcode <i>[% barcode | html %]</i>:
+                    Failed to remove item with barcode <em>[% barcode | html %]</em>:
                     <p>
                         [% IF failureMessage == "NO_ITEM" %]
                             No item with matching barcode found
@@ -92,7 +92,7 @@
               </div>
 
               <div>
-                <h2>Items in <i>[% colTitle | html %]</i></h2>
+                <h2>Items in <em>[% colTitle | html %]</em></h2>
                 [% IF ( collectionItemsLoop ) %]
                   <h3>Total items: [% collectionItemsLoop.size | html%]</h3>
                   <table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
index 590df06aa8..00956373ad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
@@ -19,7 +19,7 @@
     [%- IF ( action == "new" ) %]
         Add a new collection
     [% ELSE %]
-        <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% editColId | uri %]">Collection <i>[% editColTitle | html %]</i></a> &rsaquo; Edit
+        <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% editColId | uri %]">Collection <em>[% editColTitle | html %]</em></a> &rsaquo; Edit
     [% END -%]
 </div>
 
@@ -31,12 +31,12 @@
               [% IF ( previousActionCreate ) %]
                 [% IF ( createSuccess ) %]
                     <div class="dialog message">
-                        <p>Collection <i>[% createdTitle | html %]</i> added successfully</p>
+                        <p>Collection <em>[% createdTitle | html %]</em> added successfully</p>
                         <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p>
                     </div>
                 [% ELSE %]
                   <div class="dialog alert">
-                    <p>Collection <i>[% createdTitle | html %]</i> failed to be added</p>
+                    <p>Collection <em>[% createdTitle | html %]</em> failed to be added</p>
                     <p>
                         [% IF failureMessage == "NO_TITLE" %]
                             No title entered.
@@ -66,12 +66,12 @@
               [% IF ( previousActionUpdate ) %]
                 [% IF ( updateSuccess ) %]
                   <div class="dialog message">
-                      <p>Collection <i>[% updatedTitle | html %]</i> updated successfully</p>
+                      <p>Collection <em>[% updatedTitle | html %]</em> updated successfully</p>
                       <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p>
                   </div>
                 [% ELSE %]
                   <div class="dialog alert">
-                    <p>Collection <i>[% updatedTitle | html %]</i> failed to be updated</p>
+                    <p>Collection <em>[% updatedTitle | html %]</em> failed to be updated</p>
                     <p>
                         [% IF failureMessage == "NO_ID" %]
                             No collection id given.
@@ -89,7 +89,7 @@
 
                 [% IF action == "new" || action == "edit" %]
                     [% IF ( previousActionEdit ) %]
-                      <h1>Edit collection <i>[% editColTitle | html %]</i></h1>
+                      <h1>Edit collection <em>[% editColTitle | html %]</em></h1>
                     [% ELSE %]
                       <h1>Add new collection</h1>
                     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
index a6cd1461a1..af41ccbc85 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
@@ -10,14 +10,14 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId | html %]">Collection <i>[% colTitle | html %]</i></a> &rsaquo; Transfer collection</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId | html %]">Collection <em>[% colTitle | html %]</em></a> &rsaquo; Transfer collection</div>
 
 <div class="main container-fluid">
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-                <h1>Transfer collection <i>[% colTitle | html %]</i></h1>
+                <h1>Transfer collection <em>[% colTitle | html %]</em></h1>
 
                 [% IF ( transferSuccess ) %]
                     <div class="dialog message">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
index 23af9667b0..24afcefd25 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
@@ -8,14 +8,14 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'serials-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid | html %]"><i>[% title | html %]</i></a> &rsaquo; Preview routing list</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid | html %]"><em>[% title | html %]</em></a> &rsaquo; Preview routing list</div>
 
 <div class="main container-fluid">
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-<h2>Preview routing list for <i>[% title | html %]</i></h2>
+<h2>Preview routing list for <em>[% title | html %]</em></h2>
 
 <form method="post" action="routing-preview.pl">
 <input type="hidden" id="subscriptionid" name="subscriptionid" value="[% subscriptionid | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
index 0652f90343..d1032e26d1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
@@ -12,7 +12,7 @@
     <a href="/cgi-bin/koha/mainpage.pl">Home</a>
     &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
     [% UNLESS blocking_error %]
-        &rsaquo; <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]"><i>[% title | html %]</i></a>
+        &rsaquo; <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]"><em>[% title | html %]</em></a>
         &rsaquo; [% IF ( op ) %]Create routing list[% ELSE %]Edit routing list[% END %]
     [% END %]
 </div>
@@ -24,9 +24,9 @@
 [% INCLUDE 'blocking_errors.inc' %]
 
 [% IF ( op ) %]
-<h1>Create routing list for <i>[% title | html %]</i></h1>
+<h1>Create routing list for <em>[% title | html %]</em></h1>
 [% ELSE %]
-<h1>Edit routing list for <i>[% title | html %]</i></h1>
+<h1>Edit routing list for <em>[% title | html %]</em></h1>
 [% END %]
 
 <form method="post" action="routing.pl">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
index a67be01377..3bd496be46 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
@@ -13,7 +13,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'serials-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Serial collection information for  <i>[% bibliotitle | html %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Serial collection information for  <em>[% bibliotitle | html %]</em></div>
 
 <div class="main container-fluid">
     <div class="row">
@@ -25,7 +25,7 @@
 [% UNLESS ( popup ) %]
 	[% INCLUDE 'serials-toolbar.inc' %]
 
-	<h1>Serial collection information for  <i>[% bibliotitle | html %]</i>
+    <h1>Serial collection information for  <em>[% bibliotitle | html %]</em>
         [% IF location %] ([% AuthorisedValues.GetByCode( 'LOC', location ) | html %]) [% END %]
 		[% IF ( callnumber ) %]callnumber: [% callnumber | html %][% END %]</h1>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index bcad4da652..989029eeb3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -83,7 +83,7 @@ $(document).ready(function() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'serials-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Serial edition <i>[% bibliotitle | html %] [% IF ( callnumber ) %]([% callnumber | html %])[% END %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Serial edition <em>[% bibliotitle | html %] [% IF ( callnumber ) %]([% callnumber | html %])[% END %]</em></div>
 
 <div class="main container-fluid">
     <div class="row">
@@ -92,7 +92,7 @@ $(document).ready(function() {
 
     [% INCLUDE 'modals/serials_multi_receiving.inc' %]
 
-<h1>Serial edition <i>[% bibliotitle | html %]</i>
+<h1>Serial edition <em>[% bibliotitle | html %]</em>
     [% IF location %] ([% AuthorisedValues.GetByCode('LOC', location) | html %])[% END %]
     [% IF ( callnumber ) %] callnumber: [% callnumber | html %][% END %]</h1>
 [% IF internalnotes %]<p>Nonpublic note: [% internalnotes | html | html_line_break %]</p>[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index 1075e14d19..bbeab8ac65 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -26,7 +26,7 @@ fieldset.rows table { clear: none; margin: 0; }
     <a href="/cgi-bin/koha/mainpage.pl">Home</a>
     &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
     [% UNLESS blocking_error %]
-        &rsaquo; [% IF ( modify ) %]<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]"><i>[% bibliotitle | html %]</i></a> &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]
+        &rsaquo; [% IF ( modify ) %]<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]"><em>[% bibliotitle | html %]</em></a> &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]
     [% END %]
 </div>
 [% INCLUDE 'blocking_errors.inc' %]
@@ -34,7 +34,7 @@ fieldset.rows table { clear: none; margin: 0; }
 <div class="main container-fluid">
     <div class="row">
         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
-            <h1>[% IF ( modify ) %] Modify subscription for <i>[% bibliotitle | html %]</i>[% ELSE %]Add a new subscription[% END %] (<span id="page_number">1/2</span>)</h1>
+            <h1>[% IF ( modify ) %] Modify subscription for <em>[% bibliotitle | html %]</em>[% ELSE %]Add a new subscription[% END %] (<span id="page_number">1/2</span>)</h1>
         </div>
     </div>
     <form method="post" id="subscription_add_form" name="f" action="/cgi-bin/koha/serials/subscription-add.pl" class="validated">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index a651a7ec2e..5256c079ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -92,7 +92,7 @@
                                         <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
                                         <li><span class="label">Librarian identity:</span> [% librarian | html %]</li>
                                         <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li>
-                                        <li><span class="label">Biblio:</span>  <a href="/cgi-bin/koha/catalogue/[% default_bib_view | uri %].pl?biblionumber=[% bibnum | uri %]">[% bibliotitle | html %]</a> <i>([% bibnum | html %])</i></li>
+                                        <li><span class="label">Biblio:</span>  <a href="/cgi-bin/koha/catalogue/[% default_bib_view | uri %].pl?biblionumber=[% bibnum | uri %]">[% bibliotitle | html %]</a> <em>([% bibnum | html %])</em></li>
                                         [% IF ( OPACBaseURL ) %]
                                             <li>
                                                 <span class="label">OPAC view:</span>
@@ -265,11 +265,11 @@
                             <tr>
                                 <td>When more than</td>
                                 <td>[% whenmorethan1 | html %] [% IF ( innerloop1 ) %]<br />
-                                    <i>(is [% innerloop1 | html %])</i>[% END %]</td>
+                                    <em>(is [% innerloop1 | html %])</em>[% END %]</td>
                                 <td>[% whenmorethan2 | html %] [% IF ( innerloop2 ) %]<br />
-                                    <i>(is [% innerloop2 | html %])</i>[% END %]</td>
+                                    <em>(is [% innerloop2 | html %])</em>[% END %]</td>
                                 <td>[% whenmorethan3 | html %] [% IF ( innerloop3 ) %]<br />
-                                    <i>(is [% innerloop3 | html %])</i>[% END %]</td>
+                                    <em>(is [% innerloop3 | html %])</em>[% END %]</td>
                             </tr>
                             <tr>
                                 <td>Set back to</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
index cc5b776f40..23cc292f5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
@@ -6,14 +6,14 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'serials-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Alert subscribers for <i>[% bibliotitle | html %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Alert subscribers for <em>[% bibliotitle | html %]</em></div>
 
 <div class="main container-fluid">
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-<h1>Alert subscribers for <i>[% bibliotitle | html %]</i></h1>
+<h1>Alert subscribers for <em>[% bibliotitle | html %]</em></h1>
 
 <p>
     <span class="label">Subscription:</span> <a href="subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]">[% bibliotitle | html %] #[% subscriptionid | html %]</a>
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 ede593e118..5b5fe47f13 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -591,8 +591,8 @@
                         [% suggestions_loo.title | html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author | html %][% END %]</a>
                     <br />
                     [% IF ( suggestions_loo.copyrightdate ) %]&copy; [% suggestions_loo.copyrightdate | html %] [% END %]
-                        [% IF ( suggestions_loo.volumedesc ) %]; Volume:<i>[% suggestions_loo.volumedesc | html %]</i> [% END %]
-                        [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn | html %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode | html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear | html %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place | html %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle | html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) | html %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<div class="suggestion_note"><i class="fa fa-comment"></i> [% suggestions_loo.note | html %]</div>[% END %]
+                        [% IF ( suggestions_loo.volumedesc ) %]; Volume:<em>[% suggestions_loo.volumedesc | html %]</em> [% END %]
+                        [% IF ( suggestions_loo.isbn ) %]; ISBN:<em>[% suggestions_loo.isbn | html %]</em> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode | html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <em>[% suggestions_loo.publicationyear | html %]</em> [% END %][% IF ( suggestions_loo.place ) %] in <em>[% suggestions_loo.place | html %]</em> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle | html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) | html %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<div class="suggestion_note"><i class="fa fa-comment"></i> [% suggestions_loo.note | html %]</div>[% END %]
                         [% IF suggestions_loo.archived %]<br /><i class="fa fa-archive"></i> Archived[% END %]
                 </td>
                 <td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
index 91aa5386eb..9c5810a57a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
@@ -13,7 +13,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/tags/review.pl">Tags</a> &rsaquo; Results for tag <i>[% tag | html %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/tags/review.pl">Tags</a> &rsaquo; Results for tag <em>[% tag | html %]</em></div>
 
 <div class="main container-fluid">
     <div class="row">
@@ -21,7 +21,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
             <main>
 
 [% IF ( titles ) %]
-<h3>Titles tagged with the term <i>[% tag | html %]</i></h3>
+<h3>Titles tagged with the term <em>[% tag | html %]</em></h3>
 <table id="itemst">
 	<thead><tr>
 	    <th>Title</th>
@@ -62,7 +62,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
         [% END %]
     </table>
 [% ELSE %]
-	<div class="dialog message">There are no titles tagged with the term <i>[% tag | html %]</i></div>
+    <div class="dialog message">There are no titles tagged with the term <em>[% tag | html %]</em></div>
 [% END %]
 </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
index 64a0588f3d..73d0a59f4c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
@@ -81,7 +81,7 @@
 
                 [% ELSE %]
 
-                    <h2>Actions for <i>[% template_name | html %]</i></h2>
+                    <h2>Actions for <em>[% template_name | html %]</em></h2>
 
                     [% IF ( ActionsLoop ) %]
 
@@ -137,7 +137,7 @@
                                             [% ActionsLoo.from_field | html %][% IF ( ActionsLoo.from_subfield.length ) %]$[% ActionsLoo.from_subfield | html %][% END %]
 
                                             [% IF ( ActionsLoo.field_value ) %]
-                                                with value <i>[% ActionsLoo.field_value | html %]</i>
+                                                with value <em>[% ActionsLoo.field_value | html %]</em>
                                             [% END %]
 
                                             [% IF ( ActionsLoo.to_field ) %]
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 fddb934918..c457de7e8d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -56,7 +56,7 @@
         [% END %]
     [% END %]
 
-[% IF op == 'view' %]&rsaquo; Contents of <i>[% shelf.shelfname | html %]</i>[% END %][% IF op == 'add_form' %] &rsaquo; Create new list[% END %][% IF op == 'edit_form' %] &rsaquo; Edit list <i>[% shelf.shelfname | html %]</i>[% END %]</div>
+[% IF op == 'view' %]&rsaquo; Contents of <em>[% shelf.shelfname | html %]</em>[% END %][% IF op == 'add_form' %] &rsaquo; Create new list[% END %][% IF op == 'edit_form' %] &rsaquo; Edit list <em>[% shelf.shelfname | html %]</em>[% END %]</div>
 
     <div class="main container-fluid">
         <div class="row">
@@ -127,7 +127,7 @@
 [% IF op == 'view' %]
     [% IF itemsloop %]
 
-    <h3>Contents of <i>[% shelf.shelfname | html %]</i></h3>
+    <h3>Contents of <em>[% shelf.shelfname | html %]</em></h3>
     <div class="pages">[% pagination_bar | $raw %]</div>
     <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="listform" method="post" class="checkboxed">
         <input type="hidden" name="op" value="remove_biblios" />
@@ -265,7 +265,7 @@
             <legend>Create a new list</legend>
             <input type="hidden" name="op" value="add" />
         [% ELSE %]
-            <legend>Edit list <i>[% shelf.shelfname | html %]</i></legend>
+            <legend>Edit list <em>[% shelf.shelfname | html %]</em></legend>
             <input type="hidden" name="op" value="edit" />
         [% END %]
         <input type="hidden" name="referer" value="[% referer | html %]" />
-- 
2.39.5