diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
index 33a8564efb..4cd546f6f4 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
@@ -152,7 +152,7 @@ private fun RowScope.NameAndTimestampRow(room: RoomListRoomSummary) {
     Text(
         text = room.timestamp ?: "",
         style = ElementTheme.typography.fontBodySmRegular,
-        color = if (room.shouldDisplayNotificationAlertDecoration) {
+        color = if (room.hasUnread) {
             ElementTheme.colors.unreadIndicator
         } else {
             MaterialTheme.roomListRoomMessageDate()
@@ -182,7 +182,7 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) {
         horizontalArrangement = Arrangement.spacedBy(8.dp)
     ) {
         NotificationIcon(room)
-        if (room.shouldDisplayNotificationAlertDecoration) {
+        if (room.hasUnread) {
             UnreadIndicatorAtom(
                 modifier = Modifier.padding(top = 3.dp),
             )
@@ -190,28 +190,23 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) {
     }
 
 }
-// We should never show a green dot/icon for mute. Also mentions is not yet supported by the mobile app.
-// In some cases a green @ was incorrectly shown when we switch from ALL_MESSAGES to MENTIONS_AND_KEYWORDS_ONLY
-// and we don't know whether the room has mentions, just that it has unread.
-private val RoomListRoomSummary.shouldDisplayNotificationAlertDecoration get() = hasUnread
-    && notificationMode != RoomNotificationMode.MUTE
-    && notificationMode != RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY
 
 @Composable
 private fun NotificationIcon(room: RoomListRoomSummary) {
+    val tint = if(room.hasUnread) ElementTheme.colors.unreadIndicator else ElementTheme.colors.iconQuaternary
     when(room.notificationMode) {
         null, RoomNotificationMode.ALL_MESSAGES -> return
         RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY ->
             Icon(
                 contentDescription = stringResource(CommonStrings.screen_notification_settings_mode_mentions),
                 imageVector = ImageVector.vectorResource(VectorIcons.Mention),
-                tint = ElementTheme.colors.iconQuaternary,
+                tint = tint,
             )
         RoomNotificationMode.MUTE ->
             Icon(
                 contentDescription = stringResource(CommonStrings.common_mute),
                 imageVector = ImageVector.vectorResource(VectorIcons.Mute),
-                tint = ElementTheme.colors.iconQuaternary,
+                tint = tint,
             )
     }
 }