diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/SpaceAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/SpaceAvatar.kt
index c301a490eb..1dfc9f3169 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/SpaceAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/SpaceAvatar.kt
@@ -8,6 +8,7 @@
 
 package io.element.android.libraries.designsystem.components.avatar.internal
 
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
@@ -16,6 +17,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.components.avatar.anAvatarData
@@ -34,19 +36,26 @@ internal fun SpaceAvatar(
     contentDescription: String? = null,
 ) {
     val size = forcedAvatarSize ?: avatarData.size.dp
+    val avatarShape = avatarType.avatarShape(size)
+    val commonModifier = modifier
+        .border(
+            width = 1.dp,
+            color = ElementTheme.colors.iconQuaternaryAlpha,
+            shape = avatarShape,
+        )
     when {
         avatarType.isTombstoned -> TombstonedRoomAvatar(
             size = size,
-            avatarShape = avatarType.avatarShape(size),
-            modifier = modifier,
+            avatarShape = avatarShape,
+            modifier = commonModifier,
             contentDescription = contentDescription,
         )
         else -> InitialOrImageAvatar(
             avatarData = avatarData,
             hideAvatarImage = hideAvatarImage,
-            avatarShape = avatarType.avatarShape(size),
+            avatarShape = avatarShape,
             forcedAvatarSize = forcedAvatarSize,
-            modifier = modifier,
+            modifier = commonModifier,
             contentDescription = contentDescription,
         )
     }