diff --git a/frontend_tests/node_tests/composebox_typeahead.js b/frontend_tests/node_tests/composebox_typeahead.js
index f7bc1b8cf1..598d2741e2 100644
--- a/frontend_tests/node_tests/composebox_typeahead.js
+++ b/frontend_tests/node_tests/composebox_typeahead.js
@@ -868,7 +868,7 @@ run_test("initialize", (override) => {
         fake_this = {completing: "mention", token: "hamletcharacters"};
         actual_value = options.highlighter.call(fake_this, hamletcharacters);
         expected_value =
-            '        <i class="typeahead-image icon fa fa-group" aria-hidden="true"></i>\n<strong>hamletcharacters</strong>&nbsp;&nbsp;\n<small class="autocomplete_secondary">Characters of Hamlet</small>\n';
+            '        <i class="typeahead-image icon fa fa-group no-presence-circle" aria-hidden="true"></i>\n<strong>hamletcharacters</strong>&nbsp;&nbsp;\n<small class="autocomplete_secondary">Characters of Hamlet</small>\n';
         assert.equal(actual_value, expected_value);
 
         // matching
diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index e2a7a71933..de4a42ea74 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -2053,8 +2053,7 @@ div.focused_table {
     font-size: 19px;
     text-align: center;
 
-    &.fa-group,
-    &.fa-bullhorn {
+    &.no-presence-circle {
         margin-left: 9px;
         top: 3px;
     }
diff --git a/static/templates/typeahead_list_item.hbs b/static/templates/typeahead_list_item.hbs
index f2d43eb88e..9d96be5122 100644
--- a/static/templates/typeahead_list_item.hbs
+++ b/static/templates/typeahead_list_item.hbs
@@ -13,11 +13,11 @@
         {{#if has_image}}
         <img class="typeahead-image" src="{{ img_src }}" />
         {{else}}
-        <span class='typeahead-image fa fa-bullhorn'></span>
+        <span class='typeahead-image fa fa-bullhorn no-presence-circle'></span>
         {{/if}}
     {{else}}
         {{#if is_user_group}}
-        <i class="typeahead-image icon fa fa-group" aria-hidden="true"></i>
+        <i class="typeahead-image icon fa fa-group no-presence-circle" aria-hidden="true"></i>
         {{/if}}
     {{/if}}
 {{/if}}