diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
index a6b27e7b63..d41d8319ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
@@ -21,49 +21,38 @@ Library EANs › Administration › Koha
 [% END %]
 
 [% WRAPPER 'sub-header.inc' %]
-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-    <ol>
-        <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-        </li>
-        <li>
+    [% WRAPPER breadcrumbs %]
+        [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-        </li>
+        [% END %]
 
         [% IF ean_form %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    [% IF ean %]
-                        Modify library EAN
-                    [% ELSE %]
-                        Add new library EAN
-                    [% END %]
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1%]
+                [% IF ean %]
+                    <span>Modify library EAN</span>
+                [% ELSE %]
+                    <span>Add new library EAN</span>
+                [% END %]
+            [% END %]
 
         [% ELSIF delete_confirm %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    Confirm deletion of EAN
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1%]
+                <span>Confirm deletion of EAN</span>
+            [% END %]
 
         [% ELSE %]
-            <li>
-                <a href="#" aria-current="page">
-                    Library EANs
-                </a>
-            </li>
+            [% WRAPPER breadcrumb_item bc_active= 1%]
+                <span>Library EANs</span>
+            [% END %]
         [% END %]
-    </ol>
-</nav>
-[% END %]
+    [% END #/ WRAPPER breadcrumbs %]
+[% END #/ WRAPPER sub-header.inc %]
 
 <div class="main container-fluid">
     <div class="row">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt
index ad1bd8735e..b5ec234fcd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt
@@ -18,48 +18,39 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'prefs-admin-search.inc' %]
 
-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-    <ol>
-        <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-        </li>
-        <li>
+[% WRAPPER 'sub-header.inc' %]
+    [% WRAPPER breadcrumbs %]
+        [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-        </li>
+        [% END %]
 
-        <li>
+        [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/admin/identity_providers.pl">Identity providers</a>
-        </li>
+        [% END %]
 
         [% IF op == 'add_form' %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/identity_providers.pl?domain_ops=1&amp;identity_provider_id=[%- identity_provider_id | uri -%]">Domains for [%- identity_provider_code | html -%]</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    New Domain
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                <span>New domain</span>
+            [% END %]
 
         [% ELSIF op == 'edit_form' %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/identity_providers.pl?domain_ops=1&amp;identity_provider_id=[%- identity_provider_id | uri -%]">Domains for [%- identity_provider_code | html -%]</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    Edit Domain
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                <span>Edit domain</span>
+            [% END %]
 
         [% ELSE %]
-            <li>
-                <a href="#" aria-current="page">
-                    Domains for [%- identity_provider_code | html -%]
-                </a>
-            </li>
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                <span>Domains for [%- identity_provider_code | html -%]</span>
+            [% END %]
         [% END %]
-    </ol>
-</nav>
+    [% END #/ WRAPPER breadcrumbs %]
+[% END #/ WRAPPER sub-header.inc %]
 
 <div class="main container-fluid">
     <div class="row">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
index 6dcb3b04e9..9150dfe02b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
@@ -18,44 +18,35 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'prefs-admin-search.inc' %]
 
-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-    <ol>
-        <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-        </li>
-        <li>
+[% WRAPPER 'sub-header.inc' %]
+    [% WRAPPER breadcrumbs %]
+        [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-        </li>
+        [% END %]
 
         [% IF op == 'add_form' %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/identity_providers.pl">Identity providers</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    New
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                <span>New</span>
+            [% END %]
 
         [% ELSIF op == 'edit_form' %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/identity_providers.pl">Identity providers</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    Edit
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                <span>Edit</span>
+            [% END %]
 
         [% ELSE %]
-            <li>
-                <a href="#" aria-current="page">
-                    Identity providers
-                </a>
-            </li>
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                <span>Identity providers</span>
+            [% END %]
         [% END %]
-    </ol>
-</nav>
+    [% END #/ WRAPPER breadcrumbs %]
+[% END #/ WRAPPER sub-header.inc %]
 
 <div class="main container-fluid">
     <div class="row">
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 f97c98c41e..00330ffc34 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
@@ -50,22 +50,15 @@
 [% END %]
 
 [% WRAPPER 'sub-header.inc' %]
-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-    <ol>
-        <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-        </li>
-        <li>
+    [% WRAPPER breadcrumbs %]
+        [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-        </li>
-        <li>
-            <a href="#" aria-current="page">
-                Item circulation alerts
-            </a>
-        </li>
-    </ol>
-</nav>
-[% END %]
+        [% END %]
+        [% WRAPPER breadcrumb_item bc_active= 1 %]
+            <span>Item circulation alerts</span>
+        [% END %]
+    [% END #/ WRAPPER breadcrumbs %]
+[% END #/ WRAPPER sub-header.inc %]
 
 <div class="main container-fluid">
     <div class="row">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
index 81f98ba7ce..8878657777 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
@@ -13,35 +13,26 @@
     [% END %]
 
     [% WRAPPER 'sub-header.inc' %]
-        <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-            <ol>
-                <li>
-                    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-                </li>
-                <li>
-                    <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-                </li>
+        [% WRAPPER breadcrumbs %]
+            [% WRAPPER breadcrumb_item %]
+                <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
+            [% END %]
 
-                [% IF (field) %]
-                    <li>
-                        <a href="/cgi-bin/koha/admin/items_search_fields.pl">Item search fields</a>
-                    </li>
-                    <li>
-                        <a href="#" aria-current="page">
-                            [% field.name | html %]
-                        </a>
-                    </li>
-
-                [% ELSE %]
-                    <li>
-                        <a href="#" aria-current="page">
-                            Item search fields
-                        </a>
-                    </li>
+            [% IF (field) %]
+                [% WRAPPER breadcrumb_item %]
+                    <a href="/cgi-bin/koha/admin/items_search_fields.pl">Item search fields</a>
                 [% END %]
-            </ol>
-        </nav>
-    [% END %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    [% field.name | html %]
+                [% END %]
+
+            [% ELSE %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    <span>Item search fields</span>
+                [% END %]
+            [% END %]
+        [% END #/ WRAPPER breadcrumbs %]
+    [% END #/ WRAPPER sub-header.inc %]
 
     <div class="main container-fluid">
         <div class="row">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
index 95bf00979d..28b86492f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
@@ -13,22 +13,18 @@
     [% END %]
 
     [% WRAPPER 'sub-header.inc' %]
-        <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-            <ol>
-                <li>
-                    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-                </li>
-                <li>
-                    <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-                </li>
-                <li>
-                    <a href="#" aria-current="page">
-                            Item search fields
-                    </a>
-                </li>
-            </ol>
-        </nav>
-    [% END %]
+        [% WRAPPER breadcrumbs %]
+            [% WRAPPER breadcrumb_item %]
+                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
+            [% END %]
+            [% WRAPPER breadcrumb_item %]
+                <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                <span>Item search fields</span>
+            [% END %]
+        [% END #/ WRAPPER breadcrumbs %]
+    [% END #/ WRAPPER sub-header.inc %]
 
     <div class="main container-fluid">
         <div class="row">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
index a91de392aa..f206f8fee4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -52,74 +52,54 @@ Item types &rsaquo; Administration &rsaquo; Koha
 [% END %]
 
 [% WRAPPER 'sub-header.inc' %]
-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-    <ol>
-        <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-        </li>
-        <li>
+    [% WRAPPER breadcrumbs %]
+       [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-        </li>
+        [% END %]
+
+        [% IF op == 'add_form' || op == 'delete_confirm' || op == 'delete_confirmed' %]
+           [% WRAPPER breadcrumb_item %]
+                <a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a>
+            [% END %]
+        [% END %]
 
         [% IF op == 'add_form' %]
-            <li>
-                <a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a>
-            </li>
             [% IF itemtype %]
-                <li>
-                    <a href="#" aria-current="page">
-                        Modify item type '[% itemtype.itemtype | html %]'
-                    </a>
-                </li>
+               [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    <span>Modify item type '[% itemtype.itemtype | html %]'</span>
+                [% END %]
             [% ELSE %]
-                <li>
-                    <a href="#" aria-current="page">
-                        Add item type
-                    </a>
-                </li>
+               [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    <span>Add item type</span>
+                [% END %]
             [% END %]
         [% END %]
 
         [% IF op == 'delete_confirm' %]
-            <li>
-                <a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a>
-            </li>
             [% IF total %]
-                <li>
-                    <a href="#" aria-current="page">
-                        Cannot delete item type '[% itemtype.itemtype | html %]'
-                    </a>
-                </li>
+               [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    <span>Cannot delete item type '[% itemtype.itemtype | html %]'</span>
+                [% END %]
             [% ELSE %]
-                <li>
-                    <a href="#" aria-current="page">
-                        Delete item type '[% itemtype.itemtype | html %]'?
-                    </a>
-                </li>
+               [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    <span>Delete item type '[% itemtype.itemtype | html %]'?</span>
+                [% END %]
             [% END %]
         [% END %]
 
         [% IF op == 'delete_confirmed' %]
-            <li>
-                <a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    Data deleted
-                </a>
-            </li>
+           [% WRAPPER breadcrumb_item bc_active= 1 %]
+                <span>Data deleted</span>
+            [% END %]
         [% END %]
 
         [% IF op == 'list' %]
-            <li>
-                <a href="#" aria-current="page">
-                    Item types administration
-                </a>
-            </li>
+           [% WRAPPER breadcrumb_item bc_active= 1 %]
+                <span>Item types administration</span>
+            [% END %]
         [% END %]
-    </ol>
-</nav>
-[% END %]
+    [% END #/ WRAPPER breadcrumbs %]
+[% END #/ WRAPPER sub-header.inc %]
 
 <div class="main container-fluid">
     <div class="row">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
index ca545be15a..6b8aea71be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
@@ -12,20 +12,15 @@
 [% END %]
 
 [% WRAPPER 'sub-header.inc' %]
-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-    <ol>
-        <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-        </li>
-        <li>
+    [% WRAPPER breadcrumbs %]
+        [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-        </li>
-        <li>
-            <a href="#" aria-current="page">Koha to MARC mapping</a>
-        </li>
-    </ol>
-</nav>
-[% END %]
+        [% END %]
+        [% WRAPPER breadcrumb_item bc_active= 1 %]
+            <span>Koha to MARC mapping</span>
+        [% END %]
+    [% END #/ WRAPPER breadcrumbs %]
+[% END #/ WRAPPER sub-header.inc %]
 
 <div class="main container-fluid">
     <div class="row">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
index e7043e4c16..3536a92b4c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
@@ -14,20 +14,15 @@
 [% END %]
 
 [% WRAPPER 'sub-header.inc' %]
-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-    <ol>
-        <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-        </li>
-        <li>
+    [% WRAPPER breadcrumbs %]
+        [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-        </li>
-        <li>
-            <a href="#" aria-current="page">Library groups</a>
-        </li>
-    </ol>
-</nav>
-[% END %]
+        [% END %]
+        [% WRAPPER breadcrumb_item bc_active= 1 %]
+            <span>Library groups</span>
+        [% END %]
+    [% END #/ WRAPPER breadcrumbs %]
+[% END #/ WRAPPER sub-header.inc %]
 
 [% FOR m IN messages %]
     <div class="dialog [% m.type | html %]">
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 95df1dbfd6..1b1fe96547 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
@@ -41,18 +41,14 @@
 [% END %]
 
     [% WRAPPER 'sub-header.inc' %]
-    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-        <ol>
-            <li>
-                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-            </li>
-            <li>
+        [% WRAPPER breadcrumbs %]
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-            </li>
-            <li>
+            [% END %]
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
-            </li>
-            <li>
+            [% END %]
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode | uri %]&amp;searchfield=[% tagfield | uri %]">
                     [% IF ( frameworkcode ) %]
                         <span>[% frameworkcode | html %] framework structure</span>
@@ -60,53 +56,44 @@
                         <span>Default framework structure</span>
                     [% END %]
                 </a>
-            </li>
+            [% END %]
 
             [% IF ( add_form ) %]
                 [% IF ( use_heading_flags_p ) %]
                     [% IF ( heading_edit_subfields_p ) %]
-                        <li>
+                        [% WRAPPER breadcrumb_item %]
                             <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode | uri %]">Tag [% tagfield | html %] subfield structure</a>
-                        </li>
-                        <li>
-                            <a href="#" aria-current="page">
-                                Edit subfields constraints
-                            </a>
-                        </li>
+                        [% END %]
+                        [% WRAPPER breadcrumb_item bc_active= 1 %]
+                            <span>Edit subfields constraints</span>
+                        [% END %]
                     [% END %]
                 [% ELSE %]
-                    <li>
+                    [% WRAPPER breadcrumb_item %]
                         <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode | uri %]">Tag [% tagfield | html %] Subfield structure</a>
-                    </li>
-                    <li>
-                        <a href="#" aria-current="page">
-                            [% action | html %]
-                        </a>
-                    </li>
+                    [% END %]
+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
+                        [% action | html %]
+                    [% END %]
                 [% END %]
             [% END %]
 
             [% IF ( delete_confirm ) %]
-                <li>
+                [% WRAPPER breadcrumb_item %]
                     <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% mss.tagfield | uri %]&amp;frameworkcode=[% mss.frameworkcode | uri %]">Tag [% mss.tagfield | html %] Subfield structure</a>
-                </li>
-                <li>
-                    <a href="#" aria-current="page">
-                        Confirm deletion of subfield [% mss.tagsubfield | html %]
-                    </a>
-                </li>
+                [% END %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    <span>Confirm deletion of subfield [% mss.tagsubfield | html %]</span>
+                [% END %]
             [% END %]
 
             [% IF ( else ) %]
-                <li>
-                    <a href="#" aria-current="page">
-                        Tag [% tagfield | html %] Subfield structure
-                    </a>
-                </li>
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    <span>Tag [% tagfield | html %] Subfield structure</span>
+                [% END %]
             [% END %]
-        </ol>
-    </nav> <!-- /#breadcrumbs -->
-    [% END %]
+        [% END #/ WRAPPER breadcrumbs %]
+    [% END #/ WRAPPER sub-header.inc %]
 
     <div class="main container-fluid">
         <div class="row">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
index 35695a81e2..17cd8f9a60 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
@@ -27,20 +27,16 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
 [% END %]
 
 [% WRAPPER 'sub-header.inc' %]
-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-    <ol>
-        <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-        </li>
-        <li>
+    [% WRAPPER breadcrumbs %]
+        [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-        </li>
-        <li>
+        [% END %]
+        [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
-        </li>
+        [% END %]
 
         [% IF ( add_form ) %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">
                     [% IF framework %]
                         <span>[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</span>
@@ -48,30 +44,26 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
                         <span>Default MARC framework</span>
                     [% END%]
                 </a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    [% IF heading_add_tag_p %]
-                        <span>Add tag [% searchfield | html %]</span>
-                    [% ELSE %]
-                        <span>Modify tag [% searchfield | html %]</span>
-                    [% END %]
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1%]
+                [% IF heading_add_tag_p %]
+                    <span>Add tag [% searchfield | html %]</span>
+                [% ELSE %]
+                    <span>Modify tag [% searchfield | html %]</span>
+                [% END %]
+            [% END %]
 
         [% ELSIF ( else ) %]
-            <li>
-                <a href="#" aria-current="page">
-                    [% IF framework %]
-                        <span>[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</span>
-                    [% ELSE %]
-                        <span>Default MARC framework</span>
-                    [% END %]
-                </a>
-            </li>
+            [% WRAPPER breadcrumb_item bc_active= 1%]
+                [% IF framework %]
+                    <span>[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</span>
+                [% ELSE %]
+                    <span>Default MARC framework</span>
+                [% END %]
+            [% END %]
 
         [% ELSIF ( delete_confirm ) %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">
                     [% IF framework %]
                         <span>[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</span>
@@ -79,15 +71,13 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
                         <span>Default MARC framework</span>
                     [% END %]
                 </a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    Confirm deletion of tag [% searchfield | html %]
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1%]
+                <span>Confirm deletion of tag [% searchfield | html %]</span>
+            [% END %]
 
         [% ELSIF ( delete_confirmed ) %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">
                     [% IF framework %]
                         <span>[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</span>
@@ -95,13 +85,19 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
                         <span>Default MARC framework</span>
                     [% END %]
                 </a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    Data deleted
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1%]
+                <span>Data deleted</span>
+            [% END %]
         [% END %]
+    [% END #/ WRAPPER breadcrumbs %]
+[% END #/ WRAPPER sub-header.inc %]
+
+[% WRAPPER 'sub-header.inc' %]
+<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
+    <ol>
+
+
     </ol>
 </nav>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
index ea06752c99..4e7cd0eec1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
@@ -64,50 +64,38 @@
 [% END %]
 
 [% WRAPPER 'sub-header.inc' %]
-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-    <ol>
-        <li>
-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-        </li>
-        <li>
+    [% WRAPPER breadcrumbs %]
+        [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-        </li>
+        [% END %]
 
         [% IF ( matching_rule_form ) %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    [% IF ( edit_matching_rule ) %]
-                        Modify record matching rule
-                    [% ELSE %]
-                        Add record matching rule
-                    [% END %]
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                [% IF ( edit_matching_rule ) %]
+                    <span>Modify record matching rule</span>
+                [% ELSE %]
+                    <span>Add record matching rule</span>
+                [% END %]
+            [% END %]
 
         [% ELSIF ( delete_matching_rule_form ) %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    Confirm deletion of record matching rule &quot;[% code | html %]&quot;
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                <span>Confirm deletion of record matching rule '[% code | html %]'</span>
+            [% END %]
 
         [% ELSE %]
-            <li>
-                <a href="#" aria-current="page">
-                    Record matching rules
-                </a>
-            </li>
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                <span>Record matching rules</span>
+            [% END %]
         [% END %]
-    </ol>
-</nav> <!-- /#breadcrumbs -->
-[% END %]
-
+    [% END #/ WRAPPER breadcrumbs %]
+[% END #/ WRAPPER sub-header.inc %]
 
 <div class="main container-fluid">
     <div class="row">