diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index dfa0398d07338f8c3249c32d8b17bf03004ca01c..1defd4b1c159718d525d2eb19ae87650dfe4f6bd 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -1165,19 +1165,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             viewHolder.messageBody.setCustomSelectionActionModeCallback(new MessageTextActionModeCallback(this, viewHolder.messageBody));
         }
 
-        if (viewHolder.thread_identicon != null) {
-            viewHolder.thread_identicon.setVisibility(View.GONE);
-            final Element thread = message.getThread();
-            if (thread != null) {
-                final String threadId = thread.getContent();
-                if (threadId != null) {
-                    viewHolder.thread_identicon.setVisibility(View.VISIBLE);
-                    viewHolder.thread_identicon.setColor(UIHelper.getColorForName(threadId));
-                    viewHolder.thread_identicon.setHash(UIHelper.identiconHash(threadId));
-                }
-            }
-        }
-
         if (viewHolder.time != null) {
             if (message.isAttention()) {
                 viewHolder.time.setTypeface(null, Typeface.BOLD);
@@ -1203,6 +1190,20 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             }
         }
 
+        if (viewHolder.thread_identicon != null) {
+            viewHolder.thread_identicon.setVisibility(View.GONE);
+            final Element thread = message.getThread();
+            if (thread != null) {
+                final String threadId = thread.getContent();
+                if (threadId != null) {
+                    final var roles = MaterialColors.getColorRoles(activity, UIHelper.getColorForName(threadId));
+                    viewHolder.thread_identicon.setVisibility(View.VISIBLE);
+                    viewHolder.thread_identicon.setColor(roles.getAccent());
+                    viewHolder.thread_identicon.setHash(UIHelper.identiconHash(threadId));
+                }
+            }
+        }
+
         if (type == DATE_SEPARATOR) {
             if (UIHelper.today(message.getTimeSent())) {
                 viewHolder.status_message.setText(R.string.today);