diff --git a/message/templates/message_drawer_view_contacts_header.mustache b/message/templates/message_drawer_view_contacts_header.mustache
index 6faf4b4bebc..6c816bf0416 100644
--- a/message/templates/message_drawer_view_contacts_header.mustache
+++ b/message/templates/message_drawer_view_contacts_header.mustache
@@ -45,7 +45,7 @@
             {{#str}} contacts, core_message {{/str}}
         </div>
         <div class="ml-auto">
-            <a href="#" data-route="view-search" role="button">
+            <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 667ad5e995f..2988f3c7f12 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
@@ -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>
                 </div>
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 0cdd6be05d4..7490d621cbf 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
@@ -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>
             </div>
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 849734bd584..e63098eae40 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
@@ -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>
                     </div>
diff --git a/message/templates/message_drawer_view_overview_header.mustache b/message/templates/message_drawer_view_overview_header.mustache
index 3a0fcfd674f..460fcd3308d 100644
--- a/message/templates/message_drawer_view_overview_header.mustache
+++ b/message/templates/message_drawer_view_overview_header.mustache
@@ -54,6 +54,7 @@
                 href="#"
                 data-route="view-settings"
                 data-route-param="{{loggedinuser.id}}"
+                aria-label="{{#str}} settings, core_message {{/str}}"
                 role="button"
             >
                 {{#pix}} t/edit, core {{/pix}}
diff --git a/message/templates/message_drawer_view_search_header.mustache b/message/templates/message_drawer_view_search_header.mustache
index 86394076c2a..627bc24727c 100644
--- a/message/templates/message_drawer_view_search_header.mustache
+++ b/message/templates/message_drawer_view_search_header.mustache
@@ -58,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}}