diff --git a/res/drawable-mdpi/ic_message_outline_24.webp b/res/drawable-mdpi/ic_message_outline_24.webp
new file mode 100644
index 0000000000..3a98fd1935
Binary files /dev/null and b/res/drawable-mdpi/ic_message_outline_24.webp differ
diff --git a/res/drawable-mdpi/ic_message_solid_24.webp b/res/drawable-mdpi/ic_message_solid_24.webp
new file mode 100644
index 0000000000..15703fef6f
Binary files /dev/null and b/res/drawable-mdpi/ic_message_solid_24.webp differ
diff --git a/res/drawable-xhdpi/ic_message_outline_24.webp b/res/drawable-xhdpi/ic_message_outline_24.webp
new file mode 100644
index 0000000000..98bbe5a36a
Binary files /dev/null and b/res/drawable-xhdpi/ic_message_outline_24.webp differ
diff --git a/res/drawable-xhdpi/ic_message_solid_24.webp b/res/drawable-xhdpi/ic_message_solid_24.webp
new file mode 100644
index 0000000000..51af9ca294
Binary files /dev/null and b/res/drawable-xhdpi/ic_message_solid_24.webp differ
diff --git a/res/drawable-xxhdpi/ic_message_outline_24.webp b/res/drawable-xxhdpi/ic_message_outline_24.webp
new file mode 100644
index 0000000000..b04fd8c463
Binary files /dev/null and b/res/drawable-xxhdpi/ic_message_outline_24.webp differ
diff --git a/res/drawable-xxhdpi/ic_message_solid_24.webp b/res/drawable-xxhdpi/ic_message_solid_24.webp
new file mode 100644
index 0000000000..55b621399f
Binary files /dev/null and b/res/drawable-xxhdpi/ic_message_solid_24.webp differ
diff --git a/res/drawable-xxxhdpi/ic_message_outline_24.webp b/res/drawable-xxxhdpi/ic_message_outline_24.webp
new file mode 100644
index 0000000000..330cc223b5
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_message_outline_24.webp differ
diff --git a/res/drawable-xxxhdpi/ic_message_solid_24.webp b/res/drawable-xxxhdpi/ic_message_solid_24.webp
new file mode 100644
index 0000000000..079e5ec930
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_message_solid_24.webp differ
diff --git a/res/drawable/ic_message_outline_24.xml b/res/drawable/ic_message_outline_24.xml
deleted file mode 100644
index dd19aea775..0000000000
--- a/res/drawable/ic_message_outline_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="?icon_tint"
-      android:pathData="M12,4c4.963,0 9,3.364 9,7.5S16.963,19 12,19a10.536,10.536 0,0 1,-3.19 -0.5l-0.465,-0.148 -0.464,0.155L4.739,19.556l0.394,-2.365 0.118,-0.707 -0.477,-0.536A6.651,6.651 0,0 1,3 11.5C3,7.364 7.037,4 12,4m0,-1.5c-5.8,0 -10.5,4.029 -10.5,9a8.164,8.164 0,0 0,2.153 5.445l-0.639,3.836c-0.073,0.438 0.144,0.719 0.505,0.719a0.9,0.9 0,0 0,0.279 -0.049l4.558,-1.519A12.019,12.019 0,0 0,12 20.5c5.8,0 10.5,-4.029 10.5,-9s-4.773,-9 -10.5,-9Z"/>
-</vector>
diff --git a/res/drawable/ic_message_outline_tinted_24.xml b/res/drawable/ic_message_outline_tinted_24.xml
new file mode 100644
index 0000000000..86d8b5cc1a
--- /dev/null
+++ b/res/drawable/ic_message_outline_tinted_24.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="?icon_tint"
+    android:src="@drawable/ic_message_outline_24" />
\ No newline at end of file
diff --git a/res/drawable/ic_message_solid_24.xml b/res/drawable/ic_message_solid_24.xml
deleted file mode 100644
index fd1d44840c..0000000000
--- a/res/drawable/ic_message_solid_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="?icon_tint"
-      android:pathData="M12,2.5c-5.8,0 -10.5,4.029 -10.5,9a8.164,8.164 0,0 0,2.153 5.445l-0.639,3.836c-0.09,0.542 0.263,0.844 0.784,0.67l4.558,-1.519A12.019,12.019 0,0 0,12 20.5c5.8,0 10.5,-4.029 10.5,-9S17.727,2.5 12,2.5Z"/>
-</vector>
diff --git a/res/drawable/ic_message_solid_tinted_24.xml b/res/drawable/ic_message_solid_tinted_24.xml
new file mode 100644
index 0000000000..9b8a9fcd0d
--- /dev/null
+++ b/res/drawable/ic_message_solid_tinted_24.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="?icon_tint"
+    android:src="@drawable/ic_message_solid_24" />
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 62f62d5f56..33972b96d2 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -310,7 +310,7 @@
         <item name="menu_save_icon">@drawable/ic_download_filled_white_24</item>
         <item name="menu_reply_icon">@drawable/ic_reply_white_24dp</item>
 
-        <item name="message_icon">@drawable/ic_message_outline_24</item>
+        <item name="message_icon">@drawable/ic_message_outline_tinted_24</item>
         <item name="notifications_icon">@drawable/ic_bell_outline_24</item>
         <item name="privacy_icon">@drawable/ic_lock_outline_24</item>
         <item name="appearance_icon">@drawable/ic_appearance_outline_24</item>
@@ -525,7 +525,7 @@
         <item name="menu_save_icon">@drawable/ic_download_filled_white_24</item>
         <item name="menu_reply_icon">@drawable/ic_reply_white_24dp</item>
 
-        <item name="message_icon">@drawable/ic_message_solid_24</item>
+        <item name="message_icon">@drawable/ic_message_solid_tinted_24</item>
         <item name="notifications_icon">@drawable/ic_bell_solid_24</item>
         <item name="privacy_icon">@drawable/ic_lock_solid_24</item>
         <item name="appearance_icon">@drawable/ic_appearance_solid_24</item>