diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.kt b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
index d045094dc..5575a4911 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsManager.kt
+++ b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
@@ -186,7 +186,8 @@ class ContactsManager @UiThread constructor(context: Context) {
             }
         )
 
-        personBuilder.setKey("") // TODO FIXME: use a valid key
+        val identity = account?.params?.identityAddress?.asStringUriOnly() ?: localAddress.asStringUriOnly()
+        personBuilder.setKey(identity)
         personBuilder.setImportant(false)
         return personBuilder.build()
     }
diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index ec88c55e3..76343f23b 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -217,7 +217,7 @@ fun AvatarView.loadInitials(initials: String?) {
 fun AvatarView.loadAccountAvatar(account: AccountModel?) {
     Log.i("[Data Binding Utils] Loading account picture [${account?.avatar?.value}] with coil")
     if (account == null) {
-        loadImage(R.drawable.contact_avatar)
+        loadImage(R.drawable.user_circle)
     } else {
         val lifecycleOwner = findViewTreeLifecycleOwner()
         if (lifecycleOwner != null) {
@@ -276,7 +276,7 @@ fun AvatarView.loadAccountAvatar(account: AccountModel?) {
 @BindingAdapter("contactAvatar")
 fun AvatarView.loadContactAvatar(contact: ContactAvatarModel?) {
     if (contact == null) {
-        loadImage(R.drawable.contact_avatar)
+        loadImage(R.drawable.user_circle)
     } else {
         val uri = contact.avatar.value
         loadImage(
diff --git a/app/src/main/res/drawable/chat_text.xml b/app/src/main/res/drawable/chat_text.xml
index a2adf78df..40d711414 100644
--- a/app/src/main/res/drawable/chat_text.xml
+++ b/app/src/main/res/drawable/chat_text.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="256">
   <path
       android:pathData="M216,48L40,48A16,16 0,0 0,24 64L24,224a15.85,15.85 0,0 0,9.24 14.5A16.13,16.13 0,0 0,40 240a15.89,15.89 0,0 0,10.25 -3.78,0.69 0.69,0 0,0 0.13,-0.11L82.5,208L216,208a16,16 0,0 0,16 -16L232,64A16,16 0,0 0,216 48ZM40,224h0ZM216,192L82.5,192a16,16 0,0 0,-10.3 3.75l-0.12,0.11L40,224L40,64L216,64ZM88,112a8,8 0,0 1,8 -8h64a8,8 0,0 1,0 16L96,120A8,8 0,0 1,88 112ZM88,144a8,8 0,0 1,8 -8h64a8,8 0,1 1,0 16L96,152A8,8 0,0 1,88 144Z"
-      android:fillColor="#4e6074"/>
+      android:fillColor="#ffffff"/>
 </vector>
diff --git a/app/src/main/res/drawable/contact_avatar.xml b/app/src/main/res/drawable/contact_avatar.xml
deleted file mode 100644
index 133d052f0..000000000
--- a/app/src/main/res/drawable/contact_avatar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="vector"
-    android:width="52dp"
-    android:height="52dp"
-    android:viewportWidth="52"
-    android:viewportHeight="52">
-    <path
-        android:name="path"
-        android:pathData="M 25.978 4.333 C 14.018 4.333 4.333 14.04 4.333 26 C 4.333 37.96 14.018 47.666 25.978 47.666 C 37.96 47.666 47.667 37.96 47.667 26 C 47.667 14.04 37.96 4.333 25.978 4.333 Z M 26 43.333 C 16.423 43.333 8.667 35.576 8.667 26 C 8.667 16.423 16.423 8.666 26 8.666 C 35.577 8.666 43.333 16.423 43.333 26 C 43.333 35.576 35.577 43.333 26 43.333 Z M 33.583 23.833 C 35.382 23.833 36.833 22.381 36.833 20.583 C 36.833 18.785 35.382 17.333 33.583 17.333 C 31.785 17.333 30.333 18.785 30.333 20.583 C 30.333 22.381 31.785 23.833 33.583 23.833 Z M 18.417 23.833 C 20.215 23.833 21.667 22.381 21.667 20.583 C 21.667 18.785 20.215 17.333 18.417 17.333 C 16.618 17.333 15.167 18.785 15.167 20.583 C 15.167 22.381 16.618 23.833 18.417 23.833 Z M 26 37.916 C 31.048 37.916 35.338 34.753 37.072 30.333 L 14.928 30.333 C 16.662 34.753 20.952 37.916 26 37.916 Z"
-        android:fillColor="#4e6074"
-        android:strokeWidth="1"/>
-</vector>
diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml
index 133bedee5..06ffd61c2 100644
--- a/app/src/main/res/layout/account_list_cell.xml
+++ b/app/src/main/res/layout/account_list_cell.xml
@@ -34,7 +34,7 @@
             android:adjustViewBounds="true"
             android:background="@drawable/shape_circle_light_blue_background"
             accountAvatar="@{model}"
-            app:avatarViewPlaceholder="@drawable/contact_avatar"
+            app:avatarViewPlaceholder="@drawable/user_circle"
             app:avatarViewInitialsBackgroundColor="@color/blue_light"
             app:avatarViewInitialsTextColor="@color/gray_9"
             app:avatarViewInitialsTextSize="16sp"
diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml
index 702fc5e02..4a0944485 100644
--- a/app/src/main/res/layout/account_profile_fragment.xml
+++ b/app/src/main/res/layout/account_profile_fragment.xml
@@ -90,7 +90,7 @@
                         app:avatarViewInitialsTextColor="@color/gray_9"
                         app:avatarViewInitialsTextSize="21sp"
                         app:avatarViewInitialsTextStyle="bold"
-                        app:avatarViewPlaceholder="@drawable/contact_avatar"
+                        app:avatarViewPlaceholder="@drawable/user_circle"
                         app:avatarViewShape="circle"
                         app:avatarViewBorderWidth="0dp"
                         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
index 8ab811853..f1a408a09 100644
--- a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
+++ b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
@@ -120,8 +120,8 @@
                     android:layout_marginEnd="16dp"
                     android:layout_marginTop="21dp"
                     android:background="@drawable/shape_circle_light_blue_background"
-                    android:src="@drawable/contact_avatar"
-                    app:avatarViewPlaceholder="@drawable/contact_avatar"
+                    android:src="@drawable/user_circle"
+                    app:avatarViewPlaceholder="@drawable/user_circle"
                     app:avatarViewInitialsBackgroundColor="@color/blue_light"
                     app:avatarViewInitialsTextColor="@color/gray_9"
                     app:avatarViewInitialsTextSize="16sp"
@@ -163,8 +163,8 @@
                     android:layout_height="@dimen/avatar_list_cell_size"
                     android:adjustViewBounds="true"
                     android:background="@drawable/shape_circle_light_blue_background"
-                    android:src="@drawable/contact_avatar"
-                    app:avatarViewPlaceholder="@drawable/contact_avatar"
+                    android:src="@drawable/user_circle"
+                    app:avatarViewPlaceholder="@drawable/user_circle"
                     app:avatarViewInitialsBackgroundColor="@color/blue_light"
                     app:avatarViewInitialsTextColor="@color/gray_9"
                     app:avatarViewInitialsTextSize="16sp"
diff --git a/app/src/main/res/layout/assistant_secure_mode_fragment.xml b/app/src/main/res/layout/assistant_secure_mode_fragment.xml
index c032c1b3a..46bf5ee01 100644
--- a/app/src/main/res/layout/assistant_secure_mode_fragment.xml
+++ b/app/src/main/res/layout/assistant_secure_mode_fragment.xml
@@ -135,8 +135,8 @@
                 android:layout_marginEnd="16dp"
                 android:layout_marginTop="21dp"
                 android:background="@drawable/shape_circle_light_blue_background"
-                android:src="@drawable/contact_avatar"
-                app:avatarViewPlaceholder="@drawable/contact_avatar"
+                android:src="@drawable/user_circle"
+                app:avatarViewPlaceholder="@drawable/user_circle"
                 app:avatarViewInitialsBackgroundColor="@color/blue_light"
                 app:avatarViewInitialsTextColor="@color/gray_9"
                 app:avatarViewInitialsTextSize="16sp"
@@ -178,8 +178,8 @@
                 android:layout_height="@dimen/avatar_list_cell_size"
                 android:adjustViewBounds="true"
                 android:background="@drawable/shape_circle_light_blue_background"
-                android:src="@drawable/contact_avatar"
-                app:avatarViewPlaceholder="@drawable/contact_avatar"
+                android:src="@drawable/user_circle"
+                app:avatarViewPlaceholder="@drawable/user_circle"
                 app:avatarViewInitialsBackgroundColor="@color/blue_light"
                 app:avatarViewInitialsTextColor="@color/gray_9"
                 app:avatarViewInitialsTextSize="16sp"
diff --git a/app/src/main/res/layout/call_fragment.xml b/app/src/main/res/layout/call_fragment.xml
index 22f97d44e..b270562df 100644
--- a/app/src/main/res/layout/call_fragment.xml
+++ b/app/src/main/res/layout/call_fragment.xml
@@ -81,7 +81,7 @@
             app:avatarViewInitialsTextColor="@color/gray_9"
             app:avatarViewInitialsTextSize="21sp"
             app:avatarViewInitialsTextStyle="bold"
-            app:avatarViewPlaceholder="@drawable/contact_avatar"
+            app:avatarViewPlaceholder="@drawable/user_circle"
             app:avatarViewShape="circle"
             app:avatarViewBorderWidth="0dp"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/call_list_cell.xml b/app/src/main/res/layout/call_list_cell.xml
index 0f54880a9..5a7c1cd8e 100644
--- a/app/src/main/res/layout/call_list_cell.xml
+++ b/app/src/main/res/layout/call_list_cell.xml
@@ -38,7 +38,7 @@
             android:adjustViewBounds="true"
             android:background="@drawable/shape_circle_light_blue_background"
             contactAvatar="@{model.avatarModel}"
-            app:avatarViewPlaceholder="@drawable/contact_avatar"
+            app:avatarViewPlaceholder="@drawable/user_circle"
             app:avatarViewInitialsBackgroundColor="@color/blue_light"
             app:avatarViewInitialsTextColor="@color/gray_9"
             app:avatarViewInitialsTextSize="16sp"
diff --git a/app/src/main/res/layout/call_suggestion_list_cell.xml b/app/src/main/res/layout/call_suggestion_list_cell.xml
index d4ab0f052..c82286f77 100644
--- a/app/src/main/res/layout/call_suggestion_list_cell.xml
+++ b/app/src/main/res/layout/call_suggestion_list_cell.xml
@@ -30,7 +30,7 @@
             android:adjustViewBounds="true"
             android:background="@drawable/shape_circle_light_blue_background"
             avatarInitials="@{model.initials, default=`JD`}"
-            app:avatarViewPlaceholder="@drawable/contact_avatar"
+            app:avatarViewPlaceholder="@drawable/user_circle"
             app:avatarViewInitialsBackgroundColor="@color/blue_light"
             app:avatarViewInitialsTextColor="@color/gray_9"
             app:avatarViewInitialsTextSize="16sp"
diff --git a/app/src/main/res/layout/contact_favourite_list_cell.xml b/app/src/main/res/layout/contact_favourite_list_cell.xml
index 8b4e63a38..fedf3ad35 100644
--- a/app/src/main/res/layout/contact_favourite_list_cell.xml
+++ b/app/src/main/res/layout/contact_favourite_list_cell.xml
@@ -32,7 +32,7 @@
             android:adjustViewBounds="true"
             android:background="@drawable/shape_circle_light_blue_background"
             contactAvatar="@{model}"
-            app:avatarViewPlaceholder="@drawable/contact_avatar"
+            app:avatarViewPlaceholder="@drawable/user_circle"
             app:avatarViewInitialsBackgroundColor="@color/blue_light"
             app:avatarViewInitialsTextColor="@color/gray_9"
             app:avatarViewInitialsTextSize="16sp"
diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml
index 8e22728fd..466bf4eda 100644
--- a/app/src/main/res/layout/contact_fragment.xml
+++ b/app/src/main/res/layout/contact_fragment.xml
@@ -108,7 +108,7 @@
                     app:avatarViewInitialsTextColor="@color/gray_9"
                     app:avatarViewInitialsTextSize="21sp"
                     app:avatarViewInitialsTextStyle="bold"
-                    app:avatarViewPlaceholder="@drawable/contact_avatar"
+                    app:avatarViewPlaceholder="@drawable/user_circle"
                     app:avatarViewShape="circle"
                     app:avatarViewBorderWidth="0dp"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml
index 66357d31a..1dc9098d5 100644
--- a/app/src/main/res/layout/contact_list_cell.xml
+++ b/app/src/main/res/layout/contact_list_cell.xml
@@ -61,7 +61,7 @@
             android:adjustViewBounds="true"
             android:background="@drawable/shape_circle_light_blue_background"
             contactAvatar="@{model}"
-            app:avatarViewPlaceholder="@drawable/contact_avatar"
+            app:avatarViewPlaceholder="@drawable/user_circle"
             app:avatarViewInitialsBackgroundColor="@color/blue_light"
             app:avatarViewInitialsTextColor="@color/gray_9"
             app:avatarViewInitialsTextSize="16sp"
diff --git a/app/src/main/res/layout/main_activity_top_bar.xml b/app/src/main/res/layout/main_activity_top_bar.xml
index 80b38aa97..dacbc2bc0 100644
--- a/app/src/main/res/layout/main_activity_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_top_bar.xml
@@ -42,7 +42,7 @@
             android:layout_marginStart="15dp"
             android:background="@drawable/shape_circle_light_blue_background"
             accountAvatar="@{viewModel.account}"
-            app:avatarViewPlaceholder="@drawable/contact_avatar"
+            app:avatarViewPlaceholder="@drawable/user_circle"
             app:avatarViewInitialsBackgroundColor="@color/blue_light"
             app:avatarViewInitialsTextColor="@color/gray_9"
             app:avatarViewInitialsTextSize="16sp"
diff --git a/app/src/main/res/layout/voip_active_call_fragment.xml b/app/src/main/res/layout/voip_active_call_fragment.xml
index 46dc25742..5998ad429 100644
--- a/app/src/main/res/layout/voip_active_call_fragment.xml
+++ b/app/src/main/res/layout/voip_active_call_fragment.xml
@@ -58,7 +58,7 @@
                 app:avatarViewInitialsTextColor="@color/gray_9"
                 app:avatarViewInitialsTextSize="36sp"
                 app:avatarViewInitialsTextStyle="bold"
-                app:avatarViewPlaceholder="@drawable/contact_avatar"
+                app:avatarViewPlaceholder="@drawable/user_circle"
                 app:avatarViewShape="circle"
                 app:avatarViewBorderWidth="0dp"
                 app:avatarViewBorderColor="@color/blue_trusted"
diff --git a/app/src/main/res/layout/voip_incoming_call_fragment.xml b/app/src/main/res/layout/voip_incoming_call_fragment.xml
index 96cfaaa3f..b823d330c 100644
--- a/app/src/main/res/layout/voip_incoming_call_fragment.xml
+++ b/app/src/main/res/layout/voip_incoming_call_fragment.xml
@@ -61,7 +61,7 @@
             app:avatarViewInitialsTextColor="@color/gray_9"
             app:avatarViewInitialsTextSize="36sp"
             app:avatarViewInitialsTextStyle="bold"
-            app:avatarViewPlaceholder="@drawable/contact_avatar"
+            app:avatarViewPlaceholder="@drawable/user_circle"
             app:avatarViewShape="circle"
             app:avatarViewBorderWidth="0dp"
             app:layout_constraintEnd_toEndOf="@id/background"
diff --git a/app/src/main/res/layout/voip_outgoing_call_fragment.xml b/app/src/main/res/layout/voip_outgoing_call_fragment.xml
index 9849740c8..949440aac 100644
--- a/app/src/main/res/layout/voip_outgoing_call_fragment.xml
+++ b/app/src/main/res/layout/voip_outgoing_call_fragment.xml
@@ -75,7 +75,7 @@
             app:avatarViewInitialsTextColor="@color/gray_9"
             app:avatarViewInitialsTextSize="36sp"
             app:avatarViewInitialsTextStyle="bold"
-            app:avatarViewPlaceholder="@drawable/contact_avatar"
+            app:avatarViewPlaceholder="@drawable/user_circle"
             app:avatarViewShape="circle"
             app:avatarViewBorderWidth="0dp"
             app:layout_constraintEnd_toEndOf="@id/background"