diff --git a/web/templates/poll_modal_option.hbs b/web/templates/poll_modal_option.hbs
index 0e01a8d1e8..4ab1a8c0fa 100644
--- a/web/templates/poll_modal_option.hbs
+++ b/web/templates/poll_modal_option.hbs
@@ -1,7 +1,7 @@
 <li class="option-row">
     <i class="zulip-icon zulip-icon-grip-vertical drag-icon"></i>
     <input type="text" class="poll-option-input modal_text_input" placeholder="{{t 'New option' }}" />
-    <button type="button" class="button rounded small button-secondary delete-option" title="{{t 'Delete' }}">
+    <button type="button" class="button rounded small delete-option" title="{{t 'Delete' }}">
         <i class="fa fa-trash-o" aria-hidden="true"></i>
     </button>
 </li>
diff --git a/web/templates/recent_view_table.hbs b/web/templates/recent_view_table.hbs
index a77efd59e4..9b815f675a 100644
--- a/web/templates/recent_view_table.hbs
+++ b/web/templates/recent_view_table.hbs
@@ -1,4 +1,4 @@
-<div id="recent_view_filter_buttons" class="button-group" role="group">
+<div id="recent_view_filter_buttons" role="group">
     <div id="recent_filters_group">
         {{> recent_view_filters .}}
     </div>
diff --git a/web/templates/settings/bot_avatar_row.hbs b/web/templates/settings/bot_avatar_row.hbs
index 578eb46f88..4cb34c4aec 100644
--- a/web/templates/settings/bot_avatar_row.hbs
+++ b/web/templates/settings/bot_avatar_row.hbs
@@ -44,7 +44,7 @@
             <div class="bot-card-api-key-value-and-button no-select">
                 <!-- have the `.text-select` in `.no-select` so that the value doesn't have trailing whitespace. -->
                 <span class="bot-card-value text-select">{{api_key}}</span>
-                <button type="submit" class="button no-style button-secondary bot-card-regenerate-bot-api-key tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Generate new API key' }}" data-user-id="{{user_id}}">
+                <button type="submit" class="button no-style bot-card-regenerate-bot-api-key tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Generate new API key' }}" data-user-id="{{user_id}}">
                     <i class="fa fa-refresh" aria-hidden="true"></i>
                 </button>
             </div>
diff --git a/web/third/bootstrap/css/bootstrap.portico.css b/web/third/bootstrap/css/bootstrap.portico.css
index 1aa3399338..0b8c22bce7 100644
--- a/web/third/bootstrap/css/bootstrap.portico.css
+++ b/web/third/bootstrap/css/bootstrap.portico.css
@@ -242,8 +242,7 @@ input:focus:invalid:focus {
 .form-inline .hide {
   display: none;
 }
-.form-inline label,
-.form-inline .bootstrap-btn-group {
+.form-inline label {
   display: inline-block;
 }
 .dropdown {