diff --git a/web/templates/edit_content_button.hbs b/web/templates/edit_content_button.hbs
index 2f5ffd9800..8cf02bc080 100644
--- a/web/templates/edit_content_button.hbs
+++ b/web/templates/edit_content_button.hbs
@@ -1,5 +1,5 @@
 {{#if is_content_editable}}
-<i class="zulip-icon zulip-icon-edit edit_content_button edit_message_button" role="button" tabindex="0" aria-label="{{t 'Edit message' }} (e)"></i>
+<i class="message-controls-icon zulip-icon zulip-icon-edit edit_content_button edit_message_button" role="button" tabindex="0" aria-label="{{t 'Edit message' }} (e)"></i>
 {{else if can_move_message}}
-<i class="zulip-icon zulip-icon-move-alt move_message_button edit_message_button" role="button" tabindex="0" aria-label="{{t 'Move message' }} (m)"></i>
+<i class="message-controls-icon zulip-icon zulip-icon-move-alt move_message_button edit_message_button" role="button" tabindex="0" aria-label="{{t 'Move message' }} (m)"></i>
 {{/if}}