diff --git a/templates/zerver/development/integrations_dev_panel.html b/templates/zerver/development/integrations_dev_panel.html
index a98f392918..42d973b760 100644
--- a/templates/zerver/development/integrations_dev_panel.html
+++ b/templates/zerver/development/integrations_dev_panel.html
@@ -95,8 +95,8 @@
             </div>
             <textarea id="fixture_body"></textarea>
             <div class="buttons">
-                <button id="send_all_fixtures_button" class="btn">Send all</button>
-                <button id="send_fixture_button" class="btn">Send!</button>
+                <button id="send_all_fixtures_button" class="bootstrap-btn">Send all</button>
+                <button id="send_fixture_button" class="bootstrap-btn">Send!</button>
             </div>
         </div>
         <div class="col1">
diff --git a/web/styles/settings.css b/web/styles/settings.css
index 400a8ea92a..277ae2009b 100644
--- a/web/styles/settings.css
+++ b/web/styles/settings.css
@@ -898,7 +898,7 @@ input[type="checkbox"] {
             background-color: transparent;
         }
 
-        .btn {
+        .bootstrap-btn {
             padding: 4px;
         }
 
diff --git a/web/styles/subscriptions.css b/web/styles/subscriptions.css
index 39987ca654..c026774c84 100644
--- a/web/styles/subscriptions.css
+++ b/web/styles/subscriptions.css
@@ -16,7 +16,7 @@
     overflow-wrap: break-word;
 }
 
-.subscription_settings .btn {
+.subscription_settings .bootstrap-btn {
     border-radius: 2px;
 }
 
diff --git a/web/styles/zulip.css b/web/styles/zulip.css
index c3fe3a0b7f..68b503ad54 100644
--- a/web/styles/zulip.css
+++ b/web/styles/zulip.css
@@ -619,7 +619,7 @@ li,
     line-height: inherit;
 }
 
-.btn {
+.bootstrap-btn {
     font-size: inherit;
     height: auto;
     line-height: 100%;
diff --git a/web/templates/filter_topics.hbs b/web/templates/filter_topics.hbs
index 6ba373a143..3ad3d9093e 100644
--- a/web/templates/filter_topics.hbs
+++ b/web/templates/filter_topics.hbs
@@ -1,6 +1,6 @@
 <div class="topic_search_section filter-topics">
     <input class="topic-list-filter home-page-input filter_text_input" id="filter-topic-input" type="text" autocomplete="off" placeholder="{{t 'Filter topics'}}" />
-    <button type="button" class="btn clear_search_button" id="clear_search_topic_button">
+    <button type="button" class="bootstrap-btn clear_search_button" id="clear_search_topic_button">
         <i class="fa fa-remove" aria-hidden="true"></i>
     </button>
 </div>
diff --git a/web/templates/left_sidebar.hbs b/web/templates/left_sidebar.hbs
index 72a03e331d..cdeed80ea0 100644
--- a/web/templates/left_sidebar.hbs
+++ b/web/templates/left_sidebar.hbs
@@ -165,7 +165,7 @@
         </a>
         <div class="zoom-out-hide direct-messages-search-section">
             <input class="direct-messages-list-filter filter_text_input home-page-input" type="text" autocomplete="off" placeholder="{{t 'Filter direct messages' }}" />
-            <button type="button" class="btn clear_search_button" id="clear-direct-messages-search-button">
+            <button type="button" class="bootstrap-btn clear_search_button" id="clear-direct-messages-search-button">
                 <i class="fa fa-remove" aria-hidden="true"></i>
             </button>
         </div>
@@ -194,7 +194,7 @@
 
                 <div class="notdisplayed stream_search_section">
                     <input class="stream-list-filter home-page-input filter_text_input" type="text" autocomplete="off" placeholder="{{t 'Filter channels' }}" />
-                    <button type="button" class="btn clear_search_button" id="clear_search_stream_button">
+                    <button type="button" class="bootstrap-btn clear_search_button" id="clear_search_stream_button">
                         <i class="fa fa-remove" aria-hidden="true"></i>
                     </button>
                 </div>
diff --git a/web/templates/recent_view_filters.hbs b/web/templates/recent_view_filters.hbs
index 5449df3a0f..5ad57e3d0d 100644
--- a/web/templates/recent_view_filters.hbs
+++ b/web/templates/recent_view_filters.hbs
@@ -1,5 +1,5 @@
 {{> ./dropdown_widget widget_name="recent-view-filter"}}
-<button data-filter="include_private" type="button" class="btn bootstrap-btn-default button-recent-filters {{#if is_spectator}}fake_disabled_button{{/if}}" role="checkbox" aria-checked="true">
+<button data-filter="include_private" type="button" class="bootstrap-btn bootstrap-btn-default button-recent-filters {{#if is_spectator}}fake_disabled_button{{/if}}" role="checkbox" aria-checked="true">
     {{#if filter_pm}}
     <i class="fa fa-check-square-o"></i>
     {{else}}
@@ -7,7 +7,7 @@
     {{/if}}
     {{t 'Include DMs' }}
 </button>
-<button data-filter="unread" type="button" class="btn bootstrap-btn-default button-recent-filters {{#if is_spectator}}fake_disabled_button{{/if}}" role="checkbox" aria-checked="false">
+<button data-filter="unread" type="button" class="bootstrap-btn bootstrap-btn-default button-recent-filters {{#if is_spectator}}fake_disabled_button{{/if}}" role="checkbox" aria-checked="false">
     {{#if filter_unread}}
     <i class="fa fa-check-square-o"></i>
     {{else}}
@@ -15,7 +15,7 @@
     {{/if}}
     {{t 'Unread' }}
 </button>
-<button data-filter="participated" type="button" class="btn bootstrap-btn-default button-recent-filters {{#if is_spectator}}fake_disabled_button{{/if}}" role="checkbox" aria-checked="false">
+<button data-filter="participated" type="button" class="bootstrap-btn bootstrap-btn-default button-recent-filters {{#if is_spectator}}fake_disabled_button{{/if}}" role="checkbox" aria-checked="false">
     {{#if filter_participated}}
     <i class="fa fa-check-square-o"></i>
     {{else}}
diff --git a/web/templates/recent_view_table.hbs b/web/templates/recent_view_table.hbs
index 2c53e570c5..ede4ad7af2 100644
--- a/web/templates/recent_view_table.hbs
+++ b/web/templates/recent_view_table.hbs
@@ -4,7 +4,7 @@
     </div>
     <div class="search_group" role="group">
         <input type="text" id="recent_view_search" class="filter_text_input" value="{{ search_val }}" autocomplete="off" placeholder="{{t 'Filter topics (t)' }}" />
-        <button type="button" class="btn clear_search_button" id="recent_view_search_clear">
+        <button type="button" class="bootstrap-btn clear_search_button" id="recent_view_search_clear">
             <i class="fa fa-remove" aria-hidden="true"></i>
         </button>
     </div>
diff --git a/web/templates/right_sidebar.hbs b/web/templates/right_sidebar.hbs
index 157a64a2f2..705d104ff6 100644
--- a/web/templates/right_sidebar.hbs
+++ b/web/templates/right_sidebar.hbs
@@ -4,7 +4,7 @@
             <div id="userlist-header">
                 <div id="userlist-header-search">
                     <input class="user-list-filter home-page-input filter_text_input" type="text" autocomplete="off" placeholder="{{t 'Filter users' }}" />
-                    <button type="button" class="btn hidden" id="clear_search_people_button">
+                    <button type="button" class="bootstrap-btn hidden" id="clear_search_people_button">
                         <i class="zulip-icon zulip-icon-close" aria-hidden="true"></i>
                     </button>
                 </div>
diff --git a/web/templates/set_status_overlay.hbs b/web/templates/set_status_overlay.hbs
index 35d789f37e..d00edeed95 100644
--- a/web/templates/set_status_overlay.hbs
+++ b/web/templates/set_status_overlay.hbs
@@ -5,7 +5,7 @@
         </div>
     </div>
     <input type="text" class="user-status modal_text_input" placeholder="{{t 'Your status' }}" maxlength="60"/>
-    <button type="button" class="btn clear_search_button" id="clear_status_message_button" disabled="disabled">
+    <button type="button" class="bootstrap-btn clear_search_button" id="clear_status_message_button" disabled="disabled">
         <i class="fa fa-remove" aria-hidden="true"></i>
     </button>
 </div>
diff --git a/web/templates/settings/bot_avatar_row.hbs b/web/templates/settings/bot_avatar_row.hbs
index f2918e9fbb..659bb00b1c 100644
--- a/web/templates/settings/bot_avatar_row.hbs
+++ b/web/templates/settings/bot_avatar_row.hbs
@@ -5,23 +5,23 @@
             <div class="bot-card-name">{{name}}</div>
             {{#if is_active}}
             <div class="edit-bot-buttons">
-                <button type="submit" class="btn open_edit_bot_form tippy-zulip-delayed-tooltip" data-sidebar-form="edit-bot" data-tippy-content="{{t 'Edit bot' }}" data-email="{{email}}">
+                <button type="submit" class="bootstrap-btn open_edit_bot_form tippy-zulip-delayed-tooltip" data-sidebar-form="edit-bot" data-tippy-content="{{t 'Edit bot' }}" data-email="{{email}}">
                     <i class="fa fa-pencil blue" aria-hidden="true"></i>
                 </button>
-                <a type="submit" download="{{zuliprc}}" class="btn download_bot_zuliprc tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Download zuliprc' }}" data-email="{{email}}">
+                <a type="submit" download="{{zuliprc}}" class="bootstrap-btn download_bot_zuliprc tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Download zuliprc' }}" data-email="{{email}}">
                     <i class="fa fa-download sea-green" aria-hidden="true"></i>
                 </a>
-                <button type="submit" id="copy_zuliprc" class="btn copy_zuliprc tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Copy zuliprc' }}">
+                <button type="submit" id="copy_zuliprc" class="bootstrap-btn copy_zuliprc tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Copy zuliprc' }}">
                     <i class="zulip-icon zulip-icon-copy" aria-hidden="true"></i>
                 </button>
-                <button type="submit" class="btn deactivate_bot danger-red tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Deactivate bot' }}" data-user-id="{{user_id}}">
+                <button type="submit" class="bootstrap-btn deactivate_bot danger-red tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Deactivate bot' }}" data-user-id="{{user_id}}">
                     <i class="fa fa-user-times" aria-hidden="true"></i>
                 </button>
-                <button type="submit" class="btn open_bots_subscribed_streams tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Subscribed channels' }}" data-user-id="{{user_id}}">
+                <button type="submit" class="bootstrap-btn open_bots_subscribed_streams tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Subscribed channels' }}" data-user-id="{{user_id}}">
                     <i class="fa fa-hashtag purple" aria-hidden="true"></i>
                 </button>
                 {{#if is_incoming_webhook_bot}}
-                <button type="submit" class="btn open-generate-integration-url-modal tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Generate URL for an integration'}}" data-api-key="{{api_key}}">
+                <button type="submit" class="bootstrap-btn open-generate-integration-url-modal tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Generate URL for an integration'}}" data-api-key="{{api_key}}">
                     <i class="fa fa-link steel-blue" aria-hidden="true"></i>
                 </button>
                 {{/if}}
diff --git a/web/templates/settings/bot_settings.hbs b/web/templates/settings/bot_settings.hbs
index d9e742f4e9..2040afaabb 100644
--- a/web/templates/settings/bot_settings.hbs
+++ b/web/templates/settings/bot_settings.hbs
@@ -22,7 +22,7 @@
         <div id="active_bots_list_container" class="bots_section" data-bot-settings-section="active-bots">
             <div class="config-download-text">
                 <span>{{t 'Download config of all active outgoing webhook bots in Zulip Botserver format.' }}</span>
-                <a type="submit" download="{{botserverrc}}" id= "download_botserverrc" class="btn tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Download botserverrc' }}">
+                <a type="submit" download="{{botserverrc}}" id= "download_botserverrc" class="bootstrap-btn tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Download botserverrc' }}">
                     <i class="fa fa-download sea-green" aria-hidden="true"></i>
                 </a>
             </div>
diff --git a/web/templates/stream_settings/stream_settings_overlay.hbs b/web/templates/stream_settings/stream_settings_overlay.hbs
index 924a6e6668..dd0a8da80a 100644
--- a/web/templates/stream_settings/stream_settings_overlay.hbs
+++ b/web/templates/stream_settings/stream_settings_overlay.hbs
@@ -22,7 +22,7 @@
                 <div class="input-append stream_name_search_section" id="stream_filter">
                     <input type="text" name="stream_name" id="search_stream_name" class="filter_text_input" autocomplete="off"
                       placeholder="{{t 'Filter channels' }}" value=""/>
-                    <button type="button" class="btn clear_search_button" id="clear_search_stream_name">
+                    <button type="button" class="bootstrap-btn clear_search_button" id="clear_search_stream_name">
                         <i class="fa fa-remove" aria-hidden="true"></i>
                     </button>
                 </div>
diff --git a/web/templates/user_group_settings/user_group_settings_overlay.hbs b/web/templates/user_group_settings/user_group_settings_overlay.hbs
index 6141c10923..79909373cf 100644
--- a/web/templates/user_group_settings/user_group_settings_overlay.hbs
+++ b/web/templates/user_group_settings/user_group_settings_overlay.hbs
@@ -22,7 +22,7 @@
                 <div class="input-append group_name_search_section" id="group_filter">
                     <input type="text" name="group_name" id="search_group_name" class="filter_text_input" autocomplete="off"
                       placeholder="{{t 'Filter groups' }}" value=""/>
-                    <button type="button" class="btn clear_search_button" id="clear_search_group_name">
+                    <button type="button" class="bootstrap-btn clear_search_button" id="clear_search_group_name">
                         <i class="fa fa-remove" aria-hidden="true"></i>
                     </button>
                 </div>
diff --git a/web/third/bootstrap/css/bootstrap-btn.css b/web/third/bootstrap/css/bootstrap-btn.css
index d78af5590c..9e634b97cb 100644
--- a/web/third/bootstrap/css/bootstrap-btn.css
+++ b/web/third/bootstrap/css/bootstrap-btn.css
@@ -31,7 +31,7 @@ THE SOFTWARE.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-.btn {
+.bootstrap-btn {
   display: inline-block;
   padding: 6px 12px;
   margin-bottom: 0;
@@ -50,27 +50,27 @@ THE SOFTWARE.
   border: 1px solid transparent;
   border-radius: 0px;
 }
-.btn:focus,
-.btn:active:focus,
-.btn.active:focus {
+.bootstrap-btn:focus,
+.bootstrap-btn:active:focus,
+.bootstrap-btn.active:focus {
   outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-.btn:hover,
-.btn:focus {
+.bootstrap-btn:hover,
+.bootstrap-btn:focus {
   color: #333;
   text-decoration: none;
 }
-.btn:active,
-.btn.active {
+.bootstrap-btn:active,
+.bootstrap-btn.active {
   background-image: none;
   outline: 0;
   -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
           box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
 }
-.btn.disabled,
-.btn[disabled] {
+.bootstrap-btn.disabled,
+.bootstrap-btn[disabled] {
   pointer-events: none;
   cursor: not-allowed;
   -webkit-box-shadow: none;