diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
index b856827209..58cbff59eb 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
@@ -21,55 +21,42 @@
     [% INCLUDE 'cat-search.inc' %]
 [% 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>
-            [% SWITCH op %]
-                [% CASE 'add_form' %]
-                    <li>
-                        <a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a>
-                    </li>
-                    [% IF field %]
-                        <li>
-                            <a href="#" aria-current="page">
-                                Modify field '[% field.name | html %]'
-                            </a>
-                        </li>
-                    [% ELSE %]
-                        <li>
-                            <a href="#" aria-current="page">
-                                Add field
-                            </a>
-                        </li>
+[% WRAPPER 'sub-header.inc' %]
+    [% WRAPPER breadcrumbs %]
+        [% WRAPPER breadcrumb_item %]
+            <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
+        [% END %]
+        [% SWITCH op %]
+            [% CASE 'add_form' %]
+                [% WRAPPER breadcrumb_item %]
+                    <a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a>
+                [% END %]
+                [% IF field %]
+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
+                        Modify field '[% field.name | html %]'
                     [% END %]
+                [% ELSE %]
+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
+                        Add field
+                    [% END %]
+                [% END %]
 
-                [% CASE 'list' %]
-                    <li>
-                        <a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a>
-                    </li>
-                    <li>
-                        <a href="#" aria-current="page">
-                            Modify fields for '[% tablename | html %]'
-                        </a>
-                    </li>
+            [% CASE 'list' %]
+                [% WRAPPER breadcrumb_item %]
+                    <a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a>
+                [% END %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    Modify fields for '[% tablename | html %]'
+                [% END %]
 
-                [% CASE %]
-                    <li>
-                        <a href="#" aria-current="page">
-                            Manage additional fields
-                        </a>
-                    </li>
+            [% CASE %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    Manage additional fields
+                [% END %]
 
-            [% END %]
-        </ol>
-    </nav>
-    [% 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/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index 0e83b36721..d27a03250e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -1,3 +1,5 @@
+
+[% USE raw %]
 [% USE Koha %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
@@ -10,19 +12,12 @@
 [% 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="#" aria-current="page">
-                Administration
-            </a>
-        </li>
-    </ol>
-</nav>
-[% END %]
+    [% WRAPPER breadcrumbs %]
+        [% WRAPPER breadcrumb_item bc_active= 1 %]
+            Administration
+        [% 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/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
index 3b27d3c017..dea5c51ac6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
@@ -13,20 +13,15 @@
     [% PROCESS 'keyboard_shortcuts.inc' %]
 
 [% 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">Advanced editor shortcuts</a>
-        </li>
-    </ol>
-</nav>
-[% END %]
+        [% END %]
+        [% WRAPPER breadcrumb_item bc_active= 1 %]
+            Advanced editor shortcuts
+        [% 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/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
index 4c4c3aad78..d648b832df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -77,96 +77,75 @@
 [% 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 ( add_form ) %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
-            </li>
+            [% END %]
             [% IF ( budget_period_id ) %]
-                <li>
-                    <a href="#" aria-current="page">
-                        Modify budget '[% budget_period_description | html %]'
-                    </a>
-                </li>
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    Modify budget '[% budget_period_description | html %]'
+                [% END %]
             [% ELSE %]
-                <li>
-                    <a href="#" aria-current="page">
-                        Add budget
-                    </a>
-                </li>
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    Add budget
+                [% END %]
             [% END %]
         [% END %]
 
         [% IF ( delete_confirm ) %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
-            </li>
+            [% END %]
             [% IF ( total || funds_exist ) %]
-                <li>
-                    <a href="#" aria-current="page">
-                        Cannot delete budget '[% budget_period_description | html %]'
-                    </a>
-                </li>
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    Cannot delete budget '[% budget_period_description | html %]'
+                [% END %]
             [% ELSE %]
-                <li>
-                    <a href="#" aria-current="page">
-                        Delete budget '[% budget_period_description | html %]'?
-                    </a>
-                </li>
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    Delete budget '[% budget_period_description | html %]'?
+                [% END %]
             [% END %]
         [% END %]
 
             [% IF ( duplicate_form ) %]
-                <li>
+                [% WRAPPER breadcrumb_item %]
                     <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
-                </li>
-                <li>
-                    <a href="#" aria-current="page">
-                        Duplicate budget
-                    </a>
-                </li>
+                [% END %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    Duplicate budget
+                [% END %]
             [% END %]
 
         [% IF close_form %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    Close budget [% budget_period_description | html %]
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                Close budget [% budget_period_description | html %]
+            [% END %]
         [% END %]
 
         [% IF closed %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    Budget [% budget_period_description | html %] closed
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                Budget [% budget_period_description | html %] closed
+            [% END %]
         [% END %]
 
         [% IF ( else ) %]
-            <li>
-                <a href="#" aria-current="page">
-                    Budgets administration
-                </a>
-            </li>
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                Budgets administration
+            [% 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/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index c8ee656ba8..d2e68e9747 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -17,67 +17,55 @@
 [% 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="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
-    </li>
+    [% 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 %]
+            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
+        [% END %]
 
-    [% IF op == 'list' %]
-        [% IF budget_period_id %]
-            <li>
-                <a href="#" aria-current="page">
+        [% IF op == 'list' %]
+            [% IF budget_period_id %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
                     Funds for '[% budget_period_description | html %]'
-                </a>
-            </li>
-        [% ELSE %]
-            <li>
-                <a href="#" aria-current="page">
+                [% END %]
+            [% ELSE %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
                     All funds
-                </a>
-            </li>
+                [% END %]
+            [% END %]
         [% END %]
-    [% END %]
 
-    [% IF op == 'add_form' %]
-        <li>
-            <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a>
-        </li>
-        [% IF ( budget_id ) %]
-            <li>
-                <a href="#" aria-current="page">
-                Modify fund
+        [% IF op == 'add_form' %]
+            [% WRAPPER breadcrumb_item %]
+                <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a>
+            [% END %]
+            [% IF ( budget_id ) %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    Modify fund
                     [% IF ( budget_name ) %] '[% budget_name | html %]'[% END %]
-                </a>
-            </li>
-        [% ELSE %]
-            <li>
-                <a href="#" aria-current="page">
+                [% END %]
+            [% ELSE %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
                     Add fund
-                </a>
-            </li>
+                [% END %]
+            [% END %]
         [% END %]
-    [% END %]
 
-    [% IF op == 'delete_confirm' %]
-        <li>
-            <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a>
-        </li>
-        <li>
-            <a href="#" aria-current="page">
+        [% IF op == 'delete_confirm' %]
+            [% WRAPPER breadcrumb_item %]
+                <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
                 Delete fund?
-            </a>
-        </li>
-    [% END %]
-    </ol>
-</nav>
-[% END %]
+            [% 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/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
index 5b26ac2da8..0c3b06d680 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -23,80 +23,63 @@
 [% 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/acqui/acqui-home.pl">Acquisitions</a>
-        </li>
-        <li>
+        [% END %]
+        [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
-        </li>
+        [% END %]
 
         [% IF ( add_form ) %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
-            </li>
+            [% END %]
             [% IF ( contractnumber ) %]
-                <li>
-                    <a href="#" aria-current="page">
+                [% WRAPPER breadcrumb_item bc_active=1 %]
                         Modify contract '[% contractname | html %]'
-                    </a>
-                </li>
+                [% END %]
             [% ELSE %]
-                <li>
-                    <a href="#" aria-current="page">
-                        New contract
-                    </a>
-                </li>
+                [% WRAPPER breadcrumb_item bc_active=1 %]
+                    New contract
+                [% END %]
             [% END %]
         [% END %]
 
         [% IF ( add_validate ) %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    Data recorded
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active=1 %]
+                Data recorded
+            [% END %]
         [% END %]
 
         [% IF ( delete_confirm ) %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    Confirm deletion of contract [% contractnumber | html %]
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active=1 %]
+                Confirm deletion of contract [% contractnumber | html %]
+            [% END %]
         [% END %]
 
         [% IF ( delete_confirmed ) %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
-            </li>
-            <li>
-                <a href="#" aria-current="page">
-                    Contract deleted
-                </a>
-            </li>
+            [% END %]
+            [% WRAPPER breadcrumb_item bc_active=1 %]
+                Contract deleted
+            [% END %]
         [% END %]
 
         [% IF ( else ) %]
-            <li>
-                <a href="#" aria-current="page">
-                    Contracts
-                </a>
-            </li>
+            [% WRAPPER breadcrumb_item bc_active=1 %]
+                Contracts
+            [% 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/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
index 29992d1436..a65b9a3b09 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
@@ -15,26 +15,21 @@
 [% 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/aqbudgetperiods.pl">Budgets</a>
-        </li>
-        <li>
+        [% END %]
+        [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a>
-        </li>
-        <li>
-            <a href="#" aria-current="page">Planning</a>
-        </li>
-    </ol>
-</nav>
-[% END %]
+        [% END %]
+        [% WRAPPER breadcrumb_item bc_active= 1 %]
+            Planning
+        [% 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/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
index 2019ff2830..253eafd5f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
@@ -13,22 +13,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">
-                Audio alerts
-            </a>
-        </li>
-    </ol>
-</nav>
-[% END %]
+        [% END %]
+        [% WRAPPER breadcrumb_item bc_active= 1 %]
+            Audio alerts
+        [% 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/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
index 9db4d0c8b7..4061006a67 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
@@ -12,68 +12,58 @@
 [% END %]
 
 [% WRAPPER 'sub-header.inc' %]
-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
-    <ol>
-        <li>
+    [% WRAPPER breadcrumbs %]
+        [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/mainpage.pl">Home</a>
-        </li>
-        <li>
+        [% END %]
+        [% 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/authtypes.pl">Authority types</a>
-        </li>
+        [% END %]
 
         [% IF ( authtypecode ) %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri%]">[% authtypecode | html %] framework</a>
-            </li>
+            [% END %]
         [% ELSE %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
-            </li>
+            [% END %]
         [% END %]
 
         [% IF ( else ) %]
-            <li>
-                <a href="#" aria-current="page">
-                    Authority MARC subfield structure for [% tagfield | html %]
-                </a>
-            </li>
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                Authority MARC subfield structure for [% tagfield | html %]
+            [% END %]
         [% ELSE %]
-            <li>
+            [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;tagsubfield=[% tagsubfield | uri %]&amp;authtypecode=[% authtypecode |uri %]">Authority MARC subfield structure for [% tagfield | html %]</a>
-            </li>
+            [% END %]
         [% END %]
 
         [% IF ( delete_confirm ) %]
-            <li>
-                <a href="#" aria-current="page">
-                    Confirm deletion of subfield [% tagsubfield | html %]?
-                </a>
-            </li>
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                Confirm deletion of subfield [% tagsubfield | html %]?
+            [% END %]
         [% END %]
 
         [% IF ( add_form ) %]
             [% IF ( use_heading_flags_p ) %]
                 [% IF ( heading_edit_subfields_p ) %]
-                    <li>
-                        <a href="#" aria-current="page">
-                            Edit MARC subfields constraints
-                        </a>
-                    </li>
+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
+                        Edit MARC subfields constraints
+                    [% END %]
                 [% END %]
             [% ELSE %]
-                <li>
-                    <a href="#" aria-current="page">
-                        [% action | html %]
-                    </a>
-                </li>
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    [% action | html %]
+                [% END %]
             [% 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/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
index 3083c15c2b..b40eac911e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
@@ -43,125 +43,106 @@ Authority MARC framework &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/authtypes.pl">Authority types</a>
-        </li>
+        [% END %]
 
         [% IF ( add_form ) %]
             [% IF ( use_heading_flags_p ) %]
 
                 [% IF ( heading_modify_tag_p ) %]
                     [% IF ( authtypecode ) %]
-                        <li>
+                        [% WRAPPER breadcrumb_item %]
                             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a>
-                        </li>
+                        [% END %]
                     [% ELSE %]
-                        <li>
+                        [% WRAPPER breadcrumb_item %]
                             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
-                        </li>
+                        [% END %]
+                    [% END %]
+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
+                        Modify tag
                     [% END %]
-                    <li>
-                        <a href="#" aria-current="page">
-                            Modify tag
-                        </a>
-                    </li>
                 [% END %]
 
                 [% IF ( heading_add_tag_p ) %]
                     [% IF ( authtypecode ) %]
-                        <li>
+                        [% WRAPPER breadcrumb_item %]
                             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
-                        </li>
+                        [% END %]
                     [% ELSE %]
-                        <li>
+                        [% WRAPPER breadcrumb_item %]
                             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
-                        </li>
+                        [% END %]
+                    [% END %]
+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
+                        New tag
                     [% END %]
-                    <li>
-                        <a href="#" aria-current="page">
-                            New tag
-                        </a>
-                    </li>
                 [% END %]
 
             [% ELSE %]
                 [% IF ( authtypecode ) %]
-                    <li>
+                    [% WRAPPER breadcrumb_item %]
                         <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a>
-                    </li>
+                    [% END %]
                 [% ELSE %]
-                    <li>
+                    [% WRAPPER breadcrumb_item %]
                         <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
-                    </li>
+                    [% END %]
+                [% END %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    [% action | html %]
                 [% END %]
-                <li>
-                    <a href="#" aria-current="page">
-                        [% action | html %]
-                    </a>
-                </li>
             [% END %]
 
         [% ELSE %]
             [% IF ( delete_confirm ) %]
                 [% IF ( authtypecode ) %]
-                    <li>
+                    [% WRAPPER breadcrumb_item %]
                         <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
-                    </li>
+                    [% END %]
                 [% ELSE %]
-                    <li>
+                    [% WRAPPER breadcrumb_item %]
                         <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
-                    </li>
+                    [% END %]
+                [% END %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    Confirm deletion
                 [% END %]
-                <li>
-                    <a href="#" aria-current="page">
-                        Confirm deletion
-                    </a>
-                </li>
             [% ELSE %]
                 [% IF ( delete_confirmed ) %]
                     [% IF ( authtypecode ) %]
-                        <li>
+                        [% WRAPPER breadcrumb_item %]
                             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
-                        </li>
+                        [% END %]
                     [% ELSE %]
-                        <li>
+                        [% WRAPPER breadcrumb_item %]
                             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
-                        </li>
+                        [% END %]
+                    [% END %]
+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
+                        Data deleted
                     [% END %]
-                    <li>
-                        <a href="#" aria-current="page">
-                            Data deleted
-                        </a>
-                    </li>
                 [% ELSE %]
                     [% IF ( authtypecode ) %]
-                        <li>
-                            <a href="#" aria-current="page">
-                                [% authtypecode | html %] Framework
-                            </a>
-                        </li>
+                        [% WRAPPER breadcrumb_item bc_active= 1 %]
+                            [% authtypecode | html %] Framework
+                        [% END %]
                     [% ELSE %]
-                        <li>
-                            <a href="#" aria-current="page">
-                                Default framework
-                            </a>
-                        </li>
+                        [% WRAPPER breadcrumb_item bc_active= 1 %]
+                            Default framework
+                        [% END %]
                     [% END %]
                 [% END %]
 
             [% END %]
         [% END %]
-    </ol>
-</nav>
-[% END %]
+    [% END #/ WRAPPER breadcrumbs %]
+[% END #/ WRAPPER sub-header.inc %]
 
 <div class="main container-fluid">
     <div class="row">