diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml
index 4b6a14a27c4845eeb03f81ec164adc1712ddab5b..2f8e2d73ff7ffb25f2719f157ade7a8e5888460c 100644
--- a/app/k9mail/src/main/res/values/themes.xml
+++ b/app/k9mail/src/main/res/values/themes.xml
@@ -24,20 +24,20 @@
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="iconMenu">@lineageos.platform:drawable/ic_hamburger</item>
-        <item name="iconUnifiedInbox">@lineageos.platform:drawable/ic_unified_inbox</item>
-        <item name="iconFolder">@lineageos.platform:drawable/ic_folder</item>
-        <item name="iconFolderInbox">@lineageos.platform:drawable/ic_inbox</item>
-        <item name="iconFolderOutbox">@lineageos.platform:drawable/ic_outbox</item>
+        <item name="iconUnifiedInbox">@drawable/ic_inbox_multiple</item>
+        <item name="iconFolder">@drawable/ic_folder</item>
+        <item name="iconFolderInbox">@drawable/ic_inbox</item>
+        <item name="iconFolderOutbox">@drawable/ic_outbox</item>
         <item name="iconFolderArchive">@drawable/ic_archive</item>
-        <item name="iconFolderDrafts">@lineageos.platform:drawable/ic_file</item>
-        <item name="iconFolderSent">@lineageos.platform:drawable/ic_send</item>
-        <item name="iconFolderSpam">@lineageos.platform:drawable/ic_mail_spam</item>
+        <item name="iconFolderDrafts">@drawable/ic_drafts_folder</item>
+        <item name="iconFolderSent">@drawable/ic_send</item>
+        <item name="iconFolderSpam">@drawable/ic_alert_octagon</item>
         <item name="iconFolderTrash">@drawable/ic_trash_can</item>
         <item name="iconActionAddAttachment">@lineageos.platform:drawable/ic_attachment</item>
         <item name="iconActionArchive">@drawable/ic_archive</item>
         <item name="iconActionCompose">@drawable/ic_pencil</item>
         <item name="iconActionDelete">@drawable/ic_trash_can</item>
-        <item name="iconActionMove">@lineageos.platform:drawable/ic_folder</item>
+        <item name="iconActionMove">@drawable/ic_folder</item>
         <item name="iconActionCopy">@drawable/ic_content_copy</item>
         <item name="iconActionNextStatus">@lineageos.platform:drawable/ic_chevron_right</item>
         <item name="iconActionNextMessage">@lineageos.platform:drawable/ic_chevron_right</item>
@@ -45,11 +45,11 @@
         <item name="iconActionRefresh">@drawable/ic_refresh</item>
         <item name="iconActionSearch">@drawable/ic_magnify</item>
         <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
-        <item name="iconActionSend">@lineageos.platform:drawable/ic_send</item>
-        <item name="iconActionSettings">@lineageos.platform:drawable/ic_settings_wheel</item>
+        <item name="iconActionSend">@drawable/ic_send</item>
+        <item name="iconActionSettings">@drawable/ic_cog</item>
         <item name="iconActionSingleMessageOptions">@drawable/ic_reply_all</item>
         <item name="iconActionSort">@drawable/ic_sort</item>
-        <item name="iconActionSpam">@lineageos.platform:drawable/ic_mail_spam</item>
+        <item name="iconActionSpam">@drawable/ic_alert_octagon</item>
         <item name="iconActionFlag">@lineageos.platform:drawable/ic_star_filled</item>
         <item name="iconActionUnflag">@lineageos.platform:drawable/ic_star</item>
         <item name="iconActionMarkAsRead">@drawable/ic_opened_envelope</item>
@@ -71,14 +71,14 @@
         <item name="iconPreferencesNetwork">@drawable/ic_arrow_up_down</item>
         <item name="iconPreferencesPrivacy">@drawable/ic_shield</item>
         <item name="iconPreferencesDebug">@drawable/ic_bug</item>
-        <item name="iconPreferencesFolders">@lineageos.platform:drawable/ic_folder</item>
+        <item name="iconPreferencesFolders">@drawable/ic_folder</item>
         <item name="iconPreferencesSearch">@drawable/ic_magnify</item>
         <item name="iconPreferencesCrypto">@drawable/ic_preferences_crypto</item>
         <item name="iconPreferencesFetchMail">@drawable/ic_preferences_check_mail</item>
         <item name="iconPreferencesReadMail">@drawable/ic_opened_envelope</item>
         <item name="iconPreferencesCompose">@drawable/ic_pencil</item>
         <item name="iconSettingsAbout">@lineageos.platform:drawable/ic_info</item>
-        <item name="iconSettingsGeneral">@lineageos.platform:drawable/ic_settings_wheel</item>
+        <item name="iconSettingsGeneral">@drawable/ic_cog</item>
         <item name="iconSettingsAccount">@drawable/ic_envelope</item>
         <item name="iconSettingsAccountAdd">@lineageos.platform:drawable/ic_add</item>
         <item name="iconSettingsExport">@drawable/ic_export</item>
@@ -150,20 +150,20 @@
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="iconMenu">@lineageos.platform:drawable/ic_hamburger</item>
-        <item name="iconUnifiedInbox">@lineageos.platform:drawable/ic_unified_inbox</item>
-        <item name="iconFolder">@lineageos.platform:drawable/ic_folder</item>
-        <item name="iconFolderInbox">@lineageos.platform:drawable/ic_inbox</item>
-        <item name="iconFolderOutbox">@lineageos.platform:drawable/ic_outbox</item>
+        <item name="iconUnifiedInbox">@drawable/ic_inbox_multiple</item>
+        <item name="iconFolder">@drawable/ic_folder</item>
+        <item name="iconFolderInbox">@drawable/ic_inbox</item>
+        <item name="iconFolderOutbox">@drawable/ic_outbox</item>
         <item name="iconFolderArchive">@drawable/ic_archive</item>
-        <item name="iconFolderDrafts">@lineageos.platform:drawable/ic_file</item>
-        <item name="iconFolderSent">@lineageos.platform:drawable/ic_send</item>
-        <item name="iconFolderSpam">@lineageos.platform:drawable/ic_mail_spam</item>
+        <item name="iconFolderDrafts">@drawable/ic_drafts_folder</item>
+        <item name="iconFolderSent">@drawable/ic_send</item>
+        <item name="iconFolderSpam">@drawable/ic_alert_octagon</item>
         <item name="iconFolderTrash">@drawable/ic_trash_can</item>
         <item name="iconActionAddAttachment">@lineageos.platform:drawable/ic_attachment</item>
         <item name="iconActionArchive">@drawable/ic_archive</item>
         <item name="iconActionCompose">@drawable/ic_pencil</item>
         <item name="iconActionDelete">@drawable/ic_trash_can</item>
-        <item name="iconActionMove">@lineageos.platform:drawable/ic_folder</item>
+        <item name="iconActionMove">@drawable/ic_folder</item>
         <item name="iconActionCopy">@drawable/ic_content_copy</item>
         <item name="iconActionNextStatus">@lineageos.platform:drawable/ic_chevron_right</item>
         <item name="iconActionNextMessage">@lineageos.platform:drawable/ic_chevron_right</item>
@@ -171,11 +171,11 @@
         <item name="iconActionRefresh">@drawable/ic_refresh</item>
         <item name="iconActionSearch">@drawable/ic_magnify</item>
         <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
-        <item name="iconActionSend">@lineageos.platform:drawable/ic_send</item>
-        <item name="iconActionSettings">@lineageos.platform:drawable/ic_settings_wheel</item>
+        <item name="iconActionSend">@drawable/ic_send</item>
+        <item name="iconActionSettings">@drawable/ic_cog</item>
         <item name="iconActionSingleMessageOptions">@drawable/ic_reply_all</item>
         <item name="iconActionSort">@drawable/ic_sort</item>
-        <item name="iconActionSpam">@lineageos.platform:drawable/ic_mail_spam</item>
+        <item name="iconActionSpam">@drawable/ic_alert_octagon</item>
         <item name="iconActionFlag">@lineageos.platform:drawable/ic_star_filled</item>
         <item name="iconActionUnflag">@lineageos.platform:drawable/ic_star</item>
         <item name="iconActionMarkAsRead">@drawable/ic_opened_envelope</item>
@@ -197,14 +197,14 @@
         <item name="iconPreferencesNetwork">@drawable/ic_arrow_up_down</item>
         <item name="iconPreferencesPrivacy">@drawable/ic_shield</item>
         <item name="iconPreferencesDebug">@drawable/ic_bug</item>
-        <item name="iconPreferencesFolders">@lineageos.platform:drawable/ic_folder</item>
+        <item name="iconPreferencesFolders">@drawable/ic_folder</item>
         <item name="iconPreferencesSearch">@drawable/ic_magnify</item>
         <item name="iconPreferencesCrypto">@drawable/ic_preferences_crypto</item>
         <item name="iconPreferencesFetchMail">@drawable/ic_preferences_check_mail</item>
         <item name="iconPreferencesReadMail">@drawable/ic_opened_envelope</item>
         <item name="iconPreferencesCompose">@drawable/ic_pencil</item>
         <item name="iconSettingsAbout">@lineageos.platform:drawable/ic_info</item>
-        <item name="iconSettingsGeneral">@lineageos.platform:drawable/ic_settings_wheel</item>
+        <item name="iconSettingsGeneral">@drawable/ic_cog</item>
         <item name="iconSettingsAccount">@drawable/ic_envelope</item>
         <item name="iconSettingsAccountAdd">@lineageos.platform:drawable/ic_add</item>
         <item name="iconSettingsExport">@drawable/ic_export</item>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_alert_octagon.xml b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon.xml
index a10a748180ee8a1ffe1342a76e4ba569a45f70b3..8896679805e9ae055a1468ca55e6bc90772cd976 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_alert_octagon.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon.xml
@@ -1,9 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
     <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M15.73,3L8.27,3L3,8.27v7.46L8.27,21h7.46L21,15.73L21,8.27L15.73,3zM12,17.3c-0.72,0 -1.3,-0.58 -1.3,-1.3 0,-0.72 0.58,-1.3 1.3,-1.3 0.72,0 1.3,0.58 1.3,1.3 0,0.72 -0.58,1.3 -1.3,1.3zM13,13h-2L11,7h2v6z"/>
+        android:pathData="M12.73,0H5.27L0,5.27V12.73L5.27,18H12.73L18,12.73V5.27L12.73,0ZM16,11.9L11.9,16H6.1L2,11.9V6.1L6.1,2H11.9L16,6.1V11.9Z"
+        android:fillColor="@color/default_icon_color"/>
+    <path
+        android:pathData="M9,14C9.5523,14 10,13.5523 10,13C10,12.4477 9.5523,12 9,12C8.4477,12 8,12.4477 8,13C8,13.5523 8.4477,14 9,14Z"
+        android:fillColor="@color/default_icon_color"/>
+    <path
+        android:pathData="M8,4H10V11H8V4Z"
+        android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_cog.xml b/app/ui/legacy/src/main/res/drawable/ic_cog.xml
index e9c598c1d0697820c410fd4670f4b398f123f72d..5764b3c4200f7e9a5b3295cdea7858a5983f7cf5 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_cog.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_cog.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
     <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+        android:pathData="M17.4318,10.98C17.4718,10.66 17.5018,10.34 17.5018,10C17.5018,9.66 17.4718,9.34 17.4318,9.02L19.5418,7.37C19.7318,7.22 19.7818,6.95 19.6618,6.73L17.6618,3.27C17.5718,3.11 17.4018,3.02 17.2218,3.02C17.1618,3.02 17.1018,3.03 17.0518,3.05L14.5618,4.05C14.0418,3.65 13.4818,3.32 12.8718,3.07L12.4918,0.42C12.4618,0.18 12.2518,0 12.0018,0H8.0018C7.7518,0 7.5418,0.18 7.5118,0.42L7.1318,3.07C6.5218,3.32 5.9618,3.66 5.4418,4.05L2.9518,3.05C2.8918,3.03 2.8318,3.02 2.7718,3.02C2.6018,3.02 2.4318,3.11 2.3418,3.27L0.3418,6.73C0.2118,6.95 0.2718,7.22 0.4618,7.37L2.5718,9.02C2.5318,9.34 2.5018,9.67 2.5018,10C2.5018,10.33 2.5318,10.66 2.5718,10.98L0.4618,12.63C0.2718,12.78 0.2218,13.05 0.3418,13.27L2.3418,16.73C2.4318,16.89 2.6018,16.98 2.7818,16.98C2.8418,16.98 2.9018,16.97 2.9518,16.95L5.4418,15.95C5.9618,16.35 6.5218,16.68 7.1318,16.93L7.5118,19.58C7.5418,19.82 7.7518,20 8.0018,20H12.0018C12.2518,20 12.4618,19.82 12.4918,19.58L12.8718,16.93C13.4818,16.68 14.0418,16.34 14.5618,15.95L17.0518,16.95C17.1118,16.97 17.1718,16.98 17.2318,16.98C17.4018,16.98 17.5718,16.89 17.6618,16.73L19.6618,13.27C19.7818,13.05 19.7318,12.78 19.5418,12.63L17.4318,10.98ZM15.4518,9.27C15.4918,9.58 15.5018,9.79 15.5018,10C15.5018,10.21 15.4818,10.43 15.4518,10.73L15.3118,11.86L16.2018,12.56L17.2818,13.4L16.5818,14.61L15.3118,14.1L14.2718,13.68L13.3718,14.36C12.9418,14.68 12.5318,14.92 12.1218,15.09L11.0618,15.52L10.9018,16.65L10.7018,18H9.3018L8.9518,15.52L7.8918,15.09C7.4618,14.91 7.0618,14.68 6.6618,14.38L5.7518,13.68L4.6918,14.11L3.4218,14.62L2.7218,13.41L3.8018,12.57L4.6918,11.87L4.5518,10.74C4.5218,10.43 4.5018,10.2 4.5018,10C4.5018,9.8 4.5218,9.57 4.5518,9.27L4.6918,8.14L3.8018,7.44L2.7218,6.6L3.4218,5.39L4.6918,5.9L5.7318,6.32L6.6318,5.64C7.0618,5.32 7.4718,5.08 7.8818,4.91L8.9418,4.48L9.1018,3.35L9.3018,2H10.6918L11.0418,4.48L12.1018,4.91C12.5318,5.09 12.9318,5.32 13.3318,5.62L14.2418,6.32L15.3018,5.89L16.5718,5.38L17.2718,6.59L16.2018,7.44L15.3118,8.14L15.4518,9.27ZM10.0018,6C7.7918,6 6.0018,7.79 6.0018,10C6.0018,12.21 7.7918,14 10.0018,14C12.2118,14 14.0018,12.21 14.0018,10C14.0018,7.79 12.2118,6 10.0018,6ZM10.0018,12C8.9018,12 8.0018,11.1 8.0018,10C8.0018,8.9 8.9018,8 10.0018,8C11.1018,8 12.0018,8.9 12.0018,10C12.0018,11.1 11.1018,12 10.0018,12Z"
+        android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml
index ab4ecff6d0cd3a9c9f73d4c57fa284d045dc9d54..e7da3b70adb7f408b6c05a65de4bcd58ccfbb0fe 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:width="16dp"
+    android:height="20dp"
+    android:viewportWidth="16"
+    android:viewportHeight="20">
     <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z" />
+        android:pathData="M10,0H2C0.9,0 0.01,0.9 0.01,2L0,18C0,19.1 0.89,20 1.99,20H14C15.1,20 16,19.1 16,18V6L10,0ZM2,18V2H9V7H14V18H2Z"
+        android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_folder.xml b/app/ui/legacy/src/main/res/drawable/ic_folder.xml
index 0a2b1a23a5c766a9189872bdde2adf46e38db14c..1f96ee0bcc5363f8c350715a46d3d3cb52fa0918 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_folder.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_folder.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="20dp"
+    android:height="16dp"
+    android:viewportWidth="20"
+    android:viewportHeight="16">
     <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+        android:pathData="M7.17,2L9.17,4H18V14H2V2H7.17ZM8,0H2C0.9,0 0.01,0.9 0.01,2L0,14C0,15.1 0.9,16 2,16H18C19.1,16 20,15.1 20,14V4C20,2.9 19.1,2 18,2H10L8,0Z"
+        android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox.xml
index 82d62d1a4fc51be582a30ab4907a595219c667c9..f6d7df5b7c2e1e84ebfd5f3d46aee8cf886215d6 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_inbox.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_inbox.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
     <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.89 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.11 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10z"/>
+        android:pathData="M16,0H2C0.9,0 0,0.9 0,2V16C0,17.1 0.89,18 2,18H16C17.1,18 18,17.1 18,16V2C18,0.9 17.1,0 16,0ZM16,16H2V13H5.56C6.25,14.19 7.53,15 9.01,15C10.49,15 11.76,14.19 12.46,13H16V16ZM16,11H11.01C11.01,12.1 10.11,13 9.01,13C7.91,13 7.01,12.1 7.01,11H2V2H16V11Z"
+        android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml
index cdfc0666d4fb1cc9373673df04c90ba01612f93d..d8e92c2082d9eefe3be5ba0c1f17753d6707a45e 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v7c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,9h-4c0,1.62 -1.38,3 -3,3s-3,-1.38 -3,-3L5,9L5,5h14v4zM15,16h6v3c0,1.1 -0.9,2 -2,2L5,21c-1.1,0 -2,-0.9 -2,-2v-3h6c0,1.66 1.34,3 3,3s3,-1.34 3,-3z"/>
+        android:pathData="M16,0H2C0.9,0 0,0.9 0,2V9C0,10.1 0.9,11 2,11H16C17.1,11 18,10.1 18,9V2C18,0.9 17.1,0 16,0ZM16,6H12C12,7.62 10.62,9 9,9C7.38,9 6,7.62 6,6H2V2H16V6ZM12,13H18V16C18,17.1 17.1,18 16,18H2C0.9,18 0,17.1 0,16V13H6C6,14.66 7.34,16 9,16C10.66,16 12,14.66 12,13Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_outbox.xml b/app/ui/legacy/src/main/res/drawable/ic_outbox.xml
index 47a9b9f7608aa6d828ded12368918457cde85b76..319f688f675127ee1b43a548d1165f0e37c232c6 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_outbox.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_outbox.xml
@@ -1,9 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
     <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.9 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10zM8,11h2v3h4v-3h2l-4,-4 -4,4z"/>
+        android:pathData="M8,6.83V11H10V6.83L11.59,8.41L13,7L9,3L5,7L6.41,8.41L8,6.83Z"
+        android:fillColor="@color/default_icon_color"/>
+    <path
+        android:pathData="M16,0H2C0.9,0 0,0.9 0,2V16C0,17.1 0.9,18 2,18H16C17.1,18 18,17.1 18,16V2C18,0.9 17.1,0 16,0ZM16,16H2V13H5.02C5.93,14.21 7.37,15 9,15C10.63,15 12.06,14.21 12.98,13H16V16ZM16,11H11.82C11.41,12.16 10.31,13 9,13C7.69,13 6.6,12.16 6.18,11H2V2H16V11Z"
+        android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_send.xml b/app/ui/legacy/src/main/res/drawable/ic_send.xml
index aa4a1bfa9407f16dec7f610496f7cd8dbbf50040..1356700783e234efe3d93fdd69904aad7ac45b8f 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_send.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_send.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="22dp"
+    android:height="18dp"
+    android:viewportWidth="22"
+    android:viewportHeight="18">
     <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+        android:pathData="M0.51,18L21.5,9L0.51,0L0.5,7L15.5,9L0.5,11L0.51,18Z"
+        android:fillColor="@color/default_icon_color"/>
 </vector>