diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings
index b522cc88c..00b37bbbe 100644
--- a/ElementX/Resources/Localizations/en.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/en.lproj/Localizable.strings
@@ -301,7 +301,7 @@
 "screen_notification_settings_additional_settings_section_title" = "Additional settings";
 "screen_notification_settings_calls_label" = "Audio and video calls";
 "screen_notification_settings_configuration_mismatch" = "Configuration mismatch";
-"screen_notification_settings_configuration_mismatch_description" = "We’ve simplified Notifications Settings to make options easier to find.\n\nSome custom settings you’ve chosen in the past are not shown here, but they’re still active.\n\nIf you proceed, some of your settings may change.";
+"screen_notification_settings_configuration_mismatch_description" = "We’ve simplified Notifications Settings to make options easier to find. Some custom settings you’ve chosen in the past are not shown here, but they’re still active.\n\nIf you proceed, some of your settings may change.";
 "screen_notification_settings_direct_chats" = "Direct chats";
 "screen_notification_settings_edit_custom_settings_section_title" = "Custom setting per chat";
 "screen_notification_settings_edit_failed_updating_default_mode" = "An error occurred while updating the notification setting.";
diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift
index 37fd3987c..b1e50f598 100644
--- a/ElementX/Sources/Generated/Strings.swift
+++ b/ElementX/Sources/Generated/Strings.swift
@@ -762,9 +762,7 @@ public enum L10n {
   public static var screenNotificationSettingsCallsLabel: String { return L10n.tr("Localizable", "screen_notification_settings_calls_label") }
   /// Configuration mismatch
   public static var screenNotificationSettingsConfigurationMismatch: String { return L10n.tr("Localizable", "screen_notification_settings_configuration_mismatch") }
-  /// We’ve simplified Notifications Settings to make options easier to find.
-  /// 
-  /// Some custom settings you’ve chosen in the past are not shown here, but they’re still active.
+  /// We’ve simplified Notifications Settings to make options easier to find. Some custom settings you’ve chosen in the past are not shown here, but they’re still active.
   /// 
   /// If you proceed, some of your settings may change.
   public static var screenNotificationSettingsConfigurationMismatchDescription: String { return L10n.tr("Localizable", "screen_notification_settings_configuration_mismatch_description") }
diff --git a/ElementX/Sources/Screens/Settings/NotificationSettingsScreen/View/NotificationSettingsScreen.swift b/ElementX/Sources/Screens/Settings/NotificationSettingsScreen/View/NotificationSettingsScreen.swift
index dea81c4dc..ed7921dbb 100644
--- a/ElementX/Sources/Screens/Settings/NotificationSettingsScreen/View/NotificationSettingsScreen.swift
+++ b/ElementX/Sources/Screens/Settings/NotificationSettingsScreen/View/NotificationSettingsScreen.swift
@@ -156,13 +156,12 @@ struct NotificationSettingsScreen: View {
     private var configurationMismatchSection: some View {
         Section {
             ListRow(kind: .custom {
-                VStack(alignment: .leading, spacing: 12) {
-                    Image(systemName: "gearshape")
-                        .font(.compound.headingSMSemibold)
-                    VStack(alignment: .leading, spacing: 4) {
+                VStack(alignment: .leading, spacing: 16) {
+                    VStack(alignment: .leading, spacing: 8) {
                         Text(L10n.screenNotificationSettingsConfigurationMismatch)
-                            .font(.compound.headingSMSemibold)
+                            .font(.compound.bodyLGSemibold)
                         Text(L10n.screenNotificationSettingsConfigurationMismatchDescription)
+                            .font(.compound.bodyMD)
                             .foregroundColor(.compound.textSecondary)
                     }
                     Button {
@@ -175,7 +174,7 @@ struct NotificationSettingsScreen: View {
                     .accessibilityIdentifier(A11yIdentifiers.notificationSettingsScreen.fixMismatchConfiguration)
                 }
                 .padding(.horizontal, ListRowPadding.horizontal)
-                .padding(.vertical, ListRowPadding.vertical)
+                .padding(.vertical, 24)
             })
         }
     }
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.notificationSettingsScreenMismatchConfiguration.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.notificationSettingsScreenMismatchConfiguration.png
index 0d7d48979..fd687b638 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.notificationSettingsScreenMismatchConfiguration.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.notificationSettingsScreenMismatchConfiguration.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12aa24cb445649e4b6520e960667a92c8166bf84418e24306380d63aee6c03a7
-size 95563
+oid sha256:99866d3b4a2bc5a4ddbf926c299b84bfd8c193383ec76ad532c39c5a3922fbf2
+size 92935
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.notificationSettingsScreenMismatchConfiguration.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.notificationSettingsScreenMismatchConfiguration.png
index f502e01ca..41912e46b 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.notificationSettingsScreenMismatchConfiguration.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.notificationSettingsScreenMismatchConfiguration.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9319b24a7b129121d5e6bf8a14fae1b9700df5b44ddea3e0be03872602480578
-size 129165
+oid sha256:10fb63da202e1cc0dcad769ba42428522b89304166563b184689c08394262e7f
+size 116668
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.notificationSettingsScreenMismatchConfiguration.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.notificationSettingsScreenMismatchConfiguration.png
index 7075532d3..42d061c58 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.notificationSettingsScreenMismatchConfiguration.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.notificationSettingsScreenMismatchConfiguration.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a339016cc249bc0f2014b7f65d084213115a2ceac30c7b7df65379ab47ea1512
-size 124169
+oid sha256:dbd9ec65129869d4dbd9f6fdd4436c2894f8aef74c94bff8fcc1160a239dd551
+size 119908
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.notificationSettingsScreenMismatchConfiguration.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.notificationSettingsScreenMismatchConfiguration.png
index c2a3e073c..29dcc7620 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.notificationSettingsScreenMismatchConfiguration.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.notificationSettingsScreenMismatchConfiguration.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69fc8921f9bd24b07eeb042da2b6b4dc85861dda6a62f94133fa136c5bfb498a
-size 197579
+oid sha256:0f907bcedc944a19451dde127e2579c38f94e1d732cbd8b3f227fecd8f0fb0d4
+size 169669