diff --git a/web/templates/settings/display_settings.hbs b/web/templates/settings/display_settings.hbs
index 125fbf5759..86488b3e03 100644
--- a/web/templates/settings/display_settings.hbs
+++ b/web/templates/settings/display_settings.hbs
@@ -37,7 +37,7 @@
         </div>
 
         <div class="input-group">
-            <label>{{t "Emoji theme" }}</label>
+            <label class="settings-field-label">{{t "Emoji theme" }}</label>
             <div class="emojiset_choices grey-box prop-element" id="{{prefix}}emojiset" data-setting-widget-type="radio-group" data-setting-choice-type="string">
                 {{#each settings_object.emojiset_choices}}
                     <label class="preferences-radio-choice-label">
@@ -94,7 +94,7 @@
         </div>
 
         <div class="input-group">
-            <label>{{t "User list style" }}</label>
+            <label class="settings-field-label">{{t "User list style" }}</label>
             <div class="user_list_style_values grey-box prop-element" id="{{prefix}}user_list_style" data-setting-widget-type="radio-group" data-setting-choice-type="number">
                 {{#each user_list_style_values}}
                     <label class="preferences-radio-choice-label">
diff --git a/web/templates/settings/notification_settings.hbs b/web/templates/settings/notification_settings.hbs
index ac4c520a7d..e69fd80bd9 100644
--- a/web/templates/settings/notification_settings.hbs
+++ b/web/templates/settings/notification_settings.hbs
@@ -173,7 +173,7 @@
 
         <div class="input-group time-limit-setting">
 
-            <label for="email_notifications_batching_period">
+            <label for="email_notifications_batching_period" class="settings-field-label">
                 {{t "Delay before sending message notification emails" }}
             </label>
             <select name="email_notifications_batching_period_seconds" class="setting_email_notifications_batching_period_seconds prop-element settings_select bootstrap-focus-style" id="{{prefix}}email_notifications_batching_period_seconds" data-setting-widget-type="time-limit">
diff --git a/web/templates/settings/organization_permissions_admin.hbs b/web/templates/settings/organization_permissions_admin.hbs
index fb1fd029fa..4b13f1457b 100644
--- a/web/templates/settings/organization_permissions_admin.hbs
+++ b/web/templates/settings/organization_permissions_admin.hbs
@@ -186,7 +186,7 @@
             </div>
 
             <div class="input-group">
-                <label for="realm_move_messages_between_streams_policy">{{t "Who can move messages to another channel" }}
+                <label for="realm_move_messages_between_streams_policy" class="settings-field-label">{{t "Who can move messages to another channel" }}
                 </label>
                 <select name="realm_move_messages_between_streams_policy" class="setting-widget prop-element bootstrap-focus-style move-message-policy-setting settings_select" id="id_realm_move_messages_between_streams_policy" data-setting-widget-type="number">
                     {{> dropdown_options_widget option_values=move_messages_between_streams_policy_values}}
@@ -318,7 +318,7 @@
             </div>
             <div class="m-10 inline-block organization-permissions-parent">
                 <div class="input-group">
-                    <label for="realm_bot_creation_policy">{{t "Who can add bots" }}</label>
+                    <label for="realm_bot_creation_policy" class="settings-field-label">{{t "Who can add bots" }}</label>
                     <select name="realm_bot_creation_policy" class="setting-widget prop-element settings_select bootstrap-focus-style" id="id_realm_bot_creation_policy" data-setting-widget-type="number">
                         {{> dropdown_options_widget option_values=bot_creation_policy_values}}
                     </select>
@@ -339,7 +339,7 @@
                 </div>
 
                 <div class="input-group">
-                    <label for="realm_private_message_policy">{{t "Who can use direct messages" }} ({{t "beta" }})
+                    <label for="realm_private_message_policy" class="settings-field-label">{{t "Who can use direct messages" }} ({{t "beta" }})
                         {{> ../help_link_widget link="/help/restrict-direct-messages" }}
                     </label>
                     <select name="realm_private_message_policy" class="setting-widget prop-element settings_select bootstrap-focus-style" id="id_realm_private_message_policy" data-setting-widget-type="number">
diff --git a/web/templates/settings/organization_profile_admin.hbs b/web/templates/settings/organization_profile_admin.hbs
index 9bb9be291d..177dfff8ca 100644
--- a/web/templates/settings/organization_profile_admin.hbs
+++ b/web/templates/settings/organization_profile_admin.hbs
@@ -12,7 +12,7 @@
 
             <div class="organization-settings-parent">
                 <div class="input-group admin-realm">
-                    <label for="id_realm_name">{{t "Organization name" }}</label>
+                    <label for="id_realm_name" class="settings-field-label">{{t "Organization name" }}</label>
                     <input type="text" id="id_realm_name" name="realm_name" class="admin-realm-name setting-widget prop-element settings_text_input"
                       autocomplete="off" data-setting-widget-type="string"
                       value="{{ realm_name }}" maxlength="40" />
@@ -33,7 +33,7 @@
                   label=admin_settings_label.realm_want_advertise_in_communities_directory
                   help_link="/help/communities-directory"}}
                 <div class="input-group admin-realm">
-                    <label for="realm_description">{{t "Organization description" }}</label>
+                    <label for="realm_description" class="settings-field-label">{{t "Organization description" }}</label>
                     <textarea id="id_realm_description" name="realm_description" class="admin-realm-description setting-widget prop-element settings_textarea"
                       maxlength="1000" data-setting-widget-type="string">{{ realm_description }}</textarea>
                 </div>
diff --git a/web/templates/stream_settings/stream_creation_form.hbs b/web/templates/stream_settings/stream_creation_form.hbs
index 7a78699e51..a2e150ad62 100644
--- a/web/templates/stream_settings/stream_creation_form.hbs
+++ b/web/templates/stream_settings/stream_creation_form.hbs
@@ -6,7 +6,7 @@
             <div id="stream_creating_indicator"></div>
             <div class="stream-creation-body">
                 <section class="block">
-                    <label for="create_stream_name">
+                    <label for="create_stream_name" class="settings-field-label">
                         {{t "Channel name" }}
                     </label>
                     <input type="text" name="stream_name" id="create_stream_name" class="settings_text_input"
@@ -14,7 +14,7 @@
                     <div id="stream_name_error" class="stream_creation_error"></div>
                 </section>
                 <section class="block">
-                    <label for="create_stream_description">
+                    <label for="create_stream_description" class="settings-field-label">
                         {{t "Channel description" }}
                         {{> ../help_link_widget link="/help/change-the-stream-description" }}
                     </label>
diff --git a/web/templates/stream_settings/stream_settings.hbs b/web/templates/stream_settings/stream_settings.hbs
index aed8bb3338..f8b42e0729 100644
--- a/web/templates/stream_settings/stream_settings.hbs
+++ b/web/templates/stream_settings/stream_settings.hbs
@@ -144,7 +144,7 @@
                     </div>
                 {{/each}}
                 <div class="input-group">
-                    <label for="streamcolor">{{t "Channel color" }}</label>
+                    <label for="streamcolor" class="settings-field-label">{{t "Channel color" }}</label>
                     <span class="sub_setting_control">
                         <input stream_id="{{sub.stream_id}}" class="colorpicker" id="streamcolor" type="text" value="{{sub.color}}" tabindex="-1" />
                     </span>
diff --git a/web/templates/user_group_settings/user_group_creation_form.hbs b/web/templates/user_group_settings/user_group_creation_form.hbs
index aabba6a87a..e6a12f220c 100644
--- a/web/templates/user_group_settings/user_group_creation_form.hbs
+++ b/web/templates/user_group_settings/user_group_creation_form.hbs
@@ -6,7 +6,7 @@
             <div id="user_group_creating_indicator"></div>
             <div class="user-group-creation-body">
                 <section class="block">
-                    <label for="create_user_group_name">
+                    <label for="create_user_group_name" class="settings-field-label">
                         {{t "User group name" }}
                     </label>
                     <input type="text" name="user_group_name" id="create_user_group_name" class="settings_text_input"
@@ -14,7 +14,7 @@
                     <div id="user_group_name_error" class="user_group_creation_error"></div>
                 </section>
                 <section class="block">
-                    <label for="create_user_group_description">
+                    <label for="create_user_group_description" class="settings-field-label">
                         {{t "User group description" }}
                     </label>
                     <input type="text" name="user_group_description" id="create_user_group_description" class="settings_text_input"