diff --git a/src/cheogram/java/com/cheogram/android/TagEditorView.java b/src/cheogram/java/com/cheogram/android/TagEditorView.java
index 5405dedecd875915138cf7f2481c8bb379190236..d6731a967f067f6cd66e61fc0c6445d813660434 100644
--- a/src/cheogram/java/com/cheogram/android/TagEditorView.java
+++ b/src/cheogram/java/com/cheogram/android/TagEditorView.java
@@ -2,6 +2,7 @@ package com.cheogram.android;
 
 import android.app.Activity;
 import android.content.Context;
+import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -35,7 +36,7 @@ public class TagEditorView extends TokenCompleteTextView<ListItem.Tag> {
 		LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
 		final TextView tv = (TextView) inflater.inflate(R.layout.list_item_tag, (ViewGroup) getParent(), false);
 		tv.setText(tag.getName());
-		tv.setBackgroundColor(tag.getColor());
+		tv.getBackground().mutate().setColorFilter(tag.getColor(), PorterDuff.Mode.SRC_IN);
 		return tv;
 	}
 
diff --git a/src/cheogram/res/drawable/horizontal_space.xml b/src/cheogram/res/drawable/horizontal_space.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d20059ebc7165541d532d2d8208ef2c379ae6f4a
--- /dev/null
+++ b/src/cheogram/res/drawable/horizontal_space.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <size android:width="3dp" />
+</shape>
diff --git a/src/cheogram/res/drawable/pill.xml b/src/cheogram/res/drawable/pill.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eb9c9cb3b377aef14764cc382366a36fe6a40229
--- /dev/null
+++ b/src/cheogram/res/drawable/pill.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+	<corners android:radius="50dp" />
+</shape>
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index 3d5cb242b93789811b8d95d7265cc78f053810a0..1af16819d8305694a9ac6cbe42f3610a93827aff 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -5,6 +5,7 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -659,7 +660,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             for (final ListItem.Tag tag : tagList) {
                 final TextView tv = (TextView) inflater.inflate(R.layout.list_item_tag, binding.tags, false);
                 tv.setText(tag.getName());
-                tv.setBackgroundColor(tag.getColor());
+                tv.getBackground().mutate().setColorFilter(tag.getColor(), PorterDuff.Mode.SRC_IN);
                 binding.tags.addView(tv);
             }
         }
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index d05b3093477de909eef056527b39e95e5924c386..7089164d810b280cd1f57a37d8c7775ac70026a2 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -7,6 +7,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
@@ -605,7 +606,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
             for (final ListItem.Tag tag : tagList) {
                 final TextView tv = (TextView) inflater.inflate(R.layout.list_item_tag, binding.tags, false);
                 tv.setText(tag.getName());
-                tv.setBackgroundColor(tag.getColor());
+                tv.getBackground().mutate().setColorFilter(tag.getColor(), PorterDuff.Mode.SRC_IN);
                 binding.tags.addView(tv);
             }
         }
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index e743dfd629d08bb78d6bbc7d26644356bae2d846..97ff71c45b68909d12f4b330cd3766c302330be8 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -9,6 +9,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -740,6 +741,9 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
         boolean showDynamicTags = preferences.getBoolean(SettingsActivity.SHOW_DYNAMIC_TAGS, getResources().getBoolean(R.bool.show_dynamic_tags));
         if (showDynamicTags) {
             RecyclerView tags = mSearchView.findViewById(R.id.tags);
+            androidx.recyclerview.widget.DividerItemDecoration spacer = new androidx.recyclerview.widget.DividerItemDecoration(tags.getContext(), LinearLayoutManager.HORIZONTAL);
+            spacer.setDrawable(getResources().getDrawable(R.drawable.horizontal_space));
+            tags.addItemDecoration(spacer);
             tags.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
             tags.setAdapter(mTagsAdapter);
         }
@@ -1568,7 +1572,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
 
             public void setTag(ListItem.Tag tag) {
                 tv.setText(tag.getName());
-                tv.setBackgroundColor(tag.getColor());
+                tv.getBackground().mutate().setColorFilter(tag.getColor(), PorterDuff.Mode.SRC_IN);
             }
         }
 
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
index 5f79836049580361d04773aec8aaa139f3aa47c3..657ef6c7b2664c8fbf5ef993304e207c81e016dd 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
@@ -1,6 +1,7 @@
 package eu.siacs.conversations.ui.adapter;
 
 import android.content.SharedPreferences;
+import android.graphics.PorterDuff;
 import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -79,7 +80,7 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
 			for (ListItem.Tag tag : tags) {
 				TextView tv = (TextView) inflater.inflate(R.layout.list_item_tag, viewHolder.tags, false);
 				tv.setText(tag.getName());
-				tv.setBackgroundColor(tag.getColor());
+				tv.getBackground().mutate().setColorFilter(tag.getColor(), PorterDuff.Mode.SRC_IN);
 				tv.setOnClickListener(this.onTagTvClick);
 				viewHolder.tags.addView(tv);
 			}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java
index 14cd74d1e755095078f7797e2c6f083aa65c22d3..f1b96a8d5ebc78415fb6d5ca4b5ce8c31aaa3370 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java
@@ -3,6 +3,7 @@ package eu.siacs.conversations.ui.adapter;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.IntentSender;
+import android.graphics.PorterDuff;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.widget.TextView;
@@ -127,13 +128,13 @@ public class UserAdapter extends ListAdapter<MucOptions.User, UserAdapter.ViewHo
         for (MucOptions.Hat hat : getPseudoHats(viewHolder.binding.getRoot().getContext(), user)) {
             TextView tv = (TextView) LayoutInflater.from(viewHolder.binding.getRoot().getContext()).inflate(R.layout.list_item_tag, viewHolder.binding.tags, false);
             tv.setText(hat.toString());
-            tv.setBackgroundColor(hat.getColor());
+            tv.getBackground().mutate().setColorFilter(hat.getColor(), PorterDuff.Mode.SRC_IN);
             viewHolder.binding.tags.addView(tv);
         }
         for (MucOptions.Hat hat : user.getHats()) {
             TextView tv = (TextView) LayoutInflater.from(viewHolder.binding.getRoot().getContext()).inflate(R.layout.list_item_tag, viewHolder.binding.tags, false);
             tv.setText(hat.toString());
-            tv.setBackgroundColor(hat.getColor());
+            tv.getBackground().mutate().setColorFilter(hat.getColor(), PorterDuff.Mode.SRC_IN);
             viewHolder.binding.tags.addView(tv);
         }
 
diff --git a/src/main/res/layout/list_item_tag.xml b/src/main/res/layout/list_item_tag.xml
index 63df8571dba80cad13a252bd8214fd10aa2fac3b..22bd533c2eb22a24c8952074d61807bd7801d91c 100644
--- a/src/main/res/layout/list_item_tag.xml
+++ b/src/main/res/layout/list_item_tag.xml
@@ -5,9 +5,10 @@
           android:layout_margin="2dp"
           android:maxLines="1"
           android:paddingBottom="1dp"
-          android:paddingLeft="4dp"
-          android:paddingRight="4dp"
+          android:paddingLeft="5dp"
+          android:paddingRight="5dp"
           android:paddingTop="1dp"
           android:textAllCaps="true"
+          android:background="@drawable/pill"
           android:textAppearance="@style/TextAppearance.Conversations.Tag"
-    />
\ No newline at end of file
+    />