diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
index afc6ef0bde..f68f434707 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
@@ -40,6 +40,7 @@ import io.element.android.libraries.designsystem.atomic.atoms.RoundedIconAtom
 import io.element.android.libraries.designsystem.atomic.atoms.RoundedIconAtomSize
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.list.ListItemContent
@@ -220,6 +221,7 @@ private fun RoomNameWithAvatar(
     ) {
         UnsavedAvatar(
             avatarUri = avatarUri,
+            avatarSize = AvatarSize.EditRoomDetails,
             avatarType = AvatarType.Room(),
             modifier = Modifier.clickable(onClick = onAvatarClick),
         )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
index 8412c18826..3b8b6831ca 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
@@ -13,7 +13,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
@@ -61,7 +60,6 @@ fun EditableAvatarView(
         val a11yAvatar = stringResource(CommonStrings.a11y_avatar)
         Box(
             modifier = Modifier
-                .size(avatarSize.dp)
                 .clickable(
                     interactionSource = remember { MutableInteractionSource() },
                     onClick = onAvatarClick,
@@ -75,16 +73,20 @@ fun EditableAvatarView(
             when (avatarUrl?.scheme) {
                 null, "mxc" -> {
                     Avatar(
-                        avatarData = AvatarData(matrixId, displayName, avatarUrl?.toString(), size = avatarSize),
+                        avatarData = AvatarData(
+                            id = matrixId,
+                            name = displayName,
+                            url = avatarUrl?.toString(),
+                            size = avatarSize,
+                        ),
                         avatarType = avatarType,
-                        modifier = Modifier.fillMaxSize(),
                     )
                 }
                 else -> {
                     UnsavedAvatar(
                         avatarUri = avatarUrl,
+                        avatarSize = avatarSize,
                         avatarType = avatarType,
-                        modifier = Modifier.fillMaxSize(),
                     )
                 }
             }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
index 5a9ee72c75..db26ecb8da 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import coil3.request.ImageRequest
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.components.avatar.avatarShape
 import io.element.android.libraries.designsystem.preview.ElementPreview
@@ -43,11 +44,12 @@ import io.element.android.libraries.designsystem.theme.temporaryColorBgSpecial
 @Composable
 fun UnsavedAvatar(
     avatarUri: Uri?,
+    avatarSize: AvatarSize,
     avatarType: AvatarType,
     modifier: Modifier = Modifier,
 ) {
     val commonModifier = modifier
-        .size(70.dp)
+        .size(avatarSize.dp)
         .clip(avatarType.avatarShape())
 
     if (avatarUri != null) {
@@ -69,7 +71,7 @@ fun UnsavedAvatar(
                 contentDescription = null,
                 modifier = Modifier
                     .align(Alignment.Center)
-                    .size(40.dp),
+                    .size(avatarSize.dp * 4 / 7),
                 tint = ElementTheme.colors.iconSecondary,
             )
         }
@@ -83,9 +85,9 @@ internal fun UnsavedAvatarPreview() = ElementPreview {
         modifier = Modifier.padding(8.dp),
         horizontalArrangement = Arrangement.spacedBy(8.dp),
     ) {
-        UnsavedAvatar(null, AvatarType.User)
-        UnsavedAvatar(Uri.EMPTY, AvatarType.User)
-        UnsavedAvatar(null, AvatarType.Space(8.dp))
-        UnsavedAvatar(Uri.EMPTY, AvatarType.Space(8.dp))
+        UnsavedAvatar(null, AvatarSize.EditRoomDetails, AvatarType.User)
+        UnsavedAvatar(Uri.EMPTY, AvatarSize.EditRoomDetails, AvatarType.User)
+        UnsavedAvatar(null, AvatarSize.EditRoomDetails, AvatarType.Space(8.dp))
+        UnsavedAvatar(Uri.EMPTY, AvatarSize.EditRoomDetails, AvatarType.Space(8.dp))
     }
 }