diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
index ae95ded846..9e2bb66190 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
@@ -351,19 +351,19 @@
 </div>
 [% END %]
 
-[% # BOOTSTRAP TAB WRAPPER USAGE                                                                   %]
-[% #     [ WRAPPER tabs id= "tabs_container_id" ]                                                  %]
-[% #         [ WRAPPER tabs_nav ]                                                                  %]
-[% #             [ WRAPPER tab_item tabname= "tab_name_1" bt_active= 1 ] Tab text 1 [ END ]        %]
-[% #             [ WRAPPER tab_item tabname= "tab_name_2" ] Tab text 2 [ END ]                     %]
-[% #             ...                                                                               %]
-[% #         [ END ]                                                                               %]
-[% #         [ WRAPPER tab_panels ]                                                                %]
-[% #             [ WRAPPER tab_panel tabname="tab_name_1" bt_active= 1 ] Panel contents 1 [ END ]  %]
-[% #             [ WRAPPER tab_panel tabname="tab_name_2" ] Panel contents 2 [ END ]               %]
-[% #             ...                                                                               %]
-[% #         [ END ]                                                                               %]
-[% #     [ END ]                                                                                   %]
+[% # BOOTSTRAP TAB WRAPPER USAGE                                                                         %]
+[% #     [ WRAPPER tabs id= "tabs_container_id" ]                                                        %]
+[% #         [ WRAPPER tabs_nav ]                                                                        %]
+[% #             [ WRAPPER tab_item tabname= "tab_name_1" bt_active= 1 ] <span>Tab text 1</span> [ END ] %]
+[% #             [ WRAPPER tab_item tabname= "tab_name_2" ] <span>Tab text 2</span> [ END ]              %]
+[% #             ...                                                                                     %]
+[% #         [ END ]                                                                                     %]
+[% #         [ WRAPPER tab_panels ]                                                                      %]
+[% #             [ WRAPPER tab_panel tabname="tab_name_1" bt_active= 1 ] Panel contents 1 [ END ]        %]
+[% #             [ WRAPPER tab_panel tabname="tab_name_2" ] Panel contents 2 [ END ]                     %]
+[% #             ...                                                                                     %]
+[% #         [ END ]                                                                                     %]
+[% #     [ END ]                                                                                         %]
 
 [% BLOCK tabs %]
     [% IF ( id ) %]
@@ -421,7 +421,7 @@
 [% #                <a href="/cgi-bin/koha/module/page.pl"> Module page </a>   %]
 [% #            [ END ]                                                        %]
 [% #            [ WRAPPER breadcrumb_item bc_active = 1 ]                      %]
-[% #                Add form                                                   %]
+[% #                <span>Add form</span>                                      %]
 [% #            [ END ]                                                        %]
 
 [% #        [ ELSIF op == 'delete_confirm' ]                                   %]
@@ -429,12 +429,12 @@
 [% #                <a href="/cgi-bin/koha/module/page.pl"> Module page </a>   %]
 [% #            [ END ]                                                        %]
 [% #            [ WRAPPER breadcrumb_item bc_active = 1 ]                      %]
-[% #                Confirm deletion                                           %]
+[% #                <span>Confirm deletion</span>                              %]
 [% #            [ END ]                                                        %]
 
 [% #        [ ELSE ]                                                           %]
 [% #            [ WRAPPER breadcrumb_item bc_active = 1 ]                      %]
-[% #                Module page                                                %]
+[% #                <span>Module page</span>                                   %]
 [% #            [ END ]                                                        %]
 [% #        [ END #/IF op = add_form ]                                         %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index f78486da9e..2422fc9cc7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -28,14 +28,14 @@
 
             [% WRAPPER tabs id= "abouttabs" %]
                 [% WRAPPER tabs_nav %]
-                    [% WRAPPER tab_item tabname= "about" bt_active= 1 %] Server information [% END %]
-                    [% WRAPPER tab_item tabname= "perl" %] Perl modules [% END %]
-                    [% WRAPPER tab_item tabname= "sysinfo" %] System information [% END %]
-                    [% WRAPPER tab_item tabname= "team" %] Koha team [% END %]
-                    [% WRAPPER tab_item tabname= "licenses" %] Licenses [% END %]
-                    [% WRAPPER tab_item tabname= "translations" %] Translations [% END %]
-                    [% WRAPPER tab_item tabname= "history" %] Timeline [% END %]
-                    [% WRAPPER tab_item tabname= "dedications" %] Dedications [% END %]
+                    [% WRAPPER tab_item tabname= "about" bt_active= 1 %] <span>Server information</span> [% END %]
+                    [% WRAPPER tab_item tabname= "perl" %] <span>Perl modules</span> [% END %]
+                    [% WRAPPER tab_item tabname= "sysinfo" %] <span>System information</span> [% END %]
+                    [% WRAPPER tab_item tabname= "team" %] <span>Koha team</span> [% END %]
+                    [% WRAPPER tab_item tabname= "licenses" %] <span>Licenses</span> [% END %]
+                    [% WRAPPER tab_item tabname= "translations" %] <span>Translations</span> [% END %]
+                    [% WRAPPER tab_item tabname= "history" %] <span>Timeline</span> [% END %]
+                    [% WRAPPER tab_item tabname= "dedications" %] <span>Dedications</span> [% END %]
                 [% END %]
 
                 [% WRAPPER tab_panels %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 8724346cb9..04a9096731 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -66,11 +66,11 @@
                     <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
                         [% WRAPPER tabs id= "tabs" %]
                             [% WRAPPER tabs_nav %]
-                                [% WRAPPER tab_item tabname= "records_to_import" bt_active= 1 %] Select to import [% END %]
+                                [% WRAPPER tab_item tabname= "records_to_import" bt_active= 1 %] <span>Select to import</span> [% END %]
                                 [% IF items %]
-                                    [% WRAPPER tab_item tabname= "items_info" %] Item information [% END %]
+                                    [% WRAPPER tab_item tabname= "items_info" %] <span>Item information</span> [% END %]
                                 [% END %]
-                                [% WRAPPER tab_item tabname= "accounting_details" %] Default accounting details [% END %]
+                                [% WRAPPER tab_item tabname= "accounting_details" %] <span>Default accounting details</span> [% END %]
                             [% END %]
 
                             [% WRAPPER tab_panels %]
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 ce72d07c75..5bfb734285 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -327,8 +327,8 @@
 
                     [% WRAPPER tabs id= "basket_groups" %]
                         [% WRAPPER tabs_nav %]
-                            [% WRAPPER tab_item tabname= "opened" bt_active= 1 %] Open [% END %]
-                            [% WRAPPER tab_item tabname= "closed" %] Closed [% END %]
+                            [% WRAPPER tab_item tabname= "opened" bt_active= 1 %] <span>Open</span> [% END %]
+                            [% WRAPPER tab_item tabname= "closed" %] <span>Closed</span> [% END %]
                         [% END %]
                         [% WRAPPER tab_panels %]
                             [% WRAPPER tab_panel tabname="opened" bt_active= 1 %]
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 dcf0c3e0c3..2429dd5f19 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -131,8 +131,12 @@
 
                         [% WRAPPER tabs id= "invoicestabs" %]
                             [% WRAPPER tabs_nav %]
-                                [% WRAPPER tab_item tabname= "opened" bt_active= 1 %] Open invoices ([% openedinvoices.size || 0 | html %]) [% END %]
-                                [% WRAPPER tab_item tabname= "closed" %] Closed invoices ([% closedinvoices.size || 0 | html %]) [% END %]
+                                [% WRAPPER tab_item tabname= "opened" bt_active= 1 %]
+                                    <span>Open invoices</span> ([% openedinvoices.size || 0 | html %])
+                                [% END %]
+                                [% WRAPPER tab_item tabname= "closed" %]
+                                    <span>Closed invoices</span> ([% closedinvoices.size || 0 | html %])
+                                [% END %]
                             [% END %]
                             [% WRAPPER tab_panels %]
                                 [% WRAPPER tab_panel tabname="opened" bt_active= 1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
index 00330ffc34..3030a3b2a7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
@@ -108,8 +108,8 @@
 
                 [% WRAPPER tabs id= "alerttabs" %]
                     [% WRAPPER tabs_nav %]
-                        [% WRAPPER tab_item tabname= "checkout" bt_active= 1 %] Checkout [% END %]
-                        [% WRAPPER tab_item tabname= "checkin" %] Check-in [% END %]
+                        [% WRAPPER tab_item tabname= "checkout" bt_active= 1 %] <span>Checkout</span> [% END %]
+                        [% WRAPPER tab_item tabname= "checkin" %] <span>Check-in</span> [% END %]
                     [% END %]
 
                     [% WRAPPER tab_panels %]
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 50a21dc9a5..8e008c5328 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
@@ -256,10 +256,10 @@
                             [% WRAPPER tabs id= "serialstabs" %]
                                 [% WRAPPER tabs_nav %]
                                     [% IF mana %]
-                                        [% WRAPPER tab_item tabname= "mana" bt_active= 1 %] Mana ([% total || 0 | html %]) [% END %]
+                                        [% WRAPPER tab_item tabname= "mana" bt_active= 1 %] <span>Mana</span> ([% total || 0 | html %]) [% END %]
                                     [% ELSE %]
-                                        [% WRAPPER tab_item tabname= "opened" bt_active= 1 %] Open ([% openedsubscriptions.size || 0 | html %]) [% END %]
-                                        [% WRAPPER tab_item tabname= "closed" %] Closed ([% closedsubscriptions.size || 0 | html %]) [% END %]
+                                        [% WRAPPER tab_item tabname= "opened" bt_active= 1 %] <span>Open</span> ([% openedsubscriptions.size || 0 | html %]) [% END %]
+                                        [% WRAPPER tab_item tabname= "closed" %] <span>Closed</span> ([% closedsubscriptions.size || 0 | html %]) [% END %]
                                     [% END %]
                                 [% END # /WRAPPER tabs_nav %]
                                 [% WRAPPER tab_panels %]
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 d093249b0d..353a9b877b 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
@@ -95,12 +95,12 @@
 
                 [% WRAPPER tabs id= "subscription_description" %]
                     [% WRAPPER tabs_nav %]
-                        [% WRAPPER tab_item tabname= "subscription_info" bt_active= 1 %] Information [% END %]
-                        [% WRAPPER tab_item tabname= "subscription_planning" %] Planning [% END %]
-                        [% WRAPPER tab_item tabname= "subscription_issues" %] Issues [% END %]
-                        [% WRAPPER tab_item tabname= "subscription_summary" %] Summary [% END %]
+                        [% WRAPPER tab_item tabname= "subscription_info" bt_active= 1 %] <span>Information</span> [% END %]
+                        [% WRAPPER tab_item tabname= "subscription_planning" %] <span>Planning</span> [% END %]
+                        [% WRAPPER tab_item tabname= "subscription_issues" %] <span>Issues</span> [% END %]
+                        [% WRAPPER tab_item tabname= "subscription_summary" %] <span>Summary</span> [% END %]
                         [% IF orders_grouped.size %]
-                            [% WRAPPER tab_item tabname= "acquisition_details" %] Acquisition details [% END %]
+                            [% WRAPPER tab_item tabname= "acquisition_details" %] <span>Acquisition details</span> [% END %]
                         [% END %]
                     [% END # /WRAPPER tabs_nav %]
 
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 1dc23f228e..910deebfef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -283,7 +283,13 @@
                 [% END # /IF no_op_set %]
 
                 [% IF add_form or copy_form %]
-                    <h1>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</h1>
+                    <h1>
+                        [% IF ( modify ) %]
+                            <span>Modify notice</span>
+                        [% ELSE %]
+                            <span>Add notice</span>
+                        [% END %]
+                    </h1>
 
                     <div id="toolbar" class="btn-toolbar">
                         <div class="btn-group">
@@ -435,7 +441,7 @@
                                             [% CASE 'HOLD_SLIP' %]
                                                 <input type="text" id="data_preview" name="data_preview" value="" placeholder="biblionumber|borrowernumber" />
                                             [% CASE %]
-                                                Not supported yet.
+                                                <span>Not supported yet.</span>
                                         [% END %]
                                     </li>
                                 [% END # /IF code %]
@@ -446,7 +452,7 @@
                             <div style="clear:both"></div>
                             [% WRAPPER tabs id= "tabs" %]
                                 [% WRAPPER tabs_nav %]
-                                    [% WRAPPER tab_item tabname= "lang_default" bt_active= 1 %] Default [% END %]
+                                    [% WRAPPER tab_item tabname= "lang_default" bt_active= 1 %] <span>Default</span> [% END %]
                                     [% FOR language IN languages %]
                                         [% FOR sublanguage IN language.sublanguages_loop %]
                                             [% IF language.plural %]