diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 93c9b4e7b..000000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="1A051FDEE005XG" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-08-08T14:19:41.977381455Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/res/layout/top_search_bar.xml b/app/src/main/res/layout/top_search_bar.xml
index a4f186d87..0439c6c1d 100644
--- a/app/src/main/res/layout/top_search_bar.xml
+++ b/app/src/main/res/layout/top_search_bar.xml
@@ -37,13 +37,25 @@
             app:constraint_referenced_ids="title, search"
             app:barrierDirection="bottom" />
 
-        <ImageView
+        <io.getstream.avatarview.AvatarView
             android:onClick="@{onAvatarClickListener}"
             android:id="@+id/avatar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
             android:layout_marginStart="15dp"
-            android:src="@drawable/contact_avatar"
+            app:avatarViewBorderColor="@color/trusted_blue"
+            app:avatarViewBorderWidth="2dp"
+            app:avatarViewIndicatorSizeCriteria="4"
+            app:avatarViewIndicatorEnabled="true"
+            app:avatarViewIndicatorDrawable="@drawable/trusted"
+            app:avatarViewIndicatorPosition="bottomLeft"
+            app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message"
+            app:avatarViewInitialsTextColor="@color/gray_9"
+            app:avatarViewInitialsTextSize="21sp"
+            app:avatarViewInitialsTextStyle="bold"
+            app:avatarViewPlaceholder="@drawable/contact_avatar"
+            app:avatarViewShape="circle"
+            app:avatarViewInitials="SB"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/title" />