diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml
index 1a3da0b4b82bddd8382745afe07f832dcab288b7..4b6a14a27c4845eeb03f81ec164adc1712ddab5b 100644
--- a/app/k9mail/src/main/res/values/themes.xml
+++ b/app/k9mail/src/main/res/values/themes.xml
@@ -28,22 +28,22 @@
         <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="iconFolderArchive">@lineageos.platform:drawable/ic_archive</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="iconFolderTrash">@lineageos.platform:drawable/ic_bin</item>
+        <item name="iconFolderTrash">@drawable/ic_trash_can</item>
         <item name="iconActionAddAttachment">@lineageos.platform:drawable/ic_attachment</item>
-        <item name="iconActionArchive">@lineageos.platform:drawable/ic_archive</item>
-        <item name="iconActionCompose">@lineageos.platform:drawable/ic_pen</item>
-        <item name="iconActionDelete">@lineageos.platform:drawable/ic_bin</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="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>
         <item name="iconActionPreviousMessage">@lineageos.platform:drawable/ic_back</item>
         <item name="iconActionRefresh">@drawable/ic_refresh</item>
-        <item name="iconActionSearch">@lineageos.platform:drawable/ic_search</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>
@@ -53,7 +53,7 @@
         <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>
-        <item name="iconActionMarkAsUnread">@lineageos.platform:drawable/ic_envelope</item>
+        <item name="iconActionMarkAsUnread">@drawable/ic_envelope</item>
         <item name="iconActionRemoteSearch">@drawable/ic_magnify_cloud</item>
         <item name="iconActionAdd">@lineageos.platform:drawable/ic_add</item>
         <item name="iconActionImportExport">@drawable/ic_arrow_up_down</item>
@@ -72,14 +72,14 @@
         <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="iconPreferencesSearch">@lineageos.platform:drawable/ic_search</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">@lineageos.platform:drawable/ic_pen</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="iconSettingsAccount">@lineageos.platform:drawable/ic_envelope</item>
+        <item name="iconSettingsAccount">@drawable/ic_envelope</item>
         <item name="iconSettingsAccountAdd">@lineageos.platform:drawable/ic_add</item>
         <item name="iconSettingsExport">@drawable/ic_export</item>
         <item name="iconSettingsImport">@drawable/ic_import</item>
@@ -154,22 +154,22 @@
         <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="iconFolderArchive">@lineageos.platform:drawable/ic_archive</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="iconFolderTrash">@lineageos.platform:drawable/ic_bin</item>
+        <item name="iconFolderTrash">@drawable/ic_trash_can</item>
         <item name="iconActionAddAttachment">@lineageos.platform:drawable/ic_attachment</item>
-        <item name="iconActionArchive">@lineageos.platform:drawable/ic_archive</item>
-        <item name="iconActionCompose">@lineageos.platform:drawable/ic_pen</item>
-        <item name="iconActionDelete">@lineageos.platform:drawable/ic_bin</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="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>
         <item name="iconActionPreviousMessage">@lineageos.platform:drawable/ic_back</item>
         <item name="iconActionRefresh">@drawable/ic_refresh</item>
-        <item name="iconActionSearch">@lineageos.platform:drawable/ic_search</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>
@@ -179,7 +179,7 @@
         <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>
-        <item name="iconActionMarkAsUnread">@lineageos.platform:drawable/ic_envelope</item>
+        <item name="iconActionMarkAsUnread">@drawable/ic_envelope</item>
         <item name="iconActionRemoteSearch">@drawable/ic_magnify_cloud</item>
         <item name="iconActionAdd">@lineageos.platform:drawable/ic_add</item>
         <item name="iconActionImportExport">@drawable/ic_arrow_up_down</item>
@@ -198,14 +198,14 @@
         <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="iconPreferencesSearch">@lineageos.platform:drawable/ic_search</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">@lineageos.platform:drawable/ic_pen</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="iconSettingsAccount">@lineageos.platform:drawable/ic_envelope</item>
+        <item name="iconSettingsAccount">@drawable/ic_envelope</item>
         <item name="iconSettingsAccountAdd">@lineageos.platform:drawable/ic_add</item>
         <item name="iconSettingsExport">@drawable/ic_export</item>
         <item name="iconSettingsImport">@drawable/ic_import</item>
diff --git a/app/ui/base/src/main/res/drawable/ic_close.xml b/app/ui/base/src/main/res/drawable/ic_close.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d27860f95ac5ff39e2ff10f7426221c40bdefdb9
--- /dev/null
+++ b/app/ui/base/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="@color/default_icon_color"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/app/ui/base/src/main/res/values/styles.xml b/app/ui/base/src/main/res/values/styles.xml
index 808e7c55ee3f6aadc4ef3ec4d265ce221f3afd22..8f10a9b80fb1a78e296062dec066c14dc6d779ff 100644
--- a/app/ui/base/src/main/res/values/styles.xml
+++ b/app/ui/base/src/main/res/values/styles.xml
@@ -4,5 +4,6 @@
         <item name="colorControlNormal">@color/default_icon_color</item>
         <item name="colorAccent">@color/color_default_accent</item>
         <item name="actionModeBackground">@color/color_default_primary_dark</item>
+        <item name="actionModeCloseDrawable">@drawable/ic_close</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
index f62ca5e295e930f6d7d4a4d6f123785bc282e56e..212a88aaa6717b723d99c0184e9042ea678c822f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
@@ -10,6 +10,7 @@ import android.util.TypedValue
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.Toast
+import androidx.annotation.LayoutRes
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
@@ -111,7 +112,12 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
         drawer.addDrawerListener(parent.createDrawerListener())
         sliderView.tintStatusBar = true
         val drawerPadding = parent.resources.getDimension(R.dimen.material_drawer_vertical_padding).toInt()
-        sliderView.recyclerView.setPadding((-1) * drawerPadding, 0, (-1) * drawerPadding, sliderView.recyclerView.paddingBottom)
+        sliderView.recyclerView.setPadding(
+            (-1) * drawerPadding,
+            0,
+            (-1) * drawerPadding,
+            sliderView.recyclerView.paddingBottom
+        )
         sliderView.headerView?.setPadding(drawerPadding, 0, drawerPadding, 0)
         sliderView.onDrawerItemClickListener = { _, item, _ ->
             handleItemClickListener(item)
@@ -234,7 +240,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
             val drawerColors = getDrawerColorsForAccount(account)
             val selectedTextColor = drawerColors.accentColor.toSelectedColorStateList()
 
-            val accountItem = ProfileDrawerItem().apply {
+            val accountItem = CustomProfileDrawerItem().apply {
                 account.name.let { accountName ->
                     isNameShown = accountName != null
                     nameText = accountName.orEmpty()
@@ -365,9 +371,10 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
         }
 
         folderList.unifiedInbox?.let { unifiedInbox ->
-            val unwrappedDrawable = AppCompatResources.getDrawable(parent.applicationContext, R.drawable.ic_inbox_multiple)
+            val unwrappedDrawable =
+                AppCompatResources.getDrawable(parent.applicationContext, R.drawable.ic_inbox_multiple)
             val wrappedSelectedDrawable = DrawableCompat.wrap(unwrappedDrawable!!)
-            DrawableCompat.setTint(wrappedSelectedDrawable, ContextCompat.getColor(parent.applicationContext, R.color.color_default_accent))
+            DrawableCompat.setTintList(wrappedSelectedDrawable, selectedTextColor)
 
             val unifiedInboxItem = FolderDrawerItem().apply {
                 iconRes = R.drawable.ic_inbox_multiple //getResId(R.attr.iconUnifiedInbox)
@@ -399,7 +406,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
             val iconId = folderIconProvider.getFolderIcon(folder.type)
             val unwrappedDrawable = AppCompatResources.getDrawable(parent.applicationContext, iconId)
             val wrappedSelectedDrawable = DrawableCompat.wrap(unwrappedDrawable!!)
-            DrawableCompat.setTint(wrappedSelectedDrawable, ContextCompat.getColor(parent.applicationContext, R.color.color_default_accent))
+            DrawableCompat.setTintList(wrappedSelectedDrawable, selectedTextColor)
 
             val drawerItem = FolderDrawerItem().apply {
                 iconRes = iconId
@@ -472,9 +479,14 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
     )
 
     private fun getDrawerColorsForAccount(account: Account): DrawerColors {
+        val baseColor = if (themeManager.appTheme == Theme.DARK) {
+            getDarkThemeAccentColor(account.chipColor)
+        } else {
+            account.chipColor
+        }
         return DrawerColors(
-            accentColor = ResourcesCompat.getColor(resources, R.color.color_default_accent, null),
-            selectedColor = ResourcesCompat.getColor(resources, R.color.color_selected_background, null)
+            accentColor = baseColor,
+            selectedColor = baseColor.and(0xffffff).or(0x22000000)
         )
     }
 
@@ -567,3 +579,9 @@ private class FolderDrawerItem : PrimaryDrawerItem() {
     override val type: Int = R.id.drawer_list_folder_item
     override val layoutRes: Int = R.layout.drawer_folder_list_item
 }
+
+private class CustomProfileDrawerItem : ProfileDrawerItem() {
+    override val layoutRes: Int
+        @LayoutRes
+        get() = R.layout.custom_profile_drawer_item
+}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt
index f7e57b5f530040dccc834c50f5b35958aa6cff01..bb9f6f48ddae8ec7923dfc4dfc2221a60c96c87a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt
@@ -105,8 +105,6 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
                     navigationAction = R.id.action_settingsListScreen_to_addAccountScreen,
                     icon = R.attr.iconSettingsAccountAdd
                 )
-
-                NewSetupUiHack.addAction(this)
             }
 
             addSection(title = getString(R.string.settings_list_backup_category)) {
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 ec074e7b399cb73060b43c77d537702eac3688e9..a10a748180ee8a1ffe1342a76e4ba569a45f70b3 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,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <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="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"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_archive.xml b/app/ui/legacy/src/main/res/drawable/ic_archive.xml
index 634685489064697b16757f386e87106e344b026e..52e4a2c3d7d686e12d8b5ecec1b65a15625ffbda 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_archive.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_archive.xml
@@ -1,9 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z" />
+        android:pathData="M18,0H2C1,0 0,0.9 0,2V5.01C0,5.73 0.43,6.35 1,6.7V18C1,19.1 2.1,20 3,20H17C17.9,20 19,19.1 19,18V6.7C19.57,6.35 20,5.73 20,5.01V2C20,0.9 19,0 18,0ZM17,18H3V7H17V18ZM18,5H2V2H18V5Z" />
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M13,10H7V12H13V10Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_arrow_up_down.xml b/app/ui/legacy/src/main/res/drawable/ic_arrow_up_down.xml
index eea04380f69bccc2fc7ff5beb7671e1d2b8a50cb..a6f23b1751b34e3c5081fe73414665770f162fdb 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_arrow_up_down.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_arrow_up_down.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z" />
+        android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_attachment.xml b/app/ui/legacy/src/main/res/drawable/ic_attachment.xml
index d868f68ebdaad98d04fcf40f2c7d98a10ea370fc..0deb708fffd8c901112253bc66c465171d92dafb 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_attachment.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_attachment.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M2,12.5C2,9.46 4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v2H9.41c-0.55,0 -0.55,1 0,1H18c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H7.5C5.57,9 4,10.57 4,12.5S5.57,16 7.5,16H17v2H7.5C4.46,18 2,15.54 2,12.5z" />
+        android:pathData="M2,12.5C2,9.46 4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v2H9.41c-0.55,0 -0.55,1 0,1H18c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H7.5C5.57,9 4,10.57 4,12.5S5.57,16 7.5,16H17v2H7.5C4.46,18 2,15.54 2,12.5z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_chevron_down.xml b/app/ui/legacy/src/main/res/drawable/ic_chevron_down.xml
index e2422205a0486bde6689bc31aacc8874be68f5e8..4ab5ce0877e57faf6cb25050e03ee68cb608b8a3 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_chevron_down.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_chevron_down.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z" />
+        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_chevron_left.xml b/app/ui/legacy/src/main/res/drawable/ic_chevron_left.xml
index 9856b389aa5abe02317f12cd2820898b90c1c800..a6dc7184352c495e0c558b9a4313ce0b578a1fb2 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_chevron_left.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_chevron_left.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z" />
+        android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_chevron_right.xml b/app/ui/legacy/src/main/res/drawable/ic_chevron_right.xml
index 82255625e8b62102b903321dbf6bcc6931f04978..0774c54dbb299e6e4a06ed183fc1cb1e0ef2b7e3 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_chevron_right.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_chevron_right.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z" />
+        android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_chevron_up.xml b/app/ui/legacy/src/main/res/drawable/ic_chevron_up.xml
index 378e777e4e428b0018d00fa970dd10bf6419f3b7..06869a9ea0bcc2d99661d54f0b92f79ab4ece3fe 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_chevron_up.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_chevron_up.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z" />
+        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_clear.xml b/app/ui/legacy/src/main/res/drawable/ic_clear.xml
index 0c78f7556519d46b432a5bc6581a4418cd93f01d..2c8655466bf1dd3af96631c0ad43ccf66adb545b 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_clear.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_clear.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </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 7f4df888ccc94c15e6a563172d55848fc9845e5c..e9c598c1d0697820c410fd4670f4b398f123f72d 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:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
+        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"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_content_copy.xml b/app/ui/legacy/src/main/res/drawable/ic_content_copy.xml
index 62845fcfb66fc9af8b5523e0cbde8c9632a23bd5..501ed4040a9d48165304ee4e512f22d122fb82c2 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_content_copy.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_content_copy.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z" />
+        android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_download.xml b/app/ui/legacy/src/main/res/drawable/ic_download.xml
index 138b22742e86aed4d3d62baadafa52731b39ae17..d15cd4d397a19697bb265927525aa39e8b051b94 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_download.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_download.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M5,20h14v-2H5V20zM19,9h-4V3H9v6H5l7,7L19,9z" />
+        android:pathData="M5,20h14v-2H5V20zM19,9h-4V3H9v6H5l7,7L19,9z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_envelope.xml b/app/ui/legacy/src/main/res/drawable/ic_envelope.xml
index 715e73e22563b4d4dcbf42aec7110acf65d6947f..a73e24c5192241bcdedfe70fb5720b5b7b72cf2c 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_envelope.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_envelope.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="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
+        android:pathData="M18,0H2C0.9,0 0.01,0.9 0.01,2L0,14C0,15.1 0.9,16 2,16H18C19.1,16 20,15.1 20,14V2C20,0.9 19.1,0 18,0ZM18,14H2V4L10,9L18,4V14ZM10,7L2,2H18L10,7Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_file_upload.xml b/app/ui/legacy/src/main/res/drawable/ic_file_upload.xml
index d9883cd1a8c4a009c03ea2e9c7a490d028a3e50a..8c6788df951cc8e8b9177b0d3acfd8f6e225be01 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_file_upload.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_file_upload.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M9,16h6v-6h4l-7,-7 -7,7h4zM5,18h14v2L5,20z" />
+        android:pathData="M9,16h6v-6h4l-7,-7 -7,7h4zM5,18h14v2L5,20z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_floppy.xml b/app/ui/legacy/src/main/res/drawable/ic_floppy.xml
index cc97c0027718397346036cd28d19e29eb69329f0..64085c580106e3a464e66992c6e9f65cfa9ecac2 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_floppy.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_floppy.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z" />
+        android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
 </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 d5dedb08af03a4ed223a70b661bae5a669beb2b2..0a2b1a23a5c766a9189872bdde2adf46e38db14c 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_folder.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_folder.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <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="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"/>
 </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 a40eb0c9c5e823b5924ad597228b55df37652256..82d62d1a4fc51be582a30ab4907a595219c667c9 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_inbox.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_inbox.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <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="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"/>
 </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 9b8482c815287340f4504578901ee79811d00e24..cdfc0666d4fb1cc9373673df04c90ba01612f93d 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:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M19 3H5c-1.1 0-2 0.9-2 2v7c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm0 6h-4c0 1.62-1.38 3-3 3s-3-1.38-3-3H5V5h14v4zm-4 7h6v3c0 1.1-0.9 2-2 2H5c-1.1 0-2-0.9-2-2v-3h6c0 1.66 1.34 3 3 3s3-1.34 3-3z" />
+        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"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_magnify.xml b/app/ui/legacy/src/main/res/drawable/ic_magnify.xml
index 7f4449a74866b210cd1de65dc2477b2eb5cfdb9e..5e56103f62cfdebe5335d33df375a7c5a1e0d152 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_magnify.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_magnify.xml
@@ -1,9 +1,10 @@
 <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.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
+        android:pathData="M12.7549,11.2549H11.9649L11.6849,10.9849C12.6649,9.8449 13.2549,8.3649 13.2549,6.7549C13.2549,3.1649 10.3449,0.2549 6.7549,0.2549C3.1649,0.2549 0.2549,3.1649 0.2549,6.7549C0.2549,10.3449 3.1649,13.2549 6.7549,13.2549C8.3649,13.2549 9.8449,12.6649 10.9849,11.6849L11.2549,11.9649V12.7549L16.2549,17.7449L17.7449,16.2549L12.7549,11.2549ZM6.7549,11.2549C4.2649,11.2549 2.2549,9.2449 2.2549,6.7549C2.2549,4.2649 4.2649,2.2549 6.7549,2.2549C9.2449,2.2549 11.2549,4.2649 11.2549,6.7549C11.2549,9.2449 9.2449,11.2549 6.7549,11.2549Z" />
 </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 85f3386b646ec89e7b7f57e4b986f9021caaa604..47a9b9f7608aa6d828ded12368918457cde85b76 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_outbox.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_outbox.xml
@@ -1,12 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <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" />
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="m12,5.7768 l-5,5 3,0 0,4 4,0 0,-4 3,0z" />
+        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"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_pencil.xml b/app/ui/legacy/src/main/res/drawable/ic_pencil.xml
index 551d96ea0188477411027edd11180ec21c180a42..b8a355eb031089b9dd57b41aea25098cb30f0632 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_pencil.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_pencil.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="19dp"
+    android:height="18dp"
+    android:viewportWidth="19"
+    android:viewportHeight="18">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" />
+        android:pathData="M11.059,6.02L11.979,6.94L2.919,16H1.999V15.08L11.059,6.02ZM14.659,0C14.409,0 14.149,0.1 13.959,0.29L12.129,2.12L15.879,5.87L17.709,4.04C18.099,3.65 18.099,3.02 17.709,2.63L15.369,0.29C15.169,0.09 14.919,0 14.659,0ZM11.059,3.19L-0.001,14.25V18H3.749L14.809,6.94L11.059,3.19Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_plus.xml b/app/ui/legacy/src/main/res/drawable/ic_plus.xml
index 035965ddeb80707ff3274331ba0cce1b81925848..a6974cf51519d51d97889358b1743f2524ee70a0 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_plus.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_plus.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_receipt.xml b/app/ui/legacy/src/main/res/drawable/ic_receipt.xml
new file mode 100644
index 0000000000000000000000000000000000000000..83bcd40897645779912ce8a44cdcb86628021529
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_receipt.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="@color/default_icon_color"
+        android:pathData="M18,17L6,17v-2h12v2zM18,13L6,13v-2h12v2zM18,9L6,9L6,7h12v2zM3,22l1.5,-1.5L6,22l1.5,-1.5L9,22l1.5,-1.5L12,22l1.5,-1.5L15,22l1.5,-1.5L18,22l1.5,-1.5L21,22L21,2l-1.5,1.5L18,2l-1.5,1.5L15,2l-1.5,1.5L12,2l-1.5,1.5L9,2 7.5,3.5 6,2 4.5,3.5 3,2v20z"/>
+</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_refresh.xml b/app/ui/legacy/src/main/res/drawable/ic_refresh.xml
index 93870b19bff135bb0e9da5f2bde9ac94943fe896..c8e5a8175e374add9d456516d48b1c615e4c94a7 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_refresh.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_refresh.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_reply_all.xml b/app/ui/legacy/src/main/res/drawable/ic_reply_all.xml
index e573ed2e0bb8daf4f750bcf62349cf6d8c1703dc..c0f13570ffdc99c6d0cfd31561963f2974456378 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_reply_all.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_reply_all.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M7,8L7,5l-7,7 7,7v-3l-4,-4 4,-4zM13,9L13,5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
+        android:pathData="M7,8L7,5l-7,7 7,7v-3l-4,-4 4,-4zM13,9L13,5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_select_all.xml b/app/ui/legacy/src/main/res/drawable/ic_select_all.xml
index ce914598d83a7d930ba82194a621720d5504e25e..9ed60d005f69abb30fcd0f84de3ba2009bd41475 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_select_all.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_select_all.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z" />
+        android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
 </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 6755e765f4e87206d28529388acfdd88df4c04fe..aa4a1bfa9407f16dec7f610496f7cd8dbbf50040 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_send.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_send.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
+        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_sort.xml b/app/ui/legacy/src/main/res/drawable/ic_sort.xml
index 8e5e3f71ab99a9d65e1d1872ae42189cfd1eff2f..bd0e789631377d11d13007f5ac93676b025f6526 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_sort.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_sort.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z" />
+        android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_star.xml b/app/ui/legacy/src/main/res/drawable/ic_star.xml
index 7bd436f286527e2da49ab2f61956b8ae4da3f06d..71c9c883e37fc1d8cf46e7eb54e5ed5a143e25e4 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_star.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_star.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:tint="?attr/messageStarColor"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24"
+android:viewportHeight="24"
+android:tint="?attr/messageStarColor">
+<path
+    android:fillColor="@android:color/white"
+    android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_star_border.xml b/app/ui/legacy/src/main/res/drawable/ic_star_border.xml
index 84549a9dd8e433aa53bcc0b564a8b3e9d3771ef2..91b67b6b7340119eed5658d433e4e8db8d68b4f7 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_star_border.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_star_border.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" />
+        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml b/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml
index e0ae94b996029b5d67fba26a505ad02201e88b6e..4be2916631ef82a2410271533719a9f10e1a16b2 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_trash_can.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="14dp"
+    android:height="18dp"
+    android:viewportWidth="14"
+    android:viewportHeight="18">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
+        android:pathData="M11,6V16H3V6H11ZM9.5,0H4.5L3.5,1H0V3H14V1H10.5L9.5,0ZM13,4H1V16C1,17.1 1.9,18 3,18H11C12.1,18 13,17.1 13,16V4Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml b/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d2f5c98ebb3f97ac5fdfe1bb8b39137d222b031d
--- /dev/null
+++ b/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/material_drawer_item_profile"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:paddingStart="@dimen/material_drawer_vertical_padding"
+    android:paddingLeft="@dimen/material_drawer_vertical_padding"
+    android:paddingEnd="@dimen/material_drawer_vertical_padding"
+    android:paddingRight="@dimen/material_drawer_vertical_padding">
+
+    <com.mikepenz.materialdrawer.view.BezelImageView
+        android:id="@+id/material_drawer_profileIcon"
+        style="@style/BezelImageView"
+        android:layout_width="@dimen/material_drawer_item_profile_icon"
+        android:layout_height="@dimen/material_drawer_item_profile_icon"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginEnd="@dimen/material_drawer_item_profile_icon_padding_right"
+        android:layout_marginRight="@dimen/material_drawer_item_profile_icon_padding_right"
+        android:clickable="false"
+        android:elevation="1dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/material_drawer_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/material_drawer_padding"
+        android:layout_marginLeft="@dimen/material_drawer_padding"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="center_vertical|start"
+        android:lines="1"
+        android:paddingStart="0dp"
+        android:paddingLeft="0dp"
+        android:paddingEnd="@dimen/material_drawer_item_primary_icon_padding_right"
+        android:paddingRight="@dimen/material_drawer_item_primary_icon_padding_right"
+        android:singleLine="true"
+        android:textDirection="anyRtl"
+        android:textSize="@dimen/material_drawer_item_profile_text"
+        app:layout_constraintBottom_toTopOf="@id/material_drawer_email"
+        app:layout_constraintEnd_toStartOf="@+id/material_drawer_barrier"
+        app:layout_constraintStart_toEndOf="@id/material_drawer_profileIcon"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="Some drawer text" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/material_drawer_email"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/material_drawer_padding"
+        android:layout_marginLeft="@dimen/material_drawer_padding"
+        android:layout_marginEnd="0dp"
+        android:layout_marginRight="0dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center_vertical|start"
+        android:lines="1"
+        android:paddingStart="0dp"
+        android:paddingLeft="0dp"
+        android:paddingEnd="@dimen/material_drawer_item_primary_icon_padding_right"
+        android:paddingRight="@dimen/material_drawer_item_primary_icon_padding_right"
+        android:singleLine="true"
+        android:textDirection="anyRtl"
+        android:textSize="@dimen/material_drawer_item_profile_description"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/material_drawer_barrier"
+        app:layout_constraintStart_toEndOf="@id/material_drawer_profileIcon"
+        app:layout_constraintTop_toBottomOf="@id/material_drawer_name"
+        tools:text="Some drawer text" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/material_drawer_barrier"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:barrierDirection="start"
+        app:constraint_referenced_ids="material_drawer_badge" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/material_drawer_badge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/material_drawer_padding"
+        android:layout_marginLeft="@dimen/material_drawer_padding"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center"
+        android:lines="1"
+        android:minWidth="20dp"
+        android:paddingLeft="1dp"
+        android:paddingRight="1dp"
+        android:singleLine="true"
+        android:textSize="@dimen/material_drawer_item_primary_text"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/material_drawer_barrier"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="99" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/layout/message_list_item.xml b/app/ui/legacy/src/main/res/layout/message_list_item.xml
index fabbacbb8db29246a422a057f95f09c13a203850..8c79449b355225c560b27dc52a9f8362d5000093 100644
--- a/app/ui/legacy/src/main/res/layout/message_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/message_list_item.xml
@@ -78,9 +78,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="3dp"
                 android:layout_marginTop="5dp"
-                android:paddingRight="3dp"
+                android:paddingRight="5dp"
                 android:paddingBottom="3dp"
-                android:paddingLeft="3dp"
+                android:paddingLeft="5dp"
                 android:paddingTop="4dp"
                 android:focusable="false"
                 tools:text="3" />
diff --git a/app/ui/legacy/src/main/res/layout/message_view_header.xml b/app/ui/legacy/src/main/res/layout/message_view_header.xml
index 11c3c4ce93adb3fb101b1f2f65e1490ea75ba92b..53a076f3e808da94c4dc824811cac5d653f1f3e5 100644
--- a/app/ui/legacy/src/main/res/layout/message_view_header.xml
+++ b/app/ui/legacy/src/main/res/layout/message_view_header.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/header_container"
+    android:background="@color/color_default_background"
     android:layout_width="match_parent"
     android:orientation="vertical"
     android:layout_height="wrap_content">
@@ -18,7 +19,8 @@
             android:id="@+id/chip"
             android:layout_width="8dip"
             android:layout_height="match_parent"
-            tools:background="#FF1976D2" />
+            tools:background="#FF1976D2"
+            android:visibility="gone"/>
 
         <LinearLayout
             android:layout_width="match_parent"