diff --git a/templates/zerver/app/right_sidebar.html b/templates/zerver/app/right_sidebar.html
index 4da9bca11c..44c9aaf36d 100644
--- a/templates/zerver/app/right_sidebar.html
+++ b/templates/zerver/app/right_sidebar.html
@@ -3,24 +3,24 @@
         {% if enable_feedback %}
         <div id="feedback_section" class="new-style">
             <button type="button" class="button small rounded" id="feedback_button">
-                <i class="icon-vector-comment"></i>&nbsp;&nbsp;{{ _('Send feedback') }}
+                <i class="fa fa-comment" aria-hidden="true"></i>&nbsp;&nbsp;{{ _('Send feedback') }}
             </button>
         </div>
         {% endif %}
         <div id="user-list">
             <div id="userlist-header">
                 <h4 class='sidebar-title' id='userlist-title' data-toggle="tooltip" title="{{ _('Filter users') }}">{{ _('USERS') }}</h4>
-                <i id="user_filter_icon" class='fa fa-search' aria-label="{{ _('Filter users') }}" data-toggle="tooltip" title="{{ _('Filter users') }} (w)"></i>
+                <i id="user_filter_icon" class='fa fa-search' aria-hidden="true" aria-label="{{ _('Filter users') }}" data-toggle="tooltip" title="{{ _('Filter users') }} (w)"></i>
             </div>
             <div class="input-append notdisplayed">
                 <input class="user-list-filter" type="text" autocomplete="off" placeholder="{{ _('Search people') }}" />
                 <button type="button" class="btn clear_search_button" id="clear_search_people_button">
-                    <i class="icon-vector-remove"></i>
+                    <i class="fa fa-remove" aria-hidden="true"></i>
                 </button>
             </div>
             <ul id="user_presences" class="filters scrolling_list"></ul>
             {% if show_invites %}
-            <a id="invite-user-link" href="#invite"><i class="icon-vector-plus-sign"></i>{{ _('Invite more users') }}</a>
+            <a id="invite-user-link" href="#invite"><i class="fa fa-plus-circle" aria-hidden="true"></i>{{ _('Invite more users') }}</a>
             {% endif %}
         </div>
         <div id="group-pm-list">
@@ -31,7 +31,7 @@
             </ul>
         </div>
         <div id="sidebar-keyboard-shortcuts">
-            <i id="keyboard-icon" class="fa fa-keyboard-o fa-2x" data-html="true" data-overlay-trigger="keyboard-shortcuts" data-toggle="tooltip" title="{{ _('Keyboard shortcuts') }} <span class='hotkey-hint'>(?)</span>"></i>
+            <i id="keyboard-icon" class="fa fa-keyboard-o fa-2x" aria-hidden="true" data-html="true" data-overlay-trigger="keyboard-shortcuts" data-toggle="tooltip" title="{{ _('Keyboard shortcuts') }} <span class='hotkey-hint'>(?)</span>"></i>
         </div>
     </div>
 </div>