diff --git a/message/templates/message_drawer_contacts_list.mustache b/message/templates/message_drawer_contacts_list.mustache
index bb395da922f..8d24769fe38 100644
--- a/message/templates/message_drawer_contacts_list.mustache
+++ b/message/templates/message_drawer_contacts_list.mustache
@@ -49,6 +49,7 @@
         {{/conversationid}}
         data-contact-user-id="{{id}}"
         data-region="contact"
+        role="button"
     >
         <img
             class="rounded-circle"
diff --git a/message/templates/message_drawer_conversations_list.mustache b/message/templates/message_drawer_conversations_list.mustache
index df496af7b8c..d6d753e47e2 100644
--- a/message/templates/message_drawer_conversations_list.mustache
+++ b/message/templates/message_drawer_conversations_list.mustache
@@ -42,6 +42,7 @@
         {{#userid}}
             data-user-id="{{.}}"
         {{/userid}}
+        role="button"
     >
         {{#imageurl}}
             <img
diff --git a/message/templates/message_drawer_messages_list.mustache b/message/templates/message_drawer_messages_list.mustache
index fb96cf6a3ac..97332f74a4c 100644
--- a/message/templates/message_drawer_messages_list.mustache
+++ b/message/templates/message_drawer_messages_list.mustache
@@ -48,6 +48,7 @@
             data-route-param-3="{{userid}}"
         {{/conversationid}}
         data-conversation-id="{{conversationid}}"
+        role="button"
     >
         <img
             class="rounded-circle"
diff --git a/message/templates/message_drawer_non_contacts_list.mustache b/message/templates/message_drawer_non_contacts_list.mustache
index 9da07787437..ae5c9a94016 100644
--- a/message/templates/message_drawer_non_contacts_list.mustache
+++ b/message/templates/message_drawer_non_contacts_list.mustache
@@ -47,6 +47,7 @@
             data-route-param-2="create"
             data-route-param-3="{{id}}"
         {{/conversationid}}
+        role="button"
     >
         <img
             class="rounded-circle"
diff --git a/message/templates/message_drawer_view_contact_body_content.mustache b/message/templates/message_drawer_view_contact_body_content.mustache
index 472e4380131..ea355c24da3 100644
--- a/message/templates/message_drawer_view_contact_body_content.mustache
+++ b/message/templates/message_drawer_view_contact_body_content.mustache
@@ -35,7 +35,7 @@
 
 }}
 
-<a class="align-self-center" href="#" data-route-back>
+<a class="align-self-center" href="#" data-route-back role="button">
     {{> core_message/message_drawer_icon_back }}
 </a>
 <div class="px-3 pb-3">
diff --git a/message/templates/message_drawer_view_contacts_body_section_requests_list.mustache b/message/templates/message_drawer_view_contacts_body_section_requests_list.mustache
index 17a9eeaee66..4ca2482cb3b 100644
--- a/message/templates/message_drawer_view_contacts_body_section_requests_list.mustache
+++ b/message/templates/message_drawer_view_contacts_body_section_requests_list.mustache
@@ -49,6 +49,7 @@
         {{/conversationid}}
         data-request-id="{{id}}"
         data-region="contact-request"
+        role="button"
     >
         <img
             class="rounded-circle"
diff --git a/message/templates/message_drawer_view_contacts_header.mustache b/message/templates/message_drawer_view_contacts_header.mustache
index b4634e462e3..6c816bf0416 100644
--- a/message/templates/message_drawer_view_contacts_header.mustache
+++ b/message/templates/message_drawer_view_contacts_header.mustache
@@ -37,7 +37,7 @@
 <div class="hidden border-bottom px-2 py-3" aria-hidden="true" data-region="view-contacts">
     <div class="d-flex align-items-center">
         <div class="align-self-stretch">
-            <a class="h-100 d-flex align-items-center mr-2" href="#" data-route-back>
+            <a class="h-100 d-flex align-items-center mr-2" href="#" data-route-back role="button">
                 {{> core_message/message_drawer_icon_back }}
             </a>
         </div>
@@ -45,7 +45,7 @@
             {{#str}} contacts, core_message {{/str}}
         </div>
         <div class="ml-auto">
-            <a href="#" data-route="view-search">
+            <a href="#" data-route="view-search" role="button" aria-label="{{#str}} search, core_search {{/str}}">
                 {{#pix}} a/search, core {{/pix}}
             </a>
         </div>
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 3d748b6150a..a1105388806 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
@@ -37,12 +37,12 @@
 
 <div class="d-flex align-items-center">
     <div class="align-self-stretch" >
-        <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
+        <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
             {{> core_message/message_drawer_icon_back }}
         </a>
     </div>
     <div class="d-flex text-truncate">
-        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-contact">
+        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-contact" role="button">
             {{#imageurl}}
                 <div class="d-flex align-items-center">
                     <img
@@ -57,7 +57,8 @@
             <div class="w-100 text-truncate ml-2">
                 <div class="d-flex">
                     <strong class="m-0 text-truncate">{{name}}</strong>
-                    <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
+                    <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container"
+                    aria-label="{{#str}} favourites, core {{/str}}">
                         {{#pix}} i/star-rating, core {{/pix}}
                     </span>
                     <span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
diff --git a/message/templates/message_drawer_view_conversation_header_content_type_private_no_controls.mustache b/message/templates/message_drawer_view_conversation_header_content_type_private_no_controls.mustache
index 4422fcd8ee3..d35d6866ebc 100644
--- a/message/templates/message_drawer_view_conversation_header_content_type_private_no_controls.mustache
+++ b/message/templates/message_drawer_view_conversation_header_content_type_private_no_controls.mustache
@@ -37,7 +37,7 @@
 
 <div class="d-flex align-items-center">
     <div class="align-self-stretch" >
-        <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
+        <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
             {{> core_message/message_drawer_icon_back }}
         </a>
     </div>
@@ -56,7 +56,8 @@
         <div class="w-100 text-truncate ml-2">
             <div class="d-flex">
                 <strong class="m-0 text-truncate">{{name}}</strong>
-                <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
+                <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container"
+                aria-label="{{#str}} favourites, core {{/str}}">
                     {{#pix}} i/star-rating, core {{/pix}}
                 </span>
                 <span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
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 152a30ded8b..bfc23eb7572 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
@@ -38,12 +38,12 @@
 <div class="d-flex flex-column">
     <div class="d-flex align-items-center">
         <div class="align-self-stretch" >
-            <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
+            <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
                 {{> core_message/message_drawer_icon_back }}
             </a>
         </div>
         <div class="d-flex text-truncate">
-            <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info">
+            <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info" role="button">
                 {{#imageurl}}
                     <img
                         class="rounded-circle"
@@ -56,7 +56,8 @@
                 <div class="w-100 text-truncate ml-2">
                     <div class="d-flex">
                         <strong class="m-0 text-truncate">{{name}}</strong>
-                        <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
+                        <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary"
+                        data-region="favourite-icon-container" aria-label="{{#str}} favourites, core {{/str}}">
                             {{#pix}} i/star-rating, core {{/pix}}
                         </span>
                         <span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
@@ -95,7 +96,7 @@
         <div class="mr-2 icon" aria-hidden="true"></div>
         {{#imageurl}}<div style="width: 38px" aria-hidden="true"></div>{{/imageurl}}
         <!-- End placeholders -->
-        <a class="text-decoration-none line-height-3 ml-2" href="#" data-action="view-group-info">
+        <a class="text-decoration-none line-height-3 ml-2" href="#" data-action="view-group-info" role="button">
             <small class="m-0 text-muted text-truncate">
                 {{#str}} numparticipants, core_message, {{totalmembercount}} {{/str}}
             </small>
diff --git a/message/templates/message_drawer_view_conversation_header_placeholder.mustache b/message/templates/message_drawer_view_conversation_header_placeholder.mustache
index 1327ec1979a..1cbdbda5637 100644
--- a/message/templates/message_drawer_view_conversation_header_placeholder.mustache
+++ b/message/templates/message_drawer_view_conversation_header_placeholder.mustache
@@ -36,7 +36,7 @@
 }}
 <div class="d-flex">
     <div class="align-self-stretch" >
-        <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
+        <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
             {{> core_message/message_drawer_icon_back }}
         </a>
     </div>
diff --git a/message/templates/message_drawer_view_group_info_body_content.mustache b/message/templates/message_drawer_view_group_info_body_content.mustache
index 1e484abd82d..e7ce40553fe 100644
--- a/message/templates/message_drawer_view_group_info_body_content.mustache
+++ b/message/templates/message_drawer_view_group_info_body_content.mustache
@@ -35,7 +35,7 @@
 
 }}
 
-<a class="px-2 align-self-start" href="#" data-route-back>
+<a class="px-2 align-self-start" href="#" data-route-back role="button">
     {{> core_message/message_drawer_icon_back }}
 </a>
 <div class="px-2">
diff --git a/message/templates/message_drawer_view_group_info_participants_list.mustache b/message/templates/message_drawer_view_group_info_participants_list.mustache
index fc7d83966e3..c5630c4c750 100644
--- a/message/templates/message_drawer_view_group_info_participants_list.mustache
+++ b/message/templates/message_drawer_view_group_info_participants_list.mustache
@@ -49,6 +49,7 @@
         {{/conversationid}}
         data-contact-user-id="{{id}}"
         data-region="contact"
+        role="button"
     >
         <img
             class="rounded-circle"
diff --git a/message/templates/message_drawer_view_overview_header.mustache b/message/templates/message_drawer_view_overview_header.mustache
index 7779456a806..460fcd3308d 100644
--- a/message/templates/message_drawer_view_overview_header.mustache
+++ b/message/templates/message_drawer_view_overview_header.mustache
@@ -54,13 +54,15 @@
                 href="#"
                 data-route="view-settings"
                 data-route-param="{{loggedinuser.id}}"
+                aria-label="{{#str}} settings, core_message {{/str}}"
+                role="button"
             >
                 {{#pix}} t/edit, core {{/pix}}
             </a>
         </div>
     </div>
     <div class="text-right mt-3">
-        <a href="#" data-route="view-contacts">
+        <a href="#" data-route="view-contacts" role="button">
             {{#pix}} i/user, core {{/pix}}
             {{#str}} contacts, core_message {{/str}}
             <span class="badge bg-primary ml-2 {{^contactrequestcount}}hidden{{/contactrequestcount}}" data-region="contact-request-count">
diff --git a/message/templates/message_drawer_view_search_header.mustache b/message/templates/message_drawer_view_search_header.mustache
index 8ced5316cd6..627bc24727c 100644
--- a/message/templates/message_drawer_view_search_header.mustache
+++ b/message/templates/message_drawer_view_search_header.mustache
@@ -41,6 +41,7 @@
             href="#"
             data-route-back
             data-action="cancel-search"
+            role="button"
         >
             {{> core_message/message_drawer_icon_back }}
         </a>
@@ -57,6 +58,7 @@
                     class="btn btn-outline-secondary"
                     type="button"
                     data-action="search"
+                    aria-label="{{#str}} search, core_search {{/str}}"
                 >
                     <span data-region="search-icon-container">
                         {{#pix}} a/search, core {{/pix}}
diff --git a/message/templates/message_drawer_view_settings_header.mustache b/message/templates/message_drawer_view_settings_header.mustache
index 3411da49aff..9ac89fba923 100644
--- a/message/templates/message_drawer_view_settings_header.mustache
+++ b/message/templates/message_drawer_view_settings_header.mustache
@@ -37,7 +37,7 @@
 <div class="hidden border-bottom px-2 py-3" aria-hidden="true" data-region="view-settings">
     <div class="d-flex align-items-center">
         <div class="align-self-stretch" >
-            <a class="h-100 d-flex mr-2 align-items-center" href="#" data-route-back>
+            <a class="h-100 d-flex mr-2 align-items-center" href="#" data-route-back role="button">
                 {{> core_message/message_drawer_icon_back }}
             </a>
         </div>
diff --git a/message/templates/message_popover.mustache b/message/templates/message_popover.mustache
index 74784b326d7..7e1c75a5df1 100644
--- a/message/templates/message_popover.mustache
+++ b/message/templates/message_popover.mustache
@@ -36,7 +36,8 @@
 
 }}
 <div class="pull-right popover-region collapsed">
-    <a id="message-drawer-toggle-{{uniqid}}" class="nav-link d-inline-block popover-region-toggle position-relative" href="#">
+    <a id="message-drawer-toggle-{{uniqid}}" class="nav-link d-inline-block popover-region-toggle position-relative" href="#"
+            role="button">
         {{#pix}} t/message, core, {{#str}} togglemessagemenu, message {{/str}} {{/pix}}
         <div class="count-container {{^unreadcount}}hidden{{/unreadcount}}" data-region="count-container">{{unreadcount}}</div>
     </a>
diff --git a/message/templates/notification_preferences_processor.mustache b/message/templates/notification_preferences_processor.mustache
index b030b51efa6..d14a1572321 100644
--- a/message/templates/notification_preferences_processor.mustache
+++ b/message/templates/notification_preferences_processor.mustache
@@ -47,7 +47,8 @@
             data-processor-setting
             data-user-id="{{userid}}"
             data-context-id="{{contextid}}"
-            data-name="{{name}}">
+            data-name="{{name}}"
+            role="button">
 
             {{< core/hover_tooltip }}
                 {{$anchor}}
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer.mustache b/theme/bootstrapbase/templates/core_message/message_drawer.mustache
index bfcc6546178..7f3bc19a092 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer.mustache
@@ -46,7 +46,7 @@
     role="region"
 >
     <div class="drawer-top p-2 border-bottom bg-secondary text-right">
-        <a id="message-drawer-close-{{uniqid}}" class="" href="#">
+        <a id="message-drawer-close-{{uniqid}}" class="" href="#" role="button">
             {{#pix}} i/window_close, core, {{#str}} togglemessagemenu, message {{/str}} {{/pix}}
         </a>
     </div>
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
index 9ede2426dcf..d69d8188900 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
@@ -42,12 +42,12 @@
 
 <div class="d-flex align-items-center">
     <div class="align-self-stretch" >
-        <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
+        <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
             {{> core_message/message_drawer_icon_back }}
         </a>
     </div>
     <div class="d-flex text-truncate">
-        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-contact">
+        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-contact" role="button">
             {{#imageurl}}
                 <div class="d-flex align-items-center">
                     <img
@@ -62,7 +62,8 @@
             <div class="w-100 text-truncate ml-2">
                 <div class="d-flex">
                     <strong class="m-0 text-truncate">{{name}}</strong>
-                    <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
+                    <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container"
+                    aria-label="{{#str}} favourites, core {{/str}}">
                         {{#pix}} i/star, core {{/pix}}
                     </span>
                     <span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
@@ -84,12 +85,12 @@
         </button>
         <ul class="dropdown-menu pull-right">
             <li data-action="view-contact">
-                <a class="dropdown-item" href="#" >
+                <a class="dropdown-item" href="#">
                     {{#str}} info, core_message {{/str}}
                 </a>
             </li>
             <li class="{{#isfavourite}}hidden{{/isfavourite}} {{^showfavourite}}hidden{{/showfavourite}}" data-action="confirm-favourite">
-                <a class="dropdown-item" href="#" >
+                <a class="dropdown-item" href="#">
                     {{#str}} addtofavourites, core_message {{/str}}
                 </a>
             </li>
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private_no_controls.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private_no_controls.mustache
index 2e7ece4c50e..1445deb6c11 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private_no_controls.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private_no_controls.mustache
@@ -42,7 +42,7 @@
 
 <div class="d-flex align-items-center">
     <div class="align-self-stretch" >
-        <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
+        <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
             {{> core_message/message_drawer_icon_back }}
         </a>
     </div>
@@ -61,7 +61,8 @@
         <div class="w-100 text-truncate ml-2">
             <div class="d-flex">
                 <strong class="m-0 text-truncate">{{name}}</strong>
-                <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
+                <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container"
+                aria-label="{{#str}} favourites, core {{/str}}">
                     {{#pix}} i/star, core {{/pix}}
                 </span>
                 <span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
index b6613d40f76..794cfe160f9 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
@@ -42,12 +42,12 @@
 <div class="d-flex flex-column">
     <div class="d-flex align-items-center">
         <div class="align-self-stretch" >
-            <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
+            <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
                 {{> core_message/message_drawer_icon_back }}
             </a>
         </div>
         <div class="d-flex text-truncate">
-            <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info">
+            <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info" role="button">
                 {{#imageurl}}
                     <img
                         class="rounded-circle"
@@ -60,7 +60,8 @@
                 <div class="w-100 text-truncate ml-2">
                     <div class="d-flex">
                         <strong class="m-0 text-truncate">{{name}}</strong>
-                        <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
+                        <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary"
+                        data-region="favourite-icon-container" aria-label="{{#str}} favourites, core {{/str}}">
                             {{#pix}} i/star, core {{/pix}}
                         </span>
                         <span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
@@ -109,7 +110,7 @@
         <div class="mr-2" style="opacity: 0; visibility: hidden" aria-hidden="true">{{> core_message/message_drawer_icon_back }}</div>
         {{#imageurl}}<div aria-hidden="true" style="width: 38px"></div>{{/imageurl}}
         <!-- End placeholders -->
-        <a class="text-decoration-none line-height-3 ml-2" href="#" data-action="view-group-info">
+        <a class="text-decoration-none line-height-3 ml-2" href="#" data-action="view-group-info" role="button">
             <small class="m-0 muted text-truncate">
                 {{#str}} numparticipants, core_message, {{totalmembercount}} {{/str}}
             </small>
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_group_info_body_content.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_group_info_body_content.mustache
index 02f29b1027e..b206b5f6dfb 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_group_info_body_content.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_group_info_body_content.mustache
@@ -35,7 +35,7 @@
 
 }}
 
-<a class="px-2 align-self-start" href="#" data-route-back>
+<a class="px-2 align-self-start" href="#" data-route-back role="button">
     {{> core_message/message_drawer_icon_back }}
 </a>
 <div class="px-2">
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_overview_header.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_overview_header.mustache
index d9d47380beb..34494307dcd 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_overview_header.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_overview_header.mustache
@@ -57,13 +57,15 @@
                 href="#"
                 data-route="view-settings"
                 data-route-param="{{loggedinuser.id}}"
+                aria-label="{{#str}} settings, core_message {{/str}}"
+                role="button"
             >
                 {{#pix}} t/edit, core {{/pix}}
             </a>
         </div>
     </div>
     <div class="text-right mt-3">
-        <a href="#" data-route="view-contacts">
+        <a href="#" data-route="view-contacts" role="button">
             {{#pix}} i/user, core {{/pix}}
             {{#str}} contacts, core_message {{/str}}
             <span class="badge bg-primary ml-2 {{^contactrequestcount}}hidden{{/contactrequestcount}}" data-region="contact-request-count">
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_search_header.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_search_header.mustache
index f6230ec8473..a8a62c9bca0 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_search_header.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_search_header.mustache
@@ -46,6 +46,7 @@
             href="#"
             data-route-back
             data-action="cancel-search"
+            role="button"
         >
             {{> core_message/message_drawer_icon_back }}
         </a>
@@ -61,6 +62,7 @@
                 class="btn m-0"
                 type="button"
                 data-action="search"
+                aria-label="{{#str}} search, core_search {{/str}}"
             >
                 <span data-region="search-icon-container">
                     {{#pix}} a/search, core {{/pix}}