diff --git a/vector/sampledata/room_round_avatars/0_element_rainbow.png b/vector/sampledata/room_round_avatars/0_element_rainbow.png
new file mode 100644
index 0000000000..2efdc02312
Binary files /dev/null and b/vector/sampledata/room_round_avatars/0_element_rainbow.png differ
diff --git a/vector/sampledata/room_round_avatars/element_black.png b/vector/sampledata/room_round_avatars/element_black.png
new file mode 100644
index 0000000000..3b7430b5c1
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_black.png differ
diff --git a/vector/sampledata/room_round_avatars/element_ems.png b/vector/sampledata/room_round_avatars/element_ems.png
new file mode 100644
index 0000000000..63cdf3ccae
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_ems.png differ
diff --git a/vector/sampledata/room_round_avatars/element_multi.png b/vector/sampledata/room_round_avatars/element_multi.png
new file mode 100644
index 0000000000..ab0657768a
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_multi.png differ
diff --git a/vector/sampledata/room_round_avatars/element_sky.png b/vector/sampledata/room_round_avatars/element_sky.png
new file mode 100644
index 0000000000..16c1be7316
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_sky.png differ
diff --git a/vector/sampledata/room_round_avatars/element_verde.png b/vector/sampledata/room_round_avatars/element_verde.png
new file mode 100644
index 0000000000..778ad83725
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_verde.png differ
diff --git a/vector/sampledata/room_round_avatars/element_web.png b/vector/sampledata/room_round_avatars/element_web.png
new file mode 100644
index 0000000000..c99a34f1a2
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_web.png differ
diff --git a/vector/sampledata/room_round_avatars/element_x.png b/vector/sampledata/room_round_avatars/element_x.png
new file mode 100644
index 0000000000..bc95bf28f3
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_x.png differ
diff --git a/vector/sampledata/room_round_avatars/matrix.png b/vector/sampledata/room_round_avatars/matrix.png
new file mode 100644
index 0000000000..a3b8f89a8a
Binary files /dev/null and b/vector/sampledata/room_round_avatars/matrix.png differ
diff --git a/vector/sampledata/room_round_avatars/new_vector.png b/vector/sampledata/room_round_avatars/new_vector.png
new file mode 100644
index 0000000000..16a51c6788
Binary files /dev/null and b/vector/sampledata/room_round_avatars/new_vector.png differ
diff --git a/vector/sampledata/room_round_avatars/ops.png b/vector/sampledata/room_round_avatars/ops.png
new file mode 100644
index 0000000000..6809885cc9
Binary files /dev/null and b/vector/sampledata/room_round_avatars/ops.png differ
diff --git a/vector/sampledata/room_round_avatars/write_club.png b/vector/sampledata/room_round_avatars/write_club.png
new file mode 100644
index 0000000000..1284472581
Binary files /dev/null and b/vector/sampledata/room_round_avatars/write_club.png differ
diff --git a/vector/sampledata/space_avatars/car.png b/vector/sampledata/space_avatars/car.png
new file mode 100644
index 0000000000..7e8af6b71d
Binary files /dev/null and b/vector/sampledata/space_avatars/car.png differ
diff --git a/vector/sampledata/space_avatars/face.png b/vector/sampledata/space_avatars/face.png
new file mode 100644
index 0000000000..8bec44153c
Binary files /dev/null and b/vector/sampledata/space_avatars/face.png differ
diff --git a/vector/sampledata/space_avatars/london.png b/vector/sampledata/space_avatars/london.png
new file mode 100644
index 0000000000..e77ddaaccc
Binary files /dev/null and b/vector/sampledata/space_avatars/london.png differ
diff --git a/vector/sampledata/space_avatars/paris.png b/vector/sampledata/space_avatars/paris.png
new file mode 100644
index 0000000000..4506794b4a
Binary files /dev/null and b/vector/sampledata/space_avatars/paris.png differ
diff --git a/vector/sampledata/space_avatars/runner.png b/vector/sampledata/space_avatars/runner.png
new file mode 100644
index 0000000000..ceaa047f79
Binary files /dev/null and b/vector/sampledata/space_avatars/runner.png differ
diff --git a/vector/sampledata/space_avatars/snow.png b/vector/sampledata/space_avatars/snow.png
new file mode 100644
index 0000000000..b523cf3066
Binary files /dev/null and b/vector/sampledata/space_avatars/snow.png differ
diff --git a/vector/sampledata/user_round_avatars/amandine.png b/vector/sampledata/user_round_avatars/amandine.png
new file mode 100644
index 0000000000..2a279852b3
Binary files /dev/null and b/vector/sampledata/user_round_avatars/amandine.png differ
diff --git a/vector/sampledata/user_round_avatars/ben.png b/vector/sampledata/user_round_avatars/ben.png
new file mode 100644
index 0000000000..14839da426
Binary files /dev/null and b/vector/sampledata/user_round_avatars/ben.png differ
diff --git a/vector/sampledata/user_round_avatars/benoit.png b/vector/sampledata/user_round_avatars/benoit.png
new file mode 100644
index 0000000000..6c51a1bb5a
Binary files /dev/null and b/vector/sampledata/user_round_avatars/benoit.png differ
diff --git a/vector/sampledata/user_round_avatars/bruno.png b/vector/sampledata/user_round_avatars/bruno.png
new file mode 100644
index 0000000000..c0278ea73d
Binary files /dev/null and b/vector/sampledata/user_round_avatars/bruno.png differ
diff --git a/vector/sampledata/user_round_avatars/gaelle.png b/vector/sampledata/user_round_avatars/gaelle.png
new file mode 100644
index 0000000000..a679639e00
Binary files /dev/null and b/vector/sampledata/user_round_avatars/gaelle.png differ
diff --git a/vector/sampledata/user_round_avatars/manu.png b/vector/sampledata/user_round_avatars/manu.png
new file mode 100644
index 0000000000..0cf9229614
Binary files /dev/null and b/vector/sampledata/user_round_avatars/manu.png differ
diff --git a/vector/sampledata/user_round_avatars/matthew.png b/vector/sampledata/user_round_avatars/matthew.png
new file mode 100644
index 0000000000..13d8eb3cfc
Binary files /dev/null and b/vector/sampledata/user_round_avatars/matthew.png differ
diff --git a/vector/sampledata/user_round_avatars/nad.png b/vector/sampledata/user_round_avatars/nad.png
new file mode 100644
index 0000000000..e60f9f3325
Binary files /dev/null and b/vector/sampledata/user_round_avatars/nad.png differ
diff --git a/vector/sampledata/user_round_avatars/nique.png b/vector/sampledata/user_round_avatars/nique.png
new file mode 100644
index 0000000000..41480b4bb4
Binary files /dev/null and b/vector/sampledata/user_round_avatars/nique.png differ
diff --git a/vector/sampledata/user_round_avatars/toml.png b/vector/sampledata/user_round_avatars/toml.png
new file mode 100644
index 0000000000..1abeb74d94
Binary files /dev/null and b/vector/sampledata/user_round_avatars/toml.png differ
diff --git a/vector/sampledata/user_round_avatars/victor.png b/vector/sampledata/user_round_avatars/victor.png
new file mode 100644
index 0000000000..f1f91bda4f
Binary files /dev/null and b/vector/sampledata/user_round_avatars/victor.png differ
diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index 7ea632eefb..c9ec44df4d 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -79,7 +79,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/smallIsHeldIcon"
diff --git a/vector/src/main/res/layout/alerter_incoming_call_layout.xml b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
index 05296dd65a..304477557d 100644
--- a/vector/src/main/res/layout/alerter_incoming_call_layout.xml
+++ b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
@@ -18,7 +18,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/incomingCallNameView"
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index 7a2e81a6ce..3db8a3343c 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toStartOf="@+id/alerter_texts"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/ivIcon"
diff --git a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
index 6730a585db..cf3984bfcf 100644
--- a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
@@ -31,7 +31,7 @@
                 app:layout_constraintHorizontal_bias="0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:src="@tools:sample/avatars" />
+                tools:src="@sample/user_round_avatars" />
 
 
             <TextView
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index 2f8d890131..68fc8653cf 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -46,7 +46,7 @@
             android:layout_height="40dp"
             android:layout_gravity="center"
             android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <LinearLayout
             android:layout_width="0dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index 053a326b03..b9b3800ab3 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -23,7 +23,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/space_avatars" />
 
         <TextView
             android:id="@+id/spaceNameView"
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index 9ed8f17069..e3c97d92dc 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -26,7 +26,7 @@
             android:scaleType="centerCrop"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <im.vector.app.core.ui.views.ShieldImageView
             android:id="@+id/otherUserShield"
diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml
index e837d2d80b..4d65100a97 100644
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@@ -37,8 +37,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:contentDescription="@string/avatar"
-        tools:ignore="MissingConstraints"
-        tools:src="@tools:sample/avatars" />
+        tools:ignore="MissingConstraints" />
 
     <TextView
         android:id="@+id/composerRelatedMessageTitle"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
index f9ccd9e545..a6bd6afae4 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@@ -45,8 +45,7 @@
         android:contentDescription="@string/avatar"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="parent"
-        tools:src="@tools:sample/avatars" />
+        app:layout_constraintEnd_toStartOf="parent" />
 
     <TextView
         android:id="@+id/composerRelatedMessageTitle"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index 50fb5d27b0..b137689d9d 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -47,7 +47,7 @@
         app:layout_constraintEnd_toStartOf="@+id/composerRelatedMessageTitle"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/composerRelatedMessageTitle"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/composerRelatedMessageTitle"
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 0a4206b8c0..8e975fbbfa 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -40,7 +40,7 @@
             android:transitionName="profile"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <TextView
             android:id="@+id/homeDrawerUsernameView"
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index cf99fbd64b..697541497a 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -58,7 +58,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
                         tools:alpha="1"
-                        tools:src="@tools:sample/avatars" />
+                        tools:src="@sample/room_round_avatars" />
 
                     <im.vector.app.core.ui.views.ShieldImageView
                         android:id="@+id/matrixProfileDecorationToolbarAvatarImageView"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index 85ec04ba50..3924d98851 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -26,7 +26,7 @@
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/room_round_avatars" />
 
         <ImageView
             android:id="@+id/matrixToBetaTag"
@@ -128,7 +128,7 @@
             app:layout_constraintCircleAngle="90"
             app:layout_constraintCircleRadius="20dp"
             tools:ignore="MissingConstraints"
-            tools:src="@tools:sample/avatars"
+            tools:src="@sample/user_round_avatars"
             tools:visibility="gone" />
 
         <ImageView
@@ -140,7 +140,7 @@
             app:layout_constraintCircleAngle="90"
             app:layout_constraintCircleRadius="20dp"
             tools:ignore="MissingConstraints"
-            tools:src="@tools:sample/avatars"
+            tools:src="@sample/user_round_avatars"
             tools:visibility="gone" />
 
         <ImageView
@@ -152,7 +152,7 @@
             app:layout_constraintCircleAngle="90"
             app:layout_constraintCircleRadius="20dp"
             tools:ignore="MissingConstraints"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <ImageView
             android:id="@+id/knownMember2"
@@ -163,7 +163,7 @@
             app:layout_constraintCircleAngle="90"
             app:layout_constraintCircleRadius="20dp"
             tools:ignore="MissingConstraints"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <ImageView
             android:id="@+id/knownMember1"
@@ -173,7 +173,7 @@
             android:contentDescription="@string/avatar"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/matrixToCardDescText"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <TextView
             android:id="@+id/peopleYouMayKnowText"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
index 03599779f1..469da7d6d1 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/matrixToCardNameText"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 11d97c9f4b..05fd405c98 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -32,7 +32,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:src="@tools:sample/avatars" />
+                tools:src="@sample/room_round_avatars" />
 
             <im.vector.app.core.ui.views.ShieldImageView
                 android:id="@+id/roomToolbarDecorationImageView"
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 55dcc560e3..5520ed20d3 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -32,7 +32,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@tools:sample/avatars" />
+                    tools:src="@sample/room_round_avatars" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewToolbarTitle"
@@ -82,7 +82,7 @@
                     android:layout_height="128dp"
                     android:layout_marginTop="60dp"
                     android:importantForAccessibility="no"
-                    tools:src="@tools:sample/avatars" />
+                    tools:src="@sample/room_round_avatars" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewName"
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index 9c3827f919..281e3848ab 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -32,7 +32,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:src="@tools:sample/avatars" />
+                tools:src="@sample/room_round_avatars" />
 
             <im.vector.app.core.ui.views.ShieldImageView
                 android:id="@+id/roomSettingsDecorationToolbarAvatarImageView"
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index d6af178308..421059bd75 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -37,7 +37,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@tools:sample/avatars" />
+                    tools:src="@sample/room_round_avatars" />
 
                 <im.vector.app.core.ui.views.ShieldImageView
                     android:id="@+id/roomUploadsDecorationToolbarAvatarImageView"
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 7e89ab9070..364ae62b84 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -46,7 +46,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@tools:sample/avatars" />
+                    tools:src="@sample/space_avatars" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewToolbarTitle"
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index 6b92712d3a..19350502cf 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -69,7 +69,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/showUserCodeCardTopBarrier"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/showUserCodeCardTopBarrier"
diff --git a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
index 4fc7d45f07..e15db581fd 100644
--- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
+++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
@@ -14,7 +14,7 @@
         android:layout_height="28dp"
         android:layout_gravity="center_vertical"
         android:importantForAccessibility="no"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index c2175d495e..6bb803dd2f 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -20,7 +20,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_sender"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index de3b27d368..87d6475fde 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -23,7 +23,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <TextView
         android:id="@+id/bottomSheetRoomPreviewName"
diff --git a/vector/src/main/res/layout/item_breadcrumbs.xml b/vector/src/main/res/layout/item_breadcrumbs.xml
index 8bb1b93fb5..d615657a7b 100644
--- a/vector/src/main/res/layout/item_breadcrumbs.xml
+++ b/vector/src/main/res/layout/item_breadcrumbs.xml
@@ -34,7 +34,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/breadcrumbsUnreadCounterBadgeView"
diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml
index 8db2080b47..812325d16a 100644
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@@ -18,7 +18,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/contactDisplayName"
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index 041d0c59b5..4ba3b22538 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -25,7 +25,7 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <ImageView
             android:id="@+id/createDirectRoomUserAvatarChecked"
diff --git a/vector/src/main/res/layout/item_display_read_receipt.xml b/vector/src/main/res/layout/item_display_read_receipt.xml
index 7058b8b86f..791b4bfaff 100644
--- a/vector/src/main/res/layout/item_display_read_receipt.xml
+++ b/vector/src/main/res/layout/item_display_read_receipt.xml
@@ -17,7 +17,7 @@
         android:layout_height="32dp"
         android:layout_marginEnd="8dp"
         android:contentDescription="@string/avatar"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/readReceiptName"
diff --git a/vector/src/main/res/layout/item_editable_avatar.xml b/vector/src/main/res/layout/item_editable_avatar.xml
index 7c067cc46c..b19279989e 100644
--- a/vector/src/main/res/layout/item_editable_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_avatar.xml
@@ -34,7 +34,7 @@
             android:importantForAccessibility="no"
             android:scaleType="center"
             tools:alpha="0.3"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
     </FrameLayout>
 
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index 9cd07f3215..c575b4ee23 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -21,7 +21,7 @@
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <TextView
         android:id="@+id/groupNameView"
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index f20b7cd183..a2429e159f 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -25,7 +25,7 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <ImageView
             android:id="@+id/knownUserAvatarChecked"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 3d9aa0e876..d09086418b 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -24,7 +24,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <im.vector.app.core.ui.views.ShieldImageView
         android:id="@+id/matrixItemAvatarDecoration"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index 55e8cecade..404b716c55 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -24,7 +24,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <im.vector.app.core.ui.views.ShieldImageView
         android:id="@+id/matrixItemAvatarDecoration"
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index a65115e1da..30d20abe15 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -21,7 +21,7 @@
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <TextView
         android:id="@+id/itemPublicRoomName"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 872cf3e400..8f20271ed5 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -35,7 +35,7 @@
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/room_round_avatars" />
 
         <ImageView
             android:id="@+id/roomAvatarCheckedImageView"
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index 2654fb6997..7e1c4f6326 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -19,7 +19,7 @@
         android:contentDescription="@string/avatar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <!-- Margin bottom does not work, so I use space -->
     <Space
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space.xml b/vector/src/main/res/layout/item_room_to_add_in_space.xml
index 7d1c04468c..1a88532dfb 100644
--- a/vector/src/main/res/layout/item_room_to_add_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space.xml
@@ -20,7 +20,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <TextView
         android:id="@+id/itemAddRoomRoomNameText"
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index 3e89ab4ba4..ce6078091d 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -15,7 +15,7 @@
         android:contentDescription="@string/avatar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/messageMemberNameView"
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index 91952391be..d2ce67e703 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -31,7 +31,7 @@
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintStart_toEndOf="@id/indent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/space_avatars" />
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/groupCounterBadge"
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index e12653077e..f6083b408b 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -37,7 +37,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="MissingPrefix"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/room_round_avatars" />
 
         <TextView
             android:id="@+id/childRoomName"
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index 5dcf2fa4c6..2d435df912 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -32,7 +32,7 @@
         app:layout_constraintStart_toEndOf="@id/childSpaceTab"
         app:layout_constraintTop_toTopOf="@id/childSpaceName"
         tools:ignore="MissingPrefix"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/space_avatars" />
 
     <View
         android:layout_width="2dp"
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index e694e34c13..286802bef4 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -22,7 +22,7 @@
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/room_round_avatars" />
 
     </FrameLayout>
 
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 282c3f6140..dc094fca97 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -22,7 +22,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="4dp"
         android:contentDescription="@string/avatar"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/messageMemberNameView"
diff --git a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
index 78d0d4458d..94d25ea3f2 100644
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@@ -12,7 +12,7 @@
         android:layout_height="40dp"
         android:layout_gravity="center_horizontal"
         android:contentDescription="@string/avatar"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/itemCallCreatorNameTextView"
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
index 4387577d51..1d40d6b670 100644
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -21,7 +21,7 @@
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <TextView
         android:id="@+id/itemUnknownRoomName"
diff --git a/vector/src/main/res/layout/item_user.xml b/vector/src/main/res/layout/item_user.xml
index 2300036beb..2948b436f6 100644
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@@ -19,7 +19,7 @@
         android:contentDescription="@string/avatar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/itemUserId"
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index 3028fb7953..5b0691e98b 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/inviteNameView"
diff --git a/vector/src/main/res/layout/vector_message_merge_avatar_list.xml b/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
index 0ed0c87d5d..a9907b31a3 100644
--- a/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
+++ b/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
@@ -12,7 +12,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/mels_list_avatar_2"
@@ -23,7 +23,7 @@
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/mels_list_avatar_3"
@@ -34,7 +34,7 @@
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/mels_list_avatar_4"
@@ -45,7 +45,7 @@
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/mels_list_avatar_5"
@@ -56,6 +56,6 @@
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/vector_settings_round_avatar.xml b/vector/src/main/res/layout/vector_settings_round_avatar.xml
index 3349e092f9..596eef5d3c 100644
--- a/vector/src/main/res/layout/vector_settings_round_avatar.xml
+++ b/vector/src/main/res/layout/vector_settings_round_avatar.xml
@@ -11,7 +11,7 @@
         android:adjustViewBounds="true"
         android:contentDescription="@string/avatar"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ProgressBar
         android:id="@+id/avatar_update_progress_bar"
diff --git a/vector/src/main/res/layout/view_read_marker.xml b/vector/src/main/res/layout/view_read_marker.xml
index d9c25b4be8..bea00fbb15 100644
--- a/vector/src/main/res/layout/view_read_marker.xml
+++ b/vector/src/main/res/layout/view_read_marker.xml
@@ -21,7 +21,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar4"
@@ -30,7 +30,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar3"
@@ -39,7 +39,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar2"
@@ -48,7 +48,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar1"
@@ -57,6 +57,6 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
 </merge>
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index ac4351b379..6e674406fa 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -26,7 +26,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar4"
@@ -36,7 +36,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar3"
@@ -46,7 +46,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar2"
@@ -56,7 +56,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar1"
@@ -66,6 +66,6 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
 </merge>
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index 7df09721be..991883edbb 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -28,7 +28,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="spread_inside"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <im.vector.app.core.ui.views.ShieldImageView
             android:id="@+id/memberProfileDecorationImageView"
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index e3f16882ee..42521ebd79 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -18,7 +18,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <im.vector.app.core.ui.views.ShieldImageView
         android:id="@+id/roomProfileDecorationImageView"