diff --git a/src/rooms/RoomContextMenu.qml b/src/rooms/RoomContextMenu.qml
index 72d0c9e14..42ed7bd05 100644
--- a/src/rooms/RoomContextMenu.qml
+++ b/src/rooms/RoomContextMenu.qml
@@ -71,7 +71,7 @@ KirigamiComponents.ConvergentContextMenu {
         }
 
         Kirigami.Action {
-            text: i18nc("As in 'notify for all messages'", "All")
+            text: i18nc("As in 'notify for all messages'", "All Messages")
             icon.name: "notifications"
             checkable: true
             autoExclusive: true
@@ -95,7 +95,7 @@ KirigamiComponents.ConvergentContextMenu {
         }
 
         Kirigami.Action {
-            text: i18nc("As in 'do not notify for any messages'", "Off")
+            text: i18nc("As in 'do not notify for any messages'", "None")
             icon.name: "notifications-disabled"
             checkable: true
             autoExclusive: true
diff --git a/src/settings/PushNotification.qml b/src/settings/PushNotification.qml
index e88c287bd..eed70ea6a 100644
--- a/src/settings/PushNotification.qml
+++ b/src/settings/PushNotification.qml
@@ -23,11 +23,12 @@ FormCard.FormCardPage {
     title: i18nc('@title:window', 'Notifications')
 
     FormCard.FormHeader {
-        title: i18nc("@title:group", "Room notifications setting")
+        title: i18nc("@title:group", "Send Notifications For")
     }
 
     FormCard.FormCard {
         FormCard.FormRadioDelegate {
+            icon.name: "globe"
             text: i18nc("As in the default notification setting", "Default Settings")
             checked: room.pushNotificationState === PushNotificationState.Default
             enabled: room.pushNotificationState !== PushNotificationState.Unknown
@@ -36,7 +37,8 @@ FormCard.FormCardPage {
             }
         }
         FormCard.FormRadioDelegate {
-            text: i18nc("As in 'notify for all messages'", "All")
+            icon.name: "notifications"
+            text: i18nc("As in 'notify for all messages'", "All Messages")
             checked: room.pushNotificationState === PushNotificationState.All
             enabled: room.pushNotificationState !== PushNotificationState.Unknown
             onToggled: {
@@ -44,6 +46,7 @@ FormCard.FormCardPage {
             }
         }
         FormCard.FormRadioDelegate {
+            icon.name: "im-user"
             text: i18nc("As in 'notify when the user is mentioned or the message contains a set keyword'", "@Mentions and Keywords")
             checked: room.pushNotificationState === PushNotificationState.MentionKeyword
             enabled: room.pushNotificationState !== PushNotificationState.Unknown
@@ -52,7 +55,8 @@ FormCard.FormCardPage {
             }
         }
         FormCard.FormRadioDelegate {
-            text: i18nc("As in 'do not notify for any messages'", "Off")
+            icon.name: "notifications-disabled"
+            text: i18nc("As in 'do not notify for any messages'", "None")
             checked: room.pushNotificationState === PushNotificationState.Mute
             enabled: room.pushNotificationState !== PushNotificationState.Unknown
             onToggled: {