diff --git a/app/build.gradle b/app/build.gradle
index d569ddf32..914790766 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -161,7 +161,7 @@ ext {
   work_version = "2.3.0-alpha02"
   koin_version = "2.1.0-alpha-1"
   lifecycle_version = "2.2.0-rc01"
-  coil_version = "0.9.0"
+  coil_version = "0.9.1"
   room_version = "2.2.3"
 }
 
@@ -299,7 +299,6 @@ dependencies {
   implementation "io.coil-kt:coil:${coil_version}"
   implementation "io.coil-kt:coil-gif:${coil_version}"
   implementation "io.coil-kt:coil-svg:${coil_version}"
-  //implementation 'com.github.coil-kt:coil:9769e11f19'
 
   implementation 'com.github.natario1:Autocomplete:v1.1.0'
 
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
index 0f3e25c52..4b67fd07c 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
@@ -205,14 +205,12 @@ class ConversationItem(
             if (conversationDrawable != null) {
                 load(conversationDrawable)
             } else {
-                if (model.name?.contains("marco") == false) {
-                    load(ApiUtils.getUrlForAvatarWithName(
-                            user.baseUrl,
-                            model.name, R.dimen.avatar_size))
-                    {
-                        addHeader("Authorization", user.getCredentials())
-                        transformations(CircleCropTransformation())
-                    }
+                load(ApiUtils.getUrlForAvatarWithName(
+                        user.baseUrl,
+                        model.name, R.dimen.avatar_size))
+                {
+                    addHeader("Authorization", user.getCredentials())
+                    transformations(CircleCropTransformation())
                 }
             }
         }
diff --git a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
index 372c8bb59..796f69df1 100644
--- a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
+++ b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
@@ -36,10 +36,9 @@
 
             <ImageView
                 android:id="@id/dialogAvatar"
-                android:layout_width="@dimen/small_item_height"
-                android:layout_height="@dimen/small_item_height"
-                android:contentDescription="@null"
-                tools:src="@drawable/ic_call_black_24dp" />
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:scaleType="centerCrop" />
 
             <ImageView
                 android:id="@+id/passwordProtectedRoomImageView"
diff --git a/gradle.properties b/gradle.properties
index f80ddfc11..00b4174ac 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,12 +29,11 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m
+org.gradle.jvmargs=-Xms1024m -Xmx8000m
 
 android.useAndroidX=true
 android.enableJetifier=true
 
-# org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.caching=true