diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
index 073db8df2..e998de75b 100644
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -52,7 +52,6 @@
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_group_white_24dp"
                     android:visibility="gone"
-                    android:tint="@color/gray50"
                     android:layout_marginTop="1dp"
                     android:layout_marginRight="5dp"
                     android:layout_marginEnd="5dp" />
@@ -71,11 +70,11 @@
 
                 <ImageView
                     android:id="@+id/verified_indicator"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
                     android:layout_gravity="center"
                     android:src="@drawable/ic_verified"
-                    android:visibility="visible"
+                    android:visibility="gone"
                     android:layout_marginLeft="5dp"
                     android:layout_marginRight="5dp" />
 
diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index ef03295af..6a1a000b6 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -51,6 +51,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.search.model.MessageResult;
 import org.thoughtcrime.securesms.util.DateUtils;
+import org.thoughtcrime.securesms.util.ResUtil;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
@@ -173,6 +174,8 @@ public class ConversationListItem extends RelativeLayout
 
     verifiedIndicator.setVisibility(thread.isVerified() ? VISIBLE : GONE);
     groupIndicator.setVisibility(recipient.isGroupRecipient() ? VISIBLE : GONE);
+    int color = ResUtil.getColor(getContext(), R.attr.conversation_list_item_contact_color);
+    groupIndicator.setColorFilter(color);
   }
 
   public void bind(@NonNull  Recipient     contact,
diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java
index def65a58a..da5576af1 100644
--- a/src/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -26,7 +26,6 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.annimon.stream.function.Consumer;
-import com.b44t.messenger.DcContext;
 
 import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.connect.ApplicationDcContext;
@@ -303,8 +302,7 @@ public class Recipient implements RecipientModifiedListener {
   }
 
   public synchronized @NonNull MaterialColor getColor() {
-    if      (isGroupRecipient()) return MaterialColor.BLUE;
-    else if (color != null)      return color;
+    if (color != null)      return color;
     else if (name != null)       return ContactColors.generateFor(name);
     else                         return ContactColors.UNKNOWN_COLOR;
   }