diff --git a/app/src/main/res/drawable-xhdpi/voip_multiple_contacts_avatar.png b/app/src/main/res/drawable-xhdpi/voip_multiple_contacts_avatar.png
index 78b10f11b..5b0732545 100644
Binary files a/app/src/main/res/drawable-xhdpi/voip_multiple_contacts_avatar.png and b/app/src/main/res/drawable-xhdpi/voip_multiple_contacts_avatar.png differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_single_contact_avatar.png b/app/src/main/res/drawable-xhdpi/voip_single_contact_avatar.png
index 5d158fa49..e8806b0e4 100644
Binary files a/app/src/main/res/drawable-xhdpi/voip_single_contact_avatar.png and b/app/src/main/res/drawable-xhdpi/voip_single_contact_avatar.png differ
diff --git a/app/src/main/res/drawable/icon_multiple_contacts_avatar.xml b/app/src/main/res/drawable/icon_multiple_contacts_avatar.xml
new file mode 100644
index 000000000..15fac96a6
--- /dev/null
+++ b/app/src/main/res/drawable/icon_multiple_contacts_avatar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/voip_multiple_contacts_avatar"
+            android:tint="?attr/drawableTintColor2"/>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/icon_single_contact_avatar.xml b/app/src/main/res/drawable/icon_single_contact_avatar.xml
new file mode 100644
index 000000000..0af513c72
--- /dev/null
+++ b/app/src/main/res/drawable/icon_single_contact_avatar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/voip_single_contact_avatar"
+            android:tint="?attr/drawableTintColor2"/>
+    </item>
+</selector>
diff --git a/app/src/main/res/layout/contact_avatar.xml b/app/src/main/res/layout/contact_avatar.xml
index 98c03b62a..15ef63690 100644
--- a/app/src/main/res/layout/contact_avatar.xml
+++ b/app/src/main/res/layout/contact_avatar.xml
@@ -46,16 +46,16 @@
             android:layout_alignParentLeft="true"
             android:adjustViewBounds="true"
             android:contentDescription="@null"
-            android:src="@{groupChatAvatarVisibility ? @drawable/voip_multiple_contacts_avatar : @drawable/voip_single_contact_avatar}"/>
+            android:src="@drawable/generated_avatar_bg" />
 
         <ImageView
-            android:visibility="@{generatedAvatarVisibility &amp;&amp; !groupChatAvatarVisibility ? View.VISIBLE : View.GONE}"
+            android:visibility="@{groupChatAvatarVisibility || !generatedAvatarVisibility ? View.VISIBLE : View.GONE}"
             android:layout_width="@dimen/contact_avatar_size"
             android:layout_height="@dimen/contact_avatar_size"
             android:layout_alignParentLeft="true"
             android:adjustViewBounds="true"
             android:contentDescription="@null"
-            android:src="@drawable/generated_avatar_bg" />
+            android:src="@{groupChatAvatarVisibility ? @drawable/icon_multiple_contacts_avatar : @drawable/icon_single_contact_avatar}"/>
 
         <TextView
             android:text="@{initials}"
diff --git a/app/src/main/res/layout/voip_contact_avatar.xml b/app/src/main/res/layout/voip_contact_avatar.xml
index 558e7cce5..cc8872a50 100644
--- a/app/src/main/res/layout/voip_contact_avatar.xml
+++ b/app/src/main/res/layout/voip_contact_avatar.xml
@@ -19,7 +19,8 @@
             android:layout_alignParentStart="true"
             android:adjustViewBounds="true"
             android:contentDescription="@null"
-            android:src="@drawable/voip_single_contact_avatar"/>
+            android:background="@drawable/generated_avatar_bg"
+            android:src="@drawable/icon_single_contact_avatar"/>
 
         <ImageView
             android:visibility="@{data.displayInitials ? View.VISIBLE : View.GONE}"
diff --git a/app/src/main/res/layout/voip_contact_avatar_alt.xml b/app/src/main/res/layout/voip_contact_avatar_alt.xml
index e8084754d..9812f5f18 100644
--- a/app/src/main/res/layout/voip_contact_avatar_alt.xml
+++ b/app/src/main/res/layout/voip_contact_avatar_alt.xml
@@ -23,7 +23,8 @@
             android:layout_alignParentStart="true"
             android:adjustViewBounds="true"
             android:contentDescription="@null"
-            android:src="@{isConferenceCall ? @drawable/voip_multiple_contacts_avatar : @drawable/voip_single_contact_avatar}"/>
+            android:background="@drawable/generated_avatar_bg"
+            android:src="@{isConferenceCall ? @drawable/icon_multiple_contacts_avatar : @drawable/icon_single_contact_avatar}"/>
 
         <ImageView
             android:visibility="@{data.displayInitials &amp;&amp; !isConferenceCall ? View.VISIBLE : View.GONE}"