diff --git a/static/js/ui_init.js b/static/js/ui_init.js
index d5f56b6b1c..e625d3d6b0 100644
--- a/static/js/ui_init.js
+++ b/static/js/ui_init.js
@@ -42,7 +42,7 @@ function message_hover(message_row) {
     // But the message edit hover icon is determined by whether the message is still editable
     if ((message_edit.get_editability(message) === message_edit.editability_types.FULL) &&
         !message.status_message) {
-        message_row.find(".edit_content").html('<i class="icon-vector-pencil edit_content_button"></i>');
+        message_row.find(".edit_content").html('<i class="fa fa-pencil edit_content_button" aria-hidden="true" title="Edit"></i>');
     } else {
         message_row.find(".edit_content").html('<i class="icon-vector-file-text-alt edit_content_button" data-msgid="' + id + '"></i>');
     }