diff --git a/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
index 905154643..6ebb5dd91 100644
--- a/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
@@ -355,9 +355,8 @@ public final class TagsControlSet extends TaskEditControlFragment {
       chipGroup.setVisibility(View.VISIBLE);
       chipGroup.removeAllViews();
       for (TagData tagData : orderByName.sortedCopy(selectedTags)) {
-        Chip chip = chipProvider.newChip(getActivity(), tagData);
+        Chip chip = chipProvider.newClosableChip(getActivity(), tagData);
         chipProvider.apply(chip, tagData);
-        chip.setCloseIconVisible(true);
         chip.setOnClickListener(view -> onClickRow());
         chip.setOnCloseIconClickListener(
             view -> {
diff --git a/app/src/main/java/org/tasks/ui/ChipProvider.java b/app/src/main/java/org/tasks/ui/ChipProvider.java
index d4231c12b..c905ea3de 100644
--- a/app/src/main/java/org/tasks/ui/ChipProvider.java
+++ b/app/src/main/java/org/tasks/ui/ChipProvider.java
@@ -8,6 +8,7 @@ import static org.tasks.preferences.ResourceResolver.getDimen;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.ColorStateList;
+import androidx.annotation.LayoutRes;
 import com.google.android.material.chip.Chip;
 import com.google.common.base.Predicates;
 import com.google.common.base.Strings;
@@ -126,13 +127,19 @@ public class ChipProvider {
   }
 
   private Chip newTagChip(Activity activity, Filter filter) {
-    Chip chip = newChip(activity, filter);
+    Chip chip = newChip(activity, R.layout.chip_tag, filter);
     apply(chip, filter.listingTitle, filter.tint);
     return chip;
   }
 
-  public Chip newChip(Activity activity, Object tag) {
-    Chip chip = (Chip) activity.getLayoutInflater().inflate(R.layout.chip_tag, null);
+  public Chip newClosableChip(Activity activity, Object tag) {
+    Chip chip = (Chip) activity.getLayoutInflater().inflate(R.layout.chip_closable, null);
+    chip.setTag(tag);
+    return chip;
+  }
+
+  private Chip newChip(Activity activity, @LayoutRes int layout, Object tag) {
+    Chip chip = (Chip) activity.getLayoutInflater().inflate(layout, null);
     chip.setTag(tag);
     return chip;
   }
diff --git a/app/src/main/res/layout/chip_closable.xml b/app/src/main/res/layout/chip_closable.xml
new file mode 100644
index 000000000..04151bcea
--- /dev/null
+++ b/app/src/main/res/layout/chip_closable.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.chip.Chip
+  style="@style/ChipStyle.Closable"/>
diff --git a/app/src/main/res/layout/control_set_remote_list.xml b/app/src/main/res/layout/control_set_remote_list.xml
index 836803458..2a1f4d0b7 100644
--- a/app/src/main/res/layout/control_set_remote_list.xml
+++ b/app/src/main/res/layout/control_set_remote_list.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/remote_list_row"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -19,7 +18,6 @@
 
   <com.google.android.material.chip.Chip
     android:id="@+id/chip"
-    style="@style/ChipStyle"
-    android:visibility="gone"
-    app:closeIconEnabled="true"/>
+    style="@style/ChipStyle.Closable"
+    android:visibility="gone"/>
 </LinearLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 442b8583f..dfc1d0e22 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -151,11 +151,7 @@
     <item name="android:layout_width">wrap_content</item>
     <item name="android:maxLines">1</item>
     <item name="android:ellipsize">end</item>
-    <item name="closeIconSize">@dimen/chip_icon_size</item>
     <item name="chipIconSize">@dimen/chip_icon_size</item>
-    <item name="closeIcon">@drawable/ic_outline_clear_24px</item>
-    <item name="closeIconStartPadding">0dp</item>
-    <item name="closeIconEndPadding">@dimen/chip_text_padding</item>
     <item name="android:textAppearance">@style/TextAppearance.AppCompat.Small</item>
     <item name="chipMinHeight">@dimen/chip_min_height</item>
     <item name="closeIconVisible">false</item>
@@ -163,4 +159,10 @@
     <item name="textEndPadding">@dimen/chip_text_padding</item>
   </style>
 
+  <style name="ChipStyle.Closable">
+    <item name="closeIconEndPadding">0dp</item>
+    <item name="closeIconVisible">true</item>
+    <item name="closeIconStartPadding">0dp</item>
+  </style>
+
 </resources>