diff --git a/static/js/message_list.js b/static/js/message_list.js
index 2e6b025ddc..fb33eb0a7d 100644
--- a/static/js/message_list.js
+++ b/static/js/message_list.js
@@ -305,14 +305,14 @@ exports.MessageList.prototype = {
 
     show_edit_topic: function MessageList_show_edit_topic(recipient_row, form) {
         recipient_row.find(".topic_edit_form").empty().append(form);
-        recipient_row.find('.icon-vector-pencil').hide();
+        recipient_row.find('.fa-pencil').hide();
         recipient_row.find(".stream_topic").hide();
         recipient_row.find(".topic_edit").show();
     },
 
     hide_edit_topic: function MessageList_hide_edit_topic(recipient_row) {
         recipient_row.find(".stream_topic").show();
-        recipient_row.find('.icon-vector-pencil').show();
+        recipient_row.find('.fa-pencil').show();
         recipient_row.find(".topic_edit").hide();
     },
 
diff --git a/static/templates/recipient_row.handlebars b/static/templates/recipient_row.handlebars
index f5d6443197..9f21fbeb15 100644
--- a/static/templates/recipient_row.handlebars
+++ b/static/templates/recipient_row.handlebars
@@ -9,7 +9,7 @@
                 title="{{#tr this}}Narrow to stream "__display_recipient__"{{/tr}}">
                 {{! invite only lock }}
                 {{#if invite_only}}
-                <i class="icon-vector-lock invite-stream-icon" title="{{t 'This is a private stream' }}"></i>
+                <i class="fa fa-lock invite-stream-icon" aria-hidden="true" title="{{t 'This is a private stream' }}"></i>
                 {{/if}}
                 {{display_recipient}}
             </a>
@@ -33,16 +33,16 @@
             </span><span class="recipient_bar_controls no-select">
                 {{! edit subject pencil icon }}
                 {{#if always_visible_topic_edit}}
-                    <i class="icon-vector-pencil always_visible_topic_edit" {{#unless realm_allow_message_editing}}style="display: none"{{/unless}}></i>
+                    <i class="fa fa-pencil always_visible_topic_edit" aria-hidden="true" {{#unless realm_allow_message_editing}}style="display: none"{{/unless}}></i>
                 {{else}}
                     {{#if on_hover_topic_edit}}
-                    <i class="icon-vector-pencil on_hover_topic_edit" {{#unless realm_allow_message_editing}}style="display: none"{{/unless}}></i>
+                    <i class="fa fa-pencil on_hover_topic_edit" aria-hidden="true" {{#unless realm_allow_message_editing}}style="display: none"{{/unless}}></i>
                     {{/if}}
                 {{/if}}
                 {{! exterior links (e.g. to a trac ticket) }}
                 {{#each subject_links}}
                 <a href="{{this}}" target="_blank" class="no-underline">
-                    <i class="icon-vector-external-link-sign"></i>
+                    <i class="fa fa-external-link-square" aria-hidden="true"></i>
                 </a>
                 {{/each}}
 
@@ -50,7 +50,7 @@
                     <span class="topic_edit_form" id="{{id}}"></span>
                 </span>
 
-                <i class="icon-vector-eye-close on_hover_topic_mute" data-stream-id="{{stream_id}}" data-topic-name="{{subject}}" title="{{t 'Mute topic' }} (M)"></i>
+                <i class="fa fa-eye-slash on_hover_topic_mute" aria-hidden="true" data-stream-id="{{stream_id}}" data-topic-name="{{subject}}" title="{{t 'Mute topic' }} (M)"></i>
                 <span class="recipient_row_date {{#if show_date}}{{else}}hide-date{{/if}}">{{{date}}}</span>
             </span>
         </div>