diff --git a/web/templates/gear_menu_popover.hbs b/web/templates/gear_menu_popover.hbs
index 7b498ad466..e56497eda2 100644
--- a/web/templates/gear_menu_popover.hbs
+++ b/web/templates/gear_menu_popover.hbs
@@ -38,112 +38,112 @@
         {{/if}}
     {{/if}}
     <li class="divider" role="presentation"></li>
-    <li class="hidden-for-spectators" role="presentation">
+    <li class="link-item hidden-for-spectators" role="presentation">
         <a href="#streams/subscribed" role="menuitem">
             <i class="zulip-icon zulip-icon-hash" aria-hidden="true"></i> {{t 'Manage streams' }}
         </a>
     </li>
-    <li class="hidden-for-spectators" role="presentation">
+    <li class="link-item hidden-for-spectators" role="presentation">
         <a href="#settings" role="menuitem">
             <i class="zulip-icon zulip-icon-tool" aria-hidden="true"></i> {{t 'Personal settings' }}
         </a>
     </li>
-    <li class="admin-menu-item hidden-for-spectators" role="presentation">
+    <li class="link-item admin-menu-item hidden-for-spectators" role="presentation">
         <a href="#organization" role="menuitem">
             <i class="zulip-icon zulip-icon-building" aria-hidden="true"></i>
             <span>{{t 'Organization settings' }}</span>
         </a>
     </li>
     {{#unless is_guest}}
-    <li class="hidden-for-spectators" role="presentation">
+    <li class="link-item hidden-for-spectators" role="presentation">
         <a href="/stats" target="_blank" rel="noopener noreferrer" role="menuitem">
             <i class="zulip-icon zulip-icon-bar-chart" aria-hidden="true"></i>
             <span>{{t 'Usage statistics' }}</span>
         </a>
     </li>
     {{/unless}}
-    <li role="presentation" class="only-visible-for-spectators">
+    <li role="presentation" class="link-item only-visible-for-spectators">
         <a class="change-language-spectator" role="menuitem">
             <i class="zulip-icon zulip-icon-f-globe" aria-hidden="true"></i> {{t 'Select language' }}
         </a>
     </li>
-    <li role="presentation" class="only-visible-for-spectators">
+    <li role="presentation" class="link-item only-visible-for-spectators">
         <a class="dark-theme" role="menuitem">
             <i class="zulip-icon zulip-icon-moon" aria-hidden="true"></i> {{t 'Switch to dark theme' }}
         </a>
     </li>
-    <li role="presentation" class="only-visible-for-spectators">
+    <li role="presentation" class="link-item only-visible-for-spectators">
         <a class="light-theme" role="menuitem">
             <i class="zulip-icon zulip-icon-sun" aria-hidden="true"></i> {{t 'Switch to light theme' }}
         </a>
     </li>
     <li class="divider" role="presentation"></li>
-    <li role="presentation">
+    <li class="link-item" role="presentation">
         <a href="/help/" target="_blank" rel="noopener noreferrer" role="menuitem">
             <i class="zulip-icon zulip-icon-help" aria-hidden="true"></i> {{t 'Help center' }}
         </a>
     </li>
-    <li role="presentation">
+    <li class="link-item" role="presentation">
         <a tabindex="0" role="menuitem" data-overlay-trigger="keyboard-shortcuts">
             <i class="zulip-icon zulip-icon-keyboard" aria-hidden="true"></i> {{t 'Keyboard shortcuts' }} <span class="hotkey-hint">(?)</span>
         </a>
     </li>
-    <li role="presentation" class="hidden-for-spectators">
+    <li role="presentation" class="link-item hidden-for-spectators">
         <a tabindex="0" role="menuitem" data-overlay-trigger="message-formatting">
             <i class="zulip-icon zulip-icon-edit" aria-hidden="true"></i> {{t 'Message formatting' }}
         </a>
     </li>
-    <li role="presentation">
+    <li class="link-item" role="presentation">
         <a tabindex="0" role="menuitem" data-overlay-trigger="search-operators">
             <i class="zulip-icon zulip-icon-manage-search" aria-hidden="true"></i> {{t 'Search filters' }}
         </a>
     </li>
     <li class="divider only-visible-for-spectators" role="presentation"></li>
-    <li role="presentation" id="gear_menu_about_zulip">
+    <li class="link-item" role="presentation" id="gear_menu_about_zulip">
         <a href="#about-zulip" role="menuitem" class="menuitem-version">
             <span class="zulip-icon zulip-icon-info"></span>
             <span class="about_zulip_text">{{t "About Zulip" }}</span>
         </a>
     </li>
     {{#if corporate_enabled}}
-    <li role="presentation">
+    <li class="link-item" role="presentation">
         <a href="/help/contact-support" target="_blank" rel="noopener noreferrer" role="menuitem">
             <i class="zulip-icon zulip-icon-life-buoy" aria-hidden="true"></i> {{t 'Contact support' }}
         </a>
     </li>
     {{/if}}
     <li class="divider" role="presentation"></li>
-    <li role="presentation" class="hidden-for-spectators">
+    <li role="presentation" class="link-item hidden-for-spectators">
         <a href="{{ apps_page_url }}" target="_blank" rel="noopener noreferrer" role="menuitem">
             <i class="zulip-icon zulip-icon-monitor" aria-hidden="true"></i> {{t 'Desktop & mobile apps' }}
         </a>
     </li>
-    <li role="presentation" class="hidden-for-spectators">
+    <li role="presentation" class="link-item hidden-for-spectators">
         <a href="/integrations/" target="_blank" rel="noopener noreferrer" role="menuitem">
             <i class="zulip-icon zulip-icon-git-pull-request" aria-hidden="true"></i> {{t 'Integrations' }}
         </a>
     </li>
-    <li role="presentation" class="hidden-for-spectators">
+    <li role="presentation" class="link-item hidden-for-spectators">
         <a href="/api" target="_blank" rel="noopener noreferrer" role="menuitem">
             <i class="zulip-icon zulip-icon-file-text" aria-hidden="true"></i> {{t 'API documentation' }}
         </a>
     </li>
     {{#if show_billing}}
-    <li role="presentation" class="hidden-for-spectators">
+    <li role="presentation" class="link-item hidden-for-spectators">
         <a href="/billing/" target="_blank" rel="noopener noreferrer" role="menuitem">
             <i class="zulip-icon zulip-icon-credit-card" aria-hidden="true"></i> {{t 'Billing' }}
         </a>
     </li>
     {{/if}}
     {{#if promote_sponsoring_zulip}}
-    <li role="presentation" class="hidden-for-spectators">
+    <li role="presentation" class="link-item hidden-for-spectators">
         <a href="https://zulip.com/help/support-zulip-project" target="_blank" rel="noopener noreferrer" role="menuitem">
             <i class="zulip-icon zulip-icon-heart" aria-hidden="true"></i> {{t 'Support Zulip' }}
         </a>
     </li>
     {{/if}}
     {{#if show_plans}}
-    <li role="presentation" class="hidden-for-spectators">
+    <li role="presentation" class="link-item hidden-for-spectators">
         <a href="/plans/" target="_blank" rel="noopener noreferrer" role="menuitem">
             <i class="fa fa-rocket" aria-hidden="true"></i> {{t 'Plans and pricing' }}
         </a>
@@ -151,20 +151,20 @@
     {{/if}}
     <li class="divider hidden-for-spectators" role="presentation"></li>
     {{#if (or can_invite_users_by_email can_create_multiuse_invite)}}
-    <li role="presentation">
+    <li class="link-item" role="presentation">
         <a class="invite-user-link" role="menuitem">
             <i class="zulip-icon zulip-icon-user-plus" aria-hidden="true"></i> {{t 'Invite users' }}
         </a>
     </li>
     {{/if}}
     {{#if show_webathena}}
-    <li title="{{t 'Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via Webathena' }}" id="webathena_login_menu" role="presentation">
+    <li class="link-item" title="{{t 'Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via Webathena' }}" id="webathena_login_menu" role="presentation">
         <a href="#webathena" class="webathena_login" role="menuitem">
             <i class="fa fa-bolt" aria-hidden="true"></i>{{t 'Link with Webathena' }}
         </a>
     </li>
     {{/if}}
-    <li role="presentation" class="only-visible-for-spectators">
+    <li role="presentation" class="link-item only-visible-for-spectators">
         <a href="{{login_link}}" role="menuitem">
             <i class="zulip-icon zulip-icon-power" aria-hidden="true"></i> {{t 'Log in' }}
         </a>