diff --git a/lib/tablelib.php b/lib/tablelib.php
index 358e3dcea1e..e478263c29a 100644
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -1232,20 +1232,26 @@ class flexible_table {
         $ariacontrols = trim($ariacontrols);
 
         if (!empty($this->prefs['collapse'][$column])) {
-            $linkattributes = array('title' => get_string('show') . ' ' . strip_tags($this->headers[$index]),
-                                    'aria-expanded' => 'false',
-                                    'aria-controls' => $ariacontrols,
-                                    'data-action' => 'show',
-                                    'data-column' => $column);
+            $linkattributes = [
+                'title' => get_string('show') . ' ' . strip_tags($this->headers[$index]),
+                'aria-expanded' => 'false',
+                'aria-controls' => $ariacontrols,
+                'data-action' => 'show',
+                'data-column' => $column,
+                'role' => 'button',
+            ];
             return html_writer::link($this->baseurl->out(false, array($this->request[TABLE_VAR_SHOW] => $column)),
                     $OUTPUT->pix_icon('t/switch_plus', null), $linkattributes);
 
         } else if ($this->headers[$index] !== NULL) {
-            $linkattributes = array('title' => get_string('hide') . ' ' . strip_tags($this->headers[$index]),
-                                    'aria-expanded' => 'true',
-                                    'aria-controls' => $ariacontrols,
-                                    'data-action' => 'hide',
-                                    'data-column' => $column);
+            $linkattributes = [
+                'title' => get_string('hide') . ' ' . strip_tags($this->headers[$index]),
+                'aria-expanded' => 'true',
+                'aria-controls' => $ariacontrols,
+                'data-action' => 'hide',
+                'data-column' => $column,
+                'role' => 'button',
+            ];
             return html_writer::link($this->baseurl->out(false, array($this->request[TABLE_VAR_HIDE] => $column)),
                     $OUTPUT->pix_icon('t/switch_minus', null), $linkattributes);
         }
@@ -1664,6 +1670,7 @@ class flexible_table {
                     'data-sortable' => $this->is_sortable($column),
                     'data-sortby' => $column,
                     'data-sortorder' => $sortorder,
+                    'role' => 'button',
                 ]) . ' ' . $this->sort_icon($isprimary, $order);
     }
 
@@ -1861,7 +1868,7 @@ class flexible_table {
         $url = $this->baseurl->out(false, array($this->request[TABLE_VAR_RESET] => 1));
 
         $html  = html_writer::start_div('resettable mdl-right');
-        $html .= html_writer::link($url, get_string('resettable'));
+        $html .= html_writer::link($url, get_string('resettable'), ['role' => 'button']);
         $html .= html_writer::end_div();
 
         return $html;
diff --git a/lib/templates/initials_bar.mustache b/lib/templates/initials_bar.mustache
index ab87624b664..5bb8d2713d6 100644
--- a/lib/templates/initials_bar.mustache
+++ b/lib/templates/initials_bar.mustache
@@ -76,31 +76,20 @@
 <div class="initialbar {{class}} d-flex flex-wrap justify-content-center justify-content-md-start">
     <span class="initialbarlabel mr-2">{{title}}</span>
 
-    <div class="initialbargroups d-flex flex-wrap justify-content-center justify-content-md-start">
+    <nav class="initialbargroups d-flex flex-wrap justify-content-center justify-content-md-start">
         <ul class="pagination pagination-sm">
-        {{#current}}
-            <li class="initialbarall page-item">
-                <a data-initial="" class="page-link" href="{{url}}">{{all}}</a>
+            <li class="initialbarall page-item{{^current}} active{{/current}}">
+                <a data-initial="" class="page-link" href="{{url}}"{{^current}} aria-current="true"{{/current}}>{{all}}</a>
             </li>
-        {{/current}}
-        {{^current}}
-            <li class="initialbarall page-item active">
-                <a data-initial="" class="page-link">{{all}}</a>
-            </li>
-        {{/current}}
         </ul>
         {{#group}}
             <ul class="pagination pagination-sm">
                 {{#letter}}
-                    {{#selected}}
-                        <li data-initial="{{name}}" class="page-item active {{name}}"><span class="page-link">{{name}}</span></li>
-                    {{/selected}}
-                    {{^selected}}
-                        <li data-initial="{{name}}" class="page-item {{name}}"><a class="page-link" href="{{url}}">{{name}}</a></li>
-                    {{/selected}}
+                    <li data-initial="{{name}}" class="page-item {{name}}{{#selected}} active{{/selected}}">
+                        <a class="page-link" href="{{url}}"{{#selected}} aria-current="true"{{/selected}}>{{name}}</a>
+                    </li>
                 {{/letter}}
             </ul>
         {{/group}}
-    </div>
+    </nav>
 </div>
-
diff --git a/lib/templates/paging_bar.mustache b/lib/templates/paging_bar.mustache
index 622285e7c10..845cef6b6cf 100644
--- a/lib/templates/paging_bar.mustache
+++ b/lib/templates/paging_bar.mustache
@@ -54,7 +54,7 @@
         <ul class="mt-1 pagination " data-page-size="{{pagesize}}">
             {{#previous}}
                 <li class="page-item" data-page-number="{{page}}">
-                    <a href="{{url}}" class="page-link" aria-label="{{# str }} previouspage, moodle {{/ str }}">
+                    <a href="{{url}}" class="page-link">
                         <span aria-hidden="true">&laquo;</span>
                         <span class="sr-only">{{#str}}previouspage, moodle{{/str}}</span>
                     </a>
@@ -62,7 +62,10 @@
             {{/previous}}
             {{#first}}
                 <li class="page-item" data-page-number="{{page}}">
-                    <a href="{{url}}" class="page-link">{{page}}</a>
+                    <a href="{{url}}" class="page-link">
+                        <span aria-hidden="true">{{page}}</span>
+                        <span class="sr-only">{{#str}}pagea, moodle, {{page}}{{/str}}</span>
+                    </a>
                 </li>
                 <li class="page-item disabled" data-page-number="{{page}}">
                     <span class="page-link">&hellip;</span>
@@ -70,11 +73,9 @@
             {{/first}}
             {{#pages}}
                 <li class="page-item {{#active}}active{{/active}}" data-page-number="{{page}}">
-                    <a href="{{#url}}{{.}}{{/url}}{{^url}}#{{/url}}" class="page-link">
-                        {{page}}
-                        {{#active}}
-                            <span class="sr-only">{{#str}}currentinparentheses, theme_boost{{/str}}</span>
-                        {{/active}}
+                    <a href="{{#url}}{{.}}{{/url}}{{^url}}#{{/url}}" class="page-link" {{#active}}aria-current="page"{{/active}}>
+                        <span aria-hidden="true">{{page}}</span>
+                        <span class="sr-only">{{#str}}pagea, moodle, {{page}}{{/str}}</span>
                     </a>
                 </li>
             {{/pages}}
@@ -83,12 +84,15 @@
                     <span class="page-link">&hellip;</span>
                 </li>
                 <li class="page-item" data-page-number="{{page}}">
-                    <a href="{{url}}" class="page-link">{{page}}</a>
+                    <a href="{{url}}" class="page-link">
+                        <span aria-hidden="true">{{page}}</span>
+                        <span class="sr-only">{{#str}}pagea, moodle, {{page}}{{/str}}</span>
+                    </a>
                 </li>
             {{/last}}
             {{#next}}
                 <li class="page-item" data-page-number="{{page}}">
-                    <a href="{{url}}" class="page-link" aria-label="{{# str }} nextpage, moodle {{/ str }}">
+                    <a href="{{url}}" class="page-link">
                         <span aria-hidden="true">&raquo;</span>
                         <span class="sr-only">{{#str}}nextpage, moodle{{/str}}</span>
                     </a>
diff --git a/lib/tests/behat/alpha_chooser.feature b/lib/tests/behat/alpha_chooser.feature
index 05437a39000..4de5a10c494 100644
--- a/lib/tests/behat/alpha_chooser.feature
+++ b/lib/tests/behat/alpha_chooser.feature
@@ -77,7 +77,7 @@ Feature: Initials bar
     And I should see "Astudent Astudent"
     And I should see "Bstudent Astudent"
     And I should see "Cstudent Cstudent"
-    And I click on "A" "link" in the ".initialbar.lastinitial" "css_element"
+    And I click on "A" "link" in the ".initialbar.lastinitial .page-item.A" "css_element"
     And ".initialbarall.page-item.active" "css_element" should exist in the ".initialbar.firstinitial" "css_element"
     And ".initialbarall.page-item.active" "css_element" should not exist in the ".initialbar.lastinitial" "css_element"
     And ".page-item.active.B" "css_element" should not exist in the ".initialbar.firstinitial" "css_element"
@@ -85,7 +85,7 @@ Feature: Initials bar
     And I should see "Astudent Astudent"
     And I should see "Bstudent Astudent"
     And I should not see "Cstudent Cstudent"
-    And I click on "B" "link" in the ".initialbar.firstinitial" "css_element"
+    And I click on "B" "link" in the ".initialbar.firstinitial .page-item.B" "css_element"
     And ".initialbarall.page-item.active" "css_element" should not exist in the ".initialbar.firstinitial" "css_element"
     And ".initialbarall.page-item.active" "css_element" should not exist in the ".initialbar.lastinitial" "css_element"
     And ".page-item.active.B" "css_element" should exist in the ".initialbar.firstinitial" "css_element"
@@ -133,7 +133,7 @@ Feature: Initials bar
     And I should see "Astudent Astudent"
     And I should see "Bstudent Astudent"
     And I should see "Cstudent Cstudent"
-    And I click on "A" "link" in the ".initialbar.lastinitial" "css_element"
+    And I click on "A" "link" in the ".initialbar.lastinitial .page-item.A" "css_element"
     And ".initialbarall.page-item.active" "css_element" should exist in the ".initialbar.firstinitial" "css_element"
     And ".initialbarall.page-item.active" "css_element" should not exist in the ".initialbar.lastinitial" "css_element"
     And ".page-item.active.B" "css_element" should not exist in the ".initialbar.firstinitial" "css_element"
@@ -141,7 +141,7 @@ Feature: Initials bar
     And I should see "Astudent Astudent"
     And I should see "Bstudent Astudent"
     And I should not see "Cstudent Cstudent"
-    And I click on "B" "link" in the ".initialbar.firstinitial" "css_element"
+    And I click on "B" "link" in the ".initialbar.firstinitial .page-item.B" "css_element"
     And ".initialbarall.page-item.active" "css_element" should not exist in the ".initialbar.firstinitial" "css_element"
     And ".initialbarall.page-item.active" "css_element" should not exist in the ".initialbar.lastinitial" "css_element"
     And ".page-item.active.B" "css_element" should exist in the ".initialbar.firstinitial" "css_element"
@@ -193,7 +193,7 @@ Feature: Initials bar
     And I should see "Astudent Astudent"
     And I should see "Bstudent Astudent"
     And I should see "Cstudent Cstudent"
-    And I click on "A" "link" in the ".initialbar.lastinitial" "css_element"
+    And I click on "A" "link" in the ".initialbar.lastinitial .page-item.A" "css_element"
     And ".initialbarall.page-item.active" "css_element" should exist in the ".initialbar.firstinitial" "css_element"
     And ".initialbarall.page-item.active" "css_element" should not exist in the ".initialbar.lastinitial" "css_element"
     And ".page-item.active.B" "css_element" should not exist in the ".initialbar.firstinitial" "css_element"
@@ -201,7 +201,7 @@ Feature: Initials bar
     And I should see "Astudent Astudent"
     And I should see "Bstudent Astudent"
     And I should not see "Cstudent Cstudent"
-    And I click on "B" "link" in the ".initialbar.firstinitial" "css_element"
+    And I click on "B" "link" in the ".initialbar.firstinitial .page-item.B" "css_element"
     And ".initialbarall.page-item.active" "css_element" should not exist in the ".initialbar.firstinitial" "css_element"
     And ".initialbarall.page-item.active" "css_element" should not exist in the ".initialbar.lastinitial" "css_element"
     And ".page-item.active.B" "css_element" should exist in the ".initialbar.firstinitial" "css_element"
@@ -259,7 +259,7 @@ Feature: Initials bar
     And I should see "Astudent Astudent"
     And I should see "Bstudent Astudent"
     And I should see "Cstudent Cstudent"
-    And I click on "A" "link" in the ".initialbar.lastinitial" "css_element"
+    And I click on "A" "link" in the ".initialbar.lastinitial .page-item.A" "css_element"
     And ".initialbarall.page-item.active" "css_element" should exist in the ".initialbar.firstinitial" "css_element"
     And ".initialbarall.page-item.active" "css_element" should not exist in the ".initialbar.lastinitial" "css_element"
     And ".page-item.active.B" "css_element" should not exist in the ".initialbar.firstinitial" "css_element"
@@ -267,7 +267,7 @@ Feature: Initials bar
     And I should see "Astudent Astudent"
     And I should see "Bstudent Astudent"
     And I should not see "Cstudent Cstudent"
-    And I click on "B" "link" in the ".initialbar.firstinitial" "css_element"
+    And I click on "B" "link" in the ".initialbar.firstinitial .page-item.B" "css_element"
     And ".initialbarall.page-item.active" "css_element" should not exist in the ".initialbar.firstinitial" "css_element"
     And ".initialbarall.page-item.active" "css_element" should not exist in the ".initialbar.lastinitial" "css_element"
     And ".page-item.active.B" "css_element" should exist in the ".initialbar.firstinitial" "css_element"
diff --git a/lib/tests/tablelib_test.php b/lib/tests/tablelib_test.php
index d7494cd976f..d0710f99138 100644
--- a/lib/tests/tablelib_test.php
+++ b/lib/tests/tablelib_test.php
@@ -138,7 +138,7 @@ class tablelib_test extends \advanced_testcase {
         $headers = $this->generate_headers(2);
 
         // Search for pagination controls containing 'page-link"\saria-label="Next"'.
-        $this->expectOutputRegex('/page-link"\saria-label="Next page"/');
+        $this->expectOutputRegex('/Next page/');
 
         $this->run_table_test(
             $columns,
diff --git a/theme/boost/lang/en/deprecated.txt b/theme/boost/lang/en/deprecated.txt
index 04956efb9aa..37e07310d8a 100644
--- a/theme/boost/lang/en/deprecated.txt
+++ b/theme/boost/lang/en/deprecated.txt
@@ -1,3 +1,4 @@
 totop,theme_boost
 privacy:drawernavclosed,theme_boost
 privacy:drawernavopen,theme_boost
+currentinparentheses,theme_boost
\ No newline at end of file
diff --git a/theme/boost/lang/en/theme_boost.php b/theme/boost/lang/en/theme_boost.php
index 87d019153eb..0c9bcd19137 100644
--- a/theme/boost/lang/en/theme_boost.php
+++ b/theme/boost/lang/en/theme_boost.php
@@ -32,7 +32,6 @@ $string['brandcolor_desc'] = 'The accent colour.';
 $string['bootswatch'] = 'Bootswatch';
 $string['bootswatch_desc'] = 'A bootswatch is a set of Bootstrap variables and css to style Bootstrap';
 $string['choosereadme'] = 'Boost is a modern highly-customisable theme. This theme is intended to be used directly, or as a parent theme when creating new themes utilising Bootstrap 4.';
-$string['currentinparentheses'] = '(current)';
 $string['configtitle'] = 'Boost';
 $string['generalsettings'] = 'General settings';
 $string['loginbackgroundimage'] = 'Login page background image';
@@ -64,5 +63,6 @@ $string['privacy:drawerblockopen'] = 'The current preference for the block drawe
 $string['totop'] = 'Go to top';
 
 // Deprecated since Moodle 4.1.
+$string['currentinparentheses'] = '(current)';
 $string['privacy:drawernavclosed'] = 'The current preference for the navigation drawer is closed.';
 $string['privacy:drawernavopen'] = 'The current preference for the navigation drawer is open.';
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 5f67f01b375..73131d61916 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -2976,3 +2976,39 @@ body.dragging {
         }
     }
 }
+
+.initialbargroups ul {
+    -webkit-margin-start: 0; /* stylelint-disable-line */
+    margin-right: -1px;
+}
+
+.page-item {
+    &:first-child {
+        .page-link {
+            .initialbargroups & {
+                @include border-left-radius(0);
+                @include border-right-radius(0);
+            }
+            .initialbargroups .pagination-lg:first-child & {
+                @include border-left-radius($pagination-border-radius-lg);
+            }
+            .initialbargroups .pagination-sm:first-child & {
+                @include border-left-radius($pagination-border-radius-sm);
+            }
+        }
+    }
+    &:last-child {
+        .page-link {
+            .initialbargroups & {
+                @include border-left-radius(0);
+                @include border-right-radius(0);
+            }
+            .initialbargroups .pagination-lg:last-child & {
+                @include border-right-radius($pagination-border-radius-lg);
+            }
+            .initialbargroups .pagination-sm:last-child & {
+                @include border-right-radius($pagination-border-radius-sm);
+            }
+        }
+    }
+}
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index f37b7a61667..f58a3144c5a 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -12280,6 +12280,39 @@ body.dragging .dragging {
   .select-menu .dropdown-item[aria-selected="true"] {
     font-weight: bold; }
 
+.initialbargroups ul {
+  -webkit-margin-start: 0;
+  /* stylelint-disable-line */
+  margin-right: -1px; }
+
+.initialbargroups .page-item:first-child .page-link {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.initialbargroups .pagination-lg:first-child .page-item:first-child .page-link {
+  border-top-left-radius: 0.6rem;
+  border-bottom-left-radius: 0.6rem; }
+
+.initialbargroups .pagination-sm:first-child .page-item:first-child .page-link {
+  border-top-left-radius: 0.2rem;
+  border-bottom-left-radius: 0.2rem; }
+
+.initialbargroups .page-item:last-child .page-link {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.initialbargroups .pagination-lg:last-child .page-item:last-child .page-link {
+  border-top-right-radius: 0.6rem;
+  border-bottom-right-radius: 0.6rem; }
+
+.initialbargroups .pagination-sm:last-child .page-item:last-child .page-link {
+  border-top-right-radius: 0.2rem;
+  border-bottom-right-radius: 0.2rem; }
+
 .icon {
   font-size: 16px;
   width: 16px;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 5df2ed995ad..b8c65613f28 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -12280,6 +12280,39 @@ body.dragging .dragging {
   .select-menu .dropdown-item[aria-selected="true"] {
     font-weight: bold; }
 
+.initialbargroups ul {
+  -webkit-margin-start: 0;
+  /* stylelint-disable-line */
+  margin-right: -1px; }
+
+.initialbargroups .page-item:first-child .page-link {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.initialbargroups .pagination-lg:first-child .page-item:first-child .page-link {
+  border-top-left-radius: 0.3rem;
+  border-bottom-left-radius: 0.3rem; }
+
+.initialbargroups .pagination-sm:first-child .page-item:first-child .page-link {
+  border-top-left-radius: 0.2rem;
+  border-bottom-left-radius: 0.2rem; }
+
+.initialbargroups .page-item:last-child .page-link {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.initialbargroups .pagination-lg:last-child .page-item:last-child .page-link {
+  border-top-right-radius: 0.3rem;
+  border-bottom-right-radius: 0.3rem; }
+
+.initialbargroups .pagination-sm:last-child .page-item:last-child .page-link {
+  border-top-right-radius: 0.2rem;
+  border-bottom-right-radius: 0.2rem; }
+
 .icon {
   font-size: 16px;
   width: 16px;