diff --git a/web/styles/right_sidebar.css b/web/styles/right_sidebar.css
index 69ac66e807..8b2079970c 100644
--- a/web/styles/right_sidebar.css
+++ b/web/styles/right_sidebar.css
@@ -251,17 +251,6 @@ $user_status_emoji_width: 24px;
     }
 }
 
-#keyboard-icon {
-    position: relative;
-    cursor: pointer;
-    font-size: 20px;
-    margin-right: 15px;
-}
-
-#sidebar-keyboard-shortcuts {
-    color: inherit;
-}
-
 .right-sidebar-shortcuts {
     display: flex;
     flex-direction: row;
diff --git a/web/templates/right_sidebar.hbs b/web/templates/right_sidebar.hbs
index 5c051b4510..e152ad02cd 100644
--- a/web/templates/right_sidebar.hbs
+++ b/web/templates/right_sidebar.hbs
@@ -24,9 +24,6 @@
         </div>
         <div class="right-sidebar-shortcuts">
             <a class="invite-user-link" role="button"><i class="fa fa-user-plus" aria-hidden="true"></i>{{t 'Invite more users' }}</a>
-            <a id="sidebar-keyboard-shortcuts" data-overlay-trigger="keyboard-shortcuts" class="hidden-for-spectators">
-                <i class="fa fa-keyboard-o fa-2x tippy-zulip-tooltip" id="keyboard-icon" data-tooltip-template-id="keyboard-icon-tooltip-template"></i>
-            </a>
             {{#if realm_rendered_description}}
             <div class="only-visible-for-spectators">
                 <div class="realm-description">
diff --git a/web/templates/tooltip_templates.hbs b/web/templates/tooltip_templates.hbs
index 95db1ae1e5..07c6f9e4ae 100644
--- a/web/templates/tooltip_templates.hbs
+++ b/web/templates/tooltip_templates.hbs
@@ -178,10 +178,6 @@
     {{t 'Search people' }}
     {{tooltip_hotkey_hints "W"}}
 </template>
-<template id="keyboard-icon-tooltip-template">
-    {{t 'Keyboard shortcuts' }}
-    {{tooltip_hotkey_hints "?"}}
-</template>
 <template id="restore-scheduled-message-tooltip-template">
     {{t 'Edit and reschedule message' }}
     {{tooltip_hotkey_hints "Enter"}}