diff --git a/ai/classes/table/aiprovider_management_table.php b/ai/classes/table/aiprovider_management_table.php
index 1c4fdcc86b8..7025304c2be 100644
--- a/ai/classes/table/aiprovider_management_table.php
+++ b/ai/classes/table/aiprovider_management_table.php
@@ -373,7 +373,7 @@ class aiprovider_management_table extends flexible_table implements dynamic_tabl
                     'role' => 'button',
                     'aria-label' => get_string('moveitemup', 'core', $row->name),
                     'title' => get_string('moveitemup', 'core', $row->name),
-                    'class' => 'btn btn-link btn-icon',
+                    'class' => 'btn btn-link',
                 ]),
             );
         } else {
@@ -396,7 +396,7 @@ class aiprovider_management_table extends flexible_table implements dynamic_tabl
                     'role' => 'button',
                     'aria-label' => get_string('moveitemdown', 'core', $row->name),
                     'title' => get_string('moveitemdown', 'core', $row->name),
-                    'class' => 'btn btn-link btn-icon',
+                    'class' => 'btn btn-link',
                 ]),
             );
         } else {
diff --git a/blocks/myoverview/templates/course-action-menu.mustache b/blocks/myoverview/templates/course-action-menu.mustache
index 1f704d9dd1a..7a820cd08ce 100644
--- a/blocks/myoverview/templates/course-action-menu.mustache
+++ b/blocks/myoverview/templates/course-action-menu.mustache
@@ -25,7 +25,7 @@
     }
 }}
 <div class="ms-auto dropdown">
-    <button class="btn btn-link btn-icon coursemenubtn"
+    <button class="btn btn-icon coursemenubtn aabtn"
         type="button"
         data-bs-toggle="dropdown"
         aria-haspopup="true"
diff --git a/blocks/myoverview/templates/view-cards.mustache b/blocks/myoverview/templates/view-cards.mustache
index 96d5d75ef89..73910380650 100644
--- a/blocks/myoverview/templates/view-cards.mustache
+++ b/blocks/myoverview/templates/view-cards.mustache
@@ -38,7 +38,7 @@
 
 {{< core_course/coursecards }}
     {{$menu}}
-        <div class="card-footer menu border-0 bg-white ms-auto">
+        <div class="card-footer menu border-0 bg-white ms-auto p-2">
             {{> block_myoverview/course-action-menu }}
         </div>
     {{/menu}}
diff --git a/grade/report/singleview/classes/local/screen/grade.php b/grade/report/singleview/classes/local/screen/grade.php
index 98f67252711..401e2a375da 100644
--- a/grade/report/singleview/classes/local/screen/grade.php
+++ b/grade/report/singleview/classes/local/screen/grade.php
@@ -424,7 +424,7 @@ class grade extends tablelike implements selectable_items, filterable_items {
         $menuitems[] = new \action_menu_link_secondary($url, null, $title);
         $menu = new \action_menu($menuitems);
         $icon = $OUTPUT->pix_icon('i/moremenu', get_string('actions'));
-        $extraclasses = 'btn btn-link btn-icon d-flex';
+        $extraclasses = 'btn btn-icon d-flex';
         $menu->set_menu_trigger($icon, $extraclasses);
         $menu->set_menu_left();
         $menu->set_boundary('window');
diff --git a/grade/report/singleview/classes/local/screen/user.php b/grade/report/singleview/classes/local/screen/user.php
index 74fa2471ce7..a0346808f91 100644
--- a/grade/report/singleview/classes/local/screen/user.php
+++ b/grade/report/singleview/classes/local/screen/user.php
@@ -269,7 +269,7 @@ class user extends tablelike implements selectable_items {
         $menuitems[] = new \action_menu_link_secondary($url, null, $title);
         $menu = new \action_menu($menuitems);
         $icon = $OUTPUT->pix_icon('i/moremenu', get_string('actions'));
-        $extraclasses = 'btn btn-link btn-icon d-flex';
+        $extraclasses = 'btn btn-icon d-flex';
         $menu->set_menu_trigger($icon, $extraclasses);
         $menu->set_menu_left();
         $menu->set_boundary('window');
diff --git a/grade/templates/cellmenu.mustache b/grade/templates/cellmenu.mustache
index 966db10f4d6..734406f7e58 100644
--- a/grade/templates/cellmenu.mustache
+++ b/grade/templates/cellmenu.mustache
@@ -40,7 +40,7 @@
 }}
 <div class="action-menu moodle-actionmenu grader" data-collapse="menu">
     <div class="dropdown">
-        <button class="btn btn-link btn-icon cellmenubtn"
+        <button class="btn btn-icon cellmenubtn"
             type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
                 {{#databoundary}}data-boundary="{{databoundary}}"{{/databoundary}}
                 {{#datatype}}data-type="{{datatype}}"{{/datatype}}
diff --git a/lib/templates/emoji/auto_complete.mustache b/lib/templates/emoji/auto_complete.mustache
index 199abf5576d..89d02506e28 100644
--- a/lib/templates/emoji/auto_complete.mustache
+++ b/lib/templates/emoji/auto_complete.mustache
@@ -40,7 +40,7 @@
     {{#emojis}}
         <button
             type="button"
-            class="btn btn-link btn-icon p-0 rounded-3 emoji-button {{#active}}active{{/active}}"
+            class="btn btn-icon p-0 rounded-3 emoji-button {{#active}}active{{/active}}"
             title="{{displayshortname}}"
             data-region="emoji-button"
             data-unified="{{unified}}"
diff --git a/lib/templates/emoji/emoji_row.mustache b/lib/templates/emoji/emoji_row.mustache
index b2b34e76df0..c80e7aa3578 100644
--- a/lib/templates/emoji/emoji_row.mustache
+++ b/lib/templates/emoji/emoji_row.mustache
@@ -41,7 +41,7 @@
         <button
             data-short-names="{{shortnames}}"
             data-unified="{{unified}}"
-            class="btn btn-link btn-icon p-0 rounded-3 emoji-button"
+            class="btn btn-icon p-0 rounded-3 emoji-button"
             title="{{shortnames}}"
         >{{text}}</button>
     {{/emojis}}
diff --git a/message/templates/message_drawer_view_conversation_footer_content.mustache b/message/templates/message_drawer_view_conversation_footer_content.mustache
index cf40bb5ed4e..d2f2d714383 100644
--- a/message/templates/message_drawer_view_conversation_footer_content.mustache
+++ b/message/templates/message_drawer_view_conversation_footer_content.mustache
@@ -69,7 +69,7 @@
                 {{> core/emoji/picker }}
             </div>
             <button
-                class="btn btn-link btn-icon ms-1"
+                class="btn btn-icon ms-1"
                 aria-label="{{#str}} toggleemojipicker, core {{/str}}"
                 data-action="toggle-emoji-picker"
             >
@@ -77,7 +77,7 @@
             </button>
         {{/showemojipicker}}
         <button
-            class="btn btn-link btn-icon ms-1 mt-auto"
+            class="btn btn-icon ms-1 mt-auto"
             aria-label="{{#str}} sendmessage, core_message {{/str}}"
             data-action="send-message"
         >
diff --git a/message/templates/message_drawer_view_conversation_footer_edit_mode.mustache b/message/templates/message_drawer_view_conversation_footer_edit_mode.mustache
index 9a0a4257fe7..4596ff630dc 100644
--- a/message/templates/message_drawer_view_conversation_footer_edit_mode.mustache
+++ b/message/templates/message_drawer_view_conversation_footer_edit_mode.mustache
@@ -37,7 +37,7 @@
 
 <div class="d-flex p-3 justify-content-end">
     <button
-        class="btn btn-link btn-icon my-1 icon-size-4"
+        class="btn btn-icon my-1 icon-size-4"
         data-action="delete-selected-messages"
         data-bs-toggle="tooltip"
         data-bs-placement="top"
diff --git a/message/templates/message_drawer_view_conversation_header_content_type_private.mustache b/message/templates/message_drawer_view_conversation_header_content_type_private.mustache
index a9a70a580e6..4d53b067c64 100644
--- a/message/templates/message_drawer_view_conversation_header_content_type_private.mustache
+++ b/message/templates/message_drawer_view_conversation_header_content_type_private.mustache
@@ -82,7 +82,7 @@
         </a>
     </div>
     <div class="ms-auto dropdown">
-        <button id="conversation-actions-menu-button" class="btn btn-link btn-icon" type="button"
+        <button id="conversation-actions-menu-button" class="btn btn-icon" type="button"
         data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
         aria-label="{{#str}} conversationactions, core_message {{/str}}" aria-controls="conversation-actions-menu">
             {{#pix}} i/moremenu, core {{/pix}}
diff --git a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
index f5f63a021f1..9d350d8a9c5 100644
--- a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
+++ b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
@@ -76,7 +76,7 @@
             </a>
         </div>
         <div class="ms-auto dropdown">
-            <button id="conversation-actions-menu-button" class="btn btn-link btn-icon" type="button"
+            <button id="conversation-actions-menu-button" class="btn btn-icon" type="button"
             data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
             aria-label="{{#str}} conversationactions, core_message {{/str}}" aria-controls="conversation-actions-menu">
                 {{#pix}} i/moremenu, core {{/pix}}
diff --git a/message/templates/message_drawer_view_conversation_header_content_type_self.mustache b/message/templates/message_drawer_view_conversation_header_content_type_self.mustache
index 3dbf21445e7..a0db81b35f2 100644
--- a/message/templates/message_drawer_view_conversation_header_content_type_self.mustache
+++ b/message/templates/message_drawer_view_conversation_header_content_type_self.mustache
@@ -73,7 +73,7 @@
         </div>
     </div>
     <div class="ms-auto dropdown">
-        <button class="btn btn-link btn-icon" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <button class="btn btn-icon" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             {{#pix}} i/moremenu, core {{/pix}}
         </button>
         <div class="dropdown-menu pull-right">
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 1c03a712db7..bafb6d2455a 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -2553,7 +2553,7 @@ $picker-emojis-per-row: 7 !default;
 .emoji-auto-complete {
     height: $picker-row-height;
 
-    .btn.btn-link.btn-icon.emoji-button {
+    .btn.btn-icon.emoji-button {
         height: $picker-emoji-button-size;
         width: $picker-emoji-button-size;
         line-height: $picker-emoji-button-size;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index bab38daf284..56edcfc36b4 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -28074,13 +28074,13 @@ input[disabled] {
 .emoji-auto-complete {
   height: 40px;
 }
-.emoji-auto-complete .btn.btn-link.btn-icon.emoji-button {
+.emoji-auto-complete .btn.btn-icon.emoji-button {
   height: 40px;
   width: 40px;
   line-height: 40px;
   font-size: 24px;
 }
-.emoji-auto-complete .btn.btn-link.btn-icon.emoji-button.active {
+.emoji-auto-complete .btn.btn-icon.emoji-button.active {
   background-color: #e9ecef;
 }
 
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index c8c725705a2..905e61d8bed 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -28074,13 +28074,13 @@ input[disabled] {
 .emoji-auto-complete {
   height: 40px;
 }
-.emoji-auto-complete .btn.btn-link.btn-icon.emoji-button {
+.emoji-auto-complete .btn.btn-icon.emoji-button {
   height: 40px;
   width: 40px;
   line-height: 40px;
   font-size: 24px;
 }
-.emoji-auto-complete .btn.btn-link.btn-icon.emoji-button.active {
+.emoji-auto-complete .btn.btn-icon.emoji-button.active {
   background-color: #e9ecef;
 }