diff --git a/lib/templates/dynamic_tabs.mustache b/lib/templates/dynamic_tabs.mustache
index 34d49e9ebe2fe..0c1cdb8a744ce 100644
--- a/lib/templates/dynamic_tabs.mustache
+++ b/lib/templates/dynamic_tabs.mustache
@@ -48,7 +48,7 @@
     {{#showtabsnavigation}}
         <ul class="nav nav-tabs mb-4" id="dynamictabs-tabs" role="tablist">
             {{#tabs}}
-                <li class="nav-item">
+                <li class="nav-item" role="presentation">
                     <a class="nav-link {{#active}}active{{/active}} {{^enabled}}disabled{{/enabled}}" id="{{shortname}}-tab" data-toggle="tab" href="#{{shortname}}" role="tab" aria-controls="{{shortname}}">
                         {{{displayname}}}
                     </a>
diff --git a/reportbuilder/templates/local/audience/form.mustache b/reportbuilder/templates/local/audience/form.mustache
index e34ee43ebe2be..5dea0b1ad9be1 100644
--- a/reportbuilder/templates/local/audience/form.mustache
+++ b/reportbuilder/templates/local/audience/form.mustache
@@ -38,11 +38,11 @@
         </span>
     {{/showormessage}}
     <div class="mb-3 card">
-        <div class="card-header p-0" id="form-instance-{{instanceid}}-heading">
+        <div class="card-header p-0">
             <div class="mb-0 d-flex">
-                <span class="text-left ml-1 nomargin btn">
+                <h3 class="h6 text-left m-0 align-self-center pl-3">
                     {{title}}
-                </span>
+                </h3>
                 <span class="ml-auto">
                     {{#canedit}}
                         <button class="btn btn-link px-0"
@@ -65,16 +65,14 @@
                 </span>
             </div>
         </div>
-        <div id="form-instance-{{instanceid}}" aria-labelledby="form-instance-{{instanceid}}-heading">
-            <div class="card-body p-3" data-region="audience-form">
-                <div data-region="audience-description" {{^description}}class="hidden"{{/description}}>
-                    {{{description}}}
-                </div>
-                <div data-region="audience-form-container" {{^form}}class="hidden"{{/form}}>
-                    <div class="alert alert-warning p-2" data-region="audience-not-saved">{{#str}} audiencenotsaved, core_reportbuilder {{/str}}</div>
-                    {{{form}}}
-                </div>
+        <div class="card-body p-3" data-region="audience-form">
+            <div data-region="audience-description" {{^description}}class="hidden"{{/description}}>
+                {{{description}}}
+            </div>
+            <div data-region="audience-form-container" {{^form}}class="hidden"{{/form}}>
+                <div class="alert alert-warning p-2" data-region="audience-not-saved">{{#str}} audiencenotsaved, core_reportbuilder {{/str}}</div>
+                {{{form}}}
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/reportbuilder/templates/local/conditions/footer.mustache b/reportbuilder/templates/local/conditions/footer.mustache
index 91b02a2261a2b..99c32399ac11c 100644
--- a/reportbuilder/templates/local/conditions/footer.mustache
+++ b/reportbuilder/templates/local/conditions/footer.mustache
@@ -23,4 +23,4 @@
     {
     }
 }}
-</div>
\ No newline at end of file
+</div>
diff --git a/reportbuilder/templates/local/conditions/header.mustache b/reportbuilder/templates/local/conditions/header.mustache
index 351a1db468d5e..dd77d92878436 100644
--- a/reportbuilder/templates/local/conditions/header.mustache
+++ b/reportbuilder/templates/local/conditions/header.mustache
@@ -35,7 +35,11 @@
                 <small class="text-muted text-uppercase">{{entityname}} • {{heading}}</small>
             </div>
         </div>
-        <a data-action="report-remove-condition" class="ml-auto" href="#">
-            {{#pix}}e/cancel, core, {{#str}}deletecondition, core_reportbuilder, {{{heading}}}{{/str}}{{/pix}}
-        </a>
-    </div>
\ No newline at end of file
+        <button class="btn btn-link p-0 ml-auto"
+                type="button"
+                data-action="report-remove-condition"
+                title="{{#str}}deletecondition, core_reportbuilder, {{{heading}}}{{/str}}"
+                aria-label="{{#str}}deletecondition, core_reportbuilder, {{{heading}}}{{/str}}">
+            {{#pix}}e/cancel, core{{/pix}}
+        </button>
+    </div>
diff --git a/reportbuilder/templates/local/dynamictabs/access.mustache b/reportbuilder/templates/local/dynamictabs/access.mustache
index cae33983a1889..b560289b5f657 100644
--- a/reportbuilder/templates/local/dynamictabs/access.mustache
+++ b/reportbuilder/templates/local/dynamictabs/access.mustache
@@ -24,6 +24,7 @@
         "report": "The report content"
     }
 }}
+<h2 class="sr-only">{{#str}} access, core_reportbuilder {{/str}}</h2>
 <div class="reportbuilder-access-container">
     {{{ report }}}
-</div>
\ No newline at end of file
+</div>
diff --git a/reportbuilder/templates/local/dynamictabs/audience.mustache b/reportbuilder/templates/local/dynamictabs/audience.mustache
index 082ccaba751f4..62c74b4856226 100644
--- a/reportbuilder/templates/local/dynamictabs/audience.mustache
+++ b/reportbuilder/templates/local/dynamictabs/audience.mustache
@@ -21,19 +21,38 @@
 
     Example context (json):
     {
-        "id": 1,
+        "reportid": 1,
+        "contextid": 1,
         "hasinstances": 1,
-        "instances": "instances",
-        "form": "form"
+        "instances": [{
+            "instanceid": 1,
+            "classname": "some\\class\\name",
+            "title": "Title",
+            "showormessage": 1,
+            "canedit": 1,
+            "candelete": 1,
+            "description": "description",
+            "form": "form"
+        }],
+        "sidebarmenucards": [{
+            "menucards": [{
+                "name": "General",
+                "items": [{
+                    "name": "Manually added users",
+                    "identifier": "core_reportbuilder:users"
+                }]
+            }]
+        }]
     }
 }}
+<h2 class="sr-only">{{#str}} audience, core_reportbuilder {{/str}}</h2>
 <div class="audiences-wrapper d-flex flex-column flex-md-row">
     <div id="audiences-menu">
-        <!-- Sidebar -->
+        {{! Sidebar }}
         {{> core_reportbuilder/local/sidebar-menu/area}}
     </div>
     <div id="audiences-container" class="reportbuilder-audiences-container d-flex flex-column flex-fill" data-region="audiences">
-        <!-- No audience container -->
+        {{! No audience container }}
         <div class="justify-content-center {{#hasinstances}}hidden{{/hasinstances}}" data-region="no-instances-message">
             <div class="alert alert-info mb-0">{{#str}} addaudiences, core_reportbuilder {{/str}}</div>
         </div>
diff --git a/reportbuilder/templates/local/dynamictabs/editor.mustache b/reportbuilder/templates/local/dynamictabs/editor.mustache
index e67a735030b93..bad9ed4a8bc58 100644
--- a/reportbuilder/templates/local/dynamictabs/editor.mustache
+++ b/reportbuilder/templates/local/dynamictabs/editor.mustache
@@ -87,6 +87,7 @@
         }
     }
 }}
+<h2 class="sr-only">{{#str}} editor, core_reportbuilder {{/str}}</h2>
 <div class="reportbuilder-report"
      data-region="core_reportbuilder/report"
      data-report-id="{{id}}"
@@ -95,14 +96,14 @@
      {{#editmode}}data-editing{{/editmode}}>
     <div class="reportbuilder-wrapper d-flex flex-column flex-md-row">
         {{#editmode}}
-            <!-- Sidebar -->
+            {{! Menu sidebar }}
             {{> core_reportbuilder/local/sidebar-menu/area}}
         {{/editmode}}
-        <!-- Report -->
+        {{! Report }}
         <div class="reportbuilder-report-container">
             <div class="{{#editmode}}p-2 border{{/editmode}}">
                 <div data-region="core_reportbuilder/report-header" class="dropdown d-flex justify-content-end">
-                    <!-- Preview/Edit button -->
+                    {{! Preview/Edit button }}
                     <button data-action="toggle-edit-preview" data-edit-mode="{{editmode}}" class="btn btn-outline-secondary mr-2"
                             title="{{#editmode}}{{#str}} switchpreview, core_reportbuilder {{/str}}{{/editmode}}{{^editmode}}{{#str}} switchedit, core_reportbuilder {{/str}}{{/editmode}}">
                         {{#editmode}}
@@ -114,7 +115,7 @@
                             {{#str}} edit, core {{/str}}
                         {{/editmode}}
                     </button>
-                    <!-- Settings/Filters button -->
+                    {{! Settings/Filters button }}
                     {{#editmode}}
                         <button id="report-settings-collapse" data-toggle="collapse" data-target="#report-settings" class="btn btn-outline-secondary collapsed"
                                 title="{{#str}} reportsettingstoggle, core_reportbuilder {{/str}}">
@@ -123,20 +124,20 @@
                         </button>
                     {{/editmode}}
                     {{^editmode}}
-                        <!-- Filters -->
+                        {{! Filters }}
                         {{#filterspresent}}
                             {{>core_reportbuilder/local/filters/area}}
                         {{/filterspresent}}
                     {{/editmode}}
                 </div>
                 <div class="mt-2">
-                    <!-- Table -->
+                    {{! Table }}
                     {{{table}}}
                 </div>
             </div>
         </div>
         {{#editmode}}
-            <!-- Settings sidebar -->
+            {{! Settings sidebar }}
             {{> core_reportbuilder/local/settings/area}}
         {{/editmode}}
         </div>
diff --git a/reportbuilder/templates/local/filters/area.mustache b/reportbuilder/templates/local/filters/area.mustache
index b55a129387618..63b18a265d998 100644
--- a/reportbuilder/templates/local/filters/area.mustache
+++ b/reportbuilder/templates/local/filters/area.mustache
@@ -28,7 +28,7 @@
     }
 }}
 
-<!-- Filters button -->
+{{! Filters button }}
 <button class="btn btn-outline-secondary" type="button" id="dropdownFiltersButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{#str}} filters, moodle {{/str}}">
     {{#pix}} i/filter, core {{/pix}}
     <span data-region="filter-button-label">
@@ -36,7 +36,7 @@
         {{^filtersapplied}} {{#str}} filters, moodle {{/str}} {{/filtersapplied}}
     </span>
 </button>
-<!-- Filters content -->
+{{! Filters content }}
 <div class="filters-dropdown dropdown-menu dropdown-menu-right" aria-labelledby="dropdownFiltersButton">
     <div id="filters" class="reportbuilder-filters-sidebar" data-region="report-filters">
         <div class="p-3">
diff --git a/reportbuilder/templates/local/filters/footer.mustache b/reportbuilder/templates/local/filters/footer.mustache
index cf3b3f5e8700f..8d5e8db407737 100644
--- a/reportbuilder/templates/local/filters/footer.mustache
+++ b/reportbuilder/templates/local/filters/footer.mustache
@@ -23,4 +23,4 @@
     {
     }
 }}
-</div>
\ No newline at end of file
+</div>
diff --git a/reportbuilder/templates/local/filters/header.mustache b/reportbuilder/templates/local/filters/header.mustache
index 031e009e09f28..12fb905dd2671 100644
--- a/reportbuilder/templates/local/filters/header.mustache
+++ b/reportbuilder/templates/local/filters/header.mustache
@@ -29,4 +29,4 @@
         <div class="filter-name">
             {{name}}
         </div>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/reportbuilder/templates/local/settings/area.mustache b/reportbuilder/templates/local/settings/area.mustache
index a30c7c7fb2c96..8afb4d7264430 100644
--- a/reportbuilder/templates/local/settings/area.mustache
+++ b/reportbuilder/templates/local/settings/area.mustache
@@ -122,4 +122,3 @@
         </div>
     </div>
 </div>
-
diff --git a/reportbuilder/templates/local/settings/conditions.mustache b/reportbuilder/templates/local/settings/conditions.mustache
index c4b7571c11636..913313ee86618 100644
--- a/reportbuilder/templates/local/settings/conditions.mustache
+++ b/reportbuilder/templates/local/settings/conditions.mustache
@@ -70,4 +70,4 @@
             {{/hasactiveconditions}}
         </div>
     {{/conditions}}
-</div>
\ No newline at end of file
+</div>
diff --git a/reportbuilder/templates/local/settings/empty_message.mustache b/reportbuilder/templates/local/settings/empty_message.mustache
index 392ba9441eda2..4c2ea6bab3947 100644
--- a/reportbuilder/templates/local/settings/empty_message.mustache
+++ b/reportbuilder/templates/local/settings/empty_message.mustache
@@ -28,4 +28,4 @@
     <div class="text-xs-center text-center mt-3" data-region="empty-message">
         <p class="text-muted mt-3">{{$nothingtoshow}}{{nothingtoshow}}{{/nothingtoshow}}</p>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/reportbuilder/templates/local/settings/filters.mustache b/reportbuilder/templates/local/settings/filters.mustache
index 730c8371c0aac..58574f74f7331 100644
--- a/reportbuilder/templates/local/settings/filters.mustache
+++ b/reportbuilder/templates/local/settings/filters.mustache
@@ -77,9 +77,13 @@
                                     {{{headingeditable}}}
                                 </div>
                             </div>
-                            <a data-action="report-remove-filter" class="ml-auto" href="#">
-                                {{#pix}}e/cancel, core, {{#str}}deletefilter, core_reportbuilder, {{{heading}}}{{/str}}{{/pix}}
-                            </a>
+                            <button class="btn btn-link p-0 ml-auto"
+                                    type="button"
+                                    data-action="report-remove-filter"
+                                    title="{{#str}}deletefilter, core_reportbuilder, {{{heading}}}{{/str}}"
+                                    aria-label="{{#str}}deletefilter, core_reportbuilder, {{{heading}}}{{/str}}">
+                                {{#pix}}e/cancel, core{{/pix}}
+                            </button>
                         </li>
                     {{/activefilters}}
                 </ul>
@@ -92,4 +96,4 @@
             {{/hasactivefilters}}
         </div>
     {{/filters}}
-</div>
\ No newline at end of file
+</div>
diff --git a/reportbuilder/templates/local/settings/sorting.mustache b/reportbuilder/templates/local/settings/sorting.mustache
index 1a0feef1ffa54..75c20e7061710 100644
--- a/reportbuilder/templates/local/settings/sorting.mustache
+++ b/reportbuilder/templates/local/settings/sorting.mustache
@@ -54,7 +54,11 @@
                         {{>core/drag_handle}}
                         {{#sorticon}}
                             <span class="float-right">
-                                <button class="btn btn-link p-0" data-action="report-toggle-sort-direction" title="{{{title}}}"
+                                <button id="toggle-sort-direction-{{id}}"
+                                        class="btn btn-link p-0"
+                                        data-action="report-toggle-sort-direction"
+                                        title="{{{title}}}"
+                                        aria-label="{{{title}}}"
                                         {{^sortenabled}}disabled{{/sortenabled}}>
                                     {{#sorticon}}{{#pix}}{{key}}, {{component}}{{/pix}}{{/sorticon}}
                                 </button>
@@ -76,4 +80,4 @@
             {{/ core_reportbuilder/local/settings/empty_message }}
         {{/hassortablecolumns}}
     {{/sorting}}
-</div>
\ No newline at end of file
+</div>
diff --git a/reportbuilder/templates/local/sidebar-menu/card.mustache b/reportbuilder/templates/local/sidebar-menu/card.mustache
index 76764cf3e8ab8..ee34a5fcd8e9e 100644
--- a/reportbuilder/templates/local/sidebar-menu/card.mustache
+++ b/reportbuilder/templates/local/sidebar-menu/card.mustache
@@ -41,4 +41,4 @@
             </div>
         {{/body}}
     {{/ core_reportbuilder/toggle_card }}
-</div>
\ No newline at end of file
+</div>
diff --git a/reportbuilder/templates/table_header_cell.mustache b/reportbuilder/templates/table_header_cell.mustache
index dacdfb4d57a06..c0055beca0f89 100644
--- a/reportbuilder/templates/table_header_cell.mustache
+++ b/reportbuilder/templates/table_header_cell.mustache
@@ -35,12 +35,16 @@
         <div class="d-flex justify-content-between mb-2">
             <small class="text-muted text-nowrap text-uppercase">{{entityname}} &bull; {{name}}</small>
             <span class="text-nowrap">
-                <a data-action="report-remove-column" class="nomargin" href="#">
-                    {{#pix}}e/cancel, core, {{#str}}deletecolumn, core_reportbuilder, {{{name}}}{{/str}}{{/pix}}
-                </a>
+                <button class="btn btn-link p-0"
+                        data-action="report-remove-column"
+                        type="button"
+                        title="{{#str}}deletecolumn, core_reportbuilder, {{{name}}}{{/str}}"
+                        aria-label="{{#str}}deletecolumn, core_reportbuilder, {{{name}}}{{/str}}">
+                    {{#pix}}e/cancel, core{{/pix}}
+                </button>
             </span>
         </div>
-        <h5 class="text-nowrap">{{{headingeditable}}}</h5>
+        <h3 class="h5 text-nowrap">{{{headingeditable}}}</h3>
         <small class="text-muted text-nowrap">{{{aggregationeditable}}}</small>
     </div>
 </div>
diff --git a/reportbuilder/templates/toggle_card.mustache b/reportbuilder/templates/toggle_card.mustache
index ec6a54d1dc7f3..36620127c233d 100644
--- a/reportbuilder/templates/toggle_card.mustache
+++ b/reportbuilder/templates/toggle_card.mustache
@@ -29,16 +29,16 @@
     }
 }}
 <div class="card reportbuilder-toggle-card mb-2">
-    <div class="card-header p-0" id="{{$id}}{{/id}}-heading">
+    <div class="card-header p-0">
         <div class="d-flex align-items-center bg-light mb-0 p-1">
             <div class="ml-3">
                 <span class="mr-1">{{$header}}{{/header}}</span> {{$helpicon}}{{/helpicon}}
             </div>
             <button class="btn toggle-card-button nomargin ml-auto {{$collapsed}}{{/collapsed}}"
                     data-toggle="collapse"
-                    data-target="#{{$id}}{{/id}}"
+                    data-target="#{{$id}}{{uniqid}}{{/id}}"
                     aria-expanded="true"
-                    aria-controls="{{$id}}{{/id}}"
+                    aria-controls="{{$id}}{{uniqid}}{{/id}}"
                     title="{{#str}}showhide, core_reportbuilder, {{$header}}{{/header}}{{/str}}"
             >
                 <span class="collapsed-icon-container"><i class="toggle-card-icon fa fa-lg fa-angle-down"></i></span>
@@ -46,9 +46,9 @@
             </button>
         </div>
     </div>
-    <div id="{{$id}}{{/id}}" class="collapse {{$collapsed}}show{{/collapsed}}" aria-labelledby="{{$id}}{{/id}}-heading">
+    <div id="{{$id}}{{uniqid}}{{/id}}" class="collapse {{$collapsed}}show{{/collapsed}}">
         <div class="card-body p-0">
             {{$body}}{{/body}}
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/reportbuilder/tests/behat/cardview.feature b/reportbuilder/tests/behat/cardview.feature
index d2edf23d24a8b..190cabced1002 100644
--- a/reportbuilder/tests/behat/cardview.feature
+++ b/reportbuilder/tests/behat/cardview.feature
@@ -39,7 +39,7 @@ Feature: Manage card view settings in the report editor
     And the following fields match these values:
       | Columns visible       | 3     |
       | First column title    | Yes   |
-    And I click on "Delete column 'Full name'" "link"
+    And I click on "Delete column 'Full name'" "button"
     And I click on "Delete" "button" in the "Delete column 'Full name'" "dialogue"
     # Check that 'Columns visible' select updates taking into account report maximum columns.
     And the field "visiblecolumns" matches value "2"
diff --git a/reportbuilder/tests/behat/columneditor.feature b/reportbuilder/tests/behat/columneditor.feature
index f95816f62d6bb..1b9576934acd5 100644
--- a/reportbuilder/tests/behat/columneditor.feature
+++ b/reportbuilder/tests/behat/columneditor.feature
@@ -63,7 +63,7 @@ Feature: Manage custom report columns
       | report    | uniqueidentifier |
       | My report | user:fullname    |
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
-    When I click on "Delete column 'Full name'" "link"
+    When I click on "Delete column 'Full name'" "button"
     And I click on "Delete" "button" in the "Delete column 'Full name'" "dialogue"
     Then I should see "Deleted column 'Full name'"
     And I should see "Nothing to display"
diff --git a/reportbuilder/tests/behat/columnsortingeditor.feature b/reportbuilder/tests/behat/columnsortingeditor.feature
index 95cf40fe319ba..41421aa9795b7 100644
--- a/reportbuilder/tests/behat/columnsortingeditor.feature
+++ b/reportbuilder/tests/behat/columnsortingeditor.feature
@@ -67,6 +67,6 @@ Feature: Manage custom report columns sorting
     Given I click on "Show/hide settings sidebar" "button"
     And I change window size to "large"
     And I click on "Show/hide 'Sorting'" "button"
-    When I click on "Delete column 'Username'" "link"
+    When I click on "Delete column 'Username'" "button"
     And I click on "Delete" "button" in the "Delete column 'Username'" "dialogue"
     Then I should not see "Username" in the "#settingssorting" "css_element"
diff --git a/reportbuilder/tests/behat/conditioneditor.feature b/reportbuilder/tests/behat/conditioneditor.feature
index b1517ac16cca8..4c408198ec5a2 100644
--- a/reportbuilder/tests/behat/conditioneditor.feature
+++ b/reportbuilder/tests/behat/conditioneditor.feature
@@ -60,7 +60,7 @@ Feature: Manage custom report conditions
       | Email address operator | Does not contain |
       | Email address value    | user02           |
     And I click on "Apply" "button" in the "[data-region='settings-conditions']" "css_element"
-    And I click on "Delete condition 'Email address'" "link"
+    And I click on "Delete condition 'Email address'" "button"
     And I click on "Delete" "button" in the "Delete condition 'Email address'" "dialogue"
     Then I should see "Deleted condition 'Email address'"
     And I should see "There are no conditions selected" in the "[data-region='settings-conditions']" "css_element"
diff --git a/reportbuilder/tests/behat/filtereditor.feature b/reportbuilder/tests/behat/filtereditor.feature
index ff0f0243d14af..e97a60f5f4469 100644
--- a/reportbuilder/tests/behat/filtereditor.feature
+++ b/reportbuilder/tests/behat/filtereditor.feature
@@ -79,7 +79,7 @@ Feature: Manage custom report filters
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
     When I click on "Show/hide settings sidebar" "button"
     And I click on "Show/hide 'Filters'" "button"
-    And I click on "Delete filter 'Email address'" "link"
+    And I click on "Delete filter 'Email address'" "button"
     And I click on "Delete" "button" in the "Delete filter 'Email address'" "dialogue"
     Then I should see "Deleted filter 'Email address'"
     And I should see "There are no filters selected" in the "[data-region='active-filters']" "css_element"
diff --git a/theme/boost/scss/moodle/reportbuilder.scss b/theme/boost/scss/moodle/reportbuilder.scss
index 4183abcb51e80..757b4f1f952c4 100644
--- a/theme/boost/scss/moodle/reportbuilder.scss
+++ b/theme/boost/scss/moodle/reportbuilder.scss
@@ -92,7 +92,7 @@
 
 /* Custom table headers */
 .reportbuilder-table th {
-    a[data-action="report-remove-column"],
+    button[data-action="report-remove-column"],
     span[data-drag-type="move"] {
         .icon {
             width: 12px;
@@ -102,7 +102,7 @@
             color: $body-color;
         }
     }
-    a[data-action="report-remove-column"] .icon {
+    button[data-action="report-remove-column"] .icon {
         margin-right: 0;
     }
 }
@@ -142,8 +142,8 @@
             font-size: 12px;
             color: $body-color;
         }
-        a[data-action="report-remove-filter"],
-        a[data-action="report-remove-condition"] {
+        button[data-action="report-remove-filter"],
+        button[data-action="report-remove-condition"] {
             .icon {
                 margin-right: 0;
                 vertical-align: text-top;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 8bb73c9b9c166..c8fe4f52eedfd 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -20715,7 +20715,7 @@ div.editor_atto_toolbar button .icon {
   min-width: 0; }
 
 /* Custom table headers */
-.reportbuilder-table th a[data-action="report-remove-column"] .icon,
+.reportbuilder-table th button[data-action="report-remove-column"] .icon,
 .reportbuilder-table th span[data-drag-type="move"] .icon {
   width: 12px;
   height: 12px;
@@ -20723,7 +20723,7 @@ div.editor_atto_toolbar button .icon {
   vertical-align: text-top;
   color: #1d2125; }
 
-.reportbuilder-table th a[data-action="report-remove-column"] .icon {
+.reportbuilder-table th button[data-action="report-remove-column"] .icon {
   margin-right: 0; }
 
 /* Sidebar menu */
@@ -20765,8 +20765,8 @@ div.editor_atto_toolbar button .icon {
     height: 12px;
     font-size: 12px;
     color: #1d2125; }
-  .reportbuilder-sidebar-settings .list-group-item a[data-action="report-remove-filter"] .icon,
-  .reportbuilder-sidebar-settings .list-group-item a[data-action="report-remove-condition"] .icon {
+  .reportbuilder-sidebar-settings .list-group-item button[data-action="report-remove-filter"] .icon,
+  .reportbuilder-sidebar-settings .list-group-item button[data-action="report-remove-condition"] .icon {
     margin-right: 0;
     vertical-align: text-top; }
   .reportbuilder-sidebar-settings .list-group-item span[data-drag-type="move"] .icon {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 0a8a55c0037e1..c7ec56d18d6e7 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -20661,7 +20661,7 @@ div.editor_atto_toolbar button .icon {
   min-width: 0; }
 
 /* Custom table headers */
-.reportbuilder-table th a[data-action="report-remove-column"] .icon,
+.reportbuilder-table th button[data-action="report-remove-column"] .icon,
 .reportbuilder-table th span[data-drag-type="move"] .icon {
   width: 12px;
   height: 12px;
@@ -20669,7 +20669,7 @@ div.editor_atto_toolbar button .icon {
   vertical-align: text-top;
   color: #1d2125; }
 
-.reportbuilder-table th a[data-action="report-remove-column"] .icon {
+.reportbuilder-table th button[data-action="report-remove-column"] .icon {
   margin-right: 0; }
 
 /* Sidebar menu */
@@ -20711,8 +20711,8 @@ div.editor_atto_toolbar button .icon {
     height: 12px;
     font-size: 12px;
     color: #1d2125; }
-  .reportbuilder-sidebar-settings .list-group-item a[data-action="report-remove-filter"] .icon,
-  .reportbuilder-sidebar-settings .list-group-item a[data-action="report-remove-condition"] .icon {
+  .reportbuilder-sidebar-settings .list-group-item button[data-action="report-remove-filter"] .icon,
+  .reportbuilder-sidebar-settings .list-group-item button[data-action="report-remove-condition"] .icon {
     margin-right: 0;
     vertical-align: text-top; }
   .reportbuilder-sidebar-settings .list-group-item span[data-drag-type="move"] .icon {