diff --git a/templates/zerver/app/index.html b/templates/zerver/app/index.html
index 32c9d3a885..6c9687dd6c 100644
--- a/templates/zerver/app/index.html
+++ b/templates/zerver/app/index.html
@@ -118,7 +118,7 @@
 {% endblock %}
 
 {% block content %}
-<div id="feedback_container" class="new-style">
+<div id="feedback_container">
 </div>
 
 <div id="app-loading">
diff --git a/web/templates/add_poll_modal.hbs b/web/templates/add_poll_modal.hbs
index 08d5cd721d..8fcc7bd3f8 100644
--- a/web/templates/add_poll_modal.hbs
+++ b/web/templates/add_poll_modal.hbs
@@ -1,4 +1,4 @@
-<form id="add-poll-form" class="new-style">
+<form id="add-poll-form">
     <label class="poll-label">{{t "Question"}}</label>
     <div class="poll-question-input-container">
         <input type="text" id="poll-question-input" class="modal_text_input" placeholder="{{t 'Your question'}}" />
diff --git a/web/templates/change_email_modal.hbs b/web/templates/change_email_modal.hbs
index 3a0fc84b9f..17611de84c 100644
--- a/web/templates/change_email_modal.hbs
+++ b/web/templates/change_email_modal.hbs
@@ -1,4 +1,4 @@
-<form id="change_email_form" class="new-style">
+<form id="change_email_form">
     <label for="email" class="modal-field-label">{{t "New email" }}</label>
     <input type="text" name="email" class="modal_text_input" value="{{delivery_email}}" autocomplete="off" spellcheck="false" autofocus="autofocus"/>
 </form>
diff --git a/web/templates/compose.hbs b/web/templates/compose.hbs
index 1cb830a7b0..f64a890809 100644
--- a/web/templates/compose.hbs
+++ b/web/templates/compose.hbs
@@ -10,7 +10,7 @@
             </div>
         </div>
     </div>
-    <div id="compose_controls" class="new-style">
+    <div id="compose_controls">
         <div id="compose_buttons">
             <div class="new_message_button reply_button_container">
                 <div class="compose-reply-button-wrapper" data-reply-button-type="selected_message">
diff --git a/web/templates/confirm_dialog/confirm_deactivate_user.hbs b/web/templates/confirm_dialog/confirm_deactivate_user.hbs
index 97594aef52..2a77f30d96 100644
--- a/web/templates/confirm_dialog/confirm_deactivate_user.hbs
+++ b/web/templates/confirm_dialog/confirm_deactivate_user.hbs
@@ -18,13 +18,11 @@
         </ul>
     {{/if}}
 </p>
-<div class="new-style">
-    <label class="checkbox">
-        <input type="checkbox" class="send_email" />
-        <span class="rendered-checkbox"></span>
-        {{t "Notify this user by email?" }}
-    </label>
-</div>
+<label class="checkbox">
+    <input type="checkbox" class="send_email" />
+    <span class="rendered-checkbox"></span>
+    {{t "Notify this user by email?" }}
+</label>
 <div class="email_field">
     <p class="border-top">
         <strong>{{t "Subject" }}:</strong>
diff --git a/web/templates/demo_organization_add_email_modal.hbs b/web/templates/demo_organization_add_email_modal.hbs
index 1a4db2a752..13904fa602 100644
--- a/web/templates/demo_organization_add_email_modal.hbs
+++ b/web/templates/demo_organization_add_email_modal.hbs
@@ -1,4 +1,4 @@
-<form id="demo_organization_add_email_form" class="new-style">
+<form id="demo_organization_add_email_form">
     <div class="tip">{{t "If you haven't updated your name, it's a good idea to do so before inviting other users to join you!" }}</div>
     <div class="input-group">
         <label for="demo_organization_add_email" class="modal-field-label">{{t "Email" }}</label>
diff --git a/web/templates/invite_user_modal.hbs b/web/templates/invite_user_modal.hbs
index e37820070f..7bafc8bb2f 100644
--- a/web/templates/invite_user_modal.hbs
+++ b/web/templates/invite_user_modal.hbs
@@ -18,7 +18,7 @@
     </div>
     {{/if}}
     <div class="input-group">
-        <div id="invite_users_option_tabs_container" class="new-style"></div>
+        <div id="invite_users_option_tabs_container"></div>
         <div id="invitee_emails_container">
             <label for="invitee_emails" class="modal-field-label">{{t "Emails (one on each line or comma-separated)" }}</label>
             <div class="pill-container">
diff --git a/web/templates/message_edit_form.hbs b/web/templates/message_edit_form.hbs
index 0f879779cb..afa63af49b 100644
--- a/web/templates/message_edit_form.hbs
+++ b/web/templates/message_edit_form.hbs
@@ -1,7 +1,7 @@
 {{! Client-side Handlebars template for rendering the message edit form. }}
 <div class="message_edit">
     <div class="message_edit_form">
-        <form id="edit_form_{{message_id}}" class="new-style">
+        <form id="edit_form_{{message_id}}">
             <div class="edit_form_banners"></div>
             <div class="edit-controls edit-content-container {{#if is_editable}}surround-formatting-buttons-row{{/if}}">
                 {{> copy_message_button message_id=this.message_id}}
diff --git a/web/templates/move_topic_to_stream.hbs b/web/templates/move_topic_to_stream.hbs
index 5b10f00d9e..dd064a7a15 100644
--- a/web/templates/move_topic_to_stream.hbs
+++ b/web/templates/move_topic_to_stream.hbs
@@ -1,7 +1,7 @@
 {{#unless (or from_message_actions_popover only_topic_edit)}}
 <p class="white-space-preserve-wrap">{{#tr}}Move all messages in <strong>{topic_name}</strong>{{/tr}} to:</p>
 {{/unless}}
-<form class="new-style" id="move_topic_form">
+<form id="move_topic_form">
     {{#if only_topic_edit }}
     <p>{{t "Rename topic to:" }}</p>
     {{else if from_message_actions_popover}}
diff --git a/web/templates/settings/add_emoji.hbs b/web/templates/settings/add_emoji.hbs
index 25b36609dc..0eb10e5602 100644
--- a/web/templates/settings/add_emoji.hbs
+++ b/web/templates/settings/add_emoji.hbs
@@ -1,4 +1,4 @@
-<form class="new-style" id="add-custom-emoji-form">
+<form id="add-custom-emoji-form">
     <div>
         <input type="file" name="emoji_file_input" class="notvisible"
           id="emoji_file_input" value="{{t 'Upload image or GIF' }}"/>
diff --git a/web/templates/settings/add_new_bot_form.hbs b/web/templates/settings/add_new_bot_form.hbs
index aa7d3f90b4..f37ffe3951 100644
--- a/web/templates/settings/add_new_bot_form.hbs
+++ b/web/templates/settings/add_new_bot_form.hbs
@@ -1,4 +1,4 @@
-<form id="create_bot_form" class="new-style">
+<form id="create_bot_form">
     <div class="new-bot-form">
         <div class="input-group">
             <label for="bot_type" class="modal-field-label">
diff --git a/web/templates/settings/generate_integration_url_modal.hbs b/web/templates/settings/generate_integration_url_modal.hbs
index f243efc68d..6f6d58f882 100644
--- a/web/templates/settings/generate_integration_url_modal.hbs
+++ b/web/templates/settings/generate_integration_url_modal.hbs
@@ -1,51 +1,49 @@
-<div class="new-style">
-    <div class="input-group">
-        <div class="integration-url-name-wrapper integration-url-parameter">
-            {{> ../dropdown_widget_with_label
-              widget_name="integration-name"
-              label=(t "Integration")}}
-        </div>
-    </div>
-    <div class="input-group">
-        <div class="integration-url-stream-wrapper integration-url-parameter">
-            {{> ../dropdown_widget_with_label
-              widget_name="integration-url-stream"
-              label=(t "Where to send notifications")}}
-        </div>
-    </div>
-    <div class="input-group control-label-disabled">
-        <label class="checkbox">
-            <input type="checkbox" id="integration-url-override-topic" class="integration-url-parameter" disabled/>
-            <span class="rendered-checkbox"></span>
-        </label>
-        <label class="inline" for="integration-url-override-topic">
-            {{t "Send all notifications to a single topic"}}
-        </label>
-    </div>
-    <div class="input-group hide">
-        <label for="integration-url-topic-input" class="modal-label-field">{{t "Topic"}}</label>
-        <input type="text" id="integration-url-topic-input" class="modal_text_input integration-url-parameter" maxlength="{{ max_topic_length }}" />
-    </div>
-    <div id="integration-events-parameter" class="input-group hide">
-        <label class="checkbox">
-            <input type="checkbox" id="show-integration-events"/>
-            <span class="rendered-checkbox"></span>
-        </label>
-        <label class="inline" for="show-integration-events">
-            {{t "Filter events that will trigger notifications?"}}
-        </label>
-    </div>
-    <div class="input-group hide" id="integrations-event-container">
-        <label for="integrations-event-options">{{t "Events to include:"}}</label>
-        <div class="integration-all-events-buttons">
-            <button class="button rounded" id="add-all-integration-events">{{t "Check all"}}</button>
-            <button class="button rounded" id="remove-all-integration-events">{{t "Uncheck all"}}</button>
-        </div>
-        <div id="integrations-event-options"></div>
-    </div>
-    <hr />
-    <p class="integration-url-header">{{t "URL for your integration"}}</p>
-    <div class="integration-url">
-        {{default_url_message}}
+<div class="input-group">
+    <div class="integration-url-name-wrapper integration-url-parameter">
+        {{> ../dropdown_widget_with_label
+          widget_name="integration-name"
+          label=(t "Integration")}}
     </div>
 </div>
+<div class="input-group">
+    <div class="integration-url-stream-wrapper integration-url-parameter">
+        {{> ../dropdown_widget_with_label
+          widget_name="integration-url-stream"
+          label=(t "Where to send notifications")}}
+    </div>
+</div>
+<div class="input-group control-label-disabled">
+    <label class="checkbox">
+        <input type="checkbox" id="integration-url-override-topic" class="integration-url-parameter" disabled/>
+        <span class="rendered-checkbox"></span>
+    </label>
+    <label class="inline" for="integration-url-override-topic">
+        {{t "Send all notifications to a single topic"}}
+    </label>
+</div>
+<div class="input-group hide">
+    <label for="integration-url-topic-input" class="modal-label-field">{{t "Topic"}}</label>
+    <input type="text" id="integration-url-topic-input" class="modal_text_input integration-url-parameter" maxlength="{{ max_topic_length }}" />
+</div>
+<div id="integration-events-parameter" class="input-group hide">
+    <label class="checkbox">
+        <input type="checkbox" id="show-integration-events"/>
+        <span class="rendered-checkbox"></span>
+    </label>
+    <label class="inline" for="show-integration-events">
+        {{t "Filter events that will trigger notifications?"}}
+    </label>
+</div>
+<div class="input-group hide" id="integrations-event-container">
+    <label for="integrations-event-options">{{t "Events to include:"}}</label>
+    <div class="integration-all-events-buttons">
+        <button class="button rounded" id="add-all-integration-events">{{t "Check all"}}</button>
+        <button class="button rounded" id="remove-all-integration-events">{{t "Uncheck all"}}</button>
+    </div>
+    <div id="integrations-event-options"></div>
+</div>
+<hr />
+<p class="integration-url-header">{{t "URL for your integration"}}</p>
+<div class="integration-url">
+    {{default_url_message}}
+</div>
diff --git a/web/templates/settings_tab.hbs b/web/templates/settings_tab.hbs
index 5d4de7a31a..c0f637a532 100644
--- a/web/templates/settings_tab.hbs
+++ b/web/templates/settings_tab.hbs
@@ -1,4 +1,4 @@
-<div id="settings-change-box" class="new-style">
+<div id="settings-change-box">
     {{> settings/profile_settings }}
 
     {{> settings/account_settings }}
diff --git a/web/templates/stream_settings/confirm_stream_privacy_change_modal.hbs b/web/templates/stream_settings/confirm_stream_privacy_change_modal.hbs
index 5609df26a8..216ce2a2e9 100644
--- a/web/templates/stream_settings/confirm_stream_privacy_change_modal.hbs
+++ b/web/templates/stream_settings/confirm_stream_privacy_change_modal.hbs
@@ -1,7 +1,5 @@
 <div class="confirm-stream-privacy-modal">
-    <div class="new-style">
-        <p class="confirm-stream-privacy-info">
-            {{t "This change will make this channel's entire message history accessible according to the new configuration."}}
-        </p>
-    </div>
+    <p class="confirm-stream-privacy-info">
+        {{t "This change will make this channel's entire message history accessible according to the new configuration."}}
+    </p>
 </div>
diff --git a/web/templates/stream_settings/copy_email_address_modal.hbs b/web/templates/stream_settings/copy_email_address_modal.hbs
index 6e4e6092c7..a9cd35ba25 100644
--- a/web/templates/stream_settings/copy_email_address_modal.hbs
+++ b/web/templates/stream_settings/copy_email_address_modal.hbs
@@ -1,26 +1,24 @@
 <div class="copy-email-modal">
-    <div class="new-style">
-        <p class="question-which-parts">
-            {{t "Which parts of the email should be included in the Zulip message sent to this channel?"}}
-        </p>
-        {{#each tags}}
-            {{#if (eq this.name "prefer-html") }}
-            <hr />
-            {{/if}}
-            <div class="input-group" id="{{this.name}}-input-group">
-                <label class="checkbox">
-                    <input class="tag-checkbox" id="{{ this.name }}" type="checkbox"/>
-                    <span class="rendered-checkbox"></span>
-                </label>
-                <label class="inline" for="{{this.name}}">{{{this.description}}}</label>
-            </div>
-        {{/each}}
+    <p class="question-which-parts">
+        {{t "Which parts of the email should be included in the Zulip message sent to this channel?"}}
+    </p>
+    {{#each tags}}
+        {{#if (eq this.name "prefer-html") }}
         <hr />
-        <p class="stream-email-header">
-            {{t "Channel email address:"}}
-        </p>
-        <div class="stream-email">
-            <div class="email-address">{{email_address}}</div>
+        {{/if}}
+        <div class="input-group" id="{{this.name}}-input-group">
+            <label class="checkbox">
+                <input class="tag-checkbox" id="{{ this.name }}" type="checkbox"/>
+                <span class="rendered-checkbox"></span>
+            </label>
+            <label class="inline" for="{{this.name}}">{{{this.description}}}</label>
         </div>
+    {{/each}}
+    <hr />
+    <p class="stream-email-header">
+        {{t "Channel email address:"}}
+    </p>
+    <div class="stream-email">
+        <div class="email-address">{{email_address}}</div>
     </div>
 </div>