diff --git a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css
index 458c1d2c33..dbe8ce575d 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css
@@ -376,7 +376,8 @@ tbody tr.active td {
     width: 100%;
 }
 
-.toolbar-tabs-container .nav-tabs li.selected a:hover {
+.toolbar-tabs-container .nav-tabs li.selected a:hover,
+.toolbar-tabs-container .nav-tabs li.selected a:focus {
     background-color: #418940;
     border: 1px solid #418940;
     border-left: 0;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
index d91904c5e4..7247813bb6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
@@ -33,6 +33,8 @@
         if( hashPieces[0] !== "" ){
             selectTab( hashPieces[0] );
             window.scrollTo( 0, 0 );
+        } else {
+            selectTab( "#tab0XX_panel" );
         }
 
         $( "ul.sortable_field", "#authoritytabs" ).sortable();
@@ -57,7 +59,7 @@
             return false;
         });
 
-        $(".toolbar-tabs a").on("click",function(e){
+        $(".toolbar-tabs-container .nav-tabs a").on("click",function(e){
             e.preventDefault();
             selectTab( this.hash );
         });
@@ -75,7 +77,7 @@
             e.preventDefault();
             var tab = $(this).data("tab");
             var field = $(this).data("field");
-            var tablink = $("a[data-tabid='" + tab + "']" );
+            var tablink = $("a[data-tabname='tab" + tab + "XX']" ).get(0).hash;
             selectTab( tablink );
             window.scrollTo( 0, getScrollto( field, "toolbar" ) );
         });
@@ -83,9 +85,10 @@
 
     function selectTab( tablink ){
         let a = $("a[href='" + tablink + "']");
-        $(".toolbar-tabs li").removeClass("selected");
+        $(".toolbar-tabs-container .nav-tabs li").removeClass("selected");
         a.tab("show").parent().addClass("selected");
-        var tabid = a.data("tabid");
+        /* Get number from string like "tab9XX" */
+        var tabid = a.data("tabname").substring(3, 4);
         $(".tag_anchors").removeClass("tab_selected").hide();
         $(".tag_anchors_" + tabid ).addClass("tab_selected").show();
     }
@@ -324,17 +327,18 @@
                         </div>
                         <div class="toolbar-tabs-container">
                             [% IF ( BIG_LOOP && BIG_LOOP.size > 1 ) %]
-                                <ul class="toolbar-tabs" role="tablist">
+                                [% WRAPPER tabs_nav %]
                                     [%- FOREACH BIG_LOO IN BIG_LOOP -%]
                                         [% IF loop.first %]
-                                            <li role="presentation" class="active selected">
+                                            [% SET bt_active = 1 %]
                                         [% ELSE %]
-                                            <li role="presentation">
+                                            [% SET bt_active = 0 %]
+                                        [% END %]
+                                        [% WRAPPER tab_item tabname= "tab${BIG_LOO.number}XX" bt_active= bt_active %]
+                                            <span>[% BIG_LOO.number | html %]</span>
                                         [% END %]
-                                            <a data-tabid="[% BIG_LOO.number | html %]" href="#tab[% BIG_LOO.number | html %]XX" aria-controls="#tab[% BIG_LOO.number | html %]XX" role="tab" data-toggle="tab">[% BIG_LOO.number | html %]</a>
-                                        </li>
                                     [%- END -%]
-                                </ul>
+                                [% END # /WRAPPER tabs_nav %]
                             [% END %]
                             <ul class="tag_anchors_list">
                                 [% FOREACH BIG_LOO IN BIG_LOOP %]
@@ -357,14 +361,16 @@
                                 This authority is not used in any records.
                         [% END %]
                     </div>
-                    <div id="authoritytabs" class="toptabs numbered">
-                        <div class="tab-content">
+
+                    [% WRAPPER tabs id= "authoritytabs" %]
+                        [% WRAPPER tab_panels %]
                             [% FOREACH BIG_LOO IN BIG_LOOP %]
                                 [% IF loop.first %]
-                                    <div id="tab[% BIG_LOO.number | html %]XX" role="tabpanel" class="tab-pane active">
+                                    [% SET bt_active = 1 %]
                                 [% ELSE %]
-                                    <div id="tab[% BIG_LOO.number | html %]XX" role="tabpanel" class="tab-pane">
+                                    [% SET bt_active = 0 %]
                                 [% END %]
+                                [% WRAPPER tab_panel tabname="tab${BIG_LOO.number}XX" bt_active= bt_active %]
                                     [% IF ( BIG_LOOP.size > 1 ) %]
                                         <h2>Section [% BIG_LOO.number | html %]</h2>
                                     [% END %]
@@ -569,10 +575,10 @@
                                         [% END # /IF ( innerloo.tag ) %]
                                     [% END # /FOREACH innerloo %]
                                     </ul> <!-- /.sortable_field -->
-                                </div> <!-- /#tab[% BIG_LOO.number | html %]XX -->
+                                [% END # /tab_panel#tabXXX %]
                             [% END #/FOREACH BIG_LOO %]
-                        </div> <!-- /.tab-content -->
-                    </div> <!-- /#authoritytabs -->
+                        [% END # /WRAPPER tab_panels %]
+                    [% END # /WRAPPER tabs %]
 
                     <div name="hidden" id="hidden" class="tab">
                         [% FOREACH hidden_loo IN hidden_loop %]