diff --git a/Riot/Modules/Settings/Notifications/SwiftUI/Chip.swift b/Riot/Modules/Settings/Notifications/SwiftUI/Chip.swift
index 814086f3a..0afee76b6 100644
--- a/Riot/Modules/Settings/Notifications/SwiftUI/Chip.swift
+++ b/Riot/Modules/Settings/Notifications/SwiftUI/Chip.swift
@@ -39,7 +39,7 @@ struct Chip: View {
         if !isEnabled {
             return Color(theme.colors.tertiaryContent)
         }
-        return Color(theme.colors.background)
+        return Color.white
     }
     
     var body: some View {
@@ -65,6 +65,10 @@ struct Chip: View {
 @available(iOS 14.0, *)
 struct Chip_Previews: PreviewProvider {
     static var previews: some View {
-        Chip(chip: "My great chip", onDelete: { })
+        Group {
+            Chip(chip: "My great chip", onDelete: { })
+            Chip(chip: "My great chip", onDelete: { })
+                .theme(.dark)
+        }
     }
 }
diff --git a/Riot/Modules/Settings/Notifications/SwiftUI/Chips.swift b/Riot/Modules/Settings/Notifications/SwiftUI/Chips.swift
index a4ba01e86..a052a16e9 100644
--- a/Riot/Modules/Settings/Notifications/SwiftUI/Chips.swift
+++ b/Riot/Modules/Settings/Notifications/SwiftUI/Chips.swift
@@ -84,7 +84,11 @@ struct Chips: View {
 struct Chips_Previews: PreviewProvider {
     static var chips: [String] = ["Chip1", "Chip2", "Chip3", "Chip4", "Chip5", "Chip6"]
     static var previews: some View {
-        Chips(chips: chips, didDeleteChip: { _ in })
+        Group {
+            Chips(chips: chips, didDeleteChip: { _ in })
+            Chips(chips: chips, didDeleteChip: { _ in })
+                .theme(.dark)
+        }
         
     }
 }
diff --git a/changelog.d/4467.feature b/changelog.d/4467.feature
new file mode 100644
index 000000000..cd2bfed6f
--- /dev/null
+++ b/changelog.d/4467.feature
@@ -0,0 +1 @@
+Account Notification Settings: Enable/disable notification settings (Default, Mentions & Keywords and Other) and edit Keywords.