diff --git a/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditView.kt b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditView.kt
index 3fd9daef3e..252670630f 100644
--- a/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditView.kt
+++ b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditView.kt
@@ -51,6 +51,9 @@ import io.element.android.libraries.matrix.ui.components.AvatarPickerView
 import io.element.android.libraries.permissions.api.PermissionsView
 import io.element.android.libraries.ui.strings.CommonStrings
 
+/**
+ * https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=2204-37063
+ */
 @Composable
 fun RoomDetailsEditView(
     state: RoomDetailsEditState,
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 8407445394..8565b0575f 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
@@ -46,7 +46,7 @@ enum class AvatarSize(val dp: Dp) {
     RoomInviteItem(52.dp),
     InviteSender(16.dp),
 
-    EditRoomDetails(68.dp),
+    EditRoomDetails(64.dp),
     RoomListManageUser(96.dp),
 
     NotificationsOptIn(32.dp),
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarPickerView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarPickerView.kt
index 68a346ab84..89f980ab99 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarPickerView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarPickerView.kt
@@ -113,7 +113,7 @@ fun AvatarPickerView(
                     },
                     y = size.height - editIconRadius.toPx(),
                 ),
-                radius = editIconRadius.toPx() * 1.2f,
+                radius = editIconRadius.toPx() * 1.35f,
                 blendMode = BlendMode.Clear,
             )
         }
@@ -143,7 +143,7 @@ fun AvatarPickerView(
                 )
                 if (enabled) {
                     OverlayEditButton(
-                        editButtonSize = state.avatarData.size.dp * 0.44f,
+                        editButtonSize = state.avatarData.size.dp * 30 / 64f,
                         onClick = onClick,
                         interactionSource = interactionSource
                     )
@@ -195,7 +195,7 @@ private fun BoxScope.OverlayEditButton(
         contentAlignment = Alignment.Center,
     ) {
         Icon(
-            modifier = Modifier.size(editButtonSize * 0.66f),
+            modifier = Modifier.size(editButtonSize * 24 / 30f),
             imageVector = CompoundIcons.Edit(),
             contentDescription = null,
         )