diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java
index 4c5c8cfc6..de5681ee4 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java
@@ -33,6 +33,7 @@ import com.nextcloud.talk.api.helpers.api.ApiHelper;
 import com.nextcloud.talk.api.models.json.rooms.Room;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.persistence.entities.UserEntity;
+import com.nextcloud.talk.utils.ColorUtils;
 import com.nextcloud.talk.utils.glide.GlideApp;
 
 import java.util.List;
@@ -113,6 +114,9 @@ public class RoomItem extends AbstractFlexibleItem<RoomItem.RoomItemViewHolder>
                 holder.avatarImageView.setVisibility(View.VISIBLE);
 
                 if (!TextUtils.isEmpty(room.getName())) {
+                    holder.avatarImageView.setTextAndColorSeed(String.valueOf(room.getName().
+                            toUpperCase().charAt(0)), ColorUtils.colorSeed);
+
                     GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(),
                             room.getName()), new LazyHeaders.Builder()
                             .setHeader("Accept", "image/*")
@@ -124,13 +128,12 @@ public class RoomItem extends AbstractFlexibleItem<RoomItem.RoomItemViewHolder>
                             .skipMemoryCache(true)
                             .diskCacheStrategy(DiskCacheStrategy.NONE)
                             .load(glideUrl)
-                            .placeholder(holder.avatarImageViewInvisible.getDrawable())
                             .circleCrop()
                             .centerInside()
                             .into(holder.avatarImageView);
 
                 } else {
-                    holder.avatarImageView.setDrawable(holder.avatarImageViewInvisible.getDrawable());
+                    holder.avatarImageView.setVisibility(View.GONE);
                 }
                 break;
             case ROOM_GROUP_CALL:
@@ -162,8 +165,6 @@ public class RoomItem extends AbstractFlexibleItem<RoomItem.RoomItemViewHolder>
         public TextView roomLastPing;
         @BindView(R.id.avatar_image)
         public AvatarImageView avatarImageView;
-        @BindView(R.id.avatar_image_invisible)
-        public AvatarImageView avatarImageViewInvisible;
 
         /**
          * Default constructor.
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
index 1eb3ca72f..ffedd3b6b 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
@@ -109,7 +109,6 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
                 .asBitmap()
                 .skipMemoryCache(true)
                 .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .placeholder(holder.avatarImageViewInvisible.getDrawable())
                 .load(glideUrl)
                 .circleCrop()
                 .centerInside()
@@ -128,8 +127,6 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
         public TextView contactDisplayName;
         @BindView(R.id.avatar_image)
         public AvatarImageView avatarImageView;
-        @BindView(R.id.avatar_image_invisible)
-        public AvatarImageView avatarImageViewInvisible;
 
         /**
          * Default constructor.
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
index 005c5071e..51e0c51c4 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
@@ -90,9 +90,6 @@ public class SettingsController extends BaseController {
     @BindView(R.id.avatar_image)
     AvatarImageView avatarImageView;
 
-    @BindView(R.id.avatar_image_invisible)
-    AvatarImageView avatarImageViewInvisible;
-
     @BindView(R.id.display_name_text)
     TextView displayName;
 
@@ -191,7 +188,7 @@ public class SettingsController extends BaseController {
         UserEntity userEntity = userUtils.getCurrentUser();
         if (userEntity != null) {
             // Awful hack
-            avatarImageViewInvisible.setTextAndColorSeed(String.valueOf(userEntity.getDisplayName().
+            avatarImageView.setTextAndColorSeed(String.valueOf(userEntity.getDisplayName().
                     toUpperCase().charAt(0)), ColorUtils.colorSeed);
 
             GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(),
@@ -204,8 +201,7 @@ public class SettingsController extends BaseController {
                     .load(glideUrl)
                     .circleCrop()
                     .centerInside()
-                    .into(avatarImageView)
-                    .onLoadFailed(avatarImageViewInvisible.getDrawable());
+                    .into(avatarImageView);
 
             displayName.setText(userEntity.getDisplayName());
         }
diff --git a/app/src/main/res/layout/controller_settings.xml b/app/src/main/res/layout/controller_settings.xml
index 896eb5958..694dbfdce 100644
--- a/app/src/main/res/layout/controller_settings.xml
+++ b/app/src/main/res/layout/controller_settings.xml
@@ -34,17 +34,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <cn.carbs.android.avatarimageview.library.AvatarImageView
-                android:id="@+id/avatar_image_invisible"
-                android:layout_width="@dimen/avatar_size_big"
-                android:layout_height="@dimen/avatar_size_big"
-                android:layout_centerHorizontal="true"
-                android:scaleType="centerInside"
-                android:visibility="invisible"
-                apc:aiv_CornerRadius="@dimen/avatar_corner_radius"
-                apc:aiv_ShowBoarder="false"
-                apc:aiv_TextSizeRatio="0.5"/>
-
             <cn.carbs.android.avatarimageview.library.AvatarImageView
                 android:id="@+id/avatar_image"
                 android:layout_width="@dimen/avatar_size_big"
diff --git a/app/src/main/res/layout/rv_item_call.xml b/app/src/main/res/layout/rv_item_call.xml
index 9dd41290e..aedbab36d 100644
--- a/app/src/main/res/layout/rv_item_call.xml
+++ b/app/src/main/res/layout/rv_item_call.xml
@@ -27,19 +27,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/item_height">
 
-    <cn.carbs.android.avatarimageview.library.AvatarImageView
-        android:id="@+id/avatar_image_invisible"
-        android:visibility="invisible"
-        android:layout_width="@dimen/avatar_size"
-        android:layout_height="@dimen/avatar_size"
-        android:layout_centerVertical="true"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:scaleType="centerInside"
-        app:aiv_CornerRadius="@dimen/avatar_corner_radius"
-        app:aiv_ShowBoarder="false"
-        app:aiv_TextSizeRatio="0.5"/>
-
     <cn.carbs.android.avatarimageview.library.AvatarImageView
         android:id="@+id/avatar_image"
         android:layout_width="@dimen/avatar_size"
diff --git a/app/src/main/res/layout/rv_item_contact.xml b/app/src/main/res/layout/rv_item_contact.xml
index e06eb2a08..d360fa25e 100644
--- a/app/src/main/res/layout/rv_item_contact.xml
+++ b/app/src/main/res/layout/rv_item_contact.xml
@@ -28,19 +28,6 @@
                 android:layout_height="@dimen/item_height"
                 android:orientation="vertical">
 
-    <cn.carbs.android.avatarimageview.library.AvatarImageView
-        android:id="@+id/avatar_image_invisible"
-        android:visibility="invisible"
-        android:layout_width="@dimen/avatar_size"
-        android:layout_height="@dimen/avatar_size"
-        android:layout_centerVertical="true"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:scaleType="centerInside"
-        app:aiv_CornerRadius="@dimen/avatar_corner_radius"
-        app:aiv_ShowBoarder="false"
-        app:aiv_TextSizeRatio="0.5"/>
-
     <cn.carbs.android.avatarimageview.library.AvatarImageView
         android:id="@+id/avatar_image"
         android:layout_width="@dimen/avatar_size"