diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
index 824cf5ba6f..5c96847715 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
@@ -21,13 +21,13 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
-import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRow
@@ -228,8 +228,8 @@ internal fun RoomSummaryView(
         modifier = modifier
             .clickable { onSelection(summary) }
             .fillMaxWidth()
-            .padding(horizontal = 16.dp)
-            .height(IntrinsicSize.Min),
+            .padding(start = 16.dp, end = 4.dp)
+            .heightIn(56.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
         val roomAlias = summary.canonicalAlias ?: summary.roomId.value
@@ -238,13 +238,12 @@ internal fun RoomSummaryView(
                 id = roomAlias,
                 name = summary.name,
                 url = summary.avatarURLString,
-                size = AvatarSize.RoomListItem,
+                size = AvatarSize.ForwardRoomListItem,
             ),
         )
         Column(
             modifier = Modifier
-                .padding(start = 12.dp, end = 4.dp, top = 8.dp, bottom = 8.dp)
-                .alignByBaseline()
+                .padding(start = 12.dp, end = 4.dp, top = 4.dp, bottom = 4.dp)
                 .weight(1f)
         ) {
             // Name
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt
index 33e9767a61..e2a1329f9e 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt
@@ -25,6 +25,8 @@ enum class AvatarSize(val dp: Dp) {
     RoomHeader(96.dp),
     RoomListItem(52.dp),
 
+    ForwardRoomListItem(36.dp),
+
     UserHeader(96.dp),
     UserListItem(36.dp),