diff --git a/app/src/main/res/drawable/ic_x_18.xml b/app/src/main/res/drawable/ic_x_18.xml
new file mode 100644
index 000000000..ac495aa0e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_x_18.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/signal_icon_tint_primary"
+      android:pathData="M16.03,5.03l-1.06,-1.06l-4.97,4.969l-4.97,-4.969l-1.06,1.06l4.969,4.97l-4.969,4.97l1.06,1.06l4.97,-4.969l4.97,4.969l1.06,-1.06l-4.969,-4.97l4.969,-4.97z"/>
+</vector>
diff --git a/app/src/main/res/layout/conversation_list_filter_pull_view.xml b/app/src/main/res/layout/conversation_list_filter_pull_view.xml
index b40fc569c..851d74591 100644
--- a/app/src/main/res/layout/conversation_list_filter_pull_view.xml
+++ b/app/src/main/res/layout/conversation_list_filter_pull_view.xml
@@ -20,14 +20,20 @@
         android:textAppearance="@style/Signal.Text.LabelLarge"
         android:textColor="@color/signal_colorOnSurface"
         android:visibility="invisible"
+        tools:visibility="visible"
         app:chipBackgroundColor="@color/signal_colorSecondaryContainer"
         app:chipCornerRadius="8dp"
         app:chipMinHeight="32dp"
+        app:chipStartPadding="8dp"
+        app:chipEndPadding="8dp"
+        app:closeIconStartPadding="6dp"
+        app:closeIconEndPadding="0dp"
+        app:textStartPadding="0dp"
+        app:textEndPadding="0dp"
         app:closeIcon="@drawable/ic_x_20"
+        app:closeIconTint="@color/signal_colorOnSurface"
         app:closeIconEnabled="true"
         app:closeIconSize="18dp"
-        app:ensureMinTouchTargetSize="false"
-        app:icon="@drawable/ic_x_20"
-        app:iconTint="@color/signal_colorOnSurface" />
+        app:ensureMinTouchTargetSize="false" />
 
 </merge>
\ No newline at end of file