diff --git a/templates/zerver/app/index.html b/templates/zerver/app/index.html
index 6c9687dd6c..d34c66403c 100644
--- a/templates/zerver/app/index.html
+++ b/templates/zerver/app/index.html
@@ -152,7 +152,7 @@
 <div id="settings_overlay_container" class="overlay" data-overlay="settings" aria-hidden="true">
 </div>
 <div id="message-edit-history-overlay-container"></div>
-<div class="informational-overlays overlay new-style" data-overlay="informationalOverlays" aria-hidden="true">
+<div class="informational-overlays overlay" data-overlay="informationalOverlays" aria-hidden="true">
     <div class="overlay-content overlay-container">
         <div class="overlay-tabs">
             <span class="exit">&times;</span>
diff --git a/web/src/info_overlay.ts b/web/src/info_overlay.ts
index 8eed11c088..67c5d90f5a 100644
--- a/web/src/info_overlay.ts
+++ b/web/src/info_overlay.ts
@@ -204,7 +204,7 @@ Last task`,
     <div class="widget-content">
         <div class="todo-widget">
             <h4>Today's tasks</h4>
-            <ul class="todo-widget new-style">
+            <ul class="todo-widget">
                 <li>
                     <label class="checkbox">
                         <div>
diff --git a/web/templates/about_zulip.hbs b/web/templates/about_zulip.hbs
index 75ce88fe9a..a6c2818640 100644
--- a/web/templates/about_zulip.hbs
+++ b/web/templates/about_zulip.hbs
@@ -1,4 +1,4 @@
-<div id="about-zulip" class="overlay flex new-style" tabindex="-1" role="dialog" data-overlay="about-zulip" aria-hidden="true">
+<div id="about-zulip" class="overlay flex" tabindex="-1" role="dialog" data-overlay="about-zulip" aria-hidden="true">
     <div class="overlay-content overlay-container">
         <button type="button" class="exit" aria-label="{{t 'Close' }}"><span aria-hidden="true">&times;</span></button>
         <div class="overlay-body">
diff --git a/web/templates/bookend.hbs b/web/templates/bookend.hbs
index 650d1470ea..df340b16c7 100644
--- a/web/templates/bookend.hbs
+++ b/web/templates/bookend.hbs
@@ -27,7 +27,7 @@
         </span>
     {{/if}}
     {{#if can_toggle_subscription}}
-    <div class="sub_button_row new-style">
+    <div class="sub_button_row">
         <button class="button white rounded stream_sub_unsub_button {{#unless subscribed}}sea-green{{/unless}}" type="button" name="subscription">
             {{#if subscribed}}
             {{t 'Unsubscribe' }}
diff --git a/web/templates/draft_table_body.hbs b/web/templates/draft_table_body.hbs
index 70eeae0a21..85c501ddd0 100644
--- a/web/templates/draft_table_body.hbs
+++ b/web/templates/draft_table_body.hbs
@@ -1,4 +1,4 @@
-<div id="draft_overlay" class="overlay new-style" data-overlay="drafts">
+<div id="draft_overlay" class="overlay" data-overlay="drafts">
     <div class="flex overlay-content">
         <div class="drafts-container overlay-messages-container overlay-container">
             <div class="overlay-messages-header">
diff --git a/web/templates/invite_user_modal.hbs b/web/templates/invite_user_modal.hbs
index 7bafc8bb2f..3cf9da4502 100644
--- a/web/templates/invite_user_modal.hbs
+++ b/web/templates/invite_user_modal.hbs
@@ -26,7 +26,7 @@
             </div>
         </div>
     </div>
-    <div class="input-group new-style" id="receive-invite-acceptance-notification-container">
+    <div class="input-group" id="receive-invite-acceptance-notification-container">
         <label class="checkbox display-block">
             <input type="checkbox" id="receive-invite-acceptance-notification" checked/>
             <span class="rendered-checkbox"></span>
@@ -73,7 +73,7 @@
         <label>{{t "Channels they should join" }}</label>
         <div id="streams_to_add">
             {{#if show_select_default_streams_option}}
-            <div class="select_default_streams new-style">
+            <div class="select_default_streams">
                 <label class="checkbox display-block modal-field-label">
                     <input type="checkbox" id="invite_select_default_streams" checked="checked" />
                     <span class="rendered-checkbox"></span>
diff --git a/web/templates/lightbox_overlay.hbs b/web/templates/lightbox_overlay.hbs
index c3a75ab9f6..d6411e52d3 100644
--- a/web/templates/lightbox_overlay.hbs
+++ b/web/templates/lightbox_overlay.hbs
@@ -1,4 +1,4 @@
-<div id="lightbox_overlay" class="overlay new-style" data-overlay="lightbox" data-noclose="false">
+<div id="lightbox_overlay" class="overlay" data-overlay="lightbox" data-noclose="false">
     <div class="media-info-wrapper">
         <div class="media-description">
             <div class="title"></div>
diff --git a/web/templates/message_history_overlay.hbs b/web/templates/message_history_overlay.hbs
index 938cdd8760..44322e72c4 100644
--- a/web/templates/message_history_overlay.hbs
+++ b/web/templates/message_history_overlay.hbs
@@ -1,4 +1,4 @@
-<div id="message-history-overlay" class="overlay new-style" data-overlay="message_edit_history">
+<div id="message-history-overlay" class="overlay" data-overlay="message_edit_history">
     <div class="flex overlay-content">
         <div class="message-edit-history-container overlay-messages-container overlay-container">
             <div class="overlay-messages-header">
diff --git a/web/templates/scheduled_messages_overlay.hbs b/web/templates/scheduled_messages_overlay.hbs
index 8f649f36be..7acf99ad04 100644
--- a/web/templates/scheduled_messages_overlay.hbs
+++ b/web/templates/scheduled_messages_overlay.hbs
@@ -1,4 +1,4 @@
-<div id="scheduled_messages_overlay" class="overlay new-style" data-overlay="scheduled">
+<div id="scheduled_messages_overlay" class="overlay" data-overlay="scheduled">
     <div class="flex overlay-content">
         <div class="overlay-messages-container overlay-container">
             <div class="overlay-messages-header">
diff --git a/web/templates/set_status_overlay.hbs b/web/templates/set_status_overlay.hbs
index d59f856114..35d789f37e 100644
--- a/web/templates/set_status_overlay.hbs
+++ b/web/templates/set_status_overlay.hbs
@@ -1,4 +1,4 @@
-<div class="new-style user-status-content-wrapper">
+<div class="user-status-content-wrapper">
     <div class="tippy-zulip-tooltip" data-tippy-content="{{t 'Select emoji' }}" data-tippy-placement="top" aria-label="{{t 'Select emoji' }}" id="selected_emoji">
         <div class="status-emoji-wrapper" tabindex="0">
             {{> status_emoji_selector}}
@@ -9,7 +9,7 @@
         <i class="fa fa-remove" aria-hidden="true"></i>
     </button>
 </div>
-<div class="new-style user-status-options">
+<div class="user-status-options">
     {{#each default_status_messages_and_emoji_info}}
         <button type="button" class="button no-style user-status-value">
             {{#if emoji.emoji_alt_code}}
diff --git a/web/templates/settings/add_default_streams.hbs b/web/templates/settings/add_default_streams.hbs
index b1ae6e0c45..8343d55877 100644
--- a/web/templates/settings/add_default_streams.hbs
+++ b/web/templates/settings/add_default_streams.hbs
@@ -1,3 +1,3 @@
-<table class="default_stream_choices_table new-style">
+<table class="default_stream_choices_table">
     <tbody id="default-stream-choices"></tbody>
 </table>
diff --git a/web/templates/settings/add_new_custom_profile_field_form.hbs b/web/templates/settings/add_new_custom_profile_field_form.hbs
index 1b65dc2f47..baebc61925 100644
--- a/web/templates/settings/add_new_custom_profile_field_form.hbs
+++ b/web/templates/settings/add_new_custom_profile_field_form.hbs
@@ -1,4 +1,4 @@
-<form class="admin-profile-field-form new-style" id="add-new-custom-profile-field-form">
+<form class="admin-profile-field-form" id="add-new-custom-profile-field-form">
     <div class="new-profile-field-form wrapper">
         <div class="input-group">
             <label for="profile_field_type" class="modal-field-label">{{t "Type" }}</label>
diff --git a/web/templates/settings/admin_human_form.hbs b/web/templates/settings/admin_human_form.hbs
index 90708e2c68..0a7091a593 100644
--- a/web/templates/settings/admin_human_form.hbs
+++ b/web/templates/settings/admin_human_form.hbs
@@ -26,7 +26,7 @@
         </div>
         <div class="custom-profile-field-form"></div>
     </form>
-    <div class="input-group new-style">
+    <div class="input-group">
         {{#if is_active}}
         <span {{#if owner_is_only_user_in_organization}}class="deactivate_user_button_tooltip"{{/if}}>
             <button class="button rounded btn-danger deactivate_user_button" {{#if owner_is_only_user_in_organization}}disabled="disabled"{{/if}}>
diff --git a/web/templates/settings/edit_bot_form.hbs b/web/templates/settings/edit_bot_form.hbs
index ee8b8ea904..920b007899 100644
--- a/web/templates/settings/edit_bot_form.hbs
+++ b/web/templates/settings/edit_bot_form.hbs
@@ -1,5 +1,5 @@
 <div id="bot-edit-form" data-user-id="{{user_id}}" data-email="{{email}}">
-    <form class="new-style edit_bot_form name-setting">
+    <form class="edit_bot_form name-setting">
         <div class="alert" id="bot-edit-form-error"></div>
         <div class="input-group name_change_container">
             <label for="edit_bot_full_name" class="modal-field-label">{{t "Name" }}</label>
@@ -43,13 +43,13 @@
         </div>
     </form>
     {{#if is_incoming_webhook_bot}}
-    <div class="input-group new-style">
+    <div class="input-group">
         <button class="button rounded generate_url_for_integration">
             {{t 'Generate URL for an integration' }}
         </button>
     </div>
     {{/if}}
-    <div class="input-group new-style">
+    <div class="input-group">
         {{#if is_active}}
         <button class="button rounded btn-danger deactivate_bot_button">
             {{t 'Deactivate bot' }}
diff --git a/web/templates/settings/edit_custom_profile_field_form.hbs b/web/templates/settings/edit_custom_profile_field_form.hbs
index 11adb88b0f..3e0655c373 100644
--- a/web/templates/settings/edit_custom_profile_field_form.hbs
+++ b/web/templates/settings/edit_custom_profile_field_form.hbs
@@ -1,5 +1,5 @@
 {{#with profile_field_info}}
-<form class="name-setting profile-field-form new-style" id="edit-custom-profile-field-form-{{id}}" data-profile-field-id="{{id}}">
+<form class="name-setting profile-field-form" id="edit-custom-profile-field-form-{{id}}" data-profile-field-id="{{id}}">
     <div class="input-group">
         <label for="name" class="modal-field-label">{{t "Label" }}</label>
         <input type="text" name="name" id="id-custom-profile-field-name" class="modal_text_input prop-element" value="{{ name }}" maxlength="40" data-setting-widget-type="string" />
diff --git a/web/templates/settings/realm_domains_modal.hbs b/web/templates/settings/realm_domains_modal.hbs
index 5377f6d24c..f0c4eaedf4 100644
--- a/web/templates/settings/realm_domains_modal.hbs
+++ b/web/templates/settings/realm_domains_modal.hbs
@@ -1,4 +1,4 @@
-<table class="table table-stripped new-style" id="realm_domains_table">
+<table class="table table-stripped" id="realm_domains_table">
     <thead>
         <th>{{t "Domain" }}</th>
         <th>{{t "Allow subdomains"}}</th>
diff --git a/web/templates/settings_overlay.hbs b/web/templates/settings_overlay.hbs
index 931d86d8bc..d267b8f436 100644
--- a/web/templates/settings_overlay.hbs
+++ b/web/templates/settings_overlay.hbs
@@ -1,4 +1,4 @@
-<div id="settings_page" class="new-style overlay-content overlay-container">
+<div id="settings_page" class="overlay-content overlay-container">
     <div class="settings-header mobile">
         <i class="fa fa-chevron-left" aria-hidden="true"></i>
         <h1>{{t "Settings" }}<span class="section"></span></h1>
diff --git a/web/templates/stream_settings/stream_settings_checkbox.hbs b/web/templates/stream_settings/stream_settings_checkbox.hbs
index c6d14a1aaa..31347c80a6 100644
--- a/web/templates/stream_settings/stream_settings_checkbox.hbs
+++ b/web/templates/stream_settings/stream_settings_checkbox.hbs
@@ -1,7 +1,7 @@
 {{!-- If setting is disabled on realm level, then render setting as control-label-disabled and do not set setting value. Setting status should not change on any click handler, as it is disabled at realm level. --}}
 <div class="sub_setting_checkbox">
     <div id="sub_{{setting_name}}_setting" class="{{#if disabled_realm_setting}}control-label-disabled
-      {{else if notification_setting}}sub_notification_setting{{/if}} new-style">
+      {{else if notification_setting}}sub_notification_setting{{/if}}">
         <span {{#if (and disabled_realm_setting (eq setting_name "push_notifications"))}}class="tippy-zulip-tooltip" data-tooltip-template-id="mobile-push-notification-tooltip-template"{{/if}}>
             <label class="checkbox">
                 <input id="{{setting_name}}_{{stream_id}}" name="{{setting_name}}"
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 bcadd78e5b..cdc1409d6e 100644
--- a/web/templates/user_group_settings/user_group_settings_overlay.hbs
+++ b/web/templates/user_group_settings/user_group_settings_overlay.hbs
@@ -1,4 +1,4 @@
-<div id="groups_overlay" class="overlay new-style" data-overlay="group_subscriptions">
+<div id="groups_overlay" class="overlay" data-overlay="group_subscriptions">
     <div class="flex overlay-content">
         <div class="user-groups-container overlay-container">
             <div class="user-groups-header">
diff --git a/web/templates/user_profile_modal.hbs b/web/templates/user_profile_modal.hbs
index 1b27464812..84cb9d77f8 100644
--- a/web/templates/user_profile_modal.hbs
+++ b/web/templates/user_profile_modal.hbs
@@ -1,6 +1,6 @@
 <div class="micromodal" id="user-profile-modal" data-user-id="{{user_id}}" aria-hidden="true">
     <div class="modal__overlay" tabindex="-1">
-        <div class="modal__container new-style" role="dialog" aria-modal="true" aria-labelledby="dialog_title">
+        <div class="modal__container" role="dialog" aria-modal="true" aria-labelledby="dialog_title">
             <div class="modal__header">
                 <h1 class="modal__title user-profile-name-heading" id="name">
                     {{#unless is_bot}}
diff --git a/web/templates/widgets/todo_widget.hbs b/web/templates/widgets/todo_widget.hbs
index b6a66cbc53..08cced4293 100644
--- a/web/templates/widgets/todo_widget.hbs
+++ b/web/templates/widgets/todo_widget.hbs
@@ -8,7 +8,7 @@
             <button class="todo-task-list-title-check"><i class="fa fa-check"></i></button>
         </div>
     </div>
-    <ul class="todo-widget new-style">
+    <ul class="todo-widget">
     </ul>
     <div class="add-task-bar">
         <input type="text" class="add-task" placeholder="{{t 'New task'}}" />