diff --git a/app/src/main/res/drawable/shape_favorite_bubble.xml b/app/src/main/res/drawable/shape_favorite_bubble.xml
index 8818c776a..5af97f889 100644
--- a/app/src/main/res/drawable/shape_favorite_bubble.xml
+++ b/app/src/main/res/drawable/shape_favorite_bubble.xml
@@ -26,5 +26,5 @@
             <solid android:color="@color/bg_message_list_incoming_bubble"/>
         </shape>
     </item>
-    <item android:drawable="@drawable/ic_star_black_24dp" android:tint="@color/grey_600"/>
+    <item android:drawable="@drawable/ic_star_black_24dp" android:tint="@color/favorite_icon_tint"/>
 </layer-list>
\ No newline at end of file
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 1890d8906..372c8bb59 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
@@ -43,17 +43,19 @@
 
             <ImageView
                 android:id="@+id/passwordProtectedRoomImageView"
-                android:layout_width="@dimen/margin_between_elements"
-                android:layout_height="@dimen/margin_between_elements"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
                 android:layout_gravity="bottom|end"
-                android:background="@drawable/shape_lock_bubble" />
+                android:src="@drawable/ic_lock_grey600_24px" />
 
             <ImageView
                 android:id="@+id/favoriteConversationImageView"
-                android:layout_width="@dimen/margin_between_elements"
-                android:layout_height="@dimen/margin_between_elements"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
                 android:layout_gravity="top|end"
-                android:background="@drawable/shape_favorite_bubble" />
+                android:src="@drawable/ic_star_black_24dp"
+                android:tint="@color/favorite_icon_tint"
+                android:tintMode="src_in"/>
 
         </FrameLayout>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9dfe8abc3..80567a6a1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -68,4 +68,5 @@
 
     <color name="nc_author_text">#65A7CA</color>
     <color name="bg_bottom_sheet">#46ffffff</color>
+    <color name="favorite_icon_tint">#FFCC00</color>
 </resources>