diff --git a/web/templates/components/action_button.hbs b/web/templates/components/action_button.hbs
index b9b6438d0c..763901bfdc 100644
--- a/web/templates/components/action_button.hbs
+++ b/web/templates/components/action_button.hbs
@@ -1,6 +1,6 @@
-<button type="button" class="{{#if custom_classes}}{{custom_classes}} {{/if}}action-button action-button-{{type}}-{{intent}}" {{#if data-tooltip-template-id}}data-tooltip-template-id="{{data-tooltip-template-id}}"{{/if}} tabindex="0">
+<button type="button" class="{{#if custom_classes}}{{custom_classes}} {{/if}}action-button action-button-{{type}}-{{intent}}" {{#if data-tooltip-template-id}}data-tooltip-template-id="{{data-tooltip-template-id}}"{{/if}} tabindex="0" {{#if aria-label}}aria-label="{{aria-label}}"{{/if}}>
     {{#if icon}}
-    <i class="zulip-icon zulip-icon-{{icon}}"></i>
+    <i class="zulip-icon zulip-icon-{{icon}}" aria-hidden="true"></i>
     {{/if}}
     {{#if label}}
     <span class="action-button-label">{{label}}</span>
diff --git a/web/templates/components/icon_button.hbs b/web/templates/components/icon_button.hbs
index 6c178c849b..6d8518c97a 100644
--- a/web/templates/components/icon_button.hbs
+++ b/web/templates/components/icon_button.hbs
@@ -1,3 +1,3 @@
-<button type="button" class="{{#if custom_classes}}{{custom_classes}} {{/if}}icon-button {{#if squared}}icon-button-square {{/if}}icon-button-{{intent}}" {{#if data-tooltip-template-id}}data-tooltip-template-id="{{data-tooltip-template-id}}"{{/if}} tabindex="0">
-    <i class="zulip-icon zulip-icon-{{icon}}"></i>
+<button type="button" class="{{#if custom_classes}}{{custom_classes}} {{/if}}icon-button {{#if squared}}icon-button-square {{/if}}icon-button-{{intent}}" {{#if data-tooltip-template-id}}data-tooltip-template-id="{{data-tooltip-template-id}}"{{/if}} tabindex="0" {{#if aria-label}}aria-label="{{aria-label}}"{{/if}}>
+    <i class="zulip-icon zulip-icon-{{icon}}" aria-hidden="true"></i>
 </button>