diff --git a/static/styles/dark_theme.css b/static/styles/dark_theme.css
index 7ae9043bb3..7f213220d6 100644
--- a/static/styles/dark_theme.css
+++ b/static/styles/dark_theme.css
@@ -613,7 +613,7 @@ body.night-mode {
     .subscriptions-container .left,
     .subscriber-list-box,
     .subscriber-list-box .subscriber_list_container .subscriber-list tr,
-    #subscription_overlay ul li,
+    #subscription_overlay .subsection-parent div,
     #subscription_overlay .radio-input-parent,
     #stream_privacy_modal .radio-input-parent,
     #settings_page .sidebar,
diff --git a/static/styles/subscriptions.css b/static/styles/subscriptions.css
index 9df7d4d821..0ba6e0f0b2 100644
--- a/static/styles/subscriptions.css
+++ b/static/styles/subscriptions.css
@@ -85,10 +85,6 @@
     border-radius: 2px;
 }
 
-.subscription_settings ul {
-    list-style-type: none;
-}
-
 .stream-email {
     font-family: "Source Code Pro", monospace;
     padding: 5px;
@@ -1018,30 +1014,29 @@
     }
 }
 
-#subscription_overlay .stream-types,
-#subscription_overlay ul {
+#subscription_overlay .subsection-parent {
     margin: 0;
     padding: 5px 10px;
-}
 
-#subscription_overlay ul > li {
-    border-bottom: 1px solid hsl(0, 0%, 87%);
-    padding: 5px 0;
+    .input-group {
+        border-bottom: 1px solid hsl(0, 0%, 87%);
+        padding: 5px 0;
 
-    input[type="checkbox"] {
-        margin-top: 0;
-    }
+        input[type="checkbox"] {
+            margin-top: 0;
+        }
 
-    &:last-of-type {
-        border-bottom: none;
-    }
+        &:last-of-type {
+            border-bottom: none;
+        }
 
-    .sp-replacer {
-        box-shadow: none;
-    }
+        .sp-replacer {
+            box-shadow: none;
+        }
 
-    input[type="radio"] {
-        margin-right: 5px;
+        input[type="radio"] {
+            margin-right: 5px;
+        }
     }
 }
 
diff --git a/static/templates/stream_settings/stream_settings.hbs b/static/templates/stream_settings/stream_settings.hbs
index dd28c01673..2895900fe7 100644
--- a/static/templates/stream_settings/stream_settings.hbs
+++ b/static/templates/stream_settings/stream_settings.hbs
@@ -75,9 +75,9 @@
                 <div id="stream_change_property_status{{sub.stream_id}}" class="stream_change_property_status alert-notification"></div>
             </div>
             <div class="subscription-config">
-                <ul>
-                    {{#each other_settings}}
-                    <li>
+                <div class="subsection-parent">
+                    <div class="input-group">
+                        {{#each other_settings}}
                         {{> stream_settings_checkbox
                           setting_name=name
                           is_checked=is_checked
@@ -87,19 +87,19 @@
                           disabled_realm_setting=disabled_realm_setting
                           is_disabled=is_disabled
                           label=label}}
-                    </li>
-                    {{/each}}
-                    <li>
+                        {{/each}}
+                    </div>
+                    <div class="input-group">
                         <label for="streamcolor" class="subscription-control-label">{{t "Stream 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>
-                    </li>
-                </ul>
+                    </div>
+                </div>
                 <h4>{{t "Notification settings" }}</h4>
-                <ul>
-                    {{#each notification_settings}}
-                    <li>
+                <div class="subsection-parent">
+                    <div class="input-group">
+                        {{#each notification_settings}}
                         {{> stream_settings_checkbox
                           setting_name=name
                           is_checked=is_checked
@@ -109,9 +109,9 @@
                           disabled_realm_setting=disabled_realm_setting
                           is_disabled=is_disabled
                           label=label}}
-                    </li>
-                    {{/each}}
-                </ul>
+                        {{/each}}
+                    </div>
+                </div>
             </div>
         </div>