From 1b3192b85585f192fa6d415ab24c045cb7d7fda9 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Tue, 25 Jan 2022 22:10:26 +0600
Subject: [PATCH] 4721-Crash_in_dark_mode_issue

issue: https://gitlab.e.foundation/e/backlog/-/issues/4721
---
 .../fsck/k9/controller/push/PushService.kt    |   3 +-
 .../k9/controller/push/PushServiceManager.kt  |   1 -
 .../main/java/com/fsck/k9/K9ThemeProvider.kt  |   4 +-
 .../src/main/res/values-night/bools.xml       |   4 +
 .../src/main/res/values-night/themes.xml      |   8 --
 app/k9mail/src/main/res/values/bools.xml      |   4 +
 app/k9mail/src/main/res/values/colors.xml     |  11 ++
 app/k9mail/src/main/res/values/themes.xml     | 121 ++++++++----------
 app/ui/base/src/main/res/layout/toolbar.xml   |   2 +-
 .../base/src/main/res/values-night/colors.xml |   4 +
 app/ui/base/src/main/res/values/colors.xml    |  13 ++
 app/ui/base/src/main/res/values/styles.xml    |   4 +-
 .../src/main/res/drawable/blue_background.xml |   2 +-
 .../res/drawable/bullet_point_negative.xml    |  11 +-
 .../res/drawable/bullet_point_neutral.xml     |   2 +-
 .../res/drawable/bullet_point_positive.xml    |  11 +-
 .../src/main/res/drawable/compatibility.xml   |   2 +-
 .../src/main/res/drawable/ic_account.xml      |   2 +-
 .../src/main/res/drawable/ic_account_plus.xml |   3 +-
 .../main/res/drawable/ic_alert_octagon.xml    |   3 +-
 .../src/main/res/drawable/ic_archive.xml      |   3 +-
 .../src/main/res/drawable/ic_arrow_back.xml   |   3 +-
 .../main/res/drawable/ic_arrow_up_down.xml    |   3 +-
 .../src/main/res/drawable/ic_attachment.xml   |   3 +-
 .../res/drawable/ic_attachment_generic.xml    |   2 +-
 .../main/res/drawable/ic_attachment_image.xml |   2 +-
 .../legacy/src/main/res/drawable/ic_bug.xml   |   3 +-
 .../src/main/res/drawable/ic_check_circle.xml |   3 +-
 .../res/drawable/ic_check_circle_large.xml    |   2 +-
 .../src/main/res/drawable/ic_chevron_down.xml |   3 +-
 .../src/main/res/drawable/ic_chevron_left.xml |   3 +-
 .../main/res/drawable/ic_chevron_right.xml    |   3 +-
 .../src/main/res/drawable/ic_chevron_up.xml   |   3 +-
 .../legacy/src/main/res/drawable/ic_clear.xml |   3 +-
 .../legacy/src/main/res/drawable/ic_close.xml |   3 +-
 .../legacy/src/main/res/drawable/ic_code.xml  |   3 +-
 .../legacy/src/main/res/drawable/ic_cog.xml   |   3 +-
 .../src/main/res/drawable/ic_content_copy.xml |   3 +-
 .../src/main/res/drawable/ic_description.xml  |   3 +-
 .../src/main/res/drawable/ic_download.xml     |   3 +-
 .../main/res/drawable/ic_drafts_folder.xml    |   3 +-
 .../src/main/res/drawable/ic_drag_handle.xml  |   5 +-
 .../src/main/res/drawable/ic_envelope.xml     |   3 +-
 .../legacy/src/main/res/drawable/ic_error.xml |   3 +-
 .../src/main/res/drawable/ic_export.xml       |   3 +-
 .../src/main/res/drawable/ic_file_upload.xml  |   3 +-
 .../src/main/res/drawable/ic_floppy.xml       |   3 +-
 .../src/main/res/drawable/ic_folder.xml       |   3 +-
 .../main/res/drawable/ic_folder_magnify.xml   |   3 +-
 .../main/res/drawable/ic_folder_manage.xml    |   3 +-
 .../legacy/src/main/res/drawable/ic_forum.xml |   3 +-
 .../src/main/res/drawable/ic_import.xml       |   3 +-
 .../legacy/src/main/res/drawable/ic_inbox.xml |   3 +-
 .../main/res/drawable/ic_inbox_multiple.xml   |   3 +-
 .../legacy/src/main/res/drawable/ic_info.xml  |   3 +-
 .../legacy/src/main/res/drawable/ic_key.xml   |   3 +-
 .../legacy/src/main/res/drawable/ic_link.xml  |   3 +-
 .../src/main/res/drawable/ic_magnify.xml      |   3 +-
 .../main/res/drawable/ic_magnify_cloud.xml    |   3 +-
 .../src/main/res/drawable/ic_mark_new.xml     |   3 +-
 .../src/main/res/drawable/ic_mastodon.xml     |   3 +-
 .../legacy/src/main/res/drawable/ic_menu.xml  |   3 +-
 .../src/main/res/drawable/ic_not_imported.xml |   3 +-
 .../main/res/drawable/ic_notifications.xml    |   3 +-
 .../main/res/drawable/ic_opened_envelope.xml  |   3 +-
 .../src/main/res/drawable/ic_outbox.xml       |   5 +-
 .../src/main/res/drawable/ic_pencil.xml       |   3 +-
 .../src/main/res/drawable/ic_people.xml       |   3 +-
 .../src/main/res/drawable/ic_person_plus.xml  |   3 +-
 .../legacy/src/main/res/drawable/ic_plus.xml  |   3 +-
 .../drawable/ic_preferences_check_mail.xml    |   3 +-
 .../res/drawable/ic_preferences_crypto.xml    |   3 +-
 .../res/drawable/ic_push_notification.xml     |   3 +-
 .../src/main/res/drawable/ic_refresh.xml      |   3 +-
 .../src/main/res/drawable/ic_refresh_all.xml  |   3 +-
 .../src/main/res/drawable/ic_reply_all.xml    |   3 +-
 .../src/main/res/drawable/ic_select_all.xml   |   3 +-
 .../legacy/src/main/res/drawable/ic_send.xml  |   3 +-
 .../src/main/res/drawable/ic_shield.xml       |   3 +-
 .../legacy/src/main/res/drawable/ic_sort.xml  |   3 +-
 .../src/main/res/drawable/ic_star_border.xml  |   3 +-
 .../main/res/drawable/ic_status_corner.xml    |   4 +-
 .../legacy/src/main/res/drawable/ic_touch.xml |   3 +-
 .../src/main/res/drawable/ic_trash_can.xml    |   3 +-
 app/ui/legacy/src/main/res/drawable/ic_tv.xml |   3 +-
 .../src/main/res/drawable/ic_twitter.xml      |   3 +-
 .../src/main/res/drawable/ic_visibility.xml   |   3 +-
 .../drawable/notification_action_archive.xml  |   2 +-
 .../drawable/notification_action_delete.xml   |   2 +-
 .../notification_action_mark_as_read.xml      |   2 +-
 .../notification_action_mark_as_spam.xml      |   2 +-
 .../drawable/notification_action_reply.xml    |   2 +-
 .../drawable/notification_icon_new_mail.xml   |   2 +-
 .../drawable/notification_icon_warning.xml    |   2 +-
 .../res/drawable/status_signature_unknown.xml |  13 +-
 .../src/main/res/layout/drawer_contents.xml   |   2 +-
 .../res/layout/message_compose_content.xml    |   1 +
 .../src/main/res/layout/message_container.xml |  42 +++---
 .../main/res/layout/recipient_token_item.xml  |   1 +
 app/ui/legacy/src/main/res/values/colors.xml  |   9 ++
 app/ui/legacy/src/main/res/values/styles.xml  |  19 +--
 101 files changed, 243 insertions(+), 276 deletions(-)
 create mode 100644 app/k9mail/src/main/res/values-night/bools.xml
 delete mode 100644 app/k9mail/src/main/res/values-night/themes.xml
 create mode 100644 app/k9mail/src/main/res/values/bools.xml
 create mode 100644 app/k9mail/src/main/res/values/colors.xml
 create mode 100644 app/ui/base/src/main/res/values-night/colors.xml
 create mode 100644 app/ui/base/src/main/res/values/colors.xml

diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/PushService.kt b/app/core/src/main/java/com/fsck/k9/controller/push/PushService.kt
index a24baf9de1..987ba0b69b 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/push/PushService.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/push/PushService.kt
@@ -25,7 +25,6 @@ class PushService : Service() {
         Timber.v("PushService.onStartCommand()")
         super.onStartCommand(intent, flags, startId)
 
-       // startForeground()
         initializePushController()
 
         return START_STICKY
@@ -42,7 +41,7 @@ class PushService : Service() {
         val notification = pushNotificationManager.createForegroundNotification()
 
         if (Build.VERSION.SDK_INT >= 29) {
-                startForeground(notificationId, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+            startForeground(notificationId, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
         } else {
             startForeground(notificationId, notification)
         }
diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/PushServiceManager.kt b/app/core/src/main/java/com/fsck/k9/controller/push/PushServiceManager.kt
index e55bf3ee4a..1ac8178e08 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/push/PushServiceManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/push/PushServiceManager.kt
@@ -34,7 +34,6 @@ internal class PushServiceManager(private val context: Context) {
         try {
             val intent = Intent(context, PushService::class.java)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-               // context.startForegroundService(intent)
                 context.startService(intent)
             } else {
                 context.startService(intent)
diff --git a/app/k9mail/src/main/java/com/fsck/k9/K9ThemeProvider.kt b/app/k9mail/src/main/java/com/fsck/k9/K9ThemeProvider.kt
index 0b54cc424d..c3bed2e649 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/K9ThemeProvider.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/K9ThemeProvider.kt
@@ -5,8 +5,8 @@ import com.fsck.k9.ui.base.ThemeProvider
 // TODO: Move this class and the theme resources to the main app module
 class K9ThemeProvider : ThemeProvider {
     override val appThemeResourceId = R.style.Theme_K9_DayNight
-    override val appLightThemeResourceId = R.style.Theme_K9_Light
-    override val appDarkThemeResourceId = R.style.Theme_K9_Dark
+    override val appLightThemeResourceId = R.style.Theme_K9_DayNight
+    override val appDarkThemeResourceId = R.style.Theme_K9_DayNight
     override val dialogThemeResourceId = R.style.Theme_K9_Dialog_DayNight
     override val translucentDialogThemeResourceId = R.style.Theme_K9_Dialog_Translucent_DayNight
 }
diff --git a/app/k9mail/src/main/res/values-night/bools.xml b/app/k9mail/src/main/res/values-night/bools.xml
new file mode 100644
index 0000000000..ecb2751dc2
--- /dev/null
+++ b/app/k9mail/src/main/res/values-night/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="isLightMode">false</bool>
+</resources>
\ No newline at end of file
diff --git a/app/k9mail/src/main/res/values-night/themes.xml b/app/k9mail/src/main/res/values-night/themes.xml
deleted file mode 100644
index 90591279ed..0000000000
--- a/app/k9mail/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Theme.K9.DayNight" parent="Theme.K9.Dark" />
-    <style name="Theme.K9.Dialog.DayNight" parent="Theme.K9.Dialog.Dark" />
-    <style name="Theme.K9.Dialog.Translucent.DayNight" parent="Theme.K9.Dialog.Translucent.Dark" />
-
-</resources>
diff --git a/app/k9mail/src/main/res/values/bools.xml b/app/k9mail/src/main/res/values/bools.xml
new file mode 100644
index 0000000000..32fa9c9b75
--- /dev/null
+++ b/app/k9mail/src/main/res/values/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="isLightMode">true</bool>
+</resources>
\ No newline at end of file
diff --git a/app/k9mail/src/main/res/values/colors.xml b/app/k9mail/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..0abca75b7f
--- /dev/null
+++ b/app/k9mail/src/main/res/values/colors.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>
+    <color name="color_default_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="color_default_accent">@lineageos.platform:color/color_default_accent</color>
+    <color name="color_default_background">@lineageos.platform:color/color_default_background</color>
+    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
+    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="color_default_divider">@lineageos.platform:color/color_default_divider</color>
+</resources>
\ No newline at end of file
diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml
index 2dcfc51781..5d7ec01439 100644
--- a/app/k9mail/src/main/res/values/themes.xml
+++ b/app/k9mail/src/main/res/values/themes.xml
@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.K9.Startup" parent="Theme.K9.Dark">
-        <item name="android:windowBackground">@android:color/black</item>
+    <style name="Theme.K9.Startup" parent="Theme.K9.Common">
     </style>
 
     <!-- Empty base themes that can be easily replaced by RRO (Runtime Resource Overlay) themes -->
-    <style name="Theme.K9.Light.Base" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge" />
-    <style name="Theme.K9.Dark.Base" parent="Theme.MaterialComponents.NoActionBar.Bridge" />
+    <style name="Theme.K9.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge" />
 
-    <style name="Theme.K9.Light.Common" parent="Theme.K9.Light.Base">
-        <item name="android:windowBackground">@lineageos.platform:color/color_default_background</item>
+    <style name="Theme.K9.Common" parent="Theme.K9.Base">
+        <item name="android:windowBackground">@color/color_default_background</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
-        <item name="colorPrimary">@lineageos.platform:color/color_default_primary</item>
-        <item name="colorPrimaryDark">@lineageos.platform:color/color_default_primary_dark</item>
-        <item name="bottomBarBackground">@lineageos.platform:color/color_default_background</item>
-        <item name="colorAccent">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="23">@bool/isLightMode</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">@bool/isLightMode</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor" tools:targetApi="27">@color/color_default_primary_dark</item>
+        <item name="statusBarBackground">@color/color_default_primary_dark</item>
+        <item name="colorPrimary">@color/color_default_primary</item>
+        <item name="colorPrimaryDark">@color/color_default_primary_dark</item>
+        <item name="bottomBarBackground">@color/color_default_primary_dark</item>
+        <item name="colorAccent">@color/color_default_accent</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="iconMenu">@lineageos.platform:drawable/ic_hamburger</item>
@@ -79,8 +83,8 @@
         <item name="iconSettingsExport">@drawable/ic_export</item>
         <item name="iconSettingsImport">@drawable/ic_import</item>
         <item name="iconSettingsImportStatus">@drawable/ic_import_status</item>
-        <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_light</item>
-        <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>
+        <item name="textColorPrimaryRecipientDropdown">@color/color_default_primary_text</item>
+        <item name="textColorSecondaryRecipientDropdown">@color/color_default_secondary_text</item>
         <item name="messageListSelectedBackgroundColor">#8038B8E2</item>
         <item name="messageListReadItemBackgroundColor">#c0cdcdcd</item>
         <item name="messageListUnreadItemBackgroundColor">#00ffffff</item>
@@ -88,14 +92,14 @@
         <item name="messageListThreadCountBackground">@drawable/thread_count_box_light</item>
         <item name="messageListActiveItemBackgroundColor">#ff2ea7d1</item>
         <item name="messageListPreviewTextColor">#ff696969</item>
-        <item name="messageListDividerColor">#ffcccccc</item>
+        <item name="messageListDividerColor">@color/color_default_divider</item>
         <item name="messageListStateIconTint">#bbbbbb</item>
         <item name="messageListAttachment">@lineageos.platform:drawable/ic_attachment</item>
         <item name="messageListAnswered">@drawable/ic_messagelist_answered</item>
         <item name="messageListForwarded">@drawable/ic_messagelist_forwarded</item>
         <item name="messageListAnsweredForwarded">@drawable/ic_messagelist_answered_forwarded</item>
         <item name="messageStar">@drawable/btn_check_star</item>
-        <item name="messageViewBackgroundColor">#ffffffff</item>
+        <item name="messageViewBackgroundColor">@color/color_default_background</item>
         <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>
         <item name="attachmentCardBackground">#e8e8e8</item>
         <item name="contactPictureFallbackDefaultBackgroundColor">#ffababab</item>
@@ -125,20 +129,26 @@
 
         <item name="materialDrawerStyle">@style/Widget.MaterialDrawerStyle.K9.Light</item>
         <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle.K9.Light</item>
-        <item name="behindRecyclerView">#F0F0F0</item>
+        <item name="behindRecyclerView">@color/color_default_foreground</item>
     </style>
 
-    <style name="Theme.K9.Dark.Common" parent="Theme.K9.Dark.Base">
-        <item name="android:windowBackground">@lineageos.platform:color/color_default_background</item>
-        <item name="android:navigationBarColor">#000000</item>
+    <style name="Theme.K9.Light" parent="Theme.MaterialComponents.NoActionBar.Bridge">
+        <item name="android:windowBackground">@color/color_default_background</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
-        <item name="colorPrimary">@color/md_grey_900</item>
-        <item name="colorPrimaryDark">@color/md_grey_900</item>
-        <item name="bottomBarBackground">@color/md_grey_900</item>
-        <item name="colorAccent">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="23">@bool/isLightMode</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">@bool/isLightMode</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor" tools:targetApi="27">@color/color_default_primary_dark</item>
+        <item name="statusBarBackground">@color/color_default_primary_dark</item>
+        <item name="colorPrimary">@color/color_default_primary</item>
+        <item name="colorPrimaryDark">@color/color_default_primary_dark</item>
+        <item name="bottomBarBackground">@color/color_default_primary_dark</item>
+        <item name="colorAccent">@color/color_default_accent</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
 
         <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>
@@ -161,7 +171,7 @@
         <item name="iconActionSearch">@lineageos.platform:drawable/ic_search</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</item>
+        <item name="iconActionSettings">@lineageos.platform:drawable/ic_settings_wheel</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>
@@ -198,8 +208,8 @@
         <item name="iconSettingsExport">@drawable/ic_export</item>
         <item name="iconSettingsImport">@drawable/ic_import</item>
         <item name="iconSettingsImportStatus">@drawable/ic_import_status</item>
-        <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_light</item>
-        <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>
+        <item name="textColorPrimaryRecipientDropdown">@color/color_default_primary_text</item>
+        <item name="textColorSecondaryRecipientDropdown">@color/color_default_secondary_text</item>
         <item name="messageListSelectedBackgroundColor">#8038B8E2</item>
         <item name="messageListReadItemBackgroundColor">#c0cdcdcd</item>
         <item name="messageListUnreadItemBackgroundColor">#00ffffff</item>
@@ -207,14 +217,14 @@
         <item name="messageListThreadCountBackground">@drawable/thread_count_box_light</item>
         <item name="messageListActiveItemBackgroundColor">#ff2ea7d1</item>
         <item name="messageListPreviewTextColor">#ff696969</item>
-        <item name="messageListDividerColor">#ffcccccc</item>
+        <item name="messageListDividerColor">@color/color_default_divider</item>
         <item name="messageListStateIconTint">#bbbbbb</item>
         <item name="messageListAttachment">@lineageos.platform:drawable/ic_attachment</item>
         <item name="messageListAnswered">@drawable/ic_messagelist_answered</item>
         <item name="messageListForwarded">@drawable/ic_messagelist_forwarded</item>
         <item name="messageListAnsweredForwarded">@drawable/ic_messagelist_answered_forwarded</item>
         <item name="messageStar">@drawable/btn_check_star</item>
-        <item name="messageViewBackgroundColor">#ffffffff</item>
+        <item name="messageViewBackgroundColor">@color/color_default_background</item>
         <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>
         <item name="attachmentCardBackground">#e8e8e8</item>
         <item name="contactPictureFallbackDefaultBackgroundColor">#ffababab</item>
@@ -234,32 +244,20 @@
         <item name="iconAboutTwitter">@drawable/ic_twitter</item>
 
         <item name="unencryptedAttachmentUnlock">@drawable/ic_visibility</item>
-        <item name="openpgp_black">#fff</item>
-        <item name="openpgp_orange">#ee7700</item>
+        <item name="openpgp_black">#000</item>
+        <item name="openpgp_orange">#FF8800</item>
         <item name="openpgp_red">#CC0000</item>
-        <item name="openpgp_green">#77aa00</item>
-        <item name="openpgp_blue">#6699cc</item>
-        <item name="openpgp_grey">#888</item>
-        <item name="openpgp_dark_grey">#bbb</item>
-
-        <item name="materialDrawerStyle">@style/Widget.MaterialDrawerStyle.K9.Dark</item>
-        <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle.K9.Dark</item>
-
-        <item name="behindRecyclerView">#202020</item>
-    </style>
-
-    <style name="Theme.K9.Light" parent="Theme.K9.Light.Common" />
-    <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Common" />
-
-    <style name="Theme.K9.Dialog.Light" parent="Theme.K9.Light">
-        <item name="backgroundColorChooseAccountHeader">#cccccc</item>
-    </style>
+        <item name="openpgp_green">#669900</item>
+        <item name="openpgp_blue">#336699</item>
+        <item name="openpgp_grey">#bbb</item>
+        <item name="openpgp_dark_grey">#888</item>
 
-    <style name="Theme.K9.Dialog.Dark" parent="Theme.K9.Dark">
-        <item name="backgroundColorChooseAccountHeader">#404040</item>
+        <item name="materialDrawerStyle">@style/Widget.MaterialDrawerStyle.K9.Light</item>
+        <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle.K9.Light</item>
+        <item name="behindRecyclerView">@color/color_default_foreground</item>
     </style>
 
-    <style name="Theme.K9.Dialog.Translucent.Dark" parent="Theme.MaterialComponents.Dialog.Bridge">
+    <style name="Theme.K9.Dialog.Translucent.Common" parent="Theme.MaterialComponents.DayNight.Dialog.Bridge">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowIsTranslucent">true</item>
@@ -273,22 +271,9 @@
         <item name="tintColorBulletPointNeutral">#bbb</item>
     </style>
 
-    <style name="Theme.K9.Dialog.Translucent.Light" parent="Theme.MaterialComponents.Light.Dialog.Bridge">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
-
-        <item name="tintColorBulletPointPositive">#77aa22</item>
-        <item name="tintColorBulletPointNegative">#dd2222</item>
-        <item name="tintColorBulletPointNeutral">#bbb</item>
+    <style name="Theme.K9.DayNight" parent="Theme.K9.Common" />
+    <style name="Theme.K9.Dialog.DayNight" parent="Theme.K9.Common">
+        <item name="backgroundColorChooseAccountHeader">@color/color_default_secondary_text</item>
     </style>
-
-    <style name="Theme.K9.DayNight" parent="Theme.K9.Light" />
-    <style name="Theme.K9.Dialog.DayNight" parent="Theme.K9.Dialog.Light" />
-    <style name="Theme.K9.Dialog.Translucent.DayNight" parent="Theme.K9.Dialog.Translucent.Light" />
-
+    <style name="Theme.K9.Dialog.Translucent.DayNight" parent="Theme.K9.Dialog.Translucent.Common" />
 </resources>
diff --git a/app/ui/base/src/main/res/layout/toolbar.xml b/app/ui/base/src/main/res/layout/toolbar.xml
index 2eb71cb481..317cddb8d3 100644
--- a/app/ui/base/src/main/res/layout/toolbar.xml
+++ b/app/ui/base/src/main/res/layout/toolbar.xml
@@ -4,6 +4,6 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
+        android:background="@color/color_default_primary_dark"
         android:theme="@style/ToolbarTheme"
         android:elevation="4dp"/>
\ No newline at end of file
diff --git a/app/ui/base/src/main/res/values-night/colors.xml b/app/ui/base/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000000..75068f23a5
--- /dev/null
+++ b/app/ui/base/src/main/res/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="default_icon_color">#DEFFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/app/ui/base/src/main/res/values/colors.xml b/app/ui/base/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..fc6e72741d
--- /dev/null
+++ b/app/ui/base/src/main/res/values/colors.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="default_icon_color">#DE000000</color>
+    <color name="color_icon_background_blue">#0088ED</color>
+
+    <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>
+    <color name="color_default_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="color_default_accent">@lineageos.platform:color/color_default_accent</color>
+    <color name="color_default_background">@lineageos.platform:color/color_default_background</color>
+    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
+    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
+</resources>
\ No newline at end of file
diff --git a/app/ui/base/src/main/res/values/styles.xml b/app/ui/base/src/main/res/values/styles.xml
index 72ac176859..f6c3327afa 100644
--- a/app/ui/base/src/main/res/values/styles.xml
+++ b/app/ui/base/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="ToolbarTheme" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
-        <item name="colorControlNormal">@lineageos.platform:color/color_default_accent</item>
+    <style name="ToolbarTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
+        <item name="colorControlNormal">@color/default_icon_color</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/drawable/blue_background.xml b/app/ui/legacy/src/main/res/drawable/blue_background.xml
index 4bd4231827..73ab390fc5 100644
--- a/app/ui/legacy/src/main/res/drawable/blue_background.xml
+++ b/app/ui/legacy/src/main/res/drawable/blue_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="?attr/colorAccent" />
+    <solid android:color="@color/color_icon_background_blue" />
 
 </shape>
diff --git a/app/ui/legacy/src/main/res/drawable/bullet_point_negative.xml b/app/ui/legacy/src/main/res/drawable/bullet_point_negative.xml
index fed62836b0..506ba75f7e 100644
--- a/app/ui/legacy/src/main/res/drawable/bullet_point_negative.xml
+++ b/app/ui/legacy/src/main/res/drawable/bullet_point_negative.xml
@@ -1,4 +1,9 @@
-<vector android:height="24dp" android:viewportHeight="457.469"
-    android:viewportWidth="457.47" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M228.7,96.9C155.9,96.9 96.9,155.9 96.9,228.7 96.9,301.5 155.9,360.5 228.7,360.5 301.5,360.5 360.5,301.5 360.5,228.7 360.5,155.9 301.5,96.9 228.7,96.9zM304,249.9 L157,249.9c-9.6,0 -17.4,-7.8 -17.4,-17.4 0,-9.6 7.8,-17.4 17.4,-17.4l147,0c9.6,0 17.4,7.8 17.4,17.4 0,9.6 -7.8,17.4 -17.4,17.4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="457.47"
+    android:viewportHeight="457.469">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M228.7,96.9C155.9,96.9 96.9,155.9 96.9,228.7 96.9,301.5 155.9,360.5 228.7,360.5 301.5,360.5 360.5,301.5 360.5,228.7 360.5,155.9 301.5,96.9 228.7,96.9zM304,249.9 L157,249.9c-9.6,0 -17.4,-7.8 -17.4,-17.4 0,-9.6 7.8,-17.4 17.4,-17.4l147,0c9.6,0 17.4,7.8 17.4,17.4 0,9.6 -7.8,17.4 -17.4,17.4z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/bullet_point_neutral.xml b/app/ui/legacy/src/main/res/drawable/bullet_point_neutral.xml
index 5aed6a1adb..44fa3efe90 100644
--- a/app/ui/legacy/src/main/res/drawable/bullet_point_neutral.xml
+++ b/app/ui/legacy/src/main/res/drawable/bullet_point_neutral.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="457.469">
 
     <path
-        android:fillColor="#000000"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M228.75,96.906 C155.95,96.906,96.91,155.95,96.91,228.746
 C96.91,301.546,155.954,360.556,228.75,360.556
 C301.55,360.556,360.56,301.546,360.56,228.746 S301.55,96.906,228.75,96.906 Z
diff --git a/app/ui/legacy/src/main/res/drawable/bullet_point_positive.xml b/app/ui/legacy/src/main/res/drawable/bullet_point_positive.xml
index 4f95bda4db..5a814ec61c 100644
--- a/app/ui/legacy/src/main/res/drawable/bullet_point_positive.xml
+++ b/app/ui/legacy/src/main/res/drawable/bullet_point_positive.xml
@@ -1,4 +1,9 @@
-<vector android:height="24dp" android:viewportHeight="457.469"
-    android:viewportWidth="457.47" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M228.7,96.9C155.9,96.9 96.9,155.9 96.9,228.7 96.9,301.5 155.9,360.5 228.7,360.5 301.5,360.5 360.5,301.5 360.5,228.7 360.5,155.9 301.5,96.9 228.7,96.9zM304,249.9l-56.1,0l0,56.1c0,9.6 -7.8,17.4 -17.4,17.4 -9.6,0 -17.4,-7.8 -17.4,-17.4l0,-56.1l-56.1,0c-9.6,0 -17.4,-7.8 -17.4,-17.4 0,-9.6 7.8,-17.4 17.4,-17.4l56.1,0l0,-56.1c0,-9.6 7.8,-17.4 17.4,-17.4 9.6,0 17.4,7.8 17.4,17.4l0,56.1l56.1,0c9.6,0 17.4,7.8 17.4,17.4 0,9.6 -7.8,17.4 -17.4,17.4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="457.47"
+    android:viewportHeight="457.469">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M228.7,96.9C155.9,96.9 96.9,155.9 96.9,228.7 96.9,301.5 155.9,360.5 228.7,360.5 301.5,360.5 360.5,301.5 360.5,228.7 360.5,155.9 301.5,96.9 228.7,96.9zM304,249.9l-56.1,0l0,56.1c0,9.6 -7.8,17.4 -17.4,17.4 -9.6,0 -17.4,-7.8 -17.4,-17.4l0,-56.1l-56.1,0c-9.6,0 -17.4,-7.8 -17.4,-17.4 0,-9.6 7.8,-17.4 17.4,-17.4l56.1,0l0,-56.1c0,-9.6 7.8,-17.4 17.4,-17.4 9.6,0 17.4,7.8 17.4,17.4l0,56.1l56.1,0c9.6,0 17.4,7.8 17.4,17.4 0,9.6 -7.8,17.4 -17.4,17.4z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/compatibility.xml b/app/ui/legacy/src/main/res/drawable/compatibility.xml
index 8abc9d9d01..7e5bfbc842 100644
--- a/app/ui/legacy/src/main/res/drawable/compatibility.xml
+++ b/app/ui/legacy/src/main/res/drawable/compatibility.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/default_icon_color"
         android:pathData="m17.73,12.02 l3.98,-3.98c0.39,-0.39 0.39,-1.02 0,-1.41L17.37,2.29C16.98,1.9 16.35,1.9 15.96,2.29L11.98,6.27 8,2.29C7.8,2.1 7.55,2 7.29,2 7.04,2 6.78,2.1 6.59,2.29L2.25,6.63c-0.39,0.39 -0.39,1.02 0,1.41L6.23,12.02 2.25,16c-0.39,0.39 -0.39,1.02 0,1.41l4.34,4.34c0.39,0.39 1.02,0.39 1.41,0l3.98,-3.98 3.98,3.98c0.2,0.2 0.45,0.29 0.71,0.29 0.26,0 0.51,-0.1 0.71,-0.29l4.34,-4.34c0.39,-0.39 0.39,-1.02 0,-1.41L17.73,12.02zM12,9c0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 -0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1zM7.29,10.96 L3.66,7.34 7.29,3.71 10.91,7.33 7.29,10.96zM10,13c-0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1zM12,15c-0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1zM14,11c0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 -0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1zM16.66,20.34 L13.03,16.72 16.66,13.09 20.28,16.71 16.66,20.34z"/>
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_account.xml b/app/ui/legacy/src/main/res/drawable/ic_account.xml
index 02600b7471..2c0de44e3a 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_account.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_account.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_account_plus.xml b/app/ui/legacy/src/main/res/drawable/ic_account_plus.xml
index 994f375e75..d8ce14fbcb 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_account_plus.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_account_plus.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
 </vector>
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 226706b9e0..ec074e7b39 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,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </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 90e52ab4ee..6346854890 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_archive.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_archive.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_arrow_back.xml b/app/ui/legacy/src/main/res/drawable/ic_arrow_back.xml
index c9d2255e20..cfe1e1a3d3 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_arrow_back.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_arrow_back.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
 </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 98f7a42282..eea04380f6 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,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </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 b6387fa52a..d868f68ebd 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_attachment.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_attachment.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_attachment_generic.xml b/app/ui/legacy/src/main/res/drawable/ic_attachment_generic.xml
index fd1e89cdfe..ab4ecff6d0 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_attachment_generic.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_attachment_generic.xml
@@ -4,6 +4,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="#000000"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_attachment_image.xml b/app/ui/legacy/src/main/res/drawable/ic_attachment_image.xml
index 7d86223b87..bd78e52daa 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_attachment_image.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_attachment_image.xml
@@ -4,6 +4,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="#000000"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_bug.xml b/app/ui/legacy/src/main/res/drawable/ic_bug.xml
index c90a5a1be3..9c7e65209e 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_bug.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_bug.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_check_circle.xml b/app/ui/legacy/src/main/res/drawable/ic_check_circle.xml
index b648f57059..c3fbc4c6c1 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_check_circle.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_check_circle.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_check_circle_large.xml b/app/ui/legacy/src/main/res/drawable/ic_check_circle_large.xml
index 6483898ca3..53f3910c86 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_check_circle_large.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_check_circle_large.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M20,20m-20,0a20,20 0,1 1,40 0a20,20 0,1 1,-40 0"
       android:strokeWidth="1"
-      android:fillColor="#1976d2"
+      android:fillColor="@color/color_icon_background_blue"
       android:strokeColor="#00000000"/>
   <path
       android:pathData="m16.795,23.875 l-4.17,-4.17 -1.42,1.41 5.59,5.59 12,-12 -1.41,-1.41z"
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 35942a1f75..e2422205a0 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,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         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 e3b3964da1..9856b389aa 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,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         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 9664e23d3c..82255625e8 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,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         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 e1d4062f89..378e777e4e 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,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         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 170e3ef60b..0c78f75565 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_clear.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_clear.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        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/legacy/src/main/res/drawable/ic_close.xml b/app/ui/legacy/src/main/res/drawable/ic_close.xml
index da6ccc8f46..b7b59abdda 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_close.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_close.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@android:color/white"
+        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/legacy/src/main/res/drawable/ic_code.xml b/app/ui/legacy/src/main/res/drawable/ic_code.xml
index 8054f134c3..76b49851f0 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_code.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_code.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z" />
 </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 4e19deecc1..7f4df888cc 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_cog.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_cog.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </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 33090f515b..62845fcfb6 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,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_description.xml b/app/ui/legacy/src/main/res/drawable/ic_description.xml
index 361aebd475..0d88e4c343 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_description.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_description.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 	android:width="24dp"
 	android:height="24dp"
-	android:tint="?attr/colorControlNormal"
 	android:viewportWidth="24"
 	android:viewportHeight="24">
 	<path
-		android:fillColor="@android:color/white"
+		android:fillColor="@color/default_icon_color"
 		android:pathData="M14 2H6c-1.1 0-1.99 0.9-1.99 2L4 20c0 1.1 0.89 2 1.99 2H18c1.1 0 2-0.9 2-2V8l-6-6zm2 16H8v-2h8v2zm0-4H8v-2h8v2zm-3-5V3.5L18.5 9H13z" />
 </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 0964bd62db..138b22742e 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_download.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_download.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M5,20h14v-2H5V20zM19,9h-4V3H9v6H5l7,7L19,9z" />
 </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 9d70912881..ab4ecff6d0 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,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_drag_handle.xml b/app/ui/legacy/src/main/res/drawable/ic_drag_handle.xml
index 16755b674d..308d0906fe 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_drag_handle.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_drag_handle.xml
@@ -2,9 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z"/>
 </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 2c8521771a..715e73e225 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_envelope.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_envelope.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_error.xml b/app/ui/legacy/src/main/res/drawable/ic_error.xml
index cce259fa88..bb8f654dcf 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_error.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_error.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_export.xml b/app/ui/legacy/src/main/res/drawable/ic_export.xml
index 03b4908dba..fdad795cd2 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_export.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_export.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@color/default_icon_color"
       android:pathData="m8,7h3V16h2V7h3L12,3ZM4,19v2h16v-2z"/>
 </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 1f34349e73..d9883cd1a8 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
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         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 36541ed280..cc97c00277 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_floppy.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_floppy.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </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 4350ae5eca..d5dedb08af 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_folder.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_folder.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_folder_magnify.xml b/app/ui/legacy/src/main/res/drawable/ic_folder_magnify.xml
index b29f011b9b..bb0baf26b8 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_folder_magnify.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_folder_magnify.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M10,4L12,6L20,6C21.1,6 22,6.89 22,8L22,18C22,19.097 21.097,20 20,20L4,20C2.903,20 2,19.097 2,18L2,6C2,4.89 2.89,4 4,4L10,4ZM13.971,9C12.341,9 11,10.341 11,11.971C11,13.602 12.341,14.943 13.971,14.943C14.707,14.943 15.384,14.673 15.905,14.23L16.029,14.353L16.029,14.714L18.314,17L19,16.314L16.714,14.029L16.353,14.029L16.23,13.905C16.673,13.384 16.943,12.707 16.943,11.971C16.943,10.341 15.602,9 13.971,9ZM13.971,9.914C12.829,9.914 11.914,10.829 11.914,11.971C11.914,13.114 12.829,14.029 13.971,14.029C15.114,14.029 16.029,13.114 16.029,11.971C16.029,10.829 15.114,9.914 13.971,9.914Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_folder_manage.xml b/app/ui/legacy/src/main/res/drawable/ic_folder_manage.xml
index 5a836825b3..32d38cde69 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_folder_manage.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_folder_manage.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M4 4C2.89 4 2 4.89 2 6V18C2 19.11 2.9 20 4 20H12.08A7 7 0 0 1 12 19A7 7 0 0 1 19 12A7 7 0 0 1 22 12.69V8C22 6.89 21.1 6 20 6H12L10 4H4M18 14C17.87 14 17.76 14.09 17.74 14.21L17.55 15.53C17.25 15.66 16.96 15.82 16.7 16L15.46 15.5C15.35 15.5 15.22 15.5 15.15 15.63L14.15 17.36C14.09 17.47 14.11 17.6 14.21 17.68L15.27 18.5C15.25 18.67 15.24 18.83 15.24 19C15.24 19.17 15.25 19.33 15.27 19.5L14.21 20.32C14.12 20.4 14.09 20.53 14.15 20.64L15.15 22.37C15.21 22.5 15.34 22.5 15.46 22.5L16.7 22C16.96 22.18 17.24 22.35 17.55 22.47L17.74 23.79C17.76 23.91 17.86 24 18 24H20C20.11 24 20.22 23.91 20.24 23.79L20.43 22.47C20.73 22.34 21 22.18 21.27 22L22.5 22.5C22.63 22.5 22.76 22.5 22.83 22.37L23.83 20.64C23.89 20.53 23.86 20.4 23.77 20.32L22.7 19.5C22.72 19.33 22.74 19.17 22.74 19C22.74 18.83 22.73 18.67 22.7 18.5L23.76 17.68C23.85 17.6 23.88 17.47 23.82 17.36L22.82 15.63C22.76 15.5 22.63 15.5 22.5 15.5L21.27 16C21 15.82 20.73 15.65 20.42 15.53L20.23 14.21C20.22 14.09 20.11 14 20 14H18M19 17.5C19.83 17.5 20.5 18.17 20.5 19C20.5 19.83 19.83 20.5 19 20.5C18.16 20.5 17.5 19.83 17.5 19C17.5 18.17 18.17 17.5 19 17.5Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_forum.xml b/app/ui/legacy/src/main/res/drawable/ic_forum.xml
index 2f776ebb5d..0fee4808cf 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_forum.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_forum.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1zM17,12L17,3c0,-0.55 -0.45,-1 -1,-1L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_import.xml b/app/ui/legacy/src/main/res/drawable/ic_import.xml
index cb5d8ef836..eb0579fd2d 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_import.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_import.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M11,3L11,12L8,12L12,16L16,12L13,12L13,3L11,3zM4,19L4,21L20,21L20,19L4,19z"/>
 </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 f55b5a6499..a40eb0c9c5 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_inbox.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_inbox.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </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 e0c21d0956..9b8482c815 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,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_info.xml b/app/ui/legacy/src/main/res/drawable/ic_info.xml
index 95cc987312..31a1cfb466 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_info.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_info.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_key.xml b/app/ui/legacy/src/main/res/drawable/ic_key.xml
index 7b554c9493..51309a3d39 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_key.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_key.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_link.xml b/app/ui/legacy/src/main/res/drawable/ic_link.xml
index ccb142a610..f5849695cc 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_link.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_link.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z" />
 </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 cbf0cc71e0..7f4449a748 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_magnify.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_magnify.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_magnify_cloud.xml b/app/ui/legacy/src/main/res/drawable/ic_magnify_cloud.xml
index fff6643cf5..47fc0408a1 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_magnify_cloud.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_magnify_cloud.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M9.5,3C13.066,3 16,5.934 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14L15.5,14L20.5,19L19,20.5L14,15.5L14,14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16C5.934,16 3,13.066 3,9.5C3,5.934 5.934,3 9.5,3ZM9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5ZM11.338,9.021C11.168,8.161 10.41,7.513 9.5,7.513C8.778,7.513 8.15,7.923 7.838,8.521C7.085,8.603 6.5,9.238 6.5,10.013C6.5,10.836 7.177,11.513 8,11.513L11.25,11.513C11.936,11.513 12.5,10.949 12.5,10.263C12.5,9.603 11.988,9.068 11.338,9.021Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_mark_new.xml b/app/ui/legacy/src/main/res/drawable/ic_mark_new.xml
index de26f783aa..4bacfacd69 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_mark_new.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_mark_new.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M22 13.3C21.4 13.1 20.7 13 20 13c-3.3 0-6 2.7-6 6c0 0.3 0 0.7 0.1 1H4C2.9 20 2 19.1 2 18V6C2 4.9 2.9 4 4 4h16c1.1 0 2 0.9 2 2v7.3m-5.2 4.8c0-3.4 5.2-3.6 5.2-0.1c0 3.4-5.2 3.5-5.2 0.1zM4 6v2l8 5 8-5V6l-8 5z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_mastodon.xml b/app/ui/legacy/src/main/res/drawable/ic_mastodon.xml
index 8e50a3251d..e48d1cd22b 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_mastodon.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_mastodon.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M20.94,14c-0.28,1.41 -2.44,2.96 -4.97,3.26c-1.31,0.15 -2.6,0.3 -3.97,0.24c-2.25,-0.11 -4,-0.54 -4,-0.54v0.62c0.32,2.22 2.22,2.35 4.03,2.42c1.82,0.05 3.44,-0.46 3.44,-0.46l0.08,1.65s-1.28,0.68 -3.55,0.81c-1.25,0.07 -2.81,-0.03 -4.62,-0.5c-3.92,-1.05 -4.6,-5.24 -4.7,-9.5l-0.01,-3.43c0,-4.34 2.83,-5.61 2.83,-5.61C6.95,2.3 9.41,2 11.97,2h0.06c2.56,0 5.02,0.3 6.47,0.96c0,0 2.83,1.27 2.83,5.61c0,0 0.04,3.21 -0.39,5.43M18,8.91c0,-1.08 -0.3,-1.91 -0.85,-2.56c-0.56,-0.63 -1.3,-0.96 -2.23,-0.96c-1.06,0 -1.87,0.41 -2.42,1.23l-0.5,0.88l-0.5,-0.88c-0.56,-0.82 -1.36,-1.23 -2.43,-1.23c-0.92,0 -1.66,0.33 -2.23,0.96C6.29,7 6,7.83 6,8.91v5.26h2.1V9.06c0,-1.06 0.45,-1.62 1.36,-1.62c1,0 1.5,0.65 1.5,1.93v2.79h2.07V9.37c0,-1.28 0.5,-1.93 1.51,-1.93c0.9,0 1.35,0.56 1.35,1.62v5.11H18V8.91z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_menu.xml b/app/ui/legacy/src/main/res/drawable/ic_menu.xml
index ada350030d..8e8b03c912 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_menu.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_menu.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_not_imported.xml b/app/ui/legacy/src/main/res/drawable/ic_not_imported.xml
index 7b41d0d07c..1d320800d9 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_not_imported.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_not_imported.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8 0,-1.85 0.63,-3.55 1.69,-4.9L16.9,18.31C15.55,19.37 13.85,20 12,20zM18.31,16.9L7.1,5.69C8.45,4.63 10.15,4 12,4c4.42,0 8,3.58 8,8 0,1.85 -0.63,3.55 -1.69,4.9z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_notifications.xml b/app/ui/legacy/src/main/res/drawable/ic_notifications.xml
index 726ba1ec0d..61989ed4cc 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_notifications.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_notifications.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_opened_envelope.xml b/app/ui/legacy/src/main/res/drawable/ic_opened_envelope.xml
index e789a77db5..6013d5ada9 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_opened_envelope.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_opened_envelope.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M4,8L12,13L20,8V8L12,3L4,8V8M22,8V18A2,2 0,0 1,20 20H4A2,2 0,0 1,2 18V8C2,7.27 2.39,6.64 2.97,6.29L12,0.64L21.03,6.29C21.61,6.64 22,7.27 22,8Z" />
 </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 f495d1a25d..85f3386b64 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_outbox.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_outbox.xml
@@ -1,13 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        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="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="m12,5.7768 l-5,5 3,0 0,4 4,0 0,-4 3,0z" />
 </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 81fef3fb7d..551d96ea01 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_pencil.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_pencil.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_people.xml b/app/ui/legacy/src/main/res/drawable/ic_people.xml
index 71da7d97d1..67a2faeeb2 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_people.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_people.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_person_plus.xml b/app/ui/legacy/src/main/res/drawable/ic_person_plus.xml
index 842c6df398..7113827ab1 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_person_plus.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_person_plus.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
 </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 0553ae300c..035965ddeb 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_plus.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_plus.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_preferences_check_mail.xml b/app/ui/legacy/src/main/res/drawable/ic_preferences_check_mail.xml
index b9937db689..8db4a80fc9 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_preferences_check_mail.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_preferences_check_mail.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="m7.8134,20.0343c-0.8214,-0.4292 -1.57,-0.9803 -2.2154,-1.6253 -1.0517,-1.0518 -1.8237,-2.366 -2.2596,-3.8157l-2.9443,0.098 3.8355,-4.592 4.6109,4.3106 -3.3201,0.1129c0.6077,1.5622 1.7617,2.8673 3.2653,3.6494 2.8549,1.4846 6.3279,0.835 8.4425,-1.5766l1.5782,1.3841c-2.7541,3.1423 -7.2744,3.9878 -10.9932,2.0552m10.6658,-10.5554c-0.6073,-1.566 -1.7622,-2.8703 -3.2664,-3.6511 -2.8534,-1.487 -6.3221,-0.8373 -8.4431,1.5763l-1.5775,-1.3844c2.7598,-3.1436 7.278,-3.9874 10.9905,-2.0569 2.1743,1.1324 3.7841,3.1026 4.4831,5.445l2.94,-0.097 -3.8351,4.5921 -4.6117,-4.3149 3.3202,-0.109z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_preferences_crypto.xml b/app/ui/legacy/src/main/res/drawable/ic_preferences_crypto.xml
index 0e2b77b774..13e02b93d3 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_preferences_crypto.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_preferences_crypto.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="100"
     android:viewportHeight="100">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M81.5,45.13L79.58,45.13L79.58,29.48C79.48,10.28 66.39,-0.16 50.48,-0.16C34.57,-0.16 20.3,10.78 20.8,29.48L20.78,45.11C20.78,45.11 21.02,45.13 19.83,45.13C18.56,45.13 10.19,46.61 10.19,54.07L10.19,89.89C10.19,97.85 19.6,99.84 19.83,99.84L81.03,99.84C81.25,99.84 90.18,98.84 90.18,89.89L90.18,54.56C90.18,46.11 81.73,45.13 81.5,45.13L81.5,45.13ZM59.33,86.06L41.06,86.06L46.02,71.49C43.9,70.08 42.5,67.62 42.5,64.82C42.5,60.44 45.94,56.89 50.18,56.89C54.43,56.89 57.87,60.44 57.87,64.82C57.87,67.62 56.47,70.08 54.35,71.49L59.33,86.06L59.33,86.06ZM34.26,45.13L34.28,29.69C34.28,19.74 40.35,11.78 50.18,11.78C59.92,11.78 66.09,18.74 66.09,29.69L66.1,45.13L34.26,45.13L34.26,45.13Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_push_notification.xml b/app/ui/legacy/src/main/res/drawable/ic_push_notification.xml
index 7d758bbf78..f192b447f8 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_push_notification.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_push_notification.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10h5v-2h-5c-4.34,0 -8,-3.66 -8,-8s3.66,-8 8,-8 8,3.66 8,8v1.43c0,0.79 -0.71,1.57 -1.5,1.57s-1.5,-0.78 -1.5,-1.57L17,12c0,-2.76 -2.24,-5 -5,-5s-5,2.24 -5,5 2.24,5 5,5c1.38,0 2.64,-0.56 3.54,-1.47 0.65,0.89 1.77,1.47 2.96,1.47 1.97,0 3.5,-1.6 3.5,-3.57L22,12c0,-5.52 -4.48,-10 -10,-10zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3z" />
 </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 0d768f68dc..93870b19bf 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_refresh.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_refresh.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_refresh_all.xml b/app/ui/legacy/src/main/res/drawable/ic_refresh_all.xml
index f0721d9915..3e187baead 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_refresh_all.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_refresh_all.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M 15.857724,5.2112257 C 14.378581,4.5245963 13.792531,3.9942489 12,4 7.5800227,4.014181 4.01,7.58 4.01,12 c 0,4.42 3.57,8 7.99,8 3.73,0 7.524253,-2.99534 8.059024,-6.794874 L 17.65,14 C 16.83,16.33 14.61,18 12,18 8.69,18 6,15.31 6,12 6,8.69 8.6900019,6.0035629 12,6 c 1.452738,-0.00156 2.062645,0.5403058 3.076787,1.0329571 l -1.787121,3.6480969 6.559477,-2.4440265 -2.444026,-6.559477 z m 4.452463,0.308222 1.367566,3.6691007 -3.693934,1.4494656 -0.757545,1.913288 6.559477,-2.444026 -2.444026,-6.559477 z" />
 </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 627b2754c5..e573ed2e0b 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
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </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 b43ae6f947..ce914598d8 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
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </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 d1e2e1c9c5..6755e765f4 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_send.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_send.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         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_shield.xml b/app/ui/legacy/src/main/res/drawable/ic_shield.xml
index 5a77cae5ba..ae7882058f 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_shield.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_shield.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z" />
 </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 707e960db7..8e5e3f71ab 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_sort.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_sort.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         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_border.xml b/app/ui/legacy/src/main/res/drawable/ic_star_border.xml
index a1c9b57987..720a8af027 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,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_status_corner.xml b/app/ui/legacy/src/main/res/drawable/ic_status_corner.xml
index de69ceaf17..378ba68b34 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_status_corner.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_status_corner.xml
@@ -5,8 +5,8 @@
     android:viewportWidth="50"
     android:viewportHeight="50">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/default_icon_color"
         android:pathData="m0,0h50v50z"
         android:strokeWidth="1"
-        android:strokeColor="#000" />
+        android:strokeColor="@color/default_icon_color" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_touch.xml b/app/ui/legacy/src/main/res/drawable/ic_touch.xml
index deac85f445..556f8d735a 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_touch.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_touch.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M9,11.24L9,7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5c0,1.56 0.79,2.93 2,3.74zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11L13,13.5v-6c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,6.67 10,7.5v10.74l-3.43,-0.72c-0.08,-0.01 -0.15,-0.03 -0.24,-0.03 -0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8 4.94,4.94c0.27,0.27 0.65,0.44 1.06,0.44h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2 0,-0.62 -0.38,-1.16 -0.91,-1.38z" />
 </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 79372b1d6e..e0ae94b996 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,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_tv.xml b/app/ui/legacy/src/main/res/drawable/ic_tv.xml
index 4097ae1434..1abb186ab7 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_tv.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_tv.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h5v2h8v-2h5c1.1,0 1.99,-0.9 1.99,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,17L3,17L3,5h18v12z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_twitter.xml b/app/ui/legacy/src/main/res/drawable/ic_twitter.xml
index 07d3a117e1..55b84fee9f 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_twitter.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_twitter.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@color/default_icon_color"
       android:pathData="M22.46,6c-0.77,0.35 -1.6,0.58 -2.46,0.69c0.88,-0.53 1.56,-1.37 1.88,-2.38c-0.83,0.5 -1.75,0.85 -2.72,1.05C18.37,4.5 17.26,4 16,4c-2.35,0 -4.27,1.92 -4.27,4.29c0,0.34 0.04,0.67 0.11,0.98C8.28,9.09 5.11,7.38 3,4.79c-0.37,0.63 -0.58,1.37 -0.58,2.15c0,1.49 0.75,2.81 1.91,3.56c-0.71,0 -1.37,-0.2 -1.95,-0.5v0.03c0,2.08 1.48,3.82 3.44,4.21a4.22,4.22 0,0 1,-1.93 0.07a4.28,4.28 0,0 0,4 2.98a8.521,8.521 0,0 1,-5.33 1.84c-0.34,0 -0.68,-0.02 -1.02,-0.06C3.44,20.29 5.7,21 8.12,21C16,21 20.33,14.46 20.33,8.79c0,-0.19 0,-0.37 -0.01,-0.56c0.84,-0.6 1.56,-1.36 2.14,-2.23z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_visibility.xml b/app/ui/legacy/src/main/res/drawable/ic_visibility.xml
index cc9f66f120..579f021930 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_visibility.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_visibility.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/notification_action_archive.xml b/app/ui/legacy/src/main/res/drawable/notification_action_archive.xml
index ba3c563e34..6346854890 100644
--- a/app/ui/legacy/src/main/res/drawable/notification_action_archive.xml
+++ b/app/ui/legacy/src/main/res/drawable/notification_action_archive.xml
@@ -4,6 +4,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/notification_action_delete.xml b/app/ui/legacy/src/main/res/drawable/notification_action_delete.xml
index 6c6f704afe..e0ae94b996 100644
--- a/app/ui/legacy/src/main/res/drawable/notification_action_delete.xml
+++ b/app/ui/legacy/src/main/res/drawable/notification_action_delete.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/notification_action_mark_as_read.xml b/app/ui/legacy/src/main/res/drawable/notification_action_mark_as_read.xml
index be9b28d01b..6013d5ada9 100644
--- a/app/ui/legacy/src/main/res/drawable/notification_action_mark_as_read.xml
+++ b/app/ui/legacy/src/main/res/drawable/notification_action_mark_as_read.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M4,8L12,13L20,8V8L12,3L4,8V8M22,8V18A2,2 0,0 1,20 20H4A2,2 0,0 1,2 18V8C2,7.27 2.39,6.64 2.97,6.29L12,0.64L21.03,6.29C21.61,6.64 22,7.27 22,8Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/notification_action_mark_as_spam.xml b/app/ui/legacy/src/main/res/drawable/notification_action_mark_as_spam.xml
index a7bb50e06d..ec074e7b39 100644
--- a/app/ui/legacy/src/main/res/drawable/notification_action_mark_as_spam.xml
+++ b/app/ui/legacy/src/main/res/drawable/notification_action_mark_as_spam.xml
@@ -4,6 +4,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/notification_action_reply.xml b/app/ui/legacy/src/main/res/drawable/notification_action_reply.xml
index b879a77198..e573ed2e0b 100644
--- a/app/ui/legacy/src/main/res/drawable/notification_action_reply.xml
+++ b/app/ui/legacy/src/main/res/drawable/notification_action_reply.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/notification_icon_new_mail.xml b/app/ui/legacy/src/main/res/drawable/notification_icon_new_mail.xml
index 4d54e4d832..715e73e225 100644
--- a/app/ui/legacy/src/main/res/drawable/notification_icon_new_mail.xml
+++ b/app/ui/legacy/src/main/res/drawable/notification_icon_new_mail.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        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" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/notification_icon_warning.xml b/app/ui/legacy/src/main/res/drawable/notification_icon_warning.xml
index 74fcc6f747..e719596bc9 100644
--- a/app/ui/legacy/src/main/res/drawable/notification_icon_warning.xml
+++ b/app/ui/legacy/src/main/res/drawable/notification_icon_warning.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/status_signature_unknown.xml b/app/ui/legacy/src/main/res/drawable/status_signature_unknown.xml
index 7653ab3e5e..4ae926f452 100644
--- a/app/ui/legacy/src/main/res/drawable/status_signature_unknown.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_signature_unknown.xml
@@ -1,6 +1,11 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="101.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="101.0"
+    android:viewportHeight="100.0">
+    <path
+        android:fillColor="@color/default_icon_color"
         android:pathData="M50.81,96.55C76.76,96.55 97.81,75.51 97.81,49.55C97.81,23.59 76.76,2.55 50.81,2.55C24.85,2.55 3.81,23.59 3.81,49.55C3.81,75.51 24.85,96.55 50.81,96.55ZM43.83,79.43L43.83,67.01L56.25,67.01L56.25,79.43L43.83,79.43ZM69.57,41.86C68.89,43.58 68.05,45.05 67.04,46.27C66.03,47.49 64.92,48.53 63.7,49.39C62.47,50.25 61.32,51.11 60.23,51.97C59.14,52.83 58.18,53.81 57.33,54.92C56.49,56.03 55.96,57.41 55.74,59.08L55.74,62.24L44.73,62.24L44.73,58.5C44.9,56.11 45.34,54.12 46.08,52.51C46.81,50.9 47.67,49.53 48.65,48.39C49.63,47.26 50.66,46.27 51.75,45.44C52.83,44.61 53.84,43.78 54.76,42.95C55.69,42.11 56.44,41.2 57.01,40.2C57.58,39.2 57.83,37.96 57.78,36.46C57.78,33.91 57.17,32.03 55.95,30.8C54.72,29.59 53.02,28.98 50.85,28.98C49.38,28.98 48.12,29.27 47.05,29.85C46,30.43 45.12,31.21 44.45,32.18C43.76,33.15 43.26,34.28 42.94,35.59C42.61,36.89 42.45,38.29 42.45,39.79L30.46,39.79C30.51,36.79 31.02,34.05 31.97,31.55C32.92,29.06 34.25,26.9 35.96,25.07C37.68,23.24 39.74,21.81 42.16,20.78C44.58,19.76 47.29,19.24 50.28,19.24C54.14,19.24 57.36,19.79 59.94,20.87C62.52,21.95 64.61,23.29 66.18,24.9C67.76,26.51 68.89,28.24 69.57,30.1C70.25,31.96 70.59,33.69 70.59,35.3C70.59,37.96 70.25,40.15 69.57,41.86Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
+        android:strokeWidth="1"
+        android:strokeColor="@color/default_icon_color" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/layout/drawer_contents.xml b/app/ui/legacy/src/main/res/layout/drawer_contents.xml
index c3b229b592..066fac2f77 100644
--- a/app/ui/legacy/src/main/res/layout/drawer_contents.xml
+++ b/app/ui/legacy/src/main/res/layout/drawer_contents.xml
@@ -30,7 +30,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:padding="4dp"
-        android:background="?android:attr/windowBackground">
+        android:background="@color/color_default_foreground">
         <ImageView
             android:id="@+id/drawer_button_refresh_account"
             android:layout_width="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/message_compose_content.xml b/app/ui/legacy/src/main/res/layout/message_compose_content.xml
index 9b90db03b9..e6a44a3e0e 100644
--- a/app/ui/legacy/src/main/res/layout/message_compose_content.xml
+++ b/app/ui/legacy/src/main/res/layout/message_compose_content.xml
@@ -10,6 +10,7 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:background="@color/color_default_background"
         android:orientation="vertical" >
 
         <include layout="@layout/message_compose_recipients" />
diff --git a/app/ui/legacy/src/main/res/layout/message_container.xml b/app/ui/legacy/src/main/res/layout/message_container.xml
index fb5c072b1c..1e3278c15e 100644
--- a/app/ui/legacy/src/main/res/layout/message_container.xml
+++ b/app/ui/legacy/src/main/res/layout/message_container.xml
@@ -1,83 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.fsck.k9.ui.messageview.MessageContainerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <!-- Content area -->
     <com.fsck.k9.view.MessageWebView
         android:id="@+id/message_content"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent" />
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
 
     <!-- Unsigned content area -->
     <LinearLayout
+        android:id="@+id/message_unsigned_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:id="@+id/message_unsigned_container"
         android:visibility="gone"
-        tools:visibility="visible"
-        >
+        tools:visibility="visible">
 
         <LinearLayout
             android:id="@+id/message_unsigned_divider"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            >
+            android:layout_marginTop="4dp">
 
             <View
                 android:layout_width="16dp"
                 android:layout_height="4dp"
-                android:layout_marginTop="1dp"
                 android:layout_gravity="center_vertical"
-                android:background="#d55"
-                />
+                android:layout_marginTop="1dp"
+                android:background="#d55" />
 
             <TextView
-                android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="8dp"
-                android:textAppearance="?android:textAppearanceSmall"
                 android:text="@string/unsigned_text_divider_label"
-                android:textColor="#d55"
-                />
+                android:textAppearance="?android:textAppearanceSmall"
+                android:textColor="#d55" />
 
             <View
                 android:layout_width="wrap_content"
                 android:layout_height="4dp"
-                android:layout_marginTop="1dp"
                 android:layout_gravity="center_vertical"
+                android:layout_marginTop="1dp"
                 android:background="#d55" />
 
         </LinearLayout>
 
         <TextView
             android:id="@+id/message_unsigned_text"
-            android:layout_height="wrap_content"
             android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
             android:padding="8dp"
-            tools:text="Unsigned text content"
-            />
+            tools:text="Unsigned text content" />
 
     </LinearLayout>
 
     <!-- Attachments area -->
     <LinearLayout
         android:id="@+id/attachments_container"
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/attachments"
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            />
+            android:orientation="vertical" />
     </LinearLayout>
 
 </com.fsck.k9.ui.messageview.MessageContainerView>
diff --git a/app/ui/legacy/src/main/res/layout/recipient_token_item.xml b/app/ui/legacy/src/main/res/layout/recipient_token_item.xml
index 750d2990d3..8e1791be5b 100644
--- a/app/ui/legacy/src/main/res/layout/recipient_token_item.xml
+++ b/app/ui/legacy/src/main/res/layout/recipient_token_item.xml
@@ -50,6 +50,7 @@
         android:paddingBottom="4dp"
         android:textAppearance="@android:style/TextAppearance.Medium"
         android:textSize="15sp"
+        android:textColor="@android:color/black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/contact_photo"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/ui/legacy/src/main/res/values/colors.xml b/app/ui/legacy/src/main/res/values/colors.xml
index 5228d76811..4c9815c4a9 100644
--- a/app/ui/legacy/src/main/res/values/colors.xml
+++ b/app/ui/legacy/src/main/res/values/colors.xml
@@ -15,4 +15,13 @@
     <color name="md_grey_900">#212121</color>
 
     <color name="material_drawer_profile_icon">#F9F9F9</color>
+
+    <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>
+    <color name="color_default_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="color_default_accent">@lineageos.platform:color/color_default_accent</color>
+    <color name="color_default_background">@lineageos.platform:color/color_default_background</color>
+    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
+    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="color_default_divider">@lineageos.platform:color/color_default_divider</color>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values/styles.xml b/app/ui/legacy/src/main/res/values/styles.xml
index c49e4ac039..3f6dc1702d 100644
--- a/app/ui/legacy/src/main/res/values/styles.xml
+++ b/app/ui/legacy/src/main/res/values/styles.xml
@@ -3,17 +3,18 @@
 
     <style name="ComposeTextLabel" parent="@android:style/TextAppearance.Medium">
         <item name="android:textSize">15sp</item>
-        <item name="android:textColor">#aaa</item>
+        <item name="android:textColor">@color/color_default_secondary_text</item>
     </style>
     <style name="ComposeEditText" parent="@android:style/TextAppearance.Medium">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColorHint">#aaa</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="android:textColorHint">@color/color_default_secondary_text</item>
     </style>
     <style name="RecipientEditText" parent="ComposeEditText">
         <item name="android:lineSpacingExtra">4dp</item>
     </style>
     <style name="ComposeEditTextLarge" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColorHint">#aaa</item>
+        <item name="android:textColorHint">@color/color_default_secondary_text</item>
     </style>
 
     <style name="MessageComposeHighlight">
@@ -57,12 +58,12 @@
 
     <style name="Widget.MaterialDrawerStyle.K9.Light" parent="Widget.MaterialDrawerStyle.K9">
         <item name="materialDrawerInsetForeground">#5aaa</item>
-        <item name="materialDrawerDividerColor">#eee</item>
+        <item name="materialDrawerDividerColor">@color/color_default_divider</item>
     </style>
 
     <style name="Widget.MaterialDrawerStyle.K9.Dark" parent="Widget.MaterialDrawerStyle.K9">
         <item name="materialDrawerInsetForeground">#4000</item>
-        <item name="materialDrawerDividerColor">#444</item>
+        <item name="materialDrawerDividerColor">@color/color_default_divider</item>
     </style>
 
     <style name="Widget.MaterialDrawerHeaderStyle.K9">
@@ -70,13 +71,13 @@
     </style>
 
     <style name="Widget.MaterialDrawerHeaderStyle.K9.Light" parent="Widget.MaterialDrawerHeaderStyle.K9">
-        <item name="materialDrawerHeaderSelectionText">?android:textColorPrimaryInverse</item>
-        <item name="materialDrawerHeaderSelectionSubtext">?android:textColorSecondaryInverse</item>
+        <item name="materialDrawerHeaderSelectionText">@android:color/white</item>
+        <item name="materialDrawerHeaderSelectionSubtext">#CCFFFFFF</item>
     </style>
 
     <style name="Widget.MaterialDrawerHeaderStyle.K9.Dark" parent="Widget.MaterialDrawerHeaderStyle.K9">
-        <item name="materialDrawerHeaderSelectionText">?android:textColorPrimary</item>
-        <item name="materialDrawerHeaderSelectionSubtext">?android:textColorSecondary</item>
+        <item name="materialDrawerHeaderSelectionText">@android:color/white</item>
+        <item name="materialDrawerHeaderSelectionSubtext">#CCFFFFFF</item>
     </style>
 
     <style name="TextAppearance.K9.Small" parent="TextAppearance.AppCompat.Small">
-- 
GitLab