diff --git a/res/drawable-hdpi/ic_dialpad_white_24dp.webp b/res/drawable-hdpi/ic_dialpad_white_24dp.webp
deleted file mode 100644
index 2745be7b4..000000000
Binary files a/res/drawable-hdpi/ic_dialpad_white_24dp.webp and /dev/null differ
diff --git a/res/drawable-hdpi/ic_keyboard_white_24dp.webp b/res/drawable-hdpi/ic_keyboard_white_24dp.webp
deleted file mode 100644
index ddae91c9a..000000000
Binary files a/res/drawable-hdpi/ic_keyboard_white_24dp.webp and /dev/null differ
diff --git a/res/drawable-mdpi/ic_dialpad_white_24dp.webp b/res/drawable-mdpi/ic_dialpad_white_24dp.webp
deleted file mode 100644
index 5a3f0ced2..000000000
Binary files a/res/drawable-mdpi/ic_dialpad_white_24dp.webp and /dev/null differ
diff --git a/res/drawable-mdpi/ic_keyboard_white_24dp.webp b/res/drawable-mdpi/ic_keyboard_white_24dp.webp
deleted file mode 100644
index 7149c6751..000000000
Binary files a/res/drawable-mdpi/ic_keyboard_white_24dp.webp and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_dialpad_white_24dp.webp b/res/drawable-xhdpi/ic_dialpad_white_24dp.webp
deleted file mode 100644
index 3ff68838a..000000000
Binary files a/res/drawable-xhdpi/ic_dialpad_white_24dp.webp and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_keyboard_white_24dp.webp b/res/drawable-xhdpi/ic_keyboard_white_24dp.webp
deleted file mode 100644
index efe30aaf7..000000000
Binary files a/res/drawable-xhdpi/ic_keyboard_white_24dp.webp and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_dialpad_white_24dp.webp b/res/drawable-xxhdpi/ic_dialpad_white_24dp.webp
deleted file mode 100644
index 8d31a0653..000000000
Binary files a/res/drawable-xxhdpi/ic_dialpad_white_24dp.webp and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_keyboard_white_24dp.webp b/res/drawable-xxhdpi/ic_keyboard_white_24dp.webp
deleted file mode 100644
index 5d3798cde..000000000
Binary files a/res/drawable-xxhdpi/ic_keyboard_white_24dp.webp and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_dialpad_white_24dp.webp b/res/drawable-xxxhdpi/ic_dialpad_white_24dp.webp
deleted file mode 100644
index fb65d3fa2..000000000
Binary files a/res/drawable-xxxhdpi/ic_dialpad_white_24dp.webp and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_keyboard_white_24dp.webp b/res/drawable-xxxhdpi/ic_keyboard_white_24dp.webp
deleted file mode 100644
index 8b1cc291a..000000000
Binary files a/res/drawable-xxxhdpi/ic_keyboard_white_24dp.webp and /dev/null differ
diff --git a/res/drawable/ic_keyboard_outline_24.xml b/res/drawable/ic_keyboard_outline_24.xml
new file mode 100644
index 000000000..1f4b6f4ff
--- /dev/null
+++ b/res/drawable/ic_keyboard_outline_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?icon_tint" android:pathData="M20,4.5A1.538,1.538 0,0 1,21.5 6L21.5,17.5A1.538,1.538 0,0 1,20 19L4,19a1.538,1.538 0,0 1,-1.5 -1.5L2.5,6A1.538,1.538 0,0 1,4 4.5L20,4.5M20,3L4,3A2.946,2.946 0,0 0,1 6L1,17.5a2.946,2.946 0,0 0,3 3L20,20.5a2.946,2.946 0,0 0,3 -3L23,6A2.946,2.946 0,0 0,20 3ZM16.5,15h-9v2h9ZM7.5,12h0A1.538,1.538 0,0 0,6 10.5L6,10.5A1.538,1.538 0,0 0,4.5 12h0A1.538,1.538 0,0 0,6 13.5L6,13.5A1.538,1.538 0,0 0,7.5 12ZM11.5,12h0A1.538,1.538 0,0 0,10 10.5h0A1.538,1.538 0,0 0,8.5 12h0A1.538,1.538 0,0 0,10 13.5h0A1.538,1.538 0,0 0,11.5 12ZM15.5,12h0A1.538,1.538 0,0 0,14 10.5h0A1.538,1.538 0,0 0,12.5 12h0A1.538,1.538 0,0 0,14 13.5h0A1.538,1.538 0,0 0,15.5 12ZM19.5,12h0A1.538,1.538 0,0 0,18 10.5h0A1.538,1.538 0,0 0,16.5 12h0A1.538,1.538 0,0 0,18 13.5h0A1.538,1.538 0,0 0,19.5 12ZM7.5,8h0A1.538,1.538 0,0 0,6 6.5L6,6.5A1.538,1.538 0,0 0,4.5 8h0A1.538,1.538 0,0 0,6 9.5L6,9.5A1.538,1.538 0,0 0,7.5 8ZM11.5,8h0A1.538,1.538 0,0 0,10 6.5h0A1.538,1.538 0,0 0,8.5 8h0A1.538,1.538 0,0 0,10 9.5h0A1.538,1.538 0,0 0,11.5 8ZM15.5,8h0A1.538,1.538 0,0 0,14 6.5h0A1.538,1.538 0,0 0,12.5 8h0A1.538,1.538 0,0 0,14 9.5h0A1.538,1.538 0,0 0,15.5 8ZM19.5,8h0A1.538,1.538 0,0 0,18 6.5h0A1.538,1.538 0,0 0,16.5 8h0A1.538,1.538 0,0 0,18 9.5h0A1.538,1.538 0,0 0,19.5 8Z"/>
+</vector>
diff --git a/res/drawable/ic_keyboard_outline_contact_filter_24.xml b/res/drawable/ic_keyboard_outline_contact_filter_24.xml
new file mode 100644
index 000000000..2f8defd76
--- /dev/null
+++ b/res/drawable/ic_keyboard_outline_contact_filter_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?contact_filter_toolbar_icon_tint" android:pathData="M20,4.5A1.538,1.538 0,0 1,21.5 6L21.5,17.5A1.538,1.538 0,0 1,20 19L4,19a1.538,1.538 0,0 1,-1.5 -1.5L2.5,6A1.538,1.538 0,0 1,4 4.5L20,4.5M20,3L4,3A2.946,2.946 0,0 0,1 6L1,17.5a2.946,2.946 0,0 0,3 3L20,20.5a2.946,2.946 0,0 0,3 -3L23,6A2.946,2.946 0,0 0,20 3ZM16.5,15h-9v2h9ZM7.5,12h0A1.538,1.538 0,0 0,6 10.5L6,10.5A1.538,1.538 0,0 0,4.5 12h0A1.538,1.538 0,0 0,6 13.5L6,13.5A1.538,1.538 0,0 0,7.5 12ZM11.5,12h0A1.538,1.538 0,0 0,10 10.5h0A1.538,1.538 0,0 0,8.5 12h0A1.538,1.538 0,0 0,10 13.5h0A1.538,1.538 0,0 0,11.5 12ZM15.5,12h0A1.538,1.538 0,0 0,14 10.5h0A1.538,1.538 0,0 0,12.5 12h0A1.538,1.538 0,0 0,14 13.5h0A1.538,1.538 0,0 0,15.5 12ZM19.5,12h0A1.538,1.538 0,0 0,18 10.5h0A1.538,1.538 0,0 0,16.5 12h0A1.538,1.538 0,0 0,18 13.5h0A1.538,1.538 0,0 0,19.5 12ZM7.5,8h0A1.538,1.538 0,0 0,6 6.5L6,6.5A1.538,1.538 0,0 0,4.5 8h0A1.538,1.538 0,0 0,6 9.5L6,9.5A1.538,1.538 0,0 0,7.5 8ZM11.5,8h0A1.538,1.538 0,0 0,10 6.5h0A1.538,1.538 0,0 0,8.5 8h0A1.538,1.538 0,0 0,10 9.5h0A1.538,1.538 0,0 0,11.5 8ZM15.5,8h0A1.538,1.538 0,0 0,14 6.5h0A1.538,1.538 0,0 0,12.5 8h0A1.538,1.538 0,0 0,14 9.5h0A1.538,1.538 0,0 0,15.5 8ZM19.5,8h0A1.538,1.538 0,0 0,18 6.5h0A1.538,1.538 0,0 0,16.5 8h0A1.538,1.538 0,0 0,18 9.5h0A1.538,1.538 0,0 0,19.5 8Z"/>
+</vector>
diff --git a/res/drawable/ic_keyboard_solid_24.xml b/res/drawable/ic_keyboard_solid_24.xml
new file mode 100644
index 000000000..0f4c43b4a
--- /dev/null
+++ b/res/drawable/ic_keyboard_solid_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?icon_tint" android:pathData="M19,4L5,4A2.946,2.946 0,0 0,2 7v9.5a2.946,2.946 0,0 0,3 3L19,19.5a2.946,2.946 0,0 0,3 -3L22,7A2.946,2.946 0,0 0,19 4ZM14,6.5A1.5,1.5 0,1 1,12.5 8,1.538 1.538,0 0,1 14,6.5ZM14,10.5A1.5,1.5 0,1 1,12.5 12,1.538 1.538,0 0,1 14,10.5ZM10,6.5A1.5,1.5 0,1 1,8.5 8,1.538 1.538,0 0,1 10,6.5ZM10,10.5A1.5,1.5 0,1 1,8.5 12,1.538 1.538,0 0,1 10,10.5ZM6,6.5a1.5,1.5 0,0 1,0 3,1.5 1.5,0 0,1 0,-3ZM6,13.5a1.5,1.5 0,0 1,0 -3,1.5 1.5,0 0,1 0,3ZM16.5,17h-9L7.5,15h9ZM18,13.5A1.5,1.5 0,1 1,19.5 12,1.538 1.538,0 0,1 18,13.5ZM18,9.5A1.5,1.5 0,1 1,19.5 8,1.538 1.538,0 0,1 18,9.5Z"/>
+</vector>
diff --git a/res/drawable/ic_keyboard_solid_contact_filter_24.xml b/res/drawable/ic_keyboard_solid_contact_filter_24.xml
new file mode 100644
index 000000000..087b44f1b
--- /dev/null
+++ b/res/drawable/ic_keyboard_solid_contact_filter_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?contact_filter_toolbar_icon_tint" android:pathData="M19,4L5,4A2.946,2.946 0,0 0,2 7v9.5a2.946,2.946 0,0 0,3 3L19,19.5a2.946,2.946 0,0 0,3 -3L22,7A2.946,2.946 0,0 0,19 4ZM14,6.5A1.5,1.5 0,1 1,12.5 8,1.538 1.538,0 0,1 14,6.5ZM14,10.5A1.5,1.5 0,1 1,12.5 12,1.538 1.538,0 0,1 14,10.5ZM10,6.5A1.5,1.5 0,1 1,8.5 8,1.538 1.538,0 0,1 10,6.5ZM10,10.5A1.5,1.5 0,1 1,8.5 12,1.538 1.538,0 0,1 10,10.5ZM6,6.5a1.5,1.5 0,0 1,0 3,1.5 1.5,0 0,1 0,-3ZM6,13.5a1.5,1.5 0,0 1,0 -3,1.5 1.5,0 0,1 0,3ZM16.5,17h-9L7.5,15h9ZM18,13.5A1.5,1.5 0,1 1,19.5 12,1.538 1.538,0 0,1 18,13.5ZM18,9.5A1.5,1.5 0,1 1,19.5 8,1.538 1.538,0 0,1 18,9.5Z"/>
+</vector>
diff --git a/res/drawable/ic_number_pad_conversation_filter_24.xml b/res/drawable/ic_number_pad_conversation_filter_24.xml
new file mode 100644
index 000000000..e124c4818
--- /dev/null
+++ b/res/drawable/ic_number_pad_conversation_filter_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?contact_filter_toolbar_icon_tint" android:pathData="M8.5,4.75h0A1.8,1.8 0,0 0,6.75 3h0A1.8,1.8 0,0 0,5 4.75L5,4.75A1.8,1.8 0,0 0,6.75 6.5h0A1.8,1.8 0,0 0,8.5 4.75ZM13.75,4.75h0A1.8,1.8 0,0 0,12 3h0a1.8,1.8 0,0 0,-1.75 1.75h0A1.8,1.8 0,0 0,12 6.5h0A1.8,1.8 0,0 0,13.75 4.75ZM19,4.75h0A1.8,1.8 0,0 0,17.25 3h0A1.8,1.8 0,0 0,15.5 4.75h0A1.8,1.8 0,0 0,17.25 6.5h0A1.8,1.8 0,0 0,19 4.75ZM8.5,9.75h0A1.8,1.8 0,0 0,6.75 8h0A1.8,1.8 0,0 0,5 9.75L5,9.75A1.8,1.8 0,0 0,6.75 11.5h0A1.8,1.8 0,0 0,8.5 9.75ZM13.75,9.75h0A1.8,1.8 0,0 0,12 8h0a1.8,1.8 0,0 0,-1.75 1.75h0A1.8,1.8 0,0 0,12 11.5h0A1.8,1.8 0,0 0,13.75 9.75ZM19,9.75h0A1.8,1.8 0,0 0,17.25 8h0A1.8,1.8 0,0 0,15.5 9.75h0a1.8,1.8 0,0 0,1.75 1.75h0A1.8,1.8 0,0 0,19 9.75ZM8.5,14.75h0A1.8,1.8 0,0 0,6.75 13h0A1.8,1.8 0,0 0,5 14.75L5,14.75A1.8,1.8 0,0 0,6.75 16.5h0A1.8,1.8 0,0 0,8.5 14.75ZM13.75,14.75h0A1.8,1.8 0,0 0,12 13h0a1.8,1.8 0,0 0,-1.75 1.75h0A1.8,1.8 0,0 0,12 16.5h0A1.8,1.8 0,0 0,13.75 14.75ZM19,14.75h0A1.8,1.8 0,0 0,17.25 13h0a1.8,1.8 0,0 0,-1.75 1.75h0a1.8,1.8 0,0 0,1.75 1.75h0A1.8,1.8 0,0 0,19 14.75ZM13.75,19.75h0A1.8,1.8 0,0 0,12 18h0a1.8,1.8 0,0 0,-1.75 1.75h0A1.8,1.8 0,0 0,12 21.5h0A1.8,1.8 0,0 0,13.75 19.75Z"/>
+</vector>
diff --git a/res/drawable/ic_x_conversation_filter_24.xml b/res/drawable/ic_x_conversation_filter_24.xml
new file mode 100644
index 000000000..7214e629e
--- /dev/null
+++ b/res/drawable/ic_x_conversation_filter_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="?contact_filter_toolbar_icon_tint"
+      android:pathData="M20.5,4.5l-1,-1l-7.5,7.4l-7.5,-7.4l-1,1l7.4,7.5l-7.4,7.5l1,1l7.5,-7.4l7.5,7.4l1,-1l-7.4,-7.5z"/>
+</vector>
diff --git a/res/layout/contact_filter_toolbar.xml b/res/layout/contact_filter_toolbar.xml
index 7fb217f05..40aa3167c 100644
--- a/res/layout/contact_filter_toolbar.xml
+++ b/res/layout/contact_filter_toolbar.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout android:layout_width="match_parent"
                   android:layout_height="match_parent"
@@ -42,7 +43,7 @@
                            android:focusable="true"
                            android:tint="?contact_filter_toolbar_icon_tint"
                            android:background="?actionBarItemBackground"
-                           android:src="@drawable/ic_dialpad_white_24dp" />
+                           app:srcCompat="@drawable/ic_number_pad_conversation_filter_24" />
 
                 <ImageView android:id="@+id/search_keyboard"
                            android:contentDescription="@string/contact_filter_toolbar__show_keyboard_description"
@@ -55,7 +56,7 @@
                            android:focusable="true"
                            android:tint="?contact_filter_toolbar_icon_tint"
                            android:background="?actionBarItemBackground"
-                           android:src="@drawable/ic_keyboard_white_24dp" />
+                           app:srcCompat="?conversation_keyboard_toggle" />
 
                 <ImageView android:id="@+id/search_clear"
                            android:contentDescription="@string/contact_filter_toolbar__clear_entered_text_description"
@@ -65,10 +66,8 @@
                            android:gravity="center_vertical"
                            android:clickable="true"
                            android:visibility="gone"
-                           android:focusable="true"
-                           android:tint="?contact_filter_toolbar_icon_tint"
                            android:background="?actionBarItemBackground"
-                           android:src="@drawable/ic_clear_white_24dp" />
+                           app:srcCompat="@drawable/ic_x_conversation_filter_24" />
 
             </org.thoughtcrime.securesms.components.AnimatingToggle>
 
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 4e1bdfbd6..486081f42 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -125,6 +125,7 @@
     <attr name="contact_selection_header_text" format="reference|color" />
 
     <attr name="contact_filter_toolbar_icon_tint" format="color" />
+    <attr name="contact_filter_toolbar_keyboard_icon" format="reference" />
 
     <attr name="device_link_item_card_background" format="reference|color" />
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index a8b711921..1d953c0b6 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -180,6 +180,7 @@
         <item name="compose_icon_tint">?icon_tint</item>
 
         <item name="contact_filter_toolbar_icon_tint">?icon_tint</item>
+        <item name="contact_filter_toolbar_keyboard_icon">@drawable/ic_keyboard_outline_contact_filter_24</item>
 
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background</item>
         <item name="conversation_list_item_contact_color">@color/core_grey_90</item>
@@ -210,7 +211,7 @@
         <item name="conversation_transport_popup_background">@color/white</item>
         <item name="conversation_emoji_toggle">@drawable/ic_emoji_smiley_outline_24</item>
         <item name="conversation_sticker_toggle">@drawable/ic_sticker_outline_24</item>
-        <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_grey600_24dp</item>
+        <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_outline_24</item>
         <item name="conversation_attach_camera">@drawable/ic_camera_outline_24</item>
         <item name="conversation_attach_image">@drawable/ic_image_light</item>
         <item name="conversation_attach_video">@drawable/ic_movie_creation_light</item>
@@ -396,6 +397,7 @@
         <item name="compose_icon_tint">?icon_tint</item>
 
         <item name="contact_filter_toolbar_icon_tint">?icon_tint</item>
+        <item name="contact_filter_toolbar_keyboard_icon">@drawable/ic_keyboard_solid_contact_filter_24</item>
 
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_dark</item>
         <item name="conversation_list_item_contact_color">#ffdddddd</item>
@@ -461,7 +463,7 @@
         <item name="conversation_transport_popup_background">@color/black</item>
         <item name="conversation_emoji_toggle">@drawable/ic_emoji_smiley_solid_24</item>
         <item name="conversation_sticker_toggle">@drawable/ic_sticker_solid_24</item>
-        <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_white_24dp</item>
+        <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_solid_24</item>
         <item name="conversation_attach_camera">@drawable/ic_camera_solid_24</item>
         <item name="conversation_attach_image">@drawable/ic_image_dark</item>
         <item name="conversation_attach_video">@drawable/ic_movie_creation_dark</item>
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index 0bb355edd..0b13a567c 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -19,6 +19,8 @@ package org.thoughtcrime.securesms;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.PorterDuff;
+import android.os.Build;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
@@ -40,6 +42,7 @@ import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.ThemeUtil;
 
 /**
  * The Activity for application preference display and management.
@@ -148,6 +151,15 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
         .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_DEVICES));
       this.findPreference(PREFERENCE_CATEGORY_ADVANCED)
         .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED));
+
+      tintIcons();
+    }
+
+    private void tintIcons() {
+      if (Build.VERSION.SDK_INT >= 21) return;
+
+      Preference preference = this.findPreference(PREFERENCE_CATEGORY_SMS_MMS);
+      preference.getIcon().setColorFilter(ThemeUtil.getThemedColor(requireContext(), R.attr.icon_tint), PorterDuff.Mode.SRC_IN);
     }
 
     @Override