diff --git a/res/css/views/settings/_Notifications2.pcss b/res/css/views/settings/_Notifications2.pcss
index 7e507f61cea3..d2bee78bf408 100644
--- a/res/css/views/settings/_Notifications2.pcss
+++ b/res/css/views/settings/_Notifications2.pcss
@@ -1,4 +1,8 @@
 .mx_Notifications2 {
+    .mx_Notifications2_banner {
+        margin-bottom: 32px;
+    }
+
     .mx_SettingsSection_subSections {
         color: #17191c;
         gap: 32px;
@@ -6,6 +10,15 @@
         flex-direction: column;
     }
 
+    .mx_SettingsSubsection_description {
+        margin-bottom: 20px;
+    }
+
+    .mx_SettingsFlag {
+        margin-bottom: -2px;
+        margin-top: -2px;
+    }
+
     .mx_Notifications2_banner {
         background: #f4f8ff;
         line-height: 2.25rem;
@@ -40,7 +53,7 @@
         font-size: 1.2rem;
 
         .mx_NotificationBadge {
-            vertical-align: bottom;
+            vertical-align: baseline;
             display: inline-flex;
             margin: 0 2px;
         }
diff --git a/src/components/views/settings/Notifications2.tsx b/src/components/views/settings/Notifications2.tsx
index 71c55993c06e..50fd224d51d2 100644
--- a/src/components/views/settings/Notifications2.tsx
+++ b/src/components/views/settings/Notifications2.tsx
@@ -126,6 +126,8 @@ export default function Notifications2(): JSX.Element {
         [cli, pushers, refreshPushers, refreshThreepids],
     );
 
+    const notificationTargets = pushers.filter((it) => it.kind !== "email");
+
     return (
         <div className="mx_Notifications2">
             {hasPendingChanges && (
@@ -425,17 +427,19 @@ export default function Notifications2(): JSX.Element {
                             ))}
                     </SettingsIndent>
                 </SettingsSubsection>
-                <SettingsSubsection heading={_t("Notification targets")}>
-                    <ul>
-                        {pushers
-                            .filter((it) => it.kind !== "email")
-                            .map((pusher) => (
-                                <li key={pusher.pushkey}>
-                                    {pusher.device_display_name || `${pusher.app_id} on ${pusher.profile_tag}`}
-                                </li>
-                            ))}
-                    </ul>
-                </SettingsSubsection>
+                {notificationTargets.length > 0 && (
+                    <SettingsSubsection heading={_t("Notification targets")}>
+                        <ul>
+                            {pushers
+                                .filter((it) => it.kind !== "email")
+                                .map((pusher) => (
+                                    <li key={pusher.pushkey}>
+                                        {pusher.device_display_name || `${pusher.app_id} on ${pusher.profile_tag}`}
+                                    </li>
+                                ))}
+                        </ul>
+                    </SettingsSubsection>
+                )}
                 <SettingsSubsection heading={_t("Quick Actions")}>
                     <AccessibleButton
                         kind="primary_outline"
diff --git a/src/models/notificationsettings/NotificationSettingsModel.ts b/src/models/notificationsettings/NotificationSettingsModel.ts
index 4c121e4355f0..64c6538d0bce 100644
--- a/src/models/notificationsettings/NotificationSettingsModel.ts
+++ b/src/models/notificationsettings/NotificationSettingsModel.ts
@@ -56,6 +56,8 @@ export type NotificationSettingsModel = {
     };
 };
 
+// TODO: Use highest action for parsing
+
 export function fromRules(
     rules: Map<RuleId, StandardPushRule>,
     content: IAnnotatedPushRule[],