diff --git a/static/styles/subscriptions.css b/static/styles/subscriptions.css
index f9d4c0930a..9ad52eedf0 100644
--- a/static/styles/subscriptions.css
+++ b/static/styles/subscriptions.css
@@ -200,10 +200,10 @@
     color: hsl(0, 100%, 50%);
 }
 
-.sub_settings_title {
-    line-height: 30px;
+.stream_setting_subsection_title {
+    font-size: 1.5em;
+    line-height: 1.5;
     margin: 10px 0 0 0;
-    font-size: 16px;
 }
 
 .new-stream-name,
@@ -966,8 +966,10 @@
         }
     }
 
-    #personal_settings_label_container {
-        margin-bottom: 5px;
+    #personal-stream-settings {
+        .stream_change_property_status {
+            margin: 9px auto 3px 3px;
+        }
     }
 
     .loading_indicator_text {
diff --git a/static/templates/subscription_members.hbs b/static/templates/subscription_members.hbs
index af5f93f007..1b63e7c908 100644
--- a/static/templates/subscription_members.hbs
+++ b/static/templates/subscription_members.hbs
@@ -1,9 +1,9 @@
 {{#render_subscribers}}
 <div class="subscriber_list_settings_container" {{#unless can_access_subscribers}}style="display: none"{{/unless}}>
     <div class="subscriber_list_settings">
-        <label class="sub_settings_title float-left">
+        <h3 class="stream_setting_subsection_title float-left">
             {{t "Stream membership" }}
-        </label>
+        </h3>
         <div class="subscriber-search float-right">
             <input type="text" class="search" placeholder="{{t 'Search subscribers' }}" />
         </div>
diff --git a/static/templates/subscription_settings.hbs b/static/templates/subscription_settings.hbs
index 40efbc26bc..f6d239c48e 100644
--- a/static/templates/subscription_settings.hbs
+++ b/static/templates/subscription_settings.hbs
@@ -47,22 +47,20 @@
             </div>
             {{/with}}
             <div class="stream-email-box" {{#unless sub.email_address}}style="display: none;"{{/unless}}>
-                <label class="sub_settings_title">
+                <h3 class="stream_setting_subsection_title">
                     {{t "Email address" }}
                     {{> help_link_widget link="/help/message-a-stream-by-email" }}
-                </label>
+                </h3>
                 <div class="stream-email">
                     <span class="email-address">{{sub.email_address}}</span>
                 </div>
             </div>
         </div>
 
-        <div class="personal_settings stream_section collapse {{#sub.subscribed}}in{{/sub.subscribed}}">
-            <div id="personal_settings_label_container">
-                <label class="sub_settings_title inline-block">
-                    {{t "Personal settings" }}
-                </label>
-                <div id="stream_change_property_status{{sub.stream_id}}" class="alert-notification"></div>
+        <div id="personal-stream-settings" class="personal_settings stream_section collapse {{#sub.subscribed}}in{{/sub.subscribed}}">
+            <div class="subsection-header">
+                <h3 class="stream_setting_subsection_title inline-block">{{t "Personal settings" }}</h3>
+                <div id="stream_change_property_status{{sub.stream_id}}" class="stream_change_property_status alert-notification"></div>
             </div>
             <div class="subscription-config">
                 <ul class="grey-box">