diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt
index 5c7ef158fd..4a00aa1dc0 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt
@@ -131,16 +131,21 @@ private fun RoomListModalBottomSheetContent(
                 style = ListItemStyle.Primary,
             )
         }
+        val (textResId, icon) = if (contextMenu.isFavorite) {
+            CommonStrings.common_favourited to CompoundIcons.FavouriteSolid()
+        } else {
+            CommonStrings.common_favourite to CompoundIcons.Favourite()
+        }
         ListItem(
             headlineContent = {
                 Text(
-                    text = stringResource(id = CommonStrings.common_favourite),
+                    text = stringResource(id = textResId),
                     style = MaterialTheme.typography.bodyLarge,
                 )
             },
             leadingContent = ListItemContent.Icon(
                 iconSource = IconSource.Vector(
-                    CompoundIcons.Favourite(),
+                    icon,
                 )
             ),
             trailingContent = ListItemContent.Switch(
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownProvider.kt
index 3f2499657e..a1624e4917 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownProvider.kt
@@ -15,7 +15,7 @@ open class RoomListStateContextMenuShownProvider : PreviewParameterProvider<Room
     override val values: Sequence<RoomListState.ContextMenu.Shown>
         get() = sequenceOf(
             aContextMenuShown(hasNewContent = true),
-            aContextMenuShown(isDm = true),
+            aContextMenuShown(isDm = true, isFavorite = true),
             aContextMenuShown(roomName = null)
         )
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
index 86481be026..1fe12255b4 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@@ -589,9 +589,14 @@ private fun FavoriteItem(
     isFavorite: Boolean,
     onFavoriteChanges: (Boolean) -> Unit,
 ) {
+    val (textResId, icon) = if (isFavorite) {
+        CommonStrings.common_favourited to CompoundIcons.FavouriteSolid()
+    } else {
+        CommonStrings.common_favourite to CompoundIcons.Favourite()
+    }
     PreferenceSwitch(
-        icon = CompoundIcons.Favourite(),
-        title = stringResource(id = CommonStrings.common_favourite),
+        icon = icon,
+        title = stringResource(id = textResId),
         isChecked = isFavorite,
         onCheckedChange = onFavoriteChanges
     )