diff --git a/web/styles/left_sidebar.css b/web/styles/left_sidebar.css
index f41704b78f..50b40bcdbc 100644
--- a/web/styles/left_sidebar.css
+++ b/web/styles/left_sidebar.css
@@ -522,7 +522,8 @@ li.active-sub-filter {
         margin-top: 1px !important;
     }
 
-    .zulip-icon-inbox {
+    .zulip-icon-inbox,
+    .zulip-icon-star-filled {
         font-size: 14px;
         top: 2px;
         position: relative;
@@ -568,8 +569,7 @@ li.top_left_scheduled_messages {
     font-size: 15px;
 }
 
-.top_left_mentions i.fa-at,
-.top_left_starred_messages i.fa-star {
+.top_left_mentions i.fa-at {
     font-size: 13px;
 }
 
diff --git a/web/styles/zulip.css b/web/styles/zulip.css
index e2bf43c817..47e9c346ee 100644
--- a/web/styles/zulip.css
+++ b/web/styles/zulip.css
@@ -2098,7 +2098,8 @@ div.focused-message-list {
             }
         }
 
-        .zulip-icon-inbox {
+        .zulip-icon-inbox,
+        .zulip-icon-star-filled {
             position: relative;
             top: 2px;
         }
@@ -3328,3 +3329,11 @@ select.invite-as {
         padding: 5px;
     }
 }
+
+#unstar_all_messages,
+.emoji-popover-tab-item {
+    .zulip-icon-star {
+        position: relative;
+        top: 2px;
+    }
+}
diff --git a/web/templates/left_sidebar.hbs b/web/templates/left_sidebar.hbs
index 7f5e224c90..b48c682e1f 100644
--- a/web/templates/left_sidebar.hbs
+++ b/web/templates/left_sidebar.hbs
@@ -43,7 +43,7 @@
             <li class="top_left_starred_messages top_left_row hidden-for-spectators">
                 <a class="left-sidebar-navigation-label-container" href="#narrow/is/starred">
                     <span class="filter-icon">
-                        <i class="fa fa-star" aria-hidden="true"></i>
+                        <i class="zulip-icon zulip-icon-star-filled" aria-hidden="true"></i>
                     </span>
                     {{~!-- squash whitespace --~}}
                     <span class="left-sidebar-navigation-label">{{t 'Starred messages' }}</span>
diff --git a/web/templates/starred_messages_sidebar_actions.hbs b/web/templates/starred_messages_sidebar_actions.hbs
index 5c95dace76..a09295046b 100644
--- a/web/templates/starred_messages_sidebar_actions.hbs
+++ b/web/templates/starred_messages_sidebar_actions.hbs
@@ -4,7 +4,7 @@
     {{#if show_unstar_all_button}}
     <li>
         <a tabindex="0" id="unstar_all_messages">
-            <i class="fa fa-star-o" aria-hidden="true"></i>
+            <i class="zulip-icon zulip-icon-star" aria-hidden="true"></i>
             {{t "Unstar all messages" }}
         </a>
     </li>
diff --git a/web/templates/topic_sidebar_actions.hbs b/web/templates/topic_sidebar_actions.hbs
index e00e2a44c9..bdd172ea11 100644
--- a/web/templates/topic_sidebar_actions.hbs
+++ b/web/templates/topic_sidebar_actions.hbs
@@ -68,7 +68,7 @@
     {{#if has_starred_messages}}
     <li class="hidden-for-spectators">
         <a tabindex="0" class="sidebar-popover-unstar-all-in-topic" data-stream-id="{{ stream_id }}" data-topic-name="{{ topic_name }}">
-            <i class="fa fa-star-o" aria-hidden="true"></i>
+            <i class="zulip-icon zulip-icon-star" aria-hidden="true"></i>
             {{t "Unstar all messages in topic" }}
         </a>
     </li>