diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
index 048cd11a0..15d7d5fbd 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
@@ -101,7 +101,7 @@ public class AdvancedUserItem extends AbstractFlexibleItem<AdvancedUserItem.User
 
     @Override
     public int getLayoutRes() {
-        return R.layout.rv_item_call;
+        return R.layout.rv_item_conversation;
     }
 
     @Override
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java
index 4d14e68a6..c2027ccf3 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java
@@ -92,7 +92,7 @@ public class CallItem extends AbstractFlexibleItem<CallItem.RoomItemViewHolder>
 
     @Override
     public int getLayoutRes() {
-        return R.layout.rv_item_call;
+        return R.layout.rv_item_conversation;
     }
 
     @Override
diff --git a/app/src/main/res/layout/controller_call_menu.xml b/app/src/main/res/layout/controller_call_menu.xml
index d9356b5ee..603f2fcce 100644
--- a/app/src/main/res/layout/controller_call_menu.xml
+++ b/app/src/main/res/layout/controller_call_menu.xml
@@ -29,7 +29,7 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:listitem="@layout/rv_item_call"/>
+        tools:listitem="@layout/rv_item_conversation"/>
 
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/controller_generic_rv.xml b/app/src/main/res/layout/controller_generic_rv.xml
index 55f138639..965b50129 100644
--- a/app/src/main/res/layout/controller_generic_rv.xml
+++ b/app/src/main/res/layout/controller_generic_rv.xml
@@ -39,7 +39,7 @@
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                tools:listitem="@layout/rv_item_call"/>
+                tools:listitem="@layout/rv_item_conversation"/>
 
         </FrameLayout>
 
diff --git a/app/src/main/res/layout/rv_item_call.xml b/app/src/main/res/layout/rv_item_conversation.xml
similarity index 95%
rename from app/src/main/res/layout/rv_item_call.xml
rename to app/src/main/res/layout/rv_item_conversation.xml
index c521523b7..0477c5c93 100644
--- a/app/src/main/res/layout/rv_item_call.xml
+++ b/app/src/main/res/layout/rv_item_conversation.xml
@@ -46,12 +46,12 @@
 
         <ImageView
             android:id="@+id/password_protected_image_view"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="10dp"
+            android:layout_height="10dp"
             android:layout_gravity="bottom|end"
+            android:layout_marginEnd="6dp"
+            android:layout_marginBottom="6dp"
             android:src="@drawable/ic_lock_white_24px"
-            android:tint="@color/nc_material_yellow"
-            android:tintMode="src_in"
             android:visibility="visible"/>
 
     </FrameLayout>