From 17159fdbe0f35aa3a8b5987594261db2d562c0a0 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Fri, 6 May 2022 11:16:46 +0600
Subject: [PATCH 1/6] Update preference settings layouts

---
 .../ui/settings/CustomPreferenceCategory.java |  2 +
 .../src/main/res/layout/account_list_item.xml |  2 +
 .../src/main/res/layout/custom_preference.xml | 80 +++++++++++++++++
 .../res/layout/custom_seekbar_preference.xml  | 86 +++++++++++++++++++
 .../main/res/layout/text_icon_list_item.xml   |  1 +
 .../src/main/res/xml/about_preferences.xml    | 27 ++++--
 .../src/main/res/xml/account_settings.xml     | 67 +++++++++++++++
 .../res/xml/folder_settings_preferences.xml   |  9 +-
 .../src/main/res/xml/general_settings.xml     | 60 +++++++++++++
 9 files changed, 327 insertions(+), 7 deletions(-)
 create mode 100644 app/ui/legacy/src/main/res/layout/custom_preference.xml
 create mode 100644 app/ui/legacy/src/main/res/layout/custom_seekbar_preference.xml

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/CustomPreferenceCategory.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/CustomPreferenceCategory.java
index 6bde0b466e..4a901616b5 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/CustomPreferenceCategory.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/CustomPreferenceCategory.java
@@ -2,6 +2,7 @@ package com.fsck.k9.ui.settings;
 
 
 import android.content.Context;
+import android.graphics.Typeface;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
@@ -39,5 +40,6 @@ public class CustomPreferenceCategory extends PreferenceCategory {
         super.onBindViewHolder(holder);
         final TextView titleView = (TextView) holder.findViewById(android.R.id.title);
         titleView.setTextColor(ContextCompat.getColor(getContext(), R.color.color_default_primary_text));
+        titleView.setTypeface(titleView.getTypeface(), Typeface.BOLD);
     }
 }
diff --git a/app/ui/legacy/src/main/res/layout/account_list_item.xml b/app/ui/legacy/src/main/res/layout/account_list_item.xml
index d34d78c272..43d67b4321 100644
--- a/app/ui/legacy/src/main/res/layout/account_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/account_list_item.xml
@@ -40,6 +40,7 @@
                 android:layout_marginBottom="2dp"
                 android:textColor="@color/color_default_secondary_text"
                 android:singleLine="true"
+                android:textStyle="bold"
                 tools:text="Personal" />
 
             <TextView
@@ -49,6 +50,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:textSize="12sp"
+                android:textStyle="normal"
                 android:textColor="@color/color_default_secondary_text"
                 tools:text="test@example.org" />
 
diff --git a/app/ui/legacy/src/main/res/layout/custom_preference.xml b/app/ui/legacy/src/main/res/layout/custom_preference.xml
new file mode 100644
index 0000000000..a049a9b64b
--- /dev/null
+++ b/app/ui/legacy/src/main/res/layout/custom_preference.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:background="@color/color_default_background">
+
+    <FrameLayout
+        android:id="@+id/icon_frame"
+        android:layout_margin="16dp"
+        android:layout_width="24dp"
+        android:layout_height="24dp">
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </FrameLayout>
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:layout_weight="1">
+
+        <TextView android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textStyle="bold"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="@color/color_default_secondary_text"
+            android:textSize="14sp"
+            android:layout_marginBottom="2dp"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="@color/color_default_secondary_text"
+            android:textSize="12sp"
+            android:textStyle="normal"
+            android:maxLines="4" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_margin="16dp"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/app/ui/legacy/src/main/res/layout/custom_seekbar_preference.xml b/app/ui/legacy/src/main/res/layout/custom_seekbar_preference.xml
new file mode 100644
index 0000000000..218f1a8ae5
--- /dev/null
+++ b/app/ui/legacy/src/main/res/layout/custom_seekbar_preference.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:background="@color/color_default_background">
+
+    <FrameLayout
+        android:id="@+id/icon_frame"
+        android:layout_margin="16dp"
+        android:layout_width="24dp"
+        android:layout_height="24dp">
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </FrameLayout>
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:layout_weight="1">
+
+        <TextView android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textStyle="bold"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="@color/color_default_secondary_text"
+            android:textSize="14sp"
+            android:layout_marginBottom="5dp"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <SeekBar android:id="@+id/seekbar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_toStartOf="@id/seekbar_value"
+            android:layout_alignStart="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+             />
+
+        <TextView
+            android:id="@+id/seekbar_value"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignParentEnd="true"
+            android:textStyle="normal"
+            android:textSize="12sp"
+            android:textColor="@color/color_default_secondary_text" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/app/ui/legacy/src/main/res/layout/text_icon_list_item.xml b/app/ui/legacy/src/main/res/layout/text_icon_list_item.xml
index 0a11a30e08..bbb6785ab9 100644
--- a/app/ui/legacy/src/main/res/layout/text_icon_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/text_icon_list_item.xml
@@ -34,6 +34,7 @@
             android:singleLine="true"
             android:textColor="@color/color_default_secondary_text"
             android:textSize="14sp"
+            android:textStyle="bold"
             tools:text="List item with simple text" />
     </LinearLayout>
 
diff --git a/app/ui/legacy/src/main/res/xml/about_preferences.xml b/app/ui/legacy/src/main/res/xml/about_preferences.xml
index 3087cc7e7d..3b48871e63 100644
--- a/app/ui/legacy/src/main/res/xml/about_preferences.xml
+++ b/app/ui/legacy/src/main/res/xml/about_preferences.xml
@@ -13,16 +13,20 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout="@layout/custom_preference">
 
 
     <Preference
         android:key="notes_info"
+        android:layout="@layout/custom_preference"
         android:summary="@string/preferences_app_info"
         android:title="@string/preferences_app_info_title" />
 
     <Preference
         android:key="build_version"
+        android:layout="@layout/custom_preference"
         android:title="@string/about_version_title">
 
         <intent
@@ -35,6 +39,7 @@
 
     <Preference
         android:key="about_app"
+        android:layout="@layout/custom_preference"
         android:title="@string/preferences_about_app">
 
         <intent
@@ -44,31 +49,41 @@
     </Preference>
 
 
-    <Preference android:title="@string/about_license_tab_title">
+    <Preference
+        android:title="@string/about_license_tab_title"
+        android:layout="@layout/custom_preference">
         <intent
             android:action="android.intent.action.VIEW"
             android:data="https://gitlab.e.foundation/e/apps/Mail/-/blob/master/LICENSE" />
     </Preference>
 
-    <Preference android:title="@string/preferences_authors">
+    <Preference
+        android:title="@string/preferences_authors"
+        android:layout="@layout/custom_preference">
         <intent
             android:action="android.intent.action.VIEW"
             android:data="https://gitlab.e.foundation/e/apps/Mail/-/blob/master/AUTHORS" />
     </Preference>
 
-    <Preference android:title="@string/about_source_title">
+    <Preference
+        android:title="@string/about_source_title"
+        android:layout="@layout/custom_preference">
         <intent
             android:action="android.intent.action.VIEW"
             android:data="https://gitlab.e.foundation/e/apps/Mail" />
     </Preference>
 
-    <Preference android:title="@string/preferences_privacy_policy">
+    <Preference
+        android:title="@string/preferences_privacy_policy"
+        android:layout="@layout/custom_preference">
         <intent
             android:action="android.intent.action.VIEW"
             android:data="https://e.foundation/legal-notice-privacy/" />
     </Preference>
 
-    <Preference android:title="@string/preferences_service_terms">
+    <Preference
+        android:title="@string/preferences_service_terms"
+        android:layout="@layout/custom_preference">
         <intent
             android:action="android.intent.action.VIEW"
             android:data="https://e.foundation/legal-notice-privacy/" />
diff --git a/app/ui/legacy/src/main/res/xml/account_settings.xml b/app/ui/legacy/src/main/res/xml/account_settings.xml
index 1c3e0d12f7..6e9187344a 100644
--- a/app/ui/legacy/src/main/res/xml/account_settings.xml
+++ b/app/ui/legacy/src/main/res/xml/account_settings.xml
@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--suppress AndroidElementNotAllowed -->
 <PreferenceScreen
+    android:layout="@layout/custom_preference"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:key="main"
     android:title="@string/account_settings_title_fmt">
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconSettingsGeneral"
         android:key="account_settings"
         android:title="@string/account_settings_general_title">
 
         <com.takisoft.preferencex.AutoSummaryEditTextPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_settings_description_label"
             android:key="account_description"
             android:title="@string/account_settings_description_label" />
 
         <com.takisoft.preferencex.ColorPickerPreference
+            android:layout="@layout/custom_preference"
             android:key="chip_color"
             android:summary="@string/account_settings_color_summary"
             android:title="@string/account_settings_color_label"
@@ -26,11 +30,13 @@
     </PreferenceScreen>
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconPreferencesReadMail"
         android:key="reading_mail"
         android:title="@string/account_settings_reading_mail">
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_settings_show_pictures_label"
             android:entries="@array/show_pictures_entries"
             android:entryValues="@array/show_pictures_values"
@@ -39,6 +45,7 @@
             android:title="@string/account_settings_show_pictures_label" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:key="mark_message_as_read_on_view"
             android:summary="@string/account_settings_mark_message_as_read_on_view_summary"
             android:title="@string/account_settings_mark_message_as_read_on_view_label" />
@@ -46,11 +53,13 @@
     </PreferenceScreen>
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconPreferencesFetchMail"
         android:key="incoming_prefs"
         android:title="@string/account_settings_sync">
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_settings_mail_display_count_label"
             android:entries="@array/display_count_entries"
             android:entryValues="@array/display_count_values"
@@ -59,6 +68,7 @@
             android:title="@string/account_settings_mail_display_count_label" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_settings_message_age_label"
             android:entries="@array/message_age_entries"
             android:entryValues="@array/message_age_values"
@@ -67,6 +77,7 @@
             android:title="@string/account_settings_message_age_label" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_settings_autodownload_message_size_label"
             android:entries="@array/autodownload_message_size_entries"
             android:entryValues="@array/autodownload_message_size_values"
@@ -75,6 +86,7 @@
             android:title="@string/account_settings_autodownload_message_size_label" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_settings_mail_check_frequency_label"
             android:entries="@array/check_frequency_entries"
             android:entryValues="@array/check_frequency_values"
@@ -83,6 +95,7 @@
             android:title="@string/account_settings_mail_check_frequency_label" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_settings_folder_sync_mode_label"
             android:entries="@array/folder_sync_mode_entries"
             android:entryValues="@array/folder_sync_mode_values"
@@ -91,6 +104,7 @@
             android:title="@string/account_settings_folder_sync_mode_label" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_settings_folder_push_mode_label"
             android:entries="@array/folder_push_mode_entries"
             android:entryValues="@array/folder_push_mode_values"
@@ -99,17 +113,20 @@
             android:title="@string/account_settings_folder_push_mode_label" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:defaultValue="true"
             android:key="account_sync_remote_deletetions"
             android:summary="@string/account_settings_sync_remote_deletetions_summary"
             android:title="@string/account_settings_sync_remote_deletetions_label" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:key="mark_message_as_read_on_delete"
             android:summary="@string/account_settings_mark_message_as_read_on_delete_summary"
             android:title="@string/account_settings_mark_message_as_read_on_delete_label" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_setup_incoming_delete_policy_label"
             android:entries="@array/delete_policy_entries"
             android:entryValues="@array/delete_policy_values"
@@ -118,6 +135,7 @@
             android:title="@string/account_setup_incoming_delete_policy_label" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_setup_expunge_policy_label"
             android:entries="@array/expunge_policy_entries"
             android:entryValues="@array/expunge_policy_values"
@@ -126,15 +144,18 @@
             android:title="@string/account_setup_expunge_policy_label" />
 
         <Preference
+            android:layout="@layout/custom_preference"
             android:key="incoming"
             android:summary="@string/account_settings_incoming_summary"
             android:title="@string/account_settings_incoming_label" />
 
         <PreferenceScreen
+            android:layout="@layout/custom_preference"
             android:key="push_advanced"
             android:title="@string/account_settings_push_advanced_title">
 
             <ListPreference
+                android:layout="@layout/custom_preference"
                 android:entries="@array/push_limit_entries"
                 android:entryValues="@array/push_limit_values"
                 android:key="max_push_folders"
@@ -142,6 +163,7 @@
                 android:title="@string/account_setup_push_limit_label" />
 
             <ListPreference
+                android:layout="@layout/custom_preference"
                 android:entries="@array/idle_refresh_period_entries"
                 android:entryValues="@array/idle_refresh_period_values"
                 android:key="idle_refresh_period"
@@ -153,21 +175,25 @@
     </PreferenceScreen>
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconPreferencesCompose"
         android:key="composing"
         android:title="@string/account_settings_composition">
 
         <Preference
+            android:layout="@layout/custom_preference"
             android:key="composition"
             android:summary="@string/account_settings_composition_summary"
             android:title="@string/account_settings_composition_label" />
 
         <Preference
+            android:layout="@layout/custom_preference"
             android:key="manage_identities"
             android:summary="@string/account_settings_identities_summary"
             android:title="@string/account_settings_identities_label" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:entries="@array/message_format_entries"
             android:entryValues="@array/message_format_values"
             android:key="message_format"
@@ -175,15 +201,18 @@
             android:title="@string/account_settings_message_format_label" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:key="always_show_cc_bcc"
             android:title="@string/account_settings_always_show_cc_bcc_label" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:key="message_read_receipt"
             android:summary="@string/account_settings_message_read_receipt_summary"
             android:title="@string/account_settings_message_read_receipt_label" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:entries="@array/quote_style_entries"
             android:entryValues="@array/quote_style_values"
             android:key="quote_style"
@@ -191,12 +220,14 @@
             android:title="@string/account_settings_quote_style_label" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:defaultValue="true"
             android:key="default_quoted_text_shown"
             android:summary="@string/account_settings_default_quoted_text_shown_summary"
             android:title="@string/account_settings_default_quoted_text_shown_label" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:defaultValue="false"
             android:dependency="quote_style"
             android:key="reply_after_quote"
@@ -204,24 +235,28 @@
             android:title="@string/account_settings_reply_after_quote_label" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:defaultValue="true"
             android:key="strip_signature"
             android:summary="@string/account_settings_strip_signature_summary"
             android:title="@string/account_settings_strip_signature_label" />
 
         <com.takisoft.preferencex.AutoSummaryEditTextPreference
+            android:layout="@layout/custom_preference"
             android:dependency="quote_style"
             android:dialogTitle="@string/account_settings_quote_prefix_label"
             android:key="account_quote_prefix"
             android:title="@string/account_settings_quote_prefix_label" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:defaultValue="true"
             android:key="upload_sent_messages"
             android:summary="@string/account_settings_upload_sent_messages_summary"
             android:title="@string/account_settings_upload_sent_messages_label" />
 
         <PreferenceScreen
+            android:layout="@layout/custom_preference"
             android:key="outgoing"
             android:summary="@string/account_settings_outgoing_summary"
             android:title="@string/account_settings_outgoing_label" />
@@ -229,16 +264,19 @@
     </PreferenceScreen>
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconPreferencesFolders"
         android:key="folders"
         android:title="@string/account_settings_folders">
 
         <com.fsck.k9.ui.settings.account.FolderListPreference
+            android:layout="@layout/custom_preference"
             android:key="account_setup_auto_expand_folder"
             app:useSimpleSummaryProvider="true"
             android:title="@string/account_setup_auto_expand_folder" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_settings_folder_display_mode_label"
             android:entries="@array/folder_display_mode_entries"
             android:entryValues="@array/folder_display_mode_values"
@@ -247,6 +285,7 @@
             android:title="@string/account_settings_folder_display_mode_label" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_settings_folder_target_mode_label"
             android:entries="@array/folder_target_mode_entries"
             android:entryValues="@array/folder_target_mode_values"
@@ -255,6 +294,7 @@
             android:title="@string/account_settings_folder_target_mode_label" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_settings_searchable_label"
             android:entries="@array/searchable_entries"
             android:entryValues="@array/searchable_values"
@@ -263,26 +303,31 @@
             android:title="@string/account_settings_searchable_label" />
 
         <com.fsck.k9.ui.settings.account.FolderListPreference
+            android:layout="@layout/custom_preference"
             android:key="archive_folder"
             app:useSimpleSummaryProvider="true"
             android:title="@string/archive_folder_label" />
 
         <com.fsck.k9.ui.settings.account.FolderListPreference
+            android:layout="@layout/custom_preference"
             android:key="drafts_folder"
             app:useSimpleSummaryProvider="true"
             android:title="@string/drafts_folder_label" />
 
         <com.fsck.k9.ui.settings.account.FolderListPreference
+            android:layout="@layout/custom_preference"
             android:key="sent_folder"
             app:useSimpleSummaryProvider="true"
             android:title="@string/sent_folder_label" />
 
         <com.fsck.k9.ui.settings.account.FolderListPreference
+            android:layout="@layout/custom_preference"
             android:key="spam_folder"
             app:useSimpleSummaryProvider="true"
             android:title="@string/spam_folder_label" />
 
         <com.fsck.k9.ui.settings.account.FolderListPreference
+            android:layout="@layout/custom_preference"
             android:key="trash_folder"
             app:useSimpleSummaryProvider="true"
             android:title="@string/trash_folder_label" />
@@ -290,17 +335,20 @@
     </PreferenceScreen>
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconPreferencesNotifications"
         android:key="notifications"
         android:title="@string/notifications_title">
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:defaultValue="true"
             android:key="account_notify"
             android:summary="@string/account_settings_notify_summary"
             android:title="@string/account_settings_notify_label" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dependency="account_notify"
             android:dialogTitle="@string/account_settings_folder_notify_new_mail_mode_label"
             android:entries="@array/folder_notify_new_mail_mode_entries"
@@ -310,6 +358,7 @@
             android:title="@string/account_settings_folder_notify_new_mail_mode_label" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:defaultValue="true"
             android:dependency="account_notify"
             android:key="account_notify_self"
@@ -317,6 +366,7 @@
             android:title="@string/account_settings_notify_self_label" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:defaultValue="false"
             android:dependency="account_notify"
             android:key="account_notify_contacts_mail_only"
@@ -324,6 +374,7 @@
             android:title="@string/account_notify_contacts_mail_only_label" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:defaultValue="false"
             android:dependency="account_notify"
             android:key="ignore_chat_messages"
@@ -331,12 +382,14 @@
             android:title="@string/account_settings_ignore_chat_messages_label" />
 
         <com.fsck.k9.ui.settings.account.NotificationSoundPreference
+            android:layout="@layout/custom_preference"
             android:defaultValue="content://settings/system/notification_sound"
             android:dependency="account_notify"
             android:key="account_ringtone"
             android:title="@string/account_settings_ringtone" />
 
         <com.fsck.k9.ui.settings.account.VibrationPreference
+            android:layout="@layout/custom_preference"
             android:dependency="account_notify"
             android:key="account_combined_vibration"
             android:title="@string/account_settings_vibration"
@@ -344,6 +397,7 @@
             android:entryValues="@array/vibrate_pattern_values" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dependency="account_notify"
             android:key="notification_light"
             android:title="@string/account_settings_notification_light_label"
@@ -352,6 +406,7 @@
             app:useSimpleSummaryProvider="true" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:defaultValue="true"
             android:key="account_notify_sync"
             android:summary="@string/account_settings_notify_sync_summary"
@@ -362,11 +417,13 @@
             android:title="@string/account_settings_notification_channels_label">
 
             <com.fsck.k9.ui.settings.account.NotificationsPreference
+                android:layout="@layout/custom_preference"
                 android:key="open_notification_settings_messages"
                 android:summary="@string/account_settings_open_notification_settings_messages_summary"
                 android:title="@string/notification_channel_messages_title" />
 
             <com.fsck.k9.ui.settings.account.NotificationsPreference
+                android:layout="@layout/custom_preference"
                 android:key="open_notification_settings_miscellaneous"
                 android:summary="@string/account_settings_open_notification_settings_miscellaneous_summary"
                 android:title="@string/notification_channel_miscellaneous_title" />
@@ -375,11 +432,13 @@
     </PreferenceScreen>
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconPreferencesSearch"
         android:key="search"
         android:title="@string/account_settings_search">
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/account_settings_remote_search_num_label"
             android:entries="@array/remote_search_num_results_entries"
             android:entryValues="@array/remote_search_num_results_values"
@@ -390,20 +449,24 @@
     </PreferenceScreen>
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconPreferencesCrypto"
         android:key="openpgp"
         android:title="@string/account_settings_crypto">
 
         <SwitchPreference
+            android:layout="@layout/custom_preference"
             android:key="openpgp_provider"
             android:title="@string/account_settings_crypto_app" />
 
         <org.openintents.openpgp.util.OpenPgpKeyPreference
+            android:layout="@layout/custom_preference"
             android:dependency="openpgp_provider"
             android:key="openpgp_key"
             android:title="@string/account_settings_crypto_key" />
 
         <com.fsck.k9.ui.settings.account.AutocryptPreferEncryptPreference
+            android:layout="@layout/custom_preference"
             android:dependency="openpgp_key"
             android:key="autocrypt_prefer_encrypt"
             android:title="@string/account_settings_crypto_prefer_encrypt"
@@ -411,6 +474,7 @@
             app:summaryOn="@string/switch_on" />
 
         <SwitchPreference
+            android:layout="@layout/custom_preference"
             android:dependency="openpgp_key"
             android:key="openpgp_hide_sign_only"
             android:summaryOff="@string/account_settings_crypto_hide_sign_only_off"
@@ -418,12 +482,14 @@
             android:title="@string/account_settings_crypto_hide_sign_only" />
 
         <SwitchPreference
+            android:layout="@layout/custom_preference"
             android:dependency="openpgp_key"
             android:key="openpgp_encrypt_subject"
             android:summary="@string/account_settings_crypto_encrypt_subject_subtitle"
             android:title="@string/account_settings_crypto_encrypt_subject" />
 
         <SwitchPreference
+            android:layout="@layout/custom_preference"
             android:dependency="openpgp_key"
             android:key="openpgp_encrypt_all_drafts"
             android:title="@string/account_settings_crypto_encrypt_all_drafts"
@@ -432,6 +498,7 @@
             />
 
         <Preference
+            android:layout="@layout/custom_preference"
             android:dependency="openpgp_key"
             android:key="autocrypt_transfer"
             android:summary="@string/ac_transfer_setting_summary"
diff --git a/app/ui/legacy/src/main/res/xml/folder_settings_preferences.xml b/app/ui/legacy/src/main/res/xml/folder_settings_preferences.xml
index 45a5801c4e..077652ef8e 100644
--- a/app/ui/legacy/src/main/res/xml/folder_settings_preferences.xml
+++ b/app/ui/legacy/src/main/res/xml/folder_settings_preferences.xml
@@ -15,18 +15,21 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout="@layout/custom_preference">
 
     <com.fsck.k9.ui.settings.CustomPreferenceCategory
         android:key="folder_settings">
 
         <CheckBoxPreference
             android:key="folder_settings_in_top_group"
+            android:layout="@layout/custom_preference"
             android:title="@string/folder_settings_in_top_group_label"
             android:summary="@string/folder_settings_in_top_group_summary" />
 
         <ListPreference
             android:key="folder_settings_folder_display_mode"
+            android:layout="@layout/custom_preference"
             android:title="@string/folder_settings_folder_display_mode_label"
             app:useSimpleSummaryProvider="true"
             android:entries="@array/folder_settings_folder_display_mode_entries"
@@ -35,6 +38,7 @@
 
         <ListPreference
             android:key="folder_settings_folder_sync_mode"
+            android:layout="@layout/custom_preference"
             android:title="@string/folder_settings_folder_sync_mode_label"
             app:useSimpleSummaryProvider="true"
             android:entries="@array/folder_settings_folder_sync_mode_entries"
@@ -43,6 +47,7 @@
 
         <ListPreference
             android:key="folder_settings_folder_push_mode"
+            android:layout="@layout/custom_preference"
             android:title="@string/folder_settings_folder_push_mode_label"
             app:useSimpleSummaryProvider="true"
             android:entries="@array/folder_settings_folder_push_mode_entries"
@@ -51,6 +56,7 @@
 
         <ListPreference
             android:key="folder_settings_folder_notify_mode"
+            android:layout="@layout/custom_preference"
             android:title="@string/folder_settings_folder_notify_mode_label"
             app:useSimpleSummaryProvider="true"
             android:entries="@array/folder_settings_folder_notify_mode_entries"
@@ -59,6 +65,7 @@
 
         <CheckBoxPreference
             android:key="folder_settings_include_in_integrated_inbox"
+            android:layout="@layout/custom_preference"
             android:title="@string/folder_settings_include_in_integrated_inbox_label"
             android:summary="@string/folder_settings_include_in_integrated_inbox_summary" />
 
diff --git a/app/ui/legacy/src/main/res/xml/general_settings.xml b/app/ui/legacy/src/main/res/xml/general_settings.xml
index ff6eadb6ea..920f3f1d3b 100644
--- a/app/ui/legacy/src/main/res/xml/general_settings.xml
+++ b/app/ui/legacy/src/main/res/xml/general_settings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--suppress AndroidElementNotAllowed -->
 <PreferenceScreen
+    android:layout="@layout/custom_preference"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:search="http://schemas.android.com/apk/com.bytehamster.lib.preferencesearch"
@@ -8,6 +9,7 @@
     search:ignore="true">
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconPreferencesDisplay"
         android:key="display_preferences"
         android:title="@string/display_preferences"
@@ -19,6 +21,7 @@
 
             <com.fsck.k9.ui.settings.general.LanguagePreference
                 android:dialogTitle="@string/settings_language_label"
+                android:layout="@layout/custom_preference"
                 android:entries="@array/language_entries"
                 android:entryValues="@array/language_values"
                 android:key="language"
@@ -59,6 +62,7 @@
 
             <PreferenceScreen
                 android:key="font_size"
+                android:layout="@layout/custom_preference"
                 android:summary="@string/font_size_settings_description"
                 android:title="@string/font_size_settings_title">
 
@@ -68,6 +72,7 @@
 
                     <ListPreference
                         android:key="account_name_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_account_name"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -76,6 +81,7 @@
 
                     <ListPreference
                         android:key="account_description_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_account_description"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -90,6 +96,7 @@
 
                     <ListPreference
                         android:key="folder_name_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_folder_name"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -98,6 +105,7 @@
 
                     <ListPreference
                         android:key="folder_status_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_folder_status"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -112,6 +120,7 @@
 
                     <ListPreference
                         android:key="message_list_subject_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_message_list_subject"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -120,6 +129,7 @@
 
                     <ListPreference
                         android:key="message_list_sender_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_message_list_sender"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -128,6 +138,7 @@
 
                     <ListPreference
                         android:key="message_list_date_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_message_list_date"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -136,6 +147,7 @@
 
                     <ListPreference
                         android:key="message_list_preview_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_message_list_preview"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -150,6 +162,7 @@
 
                     <ListPreference
                         android:key="message_view_sender_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_message_view_sender"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -158,6 +171,7 @@
 
                     <ListPreference
                         android:key="message_view_to_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_message_view_to"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -166,6 +180,7 @@
 
                     <ListPreference
                         android:key="message_view_cc_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_message_view_cc"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -174,6 +189,7 @@
 
                     <ListPreference
                         android:key="message_view_bcc_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_message_view_bcc"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -182,6 +198,7 @@
 
                     <ListPreference
                         android:key="message_view_subject_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_message_view_subject"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -190,6 +207,7 @@
 
                     <ListPreference
                         android:key="message_view_date_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_message_view_date"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -198,6 +216,7 @@
 
                     <ListPreference
                         android:key="message_view_additional_headers_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_message_view_additional_headers"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -206,6 +225,7 @@
 
                     <SeekBarPreference
                         android:key="message_view_content_font_slider"
+                        android:layout="@layout/custom_seekbar_preference"
                         android:title="@string/font_size_message_view_content"
                         app:showSeekBarValue="true"
                         app:min="40"
@@ -219,6 +239,7 @@
 
                     <ListPreference
                         android:key="message_compose_input_font"
+                        android:layout="@layout/custom_preference"
                         android:title="@string/font_size_message_compose_input"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
@@ -231,6 +252,7 @@
 
             <CheckBoxPreference
                 android:key="animations"
+                android:layout="@layout/custom_preference"
                 android:summary="@string/animations_summary"
                 android:title="@string/animations_title" />
 
@@ -242,10 +264,12 @@
 
             <CheckBoxPreference
                 android:key="show_unified_inbox"
+                android:layout="@layout/custom_preference"
                 android:title="@string/show_unified_inbox_title" />
 
             <CheckBoxPreference
                 android:key="show_starred_count"
+                android:layout="@layout/custom_preference"
                 android:title="@string/show_starred_count_title" />
 
         </com.fsck.k9.ui.settings.CustomPreferenceCategory>
@@ -256,6 +280,7 @@
 
             <ListPreference
                 android:dialogTitle="@string/global_settings_preview_lines_label"
+                android:layout="@layout/custom_preference"
                 android:entries="@array/preview_lines_entries"
                 android:entryValues="@array/preview_lines_values"
                 android:key="messagelist_preview_lines"
@@ -264,32 +289,38 @@
 
             <CheckBoxPreference
                 android:key="messagelist_stars"
+                android:layout="@layout/custom_preference"
                 android:summary="@string/global_settings_flag_summary"
                 android:title="@string/global_settings_flag_label" />
 
             <CheckBoxPreference
                 android:key="messagelist_show_correspondent_names"
+                android:layout="@layout/custom_preference"
                 android:summary="@string/global_settings_show_correspondent_names_summary"
                 android:title="@string/global_settings_show_correspondent_names_label" />
 
             <CheckBoxPreference
                 android:key="messagelist_sender_above_subject"
+                android:layout="@layout/custom_preference"
                 android:summary="@string/global_settings_sender_above_subject_summary"
                 android:title="@string/global_settings_sender_above_subject_label" />
 
             <CheckBoxPreference
+                android:layout="@layout/custom_preference"
                 android:dependency="messagelist_show_correspondent_names"
                 android:key="messagelist_show_contact_name"
                 android:summary="@string/global_settings_show_contact_name_summary"
                 android:title="@string/global_settings_show_contact_name_label" />
 
             <CheckBoxPreference
+                android:layout="@layout/custom_preference"
                 android:dependency="messagelist_show_contact_name"
                 android:key="messagelist_change_contact_name_color"
                 android:summary="@string/global_settings_registered_name_color_changed"
                 android:title="@string/global_settings_registered_name_color_label" />
 
             <com.takisoft.preferencex.ColorPickerPreference
+                android:layout="@layout/custom_preference"
                 android:dependency="messagelist_change_contact_name_color"
                 android:key="messagelist_contact_name_color"
                 android:title="@string/general_settings_contact_name_color_label"
@@ -297,26 +328,31 @@
 
             <CheckBoxPreference
                 android:key="messagelist_show_contact_picture"
+                android:layout="@layout/custom_preference"
                 android:summary="@string/global_settings_show_contact_picture_summary"
                 android:title="@string/global_settings_show_contact_picture_label" />
 
             <CheckBoxPreference
+                android:layout="@layout/custom_preference"
                 android:dependency="messagelist_show_contact_picture"
                 android:key="messagelist_colorize_missing_contact_pictures"
                 android:summary="@string/global_settings_colorize_missing_contact_pictures_summary"
                 android:title="@string/global_settings_colorize_missing_contact_pictures_label" />
 
             <CheckBoxPreference
+                android:layout="@layout/custom_preference"
                 android:key="messagelist_background_as_unread_indicator"
                 android:summary="@string/global_settings_background_as_unread_indicator_summary"
                 android:title="@string/global_settings_background_as_unread_indicator_label" />
 
             <CheckBoxPreference
+                android:layout="@layout/custom_preference"
                 android:key="threaded_view"
                 android:summary="@string/global_settings_threaded_view_summary"
                 android:title="@string/global_settings_threaded_view_label" />
 
             <ListPreference
+                android:layout="@layout/custom_preference"
                 android:dialogTitle="@string/global_settings_splitview_mode_label"
                 android:entries="@array/splitview_mode_entries"
                 android:entryValues="@array/splitview_mode_values"
@@ -331,11 +367,13 @@
             android:title="@string/messageview_preferences">
 
             <CheckBoxPreference
+                android:layout="@layout/custom_preference"
                 android:key="messageview_fixedwidth_font"
                 android:summary="@string/global_settings_messageview_fixedwidth_summary"
                 android:title="@string/global_settings_messageview_fixedwidth_label" />
 
             <MultiSelectListPreference
+                android:layout="@layout/custom_preference"
                 android:dialogTitle="@string/global_settings_messageview_visible_refile_actions_title"
                 android:entries="@array/messageview_visible_refile_actions_entries"
                 android:entryValues="@array/messageview_visible_refile_actions_values"
@@ -345,6 +383,7 @@
 
             <CheckBoxPreference
                 android:key="messageview_autofit_width"
+                android:layout="@layout/custom_preference"
                 android:summary="@string/global_settings_messageview_autofit_width_summary"
                 android:title="@string/global_settings_messageview_autofit_width_label" />
 
@@ -353,12 +392,14 @@
     </PreferenceScreen>
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconPreferencesInteraction"
         android:key="interaction_preferences"
         android:title="@string/interaction_preferences"
         search:ignore="true">
 
         <MultiSelectListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/volume_navigation_title"
             android:entries="@array/volume_navigation_entries"
             android:entryValues="@array/volume_navigation_values"
@@ -366,16 +407,19 @@
             android:title="@string/volume_navigation_title" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:key="messageview_return_to_list"
             android:summary="@string/global_settings_messageview_return_to_list_summary"
             android:title="@string/global_settings_messageview_return_to_list_label" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:key="messageview_show_next"
             android:summary="@string/global_settings_messageview_show_next_summary"
             android:title="@string/global_settings_messageview_show_next_label" />
 
         <MultiSelectListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/global_settings_confirm_actions_title"
             android:entries="@array/confirm_action_entries"
             android:entryValues="@array/confirm_action_values"
@@ -386,23 +430,27 @@
     </PreferenceScreen>
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconPreferencesNotifications"
         android:key="notification_preferences"
         android:title="@string/notifications_title"
         search:ignore="true">
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:key="quiet_time_enabled"
             android:summary="@string/quiet_time_description"
             android:title="@string/quiet_time" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:dependency="quiet_time_enabled"
             android:key="disable_notifications_during_quiet_time"
             android:summary="@string/quiet_time_notification_description"
             android:title="@string/quiet_time_notification" />
 
         <com.takisoft.preferencex.TimePickerPreference
+            android:layout="@layout/custom_preference"
             android:dependency="quiet_time_enabled"
             android:key="quiet_time_starts"
             android:title="@string/quiet_time_starts"
@@ -411,6 +459,7 @@
             app:pref_summaryHasTime="%s" />
 
         <com.takisoft.preferencex.TimePickerPreference
+            android:layout="@layout/custom_preference"
             android:dependency="quiet_time_enabled"
             android:key="quiet_time_ends"
             android:title="@string/quiet_time_ends"
@@ -419,6 +468,7 @@
             app:pref_summaryHasTime="%s" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/global_settings_notification_quick_delete_title"
             android:entries="@array/notification_quick_delete_entries"
             android:entryValues="@array/notification_quick_delete_values"
@@ -427,6 +477,7 @@
             android:title="@string/global_settings_notification_quick_delete_title" />
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/global_settings_lock_screen_notification_visibility_title"
             android:entries="@array/lock_screen_notification_visibility_entries"
             android:entryValues="@array/lock_screen_notification_visibility_values"
@@ -435,6 +486,7 @@
             android:title="@string/global_settings_lock_screen_notification_visibility_title" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:key="sent_sound_enabled"
             android:summary="@string/global_settings_sent_sound_summary"
             android:title="@string/global_settings_sent_sound_title" />
@@ -442,12 +494,14 @@
     </PreferenceScreen>
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconPreferencesNetwork"
         android:key="network_preferences"
         android:title="@string/network_preferences"
         search:ignore="true">
 
         <ListPreference
+            android:layout="@layout/custom_preference"
             android:dialogTitle="@string/background_ops_label"
             android:entries="@array/background_ops_entries"
             android:entryValues="@array/background_ops_values"
@@ -458,17 +512,20 @@
     </PreferenceScreen>
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconPreferencesPrivacy"
         android:key="privacy_preferences"
         android:title="@string/privacy_preferences"
         search:ignore="true">
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:key="privacy_hide_useragent"
             android:summary="@string/global_settings_privacy_hide_useragent_detail"
             android:title="@string/global_settings_privacy_hide_useragent" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:key="privacy_hide_timezone"
             android:summary="@string/global_settings_privacy_hide_timezone_detail"
             android:title="@string/global_settings_privacy_hide_timezone" />
@@ -476,17 +533,20 @@
     </PreferenceScreen>
 
     <PreferenceScreen
+        android:layout="@layout/custom_preference"
         android:icon="?attr/iconPreferencesDebug"
         android:key="debug_preferences"
         android:title="@string/debug_preferences"
         search:ignore="true">
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:key="debug_logging"
             android:summary="@string/debug_enable_debug_logging_summary"
             android:title="@string/debug_enable_debug_logging_title" />
 
         <CheckBoxPreference
+            android:layout="@layout/custom_preference"
             android:key="sensitive_logging"
             android:summary="@string/debug_enable_sensitive_logging_summary"
             android:title="@string/debug_enable_sensitive_logging_title" />
-- 
GitLab


From 389a6c24d3be9bd86867711c14ec3914c606a81f Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Fri, 6 May 2022 22:32:03 +0600
Subject: [PATCH 2/6] update drawer icons

---
 .../src/main/java/com/fsck/k9/ui/K9Drawer.kt  |  2 +-
 .../ui/managefolders/ManageFoldersActivity.kt |  6 ++++++
 .../k9/ui/onboarding/OnboardingActivity.kt    |  6 ++++++
 .../main/res/drawable/ic_alert_octagon.xml    | 20 +++++++++----------
 .../src/main/res/drawable/ic_archive.xml      | 12 +++++------
 .../res/drawable/ic_create_new_folder.xml     |  9 +++++++++
 .../main/res/drawable/ic_drafts_folder.xml    | 12 +++++------
 .../src/main/res/drawable/ic_folder.xml       | 12 +++++------
 .../legacy/src/main/res/drawable/ic_inbox.xml | 12 +++++------
 .../main/res/drawable/ic_inbox_multiple.xml   | 10 +++++-----
 .../src/main/res/drawable/ic_outbox.xml       | 16 +++++++--------
 .../legacy/src/main/res/drawable/ic_send.xml  | 12 +++++------
 .../src/main/res/drawable/ic_trash_can.xml    | 10 +++++-----
 .../src/main/res/layout/folder_list_item.xml  | 14 +++++--------
 14 files changed, 85 insertions(+), 68 deletions(-)
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_create_new_folder.xml

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
index a2976bb1c5..347dbaa2b2 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
@@ -286,7 +286,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
         sliderView.addStickyFooterItem(
             PrimaryDrawerItem().apply {
                 nameRes = R.string.folders_action
-                iconRes = folderIconProvider.iconFolderResId
+                iconRes = R.drawable.ic_create_new_folder
                 identifier = DRAWER_ID_FOLDERS
                 isSelectable = false
             }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt
index 7ee3744893..6d5edc31bf 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt
@@ -2,7 +2,11 @@ package com.fsck.k9.ui.managefolders
 
 import android.app.Activity
 import android.content.Intent
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
+import androidx.appcompat.widget.Toolbar
+import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import androidx.navigation.NavController
 import androidx.navigation.ui.AppBarConfiguration
@@ -35,6 +39,8 @@ class ManageFoldersActivity : K9Activity() {
 
         val appBarConfiguration = AppBarConfiguration(topLevelDestinationIds = emptySet())
         setupActionBarWithNavController(navController, appBarConfiguration)
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        toolbar.navigationIcon?.mutate()?.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(this, R.color.color_default_primary_text), PorterDuff.Mode.SRC_OVER)
     }
 
     override fun onSupportNavigateUp(): Boolean {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
index 00952cd438..ae0ef86780 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
@@ -2,7 +2,11 @@ package com.fsck.k9.ui.onboarding
 
 import android.app.Activity
 import android.content.Intent
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
+import androidx.appcompat.widget.Toolbar
+import androidx.core.content.ContextCompat
 import androidx.navigation.NavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupActionBarWithNavController
@@ -26,6 +30,8 @@ class OnboardingActivity : K9Activity() {
 
         navController = findNavController(R.id.nav_host_fragment)
         setupActionBarWithNavController(navController, appBarConfiguration)
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        toolbar.navigationIcon?.mutate()?.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(this, R.color.color_default_primary_text), PorterDuff.Mode.SRC_OVER)
     }
 
     override fun onSupportNavigateUp(): Boolean {
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 8896679805..c61e387d7b 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,15 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:pathData="M12.73,0H5.27L0,5.27V12.73L5.27,18H12.73L18,12.73V5.27L12.73,0ZM16,11.9L11.9,16H6.1L2,11.9V6.1L6.1,2H11.9L16,6.1V11.9Z"
-        android:fillColor="@color/default_icon_color"/>
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M15.73,3H8.27L3,8.27V15.73L8.27,21H15.73L21,15.73V8.27L15.73,3ZM19,14.9L14.9,19H9.1L5,14.9V9.1L9.1,5H14.9L19,9.1V14.9Z" />
     <path
-        android:pathData="M9,14C9.5523,14 10,13.5523 10,13C10,12.4477 9.5523,12 9,12C8.4477,12 8,12.4477 8,13C8,13.5523 8.4477,14 9,14Z"
-        android:fillColor="@color/default_icon_color"/>
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M12,17C12.5523,17 13,16.5523 13,16C13,15.4477 12.5523,15 12,15C11.4477,15 11,15.4477 11,16C11,16.5523 11.4477,17 12,17Z" />
     <path
-        android:pathData="M8,4H10V11H8V4Z"
-        android:fillColor="@color/default_icon_color"/>
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M11,7H13V14H11V7Z" />
 </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 52e4a2c3d7..27730bbc80 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_archive.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_archive.xml
@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M18,0H2C1,0 0,0.9 0,2V5.01C0,5.73 0.43,6.35 1,6.7V18C1,19.1 2.1,20 3,20H17C17.9,20 19,19.1 19,18V6.7C19.57,6.35 20,5.73 20,5.01V2C20,0.9 19,0 18,0ZM17,18H3V7H17V18ZM18,5H2V2H18V5Z" />
+        android:pathData="M20,2H4C3,2 2,2.9 2,4V7.01C2,7.73 2.43,8.35 3,8.7V20C3,21.1 4.1,22 5,22H19C19.9,22 21,21.1 21,20V8.7C21.57,8.35 22,7.73 22,7.01V4C22,2.9 21,2 20,2ZM19,20H5V9H19V20ZM20,7H4V4H20V7Z" />
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M13,10H7V12H13V10Z" />
+        android:pathData="M15,12H9V14H15V12Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_create_new_folder.xml b/app/ui/legacy/src/main/res/drawable/ic_create_new_folder.xml
new file mode 100644
index 0000000000..4131990bac
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_create_new_folder.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M20,6H12L10,4H4C2.89,4 2.01,4.89 2.01,6L2,18C2,19.11 2.89,20 4,20H20C21.11,20 22,19.11 22,18V8C22,6.89 21.11,6 20,6ZM20,18H4V6H9.17L11.17,8H20V18ZM12,14H14V16H16V14H18V12H16V10H14V12H12V14Z" />
+</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 e7da3b70ad..4b972c01ed 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="20dp"
-    android:viewportWidth="16"
-    android:viewportHeight="20">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:pathData="M10,0H2C0.9,0 0.01,0.9 0.01,2L0,18C0,19.1 0.89,20 1.99,20H14C15.1,20 16,19.1 16,18V6L10,0ZM2,18V2H9V7H14V18H2Z"
-        android:fillColor="@color/default_icon_color"/>
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M14,2H6C4.9,2 4.01,2.9 4.01,4L4,20C4,21.1 4.89,22 5.99,22H18C19.1,22 20,21.1 20,20V8L14,2ZM6,20V4H13V9H18V20H6Z" />
 </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 1f96ee0bcc..c2b0185fc7 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_folder.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_folder.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="16dp"
-    android:viewportWidth="20"
-    android:viewportHeight="16">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:pathData="M7.17,2L9.17,4H18V14H2V2H7.17ZM8,0H2C0.9,0 0.01,0.9 0.01,2L0,14C0,15.1 0.9,16 2,16H18C19.1,16 20,15.1 20,14V4C20,2.9 19.1,2 18,2H10L8,0Z"
-        android:fillColor="@color/default_icon_color"/>
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M9.17,6L11.17,8H20V18H4V6H9.17ZM10,4H4C2.9,4 2.01,4.9 2.01,6L2,18C2,19.1 2.9,20 4,20H20C21.1,20 22,19.1 22,18V8C22,6.9 21.1,6 20,6H12L10,4Z" />
 </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 f6d7df5b7c..72fa611e1d 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_inbox.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_inbox.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:pathData="M16,0H2C0.9,0 0,0.9 0,2V16C0,17.1 0.89,18 2,18H16C17.1,18 18,17.1 18,16V2C18,0.9 17.1,0 16,0ZM16,16H2V13H5.56C6.25,14.19 7.53,15 9.01,15C10.49,15 11.76,14.19 12.46,13H16V16ZM16,11H11.01C11.01,12.1 10.11,13 9.01,13C7.91,13 7.01,12.1 7.01,11H2V2H16V11Z"
-        android:fillColor="@color/default_icon_color"/>
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M19,3H5C3.9,3 3,3.9 3,5V19C3,20.1 3.89,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3ZM19,19H5V16H8.56C9.25,17.19 10.53,18 12.01,18C13.49,18 14.76,17.19 15.46,16H19V19ZM19,14H14.01C14.01,15.1 13.11,16 12.01,16C10.91,16 10.01,15.1 10.01,14H5V5H19V14Z" />
 </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 d8e92c2082..72b2818470 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M16,0H2C0.9,0 0,0.9 0,2V9C0,10.1 0.9,11 2,11H16C17.1,11 18,10.1 18,9V2C18,0.9 17.1,0 16,0ZM16,6H12C12,7.62 10.62,9 9,9C7.38,9 6,7.62 6,6H2V2H16V6ZM12,13H18V16C18,17.1 17.1,18 16,18H2C0.9,18 0,17.1 0,16V13H6C6,14.66 7.34,16 9,16C10.66,16 12,14.66 12,13Z" />
+        android:pathData="M19,3H5C3.9,3 3,3.9 3,5V12C3,13.1 3.9,14 5,14H19C20.1,14 21,13.1 21,12V5C21,3.9 20.1,3 19,3ZM19,9H15C15,10.62 13.62,12 12,12C10.38,12 9,10.62 9,9H5V5H19V9ZM15,16H21V19C21,20.1 20.1,21 19,21H5C3.9,21 3,20.1 3,19V16H9C9,17.66 10.34,19 12,19C13.66,19 15,17.66 15,16Z" />
 </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 319f688f67..3de4e85a4f 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_outbox.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_outbox.xml
@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:pathData="M8,6.83V11H10V6.83L11.59,8.41L13,7L9,3L5,7L6.41,8.41L8,6.83Z"
-        android:fillColor="@color/default_icon_color"/>
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M11,9.83V14H13V9.83L14.59,11.41L16,10L12,6L8,10L9.41,11.41L11,9.83Z" />
     <path
-        android:pathData="M16,0H2C0.9,0 0,0.9 0,2V16C0,17.1 0.9,18 2,18H16C17.1,18 18,17.1 18,16V2C18,0.9 17.1,0 16,0ZM16,16H2V13H5.02C5.93,14.21 7.37,15 9,15C10.63,15 12.06,14.21 12.98,13H16V16ZM16,11H11.82C11.41,12.16 10.31,13 9,13C7.69,13 6.6,12.16 6.18,11H2V2H16V11Z"
-        android:fillColor="@color/default_icon_color"/>
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M19,3H5C3.9,3 3,3.9 3,5V19C3,20.1 3.9,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3ZM19,19H5V16H8.02C8.93,17.21 10.37,18 12,18C13.63,18 15.06,17.21 15.98,16H19V19ZM19,14H14.82C14.41,15.16 13.31,16 12,16C10.69,16 9.6,15.16 9.18,14H5V5H19V14Z" />
 </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 1356700783..0d6ac45f3f 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_send.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_send.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="18dp"
-    android:viewportWidth="22"
-    android:viewportHeight="18">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:pathData="M0.51,18L21.5,9L0.51,0L0.5,7L15.5,9L0.5,11L0.51,18Z"
-        android:fillColor="@color/default_icon_color"/>
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M1.51,21L22.5,12L1.51,3L1.5,10L16.5,12L1.5,14L1.51,21Z" />
 </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 4be2916631..42c5dac90c 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="14dp"
-    android:height="18dp"
-    android:viewportWidth="14"
-    android:viewportHeight="18">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M11,6V16H3V6H11ZM9.5,0H4.5L3.5,1H0V3H14V1H10.5L9.5,0ZM13,4H1V16C1,17.1 1.9,18 3,18H11C12.1,18 13,17.1 13,16V4Z" />
+        android:pathData="M6,19C6,20.1 6.9,21 8,21H16C17.1,21 18,20.1 18,19V7H6V19ZM8,9H16V19H8V9ZM15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/layout/folder_list_item.xml b/app/ui/legacy/src/main/res/layout/folder_list_item.xml
index 6a040f4359..26eeae0c85 100644
--- a/app/ui/legacy/src/main/res/layout/folder_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/folder_list_item.xml
@@ -9,27 +9,23 @@
     android:clickable="true"
     android:focusable="true"
     android:gravity="center_vertical"
-    android:minHeight="56dp"
     android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/folder_icon"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="32dp"
+        android:layout_margin="16dp"
         tools:srcCompat="@sample/folders.json/data/icon" />
 
     <TextView
         android:id="@+id/folder_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingStart="0dp"
-        android:paddingTop="12dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="12dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="@color/color_default_secondary_text"
         tools:text="@sample/folders.json/data/name" />
 
 </LinearLayout>
-- 
GitLab


From 3a7c09549ad4268db23434c1e652437debd51548 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Sat, 7 May 2022 00:58:33 +0600
Subject: [PATCH 3/6] Update recipient token style

---
 .../src/main/res/values-night/colors.xml      |  1 +
 app/k9mail/src/main/res/values/colors.xml     |  2 +
 app/k9mail/src/main/res/values/themes.xml     |  4 +-
 .../main/res/drawable/bg_recipient_token.xml  |  8 ++++
 .../src/main/res/drawable/status_dots_1.xml   | 38 +++++++++++++-----
 .../src/main/res/drawable/status_dots_2.xml   | 39 +++++++++++++-----
 .../src/main/res/drawable/status_dots_3.xml   | 40 ++++++++++++++-----
 .../main/res/layout/recipient_token_item.xml  |  6 +--
 8 files changed, 100 insertions(+), 38 deletions(-)
 create mode 100644 app/ui/legacy/src/main/res/drawable/bg_recipient_token.xml

diff --git a/app/k9mail/src/main/res/values-night/colors.xml b/app/k9mail/src/main/res/values-night/colors.xml
index 2359a8b483..8b7b4c3e09 100644
--- a/app/k9mail/src/main/res/values-night/colors.xml
+++ b/app/k9mail/src/main/res/values-night/colors.xml
@@ -8,4 +8,5 @@
     <color name="color_default_ternary_text">#61FFFFFF</color>
 
     <color name="color_dialog_backgronund">#383838</color>
+    <color name="color_contact_token_background">#4b4b4b</color>
 </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
index 124892b99a..5588940801 100644
--- a/app/k9mail/src/main/res/values/colors.xml
+++ b/app/k9mail/src/main/res/values/colors.xml
@@ -16,4 +16,6 @@
     <color name="color_message_list_unread_background">#DCDCDC</color>
     <color name="color_message_list_thread_count_background">#61000000</color>
     <color name="color_dialog_backgronund">@android:color/white</color>
+
+    <color name="color_contact_token_background">#ededed</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 3c0e96ed7c..ed3629eba0 100644
--- a/app/k9mail/src/main/res/values/themes.xml
+++ b/app/k9mail/src/main/res/values/themes.xml
@@ -113,7 +113,7 @@
         <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>
         <item name="attachmentCardBackground">@color/color_default_foreground</item>
         <item name="contactPictureFallbackDefaultBackgroundColor">#ffababab</item>
-        <item name="contactTokenBackgroundColor">#ccc</item>
+        <item name="contactTokenBackgroundColor">@color/color_contact_token_background</item>
         <item name="composerBackgroundColor">@android:color/background_light</item>
         <item name="tintColorBulletPointPositive">#77aa22</item>
         <item name="tintColorBulletPointNegative">#dd2222</item>
@@ -239,7 +239,7 @@
         <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>
         <item name="attachmentCardBackground">@color/color_default_foreground</item>
         <item name="contactPictureFallbackDefaultBackgroundColor">#ffababab</item>
-        <item name="contactTokenBackgroundColor">#ccc</item>
+        <item name="contactTokenBackgroundColor">@color/color_contact_token_background</item>
         <item name="composerBackgroundColor">@android:color/background_light</item>
         <item name="tintColorBulletPointPositive">#77aa22</item>
         <item name="tintColorBulletPointNegative">#dd2222</item>
diff --git a/app/ui/legacy/src/main/res/drawable/bg_recipient_token.xml b/app/ui/legacy/src/main/res/drawable/bg_recipient_token.xml
new file mode 100644
index 0000000000..ec48cf744f
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/bg_recipient_token.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:topRightRadius="40dp"
+        android:bottomRightRadius="40dp"/>
+
+    <solid android:color="@color/color_contact_token_background"/>
+</shape>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/drawable/status_dots_1.xml b/app/ui/legacy/src/main/res/drawable/status_dots_1.xml
index b4cf0d065a..b553cf42b8 100644
--- a/app/ui/legacy/src/main/res/drawable/status_dots_1.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_dots_1.xml
@@ -1,15 +1,31 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="49.999996" android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#000000"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="24dp"
+    android:viewportWidth="49.999996"
+    android:viewportHeight="100.0">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M25,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillColor="#00000000"
+        android:strokeWidth="5"
+        android:strokeAlpha="1"
+        android:strokeColor="@color/default_icon_color"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="@android:color/transparent"
         android:pathData="M25,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillColor="#00000000"
+        android:strokeWidth="5"
+        android:strokeAlpha="1"
+        android:strokeColor="@color/default_icon_color"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="@android:color/transparent"
         android:pathData="M25,15.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+        android:strokeWidth="5"
+        android:strokeAlpha="1"
+        android:strokeColor="@color/default_icon_color"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/status_dots_2.xml b/app/ui/legacy/src/main/res/drawable/status_dots_2.xml
index ebb4133cd8..cbf242a05d 100644
--- a/app/ui/legacy/src/main/res/drawable/status_dots_2.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_dots_2.xml
@@ -1,15 +1,32 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="49.999996" android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#000000"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="24dp"
+    android:viewportWidth="49.999996"
+    android:viewportHeight="100.0">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M25,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:strokeWidth="5"
+        android:strokeAlpha="1"
+        android:strokeColor="@color/default_icon_color"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M25,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillColor="#00000000"
+        android:strokeWidth="5"
+        android:strokeAlpha="1"
+        android:strokeColor="@color/default_icon_color"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="@android:color/transparent"
         android:pathData="M25,15.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+        android:strokeWidth="5"
+        android:strokeAlpha="1"
+        android:strokeColor="@color/default_icon_color"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/status_dots_3.xml b/app/ui/legacy/src/main/res/drawable/status_dots_3.xml
index fe2e3915d1..cd7c8bf712 100644
--- a/app/ui/legacy/src/main/res/drawable/status_dots_3.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_dots_3.xml
@@ -1,15 +1,33 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="49.999996" android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#000000"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="24dp"
+    android:viewportWidth="49.999996"
+    android:viewportHeight="100.0">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M25,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:strokeWidth="5"
+        android:strokeAlpha="1"
+        android:strokeColor="@color/default_icon_color"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M25,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:strokeWidth="5"
+        android:strokeAlpha="1"
+        android:strokeColor="@color/default_icon_color"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M25,15.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+        android:strokeWidth="5"
+        android:strokeAlpha="1"
+        android:strokeColor="@color/default_icon_color"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
 </vector>
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 8e1791be5b..ebb43ce237 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
@@ -9,7 +9,7 @@
         android:id="@+id/background"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?attr/contactTokenBackgroundColor"
+        android:background="@drawable/bg_recipient_token"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/background_position_helper"
@@ -49,8 +49,8 @@
         android:paddingEnd="14dp"
         android:paddingBottom="4dp"
         android:textAppearance="@android:style/TextAppearance.Medium"
-        android:textSize="15sp"
-        android:textColor="@android:color/black"
+        android:textSize="16sp"
+        android:textColor="@color/color_default_primary_text"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/contact_photo"
         app:layout_constraintTop_toTopOf="parent"
-- 
GitLab


From 52390c05d147b577db19856ba2027634a1b0964c Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Sat, 7 May 2022 16:14:01 +0600
Subject: [PATCH 4/6] Update drawer style

---
 app/k9mail/src/main/res/values/colors.xml     |  2 +-
 app/k9mail/src/main/res/values/themes.xml     |  1 +
 .../base/src/main/res/values-night/colors.xml |  2 +
 app/ui/base/src/main/res/values/colors.xml    |  3 +
 .../src/main/java/com/fsck/k9/ui/K9Drawer.kt  | 36 ++++----
 .../account/AccountFallbackImageProvider.kt   | 14 +---
 .../fsck/k9/ui/account/AccountImageLoader.kt  |  4 +-
 .../k9/ui/account/AccountImageModelLoader.kt  |  3 +-
 .../main/res/drawable/header_background.xml   |  2 +-
 .../main/res/drawable/ic_alert_octagon.xml    | 37 ++++----
 .../res/drawable/ic_alert_octagon_default.xml | 16 ++++
 .../drawable/ic_alert_octagon_selected.xml    | 16 ++++
 .../src/main/res/drawable/ic_archive.xml      | 34 +++++---
 .../main/res/drawable/ic_archive_default.xml  | 13 +++
 .../main/res/drawable/ic_archive_selected.xml | 13 +++
 .../src/main/res/drawable/ic_avatar.xml       | 22 +++++
 .../main/res/drawable/ic_avatar_default.xml   | 12 +++
 .../main/res/drawable/ic_avatar_selected.xml  | 12 +++
 .../main/res/drawable/ic_drafts_folder.xml    | 31 +++++--
 .../res/drawable/ic_drafts_folder_default.xml | 10 +++
 .../drawable/ic_drafts_folder_selected.xml    | 10 +++
 .../src/main/res/drawable/ic_folder.xml       | 31 +++++--
 .../main/res/drawable/ic_folder_default.xml   | 10 +++
 .../main/res/drawable/ic_folder_selected.xml  | 10 +++
 .../legacy/src/main/res/drawable/ic_inbox.xml | 31 +++++--
 .../main/res/drawable/ic_inbox_default.xml    | 10 +++
 .../main/res/drawable/ic_inbox_multiple.xml   | 31 +++++--
 .../drawable/ic_inbox_multiple_default.xml    | 10 +++
 .../drawable/ic_inbox_multiple_selected.xml   | 10 +++
 .../main/res/drawable/ic_inbox_selected.xml   | 10 +++
 .../src/main/res/drawable/ic_magnify.xml      | 11 ++-
 .../res/drawable/ic_messagelist_answered.xml  |  3 +-
 .../ic_messagelist_answered_forwarded.xml     | 11 +--
 .../res/drawable/ic_messagelist_forwarded.xml |  3 +-
 .../src/main/res/drawable/ic_outbox.xml       | 34 +++++---
 .../main/res/drawable/ic_outbox_default.xml   | 13 +++
 .../main/res/drawable/ic_outbox_selected.xml  | 13 +++
 .../legacy/src/main/res/drawable/ic_send.xml  | 31 +++++--
 .../src/main/res/drawable/ic_send_default.xml | 10 +++
 .../main/res/drawable/ic_send_selected.xml    | 10 +++
 .../src/main/res/drawable/ic_trash_can.xml    | 31 +++++--
 .../res/drawable/ic_trash_can_default.xml     | 10 +++
 .../res/drawable/ic_trash_can_selected.xml    | 10 +++
 .../res/layout/custom_profile_drawer_item.xml | 56 ++++++-------
 .../res/layout/drawer_folder_list_item.xml    | 42 +++++-----
 .../res/layout/drawer_footer_list_item.xml    | 84 +++++++++++++++++++
 .../src/main/res/values-night/colors.xml      |  3 +
 app/ui/legacy/src/main/res/values/colors.xml  |  6 +-
 app/ui/legacy/src/main/res/values/styles.xml  | 12 +--
 49 files changed, 628 insertions(+), 211 deletions(-)
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_alert_octagon_default.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_alert_octagon_selected.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_archive_default.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_archive_selected.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_avatar.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_avatar_default.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_avatar_selected.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_drafts_folder_default.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_drafts_folder_selected.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_folder_default.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_folder_selected.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_inbox_default.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_default.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_selected.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_inbox_selected.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_outbox_default.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_outbox_selected.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_send_default.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_send_selected.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_trash_can_default.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_trash_can_selected.xml
 create mode 100644 app/ui/legacy/src/main/res/layout/drawer_footer_list_item.xml

diff --git a/app/k9mail/src/main/res/values/colors.xml b/app/k9mail/src/main/res/values/colors.xml
index 5588940801..43d0c5328d 100644
--- a/app/k9mail/src/main/res/values/colors.xml
+++ b/app/k9mail/src/main/res/values/colors.xml
@@ -8,7 +8,7 @@
     <color name="color_default_primary_text">#DE000000</color>
     <color name="color_default_secondary_text">#99000000</color>
     <color name="color_default_ternary_text">#61000000</color>
-    <color name="color_default_divider">@lineageos.platform:color/color_default_divider</color>
+    <color name="color_default_divider">#14212121</color>
     <color name="color_default_gray1">@lineageos.platform:color/color_default_gray1</color>
     <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
 
diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml
index ed3629eba0..6331080f77 100644
--- a/app/k9mail/src/main/res/values/themes.xml
+++ b/app/k9mail/src/main/res/values/themes.xml
@@ -28,6 +28,7 @@
         <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="android:textColorTertiary">@color/color_default_ternary_text</item>
         <item name="android:textCursorDrawable">@drawable/edittext_cursor</item>
         <item name="android:alertDialogTheme">@style/Theme.k9.Dialog.Base</item>
 
diff --git a/app/ui/base/src/main/res/values-night/colors.xml b/app/ui/base/src/main/res/values-night/colors.xml
index 8c640e934b..21a589d687 100644
--- a/app/ui/base/src/main/res/values-night/colors.xml
+++ b/app/ui/base/src/main/res/values-night/colors.xml
@@ -4,4 +4,6 @@
     <color name="color_default_primary_text">#DEFFFFFF</color>
     <color name="color_default_secondary_text">#99FFFFFF</color>
     <color name="color_default_ternary_text">#61FFFFFF</color>
+    <color name="color_avatar_background">#474747</color>
+    <color name="color_avatar_foreground">#cfcfcf</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
index 9ade74ba47..a3f3f560ac 100644
--- a/app/ui/base/src/main/res/values/colors.xml
+++ b/app/ui/base/src/main/res/values/colors.xml
@@ -11,4 +11,7 @@
     <color name="color_default_primary_text">#DE000000</color>
     <color name="color_default_secondary_text">#99000000</color>
     <color name="color_default_ternary_text">#61000000</color>
+
+    <color name="color_avatar_background">#ededed</color>
+    <color name="color_avatar_foreground">#3e3e3e</color>
 </resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
index 347dbaa2b2..fcda8c1925 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
@@ -8,13 +8,9 @@ import android.net.Uri
 import android.os.Bundle
 import android.util.TypedValue
 import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.Toast
 import androidx.annotation.LayoutRes
-import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
-import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -57,7 +53,6 @@ import com.mikepenz.materialdrawer.util.getDrawerItem
 import com.mikepenz.materialdrawer.util.removeAllItems
 import com.mikepenz.materialdrawer.widget.AccountHeaderView
 import com.mikepenz.materialdrawer.widget.MaterialDrawerSliderView
-import java.util.ArrayList
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
@@ -284,7 +279,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
 
     private fun addFooterItems() {
         sliderView.addStickyFooterItem(
-            PrimaryDrawerItem().apply {
+            FooterDrawerItem().apply {
                 nameRes = R.string.folders_action
                 iconRes = R.drawable.ic_create_new_folder
                 identifier = DRAWER_ID_FOLDERS
@@ -293,7 +288,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
         )
 
         sliderView.addStickyFooterItem(
-            PrimaryDrawerItem().apply {
+            FooterDrawerItem().apply {
                 nameRes = R.string.preferences_action
                 iconRes = getResId(R.attr.iconActionSettings)
                 identifier = DRAWER_ID_PREFERENCES
@@ -372,14 +367,8 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
         }
 
         folderList.unifiedInbox?.let { unifiedInbox ->
-            val unwrappedDrawable =
-                AppCompatResources.getDrawable(parent.applicationContext, R.drawable.ic_inbox_multiple)
-            val wrappedSelectedDrawable = DrawableCompat.wrap(unwrappedDrawable!!)
-            DrawableCompat.setTintList(wrappedSelectedDrawable, selectedTextColor)
-
             val unifiedInboxItem = FolderDrawerItem().apply {
-                iconRes = R.drawable.ic_inbox_multiple //getResId(R.attr.iconUnifiedInbox)
-                selectedIcon = ImageHolder(wrappedSelectedDrawable)
+                iconRes = R.drawable.ic_inbox_multiple
                 identifier = DRAWER_ID_UNIFIED_INBOX
                 nameRes = R.string.integrated_inbox_title
                 selectedColorInt = selectedBackgroundColor
@@ -404,14 +393,8 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
             val folder = displayFolder.folder
             val drawerId = accountOffset + folder.id
 
-            val iconId = folderIconProvider.getFolderIcon(folder.type)
-            val unwrappedDrawable = AppCompatResources.getDrawable(parent.applicationContext, iconId)
-            val wrappedSelectedDrawable = DrawableCompat.wrap(unwrappedDrawable!!)
-            DrawableCompat.setTintList(wrappedSelectedDrawable, selectedTextColor)
-
             val drawerItem = FolderDrawerItem().apply {
-                iconRes = iconId
-                selectedIcon = ImageHolder(wrappedSelectedDrawable)
+                iconRes = folderIconProvider.getFolderIcon(folder.type)
                 identifier = drawerId
                 tag = folder
                 nameText = getFolderDisplayName(folder)
@@ -581,6 +564,17 @@ private class FolderDrawerItem : PrimaryDrawerItem() {
     override val layoutRes: Int = R.layout.drawer_folder_list_item
 }
 
+private class FooterDrawerItem : PrimaryDrawerItem() {
+    override val layoutRes: Int = R.layout.drawer_footer_list_item
+
+    override fun bindView(holder: ViewHolder, payloads: List<Any>) {
+        super.bindView(holder, payloads)
+        if (!isSelected) {
+            holder.itemView.setBackgroundColor(ContextCompat.getColor(holder.itemView.context, R.color.color_drawer_header_background))
+        }
+    }
+}
+
 private class CustomProfileDrawerItem : ProfileDrawerItem() {
     override val layoutRes: Int
         @LayoutRes
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountFallbackImageProvider.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountFallbackImageProvider.kt
index 53abd77c97..b062667633 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountFallbackImageProvider.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountFallbackImageProvider.kt
@@ -2,24 +2,14 @@ package com.fsck.k9.ui.account
 
 import android.content.Context
 import android.graphics.drawable.Drawable
+import androidx.core.content.ContextCompat
 import com.fsck.k9.ui.R
-import com.mikepenz.iconics.IconicsDrawable
-import com.mikepenz.iconics.typeface.library.fontawesome.FontAwesome
-import com.mikepenz.iconics.utils.backgroundColorRes
-import com.mikepenz.iconics.utils.colorInt
-import com.mikepenz.iconics.utils.paddingDp
-import com.mikepenz.iconics.utils.sizeDp
 
 /**
  * Provides a [Drawable] for the account using the account's color as background color.
  */
 class AccountFallbackImageProvider(private val context: Context) {
     fun getDrawable(color: Int): Drawable {
-        return IconicsDrawable(context, FontAwesome.Icon.faw_user_alt).apply {
-            colorInt = color
-            backgroundColorRes = R.color.material_drawer_profile_icon
-            sizeDp = 56
-            paddingDp = 12
-        }
+        return ContextCompat.getDrawable(context, R.drawable.ic_avatar)!!
     }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt
index 58f7d747cf..432d867e78 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.widget.ImageView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.fsck.k9.ui.R
 import com.fsck.k9.ui.helper.findActivity
 
 /**
@@ -14,8 +15,9 @@ class AccountImageLoader(private val accountFallbackImageProvider: AccountFallba
         imageView.context.ifNotDestroyed { context ->
             Glide.with(context)
                 .load(AccountImage(email, color))
-                .placeholder(accountFallbackImageProvider.getDrawable(color))
+                .placeholder(R.drawable.ic_avatar)
                 .diskCacheStrategy(DiskCacheStrategy.NONE)
+                .fallback(R.drawable.ic_avatar)
                 .dontAnimate()
                 .into(imageView)
         }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt
index 4bc81b4910..7f2a0b0960 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt
@@ -58,8 +58,7 @@ internal class AccountImageDataFetcher(
     private val accountImage: AccountImage
 ) : DataFetcher<Bitmap> {
     override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in Bitmap>) {
-        val bitmap = loadAccountImage() ?: createFallbackBitmap()
-        callback.onDataReady(bitmap)
+        callback.onDataReady(loadAccountImage())
     }
 
     private fun loadAccountImage(): Bitmap? {
diff --git a/app/ui/legacy/src/main/res/drawable/header_background.xml b/app/ui/legacy/src/main/res/drawable/header_background.xml
index a85d95e6a7..d93ad4eaf3 100644
--- a/app/ui/legacy/src/main/res/drawable/header_background.xml
+++ b/app/ui/legacy/src/main/res/drawable/header_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="@color/color_default_foreground" />
+    <solid android:color="@color/color_drawer_header_background" />
 
 </shape>
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 c61e387d7b..ddab9f180b 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,15 +1,22 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M15.73,3H8.27L3,8.27V15.73L8.27,21H15.73L21,15.73V8.27L15.73,3ZM19,14.9L14.9,19H9.1L5,14.9V9.1L9.1,5H14.9L19,9.1V14.9Z" />
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M12,17C12.5523,17 13,16.5523 13,16C13,15.4477 12.5523,15 12,15C11.4477,15 11,15.4477 11,16C11,16.5523 11.4477,17 12,17Z" />
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M11,7H13V14H11V7Z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@drawable/ic_alert_octagon_selected" />
+    <item android:drawable="@drawable/ic_alert_octagon_default" />
+</selector>
+
diff --git a/app/ui/legacy/src/main/res/drawable/ic_alert_octagon_default.xml b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon_default.xml
new file mode 100644
index 0000000000..5f7932dc83
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon_default.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M15.73,3H8.27L3,8.27V15.73L8.27,21H15.73L21,15.73V8.27L15.73,3ZM19,14.9L14.9,19H9.1L5,14.9V9.1L9.1,5H14.9L19,9.1V14.9Z" />
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M12,17C12.5523,17 13,16.5523 13,16C13,15.4477 12.5523,15 12,15C11.4477,15 11,15.4477 11,16C11,16.5523 11.4477,17 12,17Z" />
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M11,7H13V14H11V7Z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_alert_octagon_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon_selected.xml
new file mode 100644
index 0000000000..aaf9a8d03f
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon_selected.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M15.73,3H8.27L3,8.27V15.73L8.27,21H15.73L21,15.73V8.27L15.73,3ZM19,14.9L14.9,19H9.1L5,14.9V9.1L9.1,5H14.9L19,9.1V14.9Z" />
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M12,17C12.5523,17 13,16.5523 13,16C13,15.4477 12.5523,15 12,15C11.4477,15 11,15.4477 11,16C11,16.5523 11.4477,17 12,17Z" />
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M11,7H13V14H11V7Z" />
+</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 27730bbc80..eb0734213b 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_archive.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_archive.xml
@@ -1,12 +1,22 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M20,2H4C3,2 2,2.9 2,4V7.01C2,7.73 2.43,8.35 3,8.7V20C3,21.1 4.1,22 5,22H19C19.9,22 21,21.1 21,20V8.7C21.57,8.35 22,7.73 22,7.01V4C22,2.9 21,2 20,2ZM19,20H5V9H19V20ZM20,7H4V4H20V7Z" />
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M15,12H9V14H15V12Z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@drawable/ic_archive_selected" />
+    <item android:drawable="@drawable/ic_archive_default" />
+</selector>
+
diff --git a/app/ui/legacy/src/main/res/drawable/ic_archive_default.xml b/app/ui/legacy/src/main/res/drawable/ic_archive_default.xml
new file mode 100644
index 0000000000..2084e35242
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_archive_default.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M20,2H4C3,2 2,2.9 2,4V7.01C2,7.73 2.43,8.35 3,8.7V20C3,21.1 4.1,22 5,22H19C19.9,22 21,21.1 21,20V8.7C21.57,8.35 22,7.73 22,7.01V4C22,2.9 21,2 20,2ZM19,20H5V9H19V20ZM20,7H4V4H20V7Z" />
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M15,12H9V14H15V12Z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_archive_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_archive_selected.xml
new file mode 100644
index 0000000000..3b34679f15
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_archive_selected.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M20,2H4C3,2 2,2.9 2,4V7.01C2,7.73 2.43,8.35 3,8.7V20C3,21.1 4.1,22 5,22H19C19.9,22 21,21.1 21,20V8.7C21.57,8.35 22,7.73 22,7.01V4C22,2.9 21,2 20,2ZM19,20H5V9H19V20ZM20,7H4V4H20V7Z" />
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M15,12H9V14H15V12Z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_avatar.xml b/app/ui/legacy/src/main/res/drawable/ic_avatar.xml
new file mode 100644
index 0000000000..b29e9254a6
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_avatar.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@drawable/ic_avatar_selected" />
+    <item android:drawable="@drawable/ic_avatar_default" />
+</selector>
+
diff --git a/app/ui/legacy/src/main/res/drawable/ic_avatar_default.xml b/app/ui/legacy/src/main/res/drawable/ic_avatar_default.xml
new file mode 100644
index 0000000000..00b7012ec7
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_avatar_default.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="59dp"
+    android:height="59dp"
+    android:viewportWidth="59"
+    android:viewportHeight="59">
+    <path
+        android:fillColor="@color/color_avatar_background"
+        android:pathData="M29.5,29.5m-29.5,0a29.5,29.5 0,1 1,59 0a29.5,29.5 0,1 1,-59 0" />
+    <path
+        android:fillColor="@color/color_avatar_foreground"
+        android:pathData="M29.0002,28.9999C31.9468,28.9999 34.3335,26.6133 34.3335,23.6666C34.3335,20.7199 31.9468,18.3333 29.0002,18.3333C26.0535,18.3333 23.6668,20.7199 23.6668,23.6666C23.6668,26.6133 26.0535,28.9999 29.0002,28.9999ZM29.0002,31.6666C25.4402,31.6666 18.3335,33.4533 18.3335,36.9999V39.6666H39.6668V36.9999C39.6668,33.4533 32.5602,31.6666 29.0002,31.6666Z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_avatar_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_avatar_selected.xml
new file mode 100644
index 0000000000..778ad75b55
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_avatar_selected.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="59dp"
+    android:height="59dp"
+    android:viewportWidth="59"
+    android:viewportHeight="59">
+    <path
+        android:fillColor="@color/color_avatar_background"
+        android:pathData="M29.5,29.5m-29.5,0a29.5,29.5 0,1 1,59 0a29.5,29.5 0,1 1,-59 0" />
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M29.0002,28.9999C31.9468,28.9999 34.3335,26.6133 34.3335,23.6666C34.3335,20.7199 31.9468,18.3333 29.0002,18.3333C26.0535,18.3333 23.6668,20.7199 23.6668,23.6666C23.6668,26.6133 26.0535,28.9999 29.0002,28.9999ZM29.0002,31.6666C25.4402,31.6666 18.3335,33.4533 18.3335,36.9999V39.6666H39.6668V36.9999C39.6668,33.4533 32.5602,31.6666 29.0002,31.6666Z" />
+</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 4b972c01ed..f2614bdacc 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml
@@ -1,9 +1,22 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M14,2H6C4.9,2 4.01,2.9 4.01,4L4,20C4,21.1 4.89,22 5.99,22H18C19.1,22 20,21.1 20,20V8L14,2ZM6,20V4H13V9H18V20H6Z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@drawable/ic_drafts_folder_selected" />
+    <item android:drawable="@drawable/ic_drafts_folder_default" />
+</selector>
+
diff --git a/app/ui/legacy/src/main/res/drawable/ic_drafts_folder_default.xml b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder_default.xml
new file mode 100644
index 0000000000..6c1178307a
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder_default.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M14,2H6C4.9,2 4.01,2.9 4.01,4L4,20C4,21.1 4.89,22 5.99,22H18C19.1,22 20,21.1 20,20V8L14,2ZM6,20V4H13V9H18V20H6Z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_drafts_folder_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder_selected.xml
new file mode 100644
index 0000000000..ca41f8bdb3
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder_selected.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M14,2H6C4.9,2 4.01,2.9 4.01,4L4,20C4,21.1 4.89,22 5.99,22H18C19.1,22 20,21.1 20,20V8L14,2ZM6,20V4H13V9H18V20H6Z" />
+</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 c2b0185fc7..141e8f9b85 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_folder.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_folder.xml
@@ -1,9 +1,22 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M9.17,6L11.17,8H20V18H4V6H9.17ZM10,4H4C2.9,4 2.01,4.9 2.01,6L2,18C2,19.1 2.9,20 4,20H20C21.1,20 22,19.1 22,18V8C22,6.9 21.1,6 20,6H12L10,4Z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@drawable/ic_folder_selected" />
+    <item android:drawable="@drawable/ic_folder_default" />
+</selector>
+
diff --git a/app/ui/legacy/src/main/res/drawable/ic_folder_default.xml b/app/ui/legacy/src/main/res/drawable/ic_folder_default.xml
new file mode 100644
index 0000000000..cb5006c23f
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_folder_default.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M9.17,6L11.17,8H20V18H4V6H9.17ZM10,4H4C2.9,4 2.01,4.9 2.01,6L2,18C2,19.1 2.9,20 4,20H20C21.1,20 22,19.1 22,18V8C22,6.9 21.1,6 20,6H12L10,4Z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_folder_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_folder_selected.xml
new file mode 100644
index 0000000000..fdbddef93f
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_folder_selected.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M9.17,6L11.17,8H20V18H4V6H9.17ZM10,4H4C2.9,4 2.01,4.9 2.01,6L2,18C2,19.1 2.9,20 4,20H20C21.1,20 22,19.1 22,18V8C22,6.9 21.1,6 20,6H12L10,4Z" />
+</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 72fa611e1d..0f0f29095e 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_inbox.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_inbox.xml
@@ -1,9 +1,22 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M19,3H5C3.9,3 3,3.9 3,5V19C3,20.1 3.89,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3ZM19,19H5V16H8.56C9.25,17.19 10.53,18 12.01,18C13.49,18 14.76,17.19 15.46,16H19V19ZM19,14H14.01C14.01,15.1 13.11,16 12.01,16C10.91,16 10.01,15.1 10.01,14H5V5H19V14Z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@drawable/ic_inbox_selected" />
+    <item android:drawable="@drawable/ic_inbox_default" />
+</selector>
+
diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox_default.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox_default.xml
new file mode 100644
index 0000000000..680c06eaaa
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_inbox_default.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M19,3H5C3.9,3 3,3.9 3,5V19C3,20.1 3.89,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3ZM19,19H5V16H8.56C9.25,17.19 10.53,18 12.01,18C13.49,18 14.76,17.19 15.46,16H19V19ZM19,14H14.01C14.01,15.1 13.11,16 12.01,16C10.91,16 10.01,15.1 10.01,14H5V5H19V14Z" />
+</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 72b2818470..a683471598 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml
@@ -1,9 +1,22 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M19,3H5C3.9,3 3,3.9 3,5V12C3,13.1 3.9,14 5,14H19C20.1,14 21,13.1 21,12V5C21,3.9 20.1,3 19,3ZM19,9H15C15,10.62 13.62,12 12,12C10.38,12 9,10.62 9,9H5V5H19V9ZM15,16H21V19C21,20.1 20.1,21 19,21H5C3.9,21 3,20.1 3,19V16H9C9,17.66 10.34,19 12,19C13.66,19 15,17.66 15,16Z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@drawable/ic_inbox_multiple_selected" />
+    <item android:drawable="@drawable/ic_inbox_multiple_default" />
+</selector>
+
diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_default.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_default.xml
new file mode 100644
index 0000000000..b66dd11feb
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_default.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M19,3H5C3.9,3 3,3.9 3,5V12C3,13.1 3.9,14 5,14H19C20.1,14 21,13.1 21,12V5C21,3.9 20.1,3 19,3ZM19,9H15C15,10.62 13.62,12 12,12C10.38,12 9,10.62 9,9H5V5H19V9ZM15,16H21V19C21,20.1 20.1,21 19,21H5C3.9,21 3,20.1 3,19V16H9C9,17.66 10.34,19 12,19C13.66,19 15,17.66 15,16Z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_selected.xml
new file mode 100644
index 0000000000..1ea1517e26
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_selected.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M19,3H5C3.9,3 3,3.9 3,5V12C3,13.1 3.9,14 5,14H19C20.1,14 21,13.1 21,12V5C21,3.9 20.1,3 19,3ZM19,9H15C15,10.62 13.62,12 12,12C10.38,12 9,10.62 9,9H5V5H19V9ZM15,16H21V19C21,20.1 20.1,21 19,21H5C3.9,21 3,20.1 3,19V16H9C9,17.66 10.34,19 12,19C13.66,19 15,17.66 15,16Z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox_selected.xml
new file mode 100644
index 0000000000..4e8acb824c
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_inbox_selected.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M19,3H5C3.9,3 3,3.9 3,5V19C3,20.1 3.89,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3ZM19,19H5V16H8.56C9.25,17.19 10.53,18 12.01,18C13.49,18 14.76,17.19 15.46,16H19V19ZM19,14H14.01C14.01,15.1 13.11,16 12.01,16C10.91,16 10.01,15.1 10.01,14H5V5H19V14Z" />
+</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 5e56103f62..4d3494f6c8 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="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M12.7549,11.2549H11.9649L11.6849,10.9849C12.6649,9.8449 13.2549,8.3649 13.2549,6.7549C13.2549,3.1649 10.3449,0.2549 6.7549,0.2549C3.1649,0.2549 0.2549,3.1649 0.2549,6.7549C0.2549,10.3449 3.1649,13.2549 6.7549,13.2549C8.3649,13.2549 9.8449,12.6649 10.9849,11.6849L11.2549,11.9649V12.7549L16.2549,17.7449L17.7449,16.2549L12.7549,11.2549ZM6.7549,11.2549C4.2649,11.2549 2.2549,9.2449 2.2549,6.7549C2.2549,4.2649 4.2649,2.2549 6.7549,2.2549C9.2449,2.2549 11.2549,4.2649 11.2549,6.7549C11.2549,9.2449 9.2449,11.2549 6.7549,11.2549Z" />
+        android:pathData="M15.7549,14.2549H14.9649L14.6849,13.9849C15.6649,12.8449 16.2549,11.3649 16.2549,9.7549C16.2549,6.1649 13.3449,3.2549 9.7549,3.2549C6.1649,3.2549 3.2549,6.1649 3.2549,9.7549C3.2549,13.3449 6.1649,16.2549 9.7549,16.2549C11.3649,16.2549 12.8449,15.6649 13.9849,14.6849L14.2549,14.9649V15.7549L19.2549,20.7449L20.7449,19.2549L15.7549,14.2549ZM9.7549,14.2549C7.2649,14.2549 5.2549,12.2449 5.2549,9.7549C5.2549,7.2649 7.2649,5.2549 9.7549,5.2549C12.2449,5.2549 14.2549,7.2649 14.2549,9.7549C14.2549,12.2449 12.2449,14.2549 9.7549,14.2549Z" />
 </vector>
-
diff --git a/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered.xml b/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered.xml
index 979cfb2057..df3550a0ab 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/messageListStateIconTint"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M3,12 L10,19 L10,15 C17,14,20,9,21,4 C18.5,7.5,15,9.1,10,9.1 L10,5 Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered_forwarded.xml b/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered_forwarded.xml
index a50305bd08..89af3f5917 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered_forwarded.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered_forwarded.xml
@@ -2,15 +2,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/messageListStateIconTint"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M8.20553,7.94632 L14.2687,14.0095 L14.2687,10.5448 C20.3319,9.67866,22.9304,5.3478,23.7966,1.01695 C21.6312,4.04855,18.5996,5.43442,14.2687,5.43442 L14.2687,1.88312 Z"
-        android:strokeWidth="0.866171" />
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M8.20553,7.94632 L14.2687,14.0095 L14.2687,10.5448 C20.3319,9.67866,22.9304,5.3478,23.7966,1.01695 C21.6312,4.04855,18.5996,5.43442,14.2687,5.43442 L14.2687,1.88312 Z" />
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M15.6928,17.3127 L9.62958,23.3759 L9.62958,19.9112 C3.56638,19.0451,0.967866,14.7142,0.101695,10.3833 C2.26712,13.4149,5.29872,14.8008,9.62958,14.8008 L9.62958,11.2495 Z"
-        android:strokeWidth="0.866171" />
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M15.6928,17.3127 L9.62958,23.3759 L9.62958,19.9112 C3.56638,19.0451,0.967866,14.7142,0.101695,10.3833 C2.26712,13.4149,5.29872,14.8008,9.62958,14.8008 L9.62958,11.2495 Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_messagelist_forwarded.xml b/app/ui/legacy/src/main/res/drawable/ic_messagelist_forwarded.xml
index 93d28c9d1f..49a489e788 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_messagelist_forwarded.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_messagelist_forwarded.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/messageListStateIconTint"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M21,12 L14,19 L14,15 C7,14,4,9,3,4 C5.5,7.5,9,9.1,14,9.1 L14,5 Z" />
 </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 3de4e85a4f..8c4fbb6069 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_outbox.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_outbox.xml
@@ -1,12 +1,22 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M11,9.83V14H13V9.83L14.59,11.41L16,10L12,6L8,10L9.41,11.41L11,9.83Z" />
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M19,3H5C3.9,3 3,3.9 3,5V19C3,20.1 3.9,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3ZM19,19H5V16H8.02C8.93,17.21 10.37,18 12,18C13.63,18 15.06,17.21 15.98,16H19V19ZM19,14H14.82C14.41,15.16 13.31,16 12,16C10.69,16 9.6,15.16 9.18,14H5V5H19V14Z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@drawable/ic_outbox_selected" />
+    <item android:drawable="@drawable/ic_outbox_default" />
+</selector>
+
diff --git a/app/ui/legacy/src/main/res/drawable/ic_outbox_default.xml b/app/ui/legacy/src/main/res/drawable/ic_outbox_default.xml
new file mode 100644
index 0000000000..d618ab2d64
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_outbox_default.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M11,9.83V14H13V9.83L14.59,11.41L16,10L12,6L8,10L9.41,11.41L11,9.83Z" />
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M19,3H5C3.9,3 3,3.9 3,5V19C3,20.1 3.9,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3ZM19,19H5V16H8.02C8.93,17.21 10.37,18 12,18C13.63,18 15.06,17.21 15.98,16H19V19ZM19,14H14.82C14.41,15.16 13.31,16 12,16C10.69,16 9.6,15.16 9.18,14H5V5H19V14Z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_outbox_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_outbox_selected.xml
new file mode 100644
index 0000000000..d912cc5b49
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_outbox_selected.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M11,9.83V14H13V9.83L14.59,11.41L16,10L12,6L8,10L9.41,11.41L11,9.83Z" />
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M19,3H5C3.9,3 3,3.9 3,5V19C3,20.1 3.9,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3ZM19,19H5V16H8.02C8.93,17.21 10.37,18 12,18C13.63,18 15.06,17.21 15.98,16H19V19ZM19,14H14.82C14.41,15.16 13.31,16 12,16C10.69,16 9.6,15.16 9.18,14H5V5H19V14Z" />
+</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 0d6ac45f3f..ab27bb5a82 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_send.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_send.xml
@@ -1,9 +1,22 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M1.51,21L22.5,12L1.51,3L1.5,10L16.5,12L1.5,14L1.51,21Z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@drawable/ic_send_selected" />
+    <item android:drawable="@drawable/ic_send_default" />
+</selector>
+
diff --git a/app/ui/legacy/src/main/res/drawable/ic_send_default.xml b/app/ui/legacy/src/main/res/drawable/ic_send_default.xml
new file mode 100644
index 0000000000..1b6a78dc86
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_send_default.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M1.51,21L22.5,12L1.51,3L1.5,10L16.5,12L1.5,14L1.51,21Z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_send_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_send_selected.xml
new file mode 100644
index 0000000000..f124280c10
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_send_selected.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M1.51,21L22.5,12L1.51,3L1.5,10L16.5,12L1.5,14L1.51,21Z" />
+</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 42c5dac90c..099900dbc0 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml
@@ -1,9 +1,22 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M6,19C6,20.1 6.9,21 8,21H16C17.1,21 18,20.1 18,19V7H6V19ZM8,9H16V19H8V9ZM15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@drawable/ic_trash_can_selected" />
+    <item android:drawable="@drawable/ic_trash_can_default" />
+</selector>
+
diff --git a/app/ui/legacy/src/main/res/drawable/ic_trash_can_default.xml b/app/ui/legacy/src/main/res/drawable/ic_trash_can_default.xml
new file mode 100644
index 0000000000..53866c3e29
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_trash_can_default.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M6,19C6,20.1 6.9,21 8,21H16C17.1,21 18,20.1 18,19V7H6V19ZM8,9H16V19H8V9ZM15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_trash_can_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_trash_can_selected.xml
new file mode 100644
index 0000000000..4b4530cc9a
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_trash_can_selected.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M6,19C6,20.1 6.9,21 8,21H16C17.1,21 18,20.1 18,19V7H6V19ZM8,9H16V19H8V9ZM15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml b/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml
index d2f5c98ebb..78143be23d 100644
--- a/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml
+++ b/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml
@@ -3,23 +3,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/material_drawer_item_profile"
+    android:layout_height="65dp"
     android:clipChildren="false"
-    android:clipToPadding="false"
-    android:paddingStart="@dimen/material_drawer_vertical_padding"
-    android:paddingLeft="@dimen/material_drawer_vertical_padding"
-    android:paddingEnd="@dimen/material_drawer_vertical_padding"
-    android:paddingRight="@dimen/material_drawer_vertical_padding">
+    android:clipToPadding="false">
+
 
     <com.mikepenz.materialdrawer.view.BezelImageView
         android:id="@+id/material_drawer_profileIcon"
         style="@style/BezelImageView"
-        android:layout_width="@dimen/material_drawer_item_profile_icon"
-        android:layout_height="@dimen/material_drawer_item_profile_icon"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginEnd="@dimen/material_drawer_item_profile_icon_padding_right"
-        android:layout_marginRight="@dimen/material_drawer_item_profile_icon_padding_right"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_margin="16dp"
         android:clickable="false"
         android:elevation="1dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -30,18 +24,19 @@
         android:id="@+id/material_drawer_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/material_drawer_padding"
-        android:layout_marginLeft="@dimen/material_drawer_padding"
-        android:fontFamily="sans-serif-medium"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
         android:gravity="center_vertical|start"
         android:lines="1"
         android:paddingStart="0dp"
         android:paddingLeft="0dp"
-        android:paddingEnd="@dimen/material_drawer_item_primary_icon_padding_right"
-        android:paddingRight="@dimen/material_drawer_item_primary_icon_padding_right"
+        android:paddingEnd="16dp"
+        android:paddingRight="16dp"
         android:singleLine="true"
         android:textDirection="anyRtl"
         android:textSize="@dimen/material_drawer_item_profile_text"
+        android:textColor="@color/color_default_secondary_text"
+        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/material_drawer_email"
         app:layout_constraintEnd_toStartOf="@+id/material_drawer_barrier"
         app:layout_constraintStart_toEndOf="@id/material_drawer_profileIcon"
@@ -53,20 +48,19 @@
         android:id="@+id/material_drawer_email"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/material_drawer_padding"
-        android:layout_marginLeft="@dimen/material_drawer_padding"
-        android:layout_marginEnd="0dp"
-        android:layout_marginRight="0dp"
-        android:fontFamily="sans-serif"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
         android:gravity="center_vertical|start"
         android:lines="1"
         android:paddingStart="0dp"
         android:paddingLeft="0dp"
-        android:paddingEnd="@dimen/material_drawer_item_primary_icon_padding_right"
-        android:paddingRight="@dimen/material_drawer_item_primary_icon_padding_right"
+        android:paddingEnd="16dp"
+        android:paddingRight="16dp"
         android:singleLine="true"
         android:textDirection="anyRtl"
-        android:textSize="@dimen/material_drawer_item_profile_description"
+        android:textSize="12dp"
+        android:textColor="@color/color_default_secondary_text"
+        android:textStyle="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/material_drawer_barrier"
         app:layout_constraintStart_toEndOf="@id/material_drawer_profileIcon"
@@ -84,18 +78,18 @@
         android:id="@+id/material_drawer_badge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/material_drawer_padding"
-        android:layout_marginLeft="@dimen/material_drawer_padding"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:fontFamily="sans-serif"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
         android:gravity="center"
         android:lines="1"
-        android:minWidth="20dp"
         android:paddingLeft="1dp"
         android:paddingRight="1dp"
         android:singleLine="true"
         android:textSize="@dimen/material_drawer_item_primary_text"
+        android:textColor="@color/color_default_secondary_text"
+        android:textStyle="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/material_drawer_barrier"
diff --git a/app/ui/legacy/src/main/res/layout/drawer_folder_list_item.xml b/app/ui/legacy/src/main/res/layout/drawer_folder_list_item.xml
index fc3b5b4d78..05536ca302 100644
--- a/app/ui/legacy/src/main/res/layout/drawer_folder_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/drawer_folder_list_item.xml
@@ -3,21 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/material_drawer_item_primary"
-    android:paddingStart="@dimen/material_drawer_vertical_padding"
-    android:paddingLeft="@dimen/material_drawer_vertical_padding"
-    android:paddingEnd="@dimen/material_drawer_vertical_padding"
-    android:paddingRight="@dimen/material_drawer_vertical_padding">
+    android:layout_height="48dp">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/material_drawer_icon"
-        android:layout_width="@dimen/material_drawer_item_primary_icon"
-        android:layout_height="@dimen/material_drawer_item_primary"
-        android:paddingStart="0dp"
-        android:paddingTop="@dimen/material_drawer_item_primary_icon_padding"
-        android:paddingEnd="@dimen/material_drawer_item_primary_icon_padding_right"
-        android:paddingBottom="@dimen/material_drawer_item_primary_icon_padding"
-        android:layout_marginStart="@dimen/material_drawer_vertical_padding"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_margin="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -26,13 +18,15 @@
         android:id="@+id/material_drawer_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:fontFamily="sans-serif-medium"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="16dp"
         android:gravity="center_vertical|start"
         android:singleLine="true"
         android:ellipsize="middle"
         android:textDirection="anyRtl"
-        android:textSize="@dimen/material_drawer_item_primary_text"
+        android:textSize="14sp"
+        android:textColor="@color/color_default_secondary_text"
+        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/material_drawer_description"
         app:layout_constraintEnd_toStartOf="@+id/material_drawer_barrier"
         app:layout_constraintStart_toEndOf="@id/material_drawer_icon"
@@ -44,13 +38,15 @@
         android:id="@+id/material_drawer_description"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:fontFamily="sans-serif"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="16dp"
         android:gravity="center_vertical|start"
         android:lines="1"
         android:singleLine="true"
         android:textDirection="anyRtl"
-        android:textSize="@dimen/material_drawer_item_primary_description"
+        android:textSize="12sp"
+        android:textColor="@color/color_default_secondary_text"
+        android:textStyle="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/material_drawer_barrier"
         app:layout_constraintStart_toEndOf="@id/material_drawer_icon"
@@ -68,16 +64,16 @@
         android:id="@+id/material_drawer_badge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/material_drawer_padding"
-        android:layout_marginEnd="@dimen/material_drawer_vertical_padding"
-        android:fontFamily="sans-serif"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="20dp"
         android:gravity="center"
         android:lines="1"
-        android:minWidth="20dp"
         android:paddingLeft="1dp"
         android:paddingRight="1dp"
         android:singleLine="true"
-        android:textSize="@dimen/material_drawer_item_primary_text"
+        android:textSize="14sp"
+        android:textColor="@color/color_default_secondary_text"
+        android:textStyle="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/material_drawer_barrier"
diff --git a/app/ui/legacy/src/main/res/layout/drawer_footer_list_item.xml b/app/ui/legacy/src/main/res/layout/drawer_footer_list_item.xml
new file mode 100644
index 0000000000..04e7693379
--- /dev/null
+++ b/app/ui/legacy/src/main/res/layout/drawer_footer_list_item.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="48dp">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/material_drawer_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/material_drawer_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="16dp"
+        android:gravity="center_vertical|start"
+        android:singleLine="true"
+        android:ellipsize="middle"
+        android:textDirection="anyRtl"
+        android:textSize="14sp"
+        android:textColor="@color/color_default_secondary_text"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@id/material_drawer_description"
+        app:layout_constraintEnd_toStartOf="@+id/material_drawer_barrier"
+        app:layout_constraintStart_toEndOf="@id/material_drawer_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="Some drawer text" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/material_drawer_description"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="16dp"
+        android:gravity="center_vertical|start"
+        android:lines="1"
+        android:singleLine="true"
+        android:textDirection="anyRtl"
+        android:textSize="12sp"
+        android:textColor="@color/color_default_secondary_text"
+        android:textStyle="normal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/material_drawer_barrier"
+        app:layout_constraintStart_toEndOf="@id/material_drawer_icon"
+        app:layout_constraintTop_toBottomOf="@id/material_drawer_name"
+        tools:text="Some drawer text" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/material_drawer_barrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="start"
+        app:constraint_referenced_ids="material_drawer_badge" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/material_drawer_badge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="20dp"
+        android:gravity="center"
+        android:lines="1"
+        android:paddingLeft="1dp"
+        android:paddingRight="1dp"
+        android:singleLine="true"
+        android:textSize="14sp"
+        android:textColor="@color/color_default_secondary_text"
+        android:textStyle="normal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/material_drawer_barrier"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="99" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/ui/legacy/src/main/res/values-night/colors.xml b/app/ui/legacy/src/main/res/values-night/colors.xml
index e7c803a100..f154cb310e 100644
--- a/app/ui/legacy/src/main/res/values-night/colors.xml
+++ b/app/ui/legacy/src/main/res/values-night/colors.xml
@@ -8,4 +8,7 @@
     <color name="color_compose_divider">#6BFFFFFF</color>
     <color name="color_message_compose_common_divider">#14FFFFFF</color>
     <color name="color_quote_background">#2e2e2e</color>
+
+    <color name="color_drawer_background">#363636</color>
+    <color name="color_drawer_header_background">#2e2e2e</color>
 </resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/values/colors.xml b/app/ui/legacy/src/main/res/values/colors.xml
index a188c107bd..23c9fd51fe 100644
--- a/app/ui/legacy/src/main/res/values/colors.xml
+++ b/app/ui/legacy/src/main/res/values/colors.xml
@@ -26,14 +26,14 @@
     <color name="color_default_primary_text">#DE000000</color>
     <color name="color_default_secondary_text">#99000000</color>
     <color name="color_default_ternary_text">#61000000</color>
-    <color name="color_default_divider">@lineageos.platform:color/color_default_divider</color>
+    <color name="color_default_divider">#14212121</color>
     <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
 
     <color name="color_compose_divider">#6B212121</color>
     <color name="color_message_compose_common_divider">#14212121</color>
     <color name="color_quote_background">#f5f5f5</color>
 
-    <color name="color_drawer_background">@lineageos.platform:color/color_default_background</color>
-
+    <color name="color_drawer_background">#fafafa</color>
     <color name="color_drawer_selected_background">#145DB2FF</color>
+    <color name="color_drawer_header_background">@android:color/white</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 6d95f97556..3b5be0586e 100644
--- a/app/ui/legacy/src/main/res/values/styles.xml
+++ b/app/ui/legacy/src/main/res/values/styles.xml
@@ -54,11 +54,11 @@
 
     <style name="Widget.MaterialDrawerStyle.K9" parent="Widget.MaterialDrawerStyle">
         <item name="materialDrawerBackground">@color/color_drawer_background</item>
-        <item name="materialDrawerPrimaryText">?android:textColorPrimary</item>
-        <item name="materialDrawerPrimaryIcon">?android:textColorSecondary</item>
-        <item name="materialDrawerSecondaryText">?android:textColorSecondary</item>
-        <item name="materialDrawerSecondaryIcon">?android:textColorSecondary</item>
-        <item name="materialDrawerSelectedBackgroundColor">?colorAccent</item>
+        <item name="materialDrawerPrimaryText">@color/color_default_secondary_text</item>
+        <item name="materialDrawerPrimaryIcon">@color/default_icon_color</item>
+        <item name="materialDrawerSecondaryText">@color/color_default_secondary_text</item>
+        <item name="materialDrawerSecondaryIcon">@color/default_icon_color</item>
+        <item name="materialDrawerSelectedBackgroundColor">@color/color_default_accent</item>
     </style>
 
     <style name="Widget.MaterialDrawerStyle.K9.Light" parent="Widget.MaterialDrawerStyle.K9">
@@ -74,7 +74,7 @@
     <style name="Widget.MaterialDrawerHeaderStyle.K9">
         <item name="materialDrawerCompactStyle">false</item>
         <item name="materialDrawerHeaderSelectionText">@color/color_default_primary_text</item>
-        <item name="materialDrawerHeaderSelectionSubtext">@color/color_default_secondary_text</item>
+        <item name="materialDrawerHeaderSelectionSubtext">@color/color_default_ternary_text</item>
     </style>
 
     <style name="Widget.MaterialDrawerHeaderStyle.K9.Light" parent="Widget.MaterialDrawerHeaderStyle.K9">
-- 
GitLab


From 9e112943d7657b21d4baa0c81d7c80396a185eac Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Sat, 7 May 2022 19:04:14 +0600
Subject: [PATCH 5/6] Update mail details page ui according to mock up

---
 app/ui/base/src/main/res/values/colors.xml    |   2 +
 .../fsck/k9/contacts/ContactPictureLoader.kt  |   6 +-
 .../fsck/k9/fragment/MessageListAdapter.kt    |   2 +-
 .../java/com/fsck/k9/view/MessageHeader.java  |   5 +-
 .../src/main/res/drawable/btn_check_star.xml  |   4 +-
 .../main/res/drawable/ic_contact_picture.xml  |  15 ---
 .../legacy/src/main/res/drawable/ic_star.xml  |   2 +-
 .../src/main/res/drawable/ic_star_24dp.xml    |   9 ++
 .../src/main/res/drawable/ic_star_border.xml  |   2 +-
 .../main/res/drawable/ic_star_border_24dp.xml |   9 ++
 .../res/drawable/status_lock_disabled.xml     |  21 ++--
 .../src/main/res/layout/message_list_item.xml |   2 +-
 .../main/res/layout/message_view_header.xml   | 112 ++++++++----------
 .../res/layout/recipient_alternate_item.xml   |   2 +-
 .../res/layout/recipient_dropdown_item.xml    |   2 +-
 .../main/res/layout/recipient_token_item.xml  |   2 +-
 16 files changed, 97 insertions(+), 100 deletions(-)
 delete mode 100644 app/ui/legacy/src/main/res/drawable/ic_contact_picture.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_star_24dp.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_star_border_24dp.xml

diff --git a/app/ui/base/src/main/res/values/colors.xml b/app/ui/base/src/main/res/values/colors.xml
index a3f3f560ac..5b0ddc7556 100644
--- a/app/ui/base/src/main/res/values/colors.xml
+++ b/app/ui/base/src/main/res/values/colors.xml
@@ -14,4 +14,6 @@
 
     <color name="color_avatar_background">#ededed</color>
     <color name="color_avatar_foreground">#3e3e3e</color>
+
+    <color name="color_star_fill">#FFC300</color>
 </resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt
index 7204b21f0b..edcbc1d83a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt
@@ -41,8 +41,8 @@ class ContactPictureLoader(
     private fun setContactPicture(imageView: ImageView, contactPictureUri: Uri) {
         Glide.with(imageView.context)
             .load(contactPictureUri)
-            .placeholder(R.drawable.ic_contact_picture)
-            .error(R.drawable.ic_contact_picture)
+            .placeholder(R.drawable.ic_avatar)
+            .error(R.drawable.ic_avatar)
             .diskCacheStrategy(DiskCacheStrategy.NONE)
             .dontAnimate()
             .into(imageView)
@@ -72,7 +72,7 @@ class ContactPictureLoader(
         return Glide.with(context)
             .asBitmap()
             .load(contactPictureUri)
-            .error(R.drawable.ic_contact_picture)
+            .error(R.drawable.ic_avatar)
             .diskCacheStrategy(DiskCacheStrategy.NONE)
             .dontAnimate()
             .submit(pictureSizeInPx, pictureSizeInPx)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt
index e07b709cf2..5e2b12d760 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt
@@ -235,7 +235,7 @@ class MessageListAdapter internal constructor(
         if (displayAddress != null) {
             contactsPictureLoader.setContactPicture(contactPictureView, displayAddress)
         } else {
-            contactPictureView.setImageResource(R.drawable.ic_contact_picture)
+            contactPictureView.setImageResource(R.drawable.ic_avatar)
         }
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java
index 47c384edfa..dfa67c4737 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java
@@ -265,7 +265,7 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo
                 mContactBadge.setContact(fromAddress);
                 mContactsPictureLoader.setContactPicture(mContactBadge, fromAddress);
             } else {
-                mContactBadge.setImageResource(R.drawable.ic_contact_picture);
+                mContactBadge.setImageResource(R.drawable.ic_avatar);
             }
         }
 
@@ -327,8 +327,7 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo
 
     private void updateAddressField(TextView v, CharSequence text, View label) {
         boolean hasText = !TextUtils.isEmpty(text);
-
-        v.setText(text);
+        v.setText(text + " ");
         v.setVisibility(hasText ? View.VISIBLE : View.GONE);
         label.setVisibility(hasText ? View.VISIBLE : View.GONE);
     }
diff --git a/app/ui/legacy/src/main/res/drawable/btn_check_star.xml b/app/ui/legacy/src/main/res/drawable/btn_check_star.xml
index c8444f6dcc..17ef137a4c 100644
--- a/app/ui/legacy/src/main/res/drawable/btn_check_star.xml
+++ b/app/ui/legacy/src/main/res/drawable/btn_check_star.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:drawable="@drawable/ic_star" />
-    <item android:state_checked="false" android:drawable="@drawable/ic_star_border" />
+    <item android:state_checked="true" android:drawable="@drawable/ic_star_24dp" />
+    <item android:state_checked="false" android:drawable="@drawable/ic_star_border_24dp" />
 </selector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_contact_picture.xml b/app/ui/legacy/src/main/res/drawable/ic_contact_picture.xml
deleted file mode 100644
index 1bc2a71d37..0000000000
--- a/app/ui/legacy/src/main/res/drawable/ic_contact_picture.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-
-    <path
-        android:fillColor="#FF9E9E9E"
-        android:pathData="M 0,0 L 24,0 25,24 0,24 z"/>
-
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="m 12,12 c 1.72,0 3.12,-1.39 3.12,-3.12 0,-1.72 -1.39,-3.12 -3.12,-3.12 -1.72,0 -3.12,1.39 -3.12,3.12 C 8.88,10.61 10.28,12 12,12 Z m 0,1.56 c -2.08,0 -6.23,1.04 -6.23,3.12 v 1.56 H 18.23 v -1.56 c 0,-2.07 -4.15,-3.12 -6.23,-3.12 z"/>
-
-</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_star.xml b/app/ui/legacy/src/main/res/drawable/ic_star.xml
index c879c6d16a..7298cfc357 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_star.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_star.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
     <path
-        android:fillColor="#FFC300"
+        android:fillColor="@color/color_star_fill"
         android:pathData="M7.9999,11.8467L12.1199,14.3334L11.0266,9.6468L14.6666,6.4934L9.8733,6.0868L7.9999,1.6667L6.1266,6.0868L1.3333,6.4934L4.9732,9.6468L3.8799,14.3334L7.9999,11.8467Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_star_24dp.xml b/app/ui/legacy/src/main/res/drawable/ic_star_24dp.xml
new file mode 100644
index 0000000000..647b76b588
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_star_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="@color/color_star_fill"
+        android:pathData="M7.9999,11.8467L12.1199,14.3334L11.0266,9.6468L14.6666,6.4934L9.8733,6.0868L7.9999,1.6667L6.1266,6.0868L1.3333,6.4934L4.9732,9.6468L3.8799,14.3334L7.9999,11.8467Z" />
+</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 34a32a725f..09d146b3ae 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
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
+        android:pathData="M22,9.74L14.81,9.12L12,2.5L9.19,9.13L2,9.74L7.46,14.47L5.82,21.5L12,17.77L18.18,21.5L16.55,14.47L22,9.74ZM12,15.9L8.24,18.17L9.24,13.89L5.92,11.01L10.3,10.63L12,6.6L13.71,10.64L18.09,11.02L14.77,13.9L15.77,18.18L12,15.9Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/ic_star_border_24dp.xml b/app/ui/legacy/src/main/res/drawable/ic_star_border_24dp.xml
new file mode 100644
index 0000000000..16e8aa3caf
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_star_border_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_default_ternary_text"
+        android:pathData="M22,9.74L14.81,9.12L12,2.5L9.19,9.13L2,9.74L7.46,14.47L5.82,21.5L12,17.77L18.18,21.5L16.55,14.47L22,9.74ZM12,15.9L8.24,18.17L9.24,13.89L5.92,11.01L10.3,10.63L12,6.6L13.71,10.64L18.09,11.02L14.77,13.9L15.77,18.18L12,15.9Z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml b/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml
index c07500d1db..0f7777f6ca 100644
--- a/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml
@@ -1,10 +1,15 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000"
-        android:pathData="M50.48,-0.16C39.1,-0.16 28.58,5.44 23.69,15.47L34.51,26.48C35.67,18.09 41.43,11.78 50.18,11.78C59.92,11.78 66.09,18.74 66.09,29.69L66.1,45.13L52.83,45.13L90.18,83.16L90.18,54.56C90.18,46.11 81.73,45.13 81.5,45.13L79.58,45.13L79.58,29.48C79.48,10.28 66.39,-0.16 50.48,-0.16zM20.8,27.68C20.79,28.27 20.78,28.87 20.8,29.48L20.79,45.11C20.79,45.11 21.02,45.13 19.82,45.13C18.55,45.13 10.19,46.61 10.19,54.07L10.19,89.89C10.19,97.85 19.6,99.84 19.82,99.84L81.03,99.84C81.19,99.84 85.92,99.3 88.51,95.59L38.2,45.13L34.26,45.13L34.27,41.19L20.8,27.68z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillAlpha="1" android:fillColor="#000000"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="100.0"
+    android:viewportHeight="100.0">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M50.48,-0.16C39.1,-0.16 28.58,5.44 23.69,15.47L34.51,26.48C35.67,18.09 41.43,11.78 50.18,11.78C59.92,11.78 66.09,18.74 66.09,29.69L66.1,45.13L52.83,45.13L90.18,83.16L90.18,54.56C90.18,46.11 81.73,45.13 81.5,45.13L79.58,45.13L79.58,29.48C79.48,10.28 66.39,-0.16 50.48,-0.16zM20.8,27.68C20.79,28.27 20.78,28.87 20.8,29.48L20.79,45.11C20.79,45.11 21.02,45.13 19.82,45.13C18.55,45.13 10.19,46.61 10.19,54.07L10.19,89.89C10.19,97.85 19.6,99.84 19.82,99.84L81.03,99.84C81.19,99.84 85.92,99.3 88.51,95.59L38.2,45.13L34.26,45.13L34.27,41.19L20.8,27.68z" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="@color/default_icon_color"
         android:pathData="m9.99,20.47 l4.79,-4.41 79.06,80.48 -4.01,4.01z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/layout/message_list_item.xml b/app/ui/legacy/src/main/res/layout/message_list_item.xml
index 06c96b3356..1463baf15e 100644
--- a/app/ui/legacy/src/main/res/layout/message_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/message_list_item.xml
@@ -23,7 +23,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@android:color/transparent"
-            tools:src="@drawable/ic_contact_picture" />
+            tools:src="@drawable/ic_avatar" />
 
         <ImageView
             android:id="@+id/selected"
diff --git a/app/ui/legacy/src/main/res/layout/message_view_header.xml b/app/ui/legacy/src/main/res/layout/message_view_header.xml
index 4c822cf73d..3ef5dd447b 100644
--- a/app/ui/legacy/src/main/res/layout/message_view_header.xml
+++ b/app/ui/legacy/src/main/res/layout/message_view_header.xml
@@ -30,33 +30,32 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:padding="8dp"
-                >
+                android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/subject"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:layout_marginTop="4dp"
+                    android:layout_marginTop="13dp"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="28dp"
                     android:layout_marginBottom="4dp"
                     android:ellipsize="end"
                     android:maxLines="3"
                     android:textColor="?android:attr/textColorPrimary"
+                    android:textSize="16sp"
                     android:textAppearance="@style/TextAppearance.K9.MediumSmall"
-                    tools:text="(no subject)"
-                    />
+                    tools:text="(no subject)" />
 
                 <ImageView
                     android:id="@+id/crypto_status_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:padding="6dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginTop="13dp"
                     app:srcCompat="@drawable/status_lock_disabled"
-                    app:tint="?attr/openpgp_grey"
-                    android:background="?selectableItemBackground"
                     android:visibility="gone"
                     />
 
@@ -65,32 +64,33 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginTop="13dp"
                     android:focusable="false"
                     android:checked="false"
-                    style="@style/MessageStarStyle"
-                    android:buttonTint="@color/star_color"
-                    />
+                    style="@style/MessageStarStyle" />
 
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="23dp"
                 android:orientation="horizontal" >
 
 
                 <RelativeLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginStart="8dp"
                     android:orientation="vertical" >
 
                     <com.fsck.k9.ui.ContactBadge
                         android:id="@+id/contact_badge"
                         android:layout_width="40dp"
                         android:layout_height="40dp"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginTop="8dp"
-                        tools:src="@drawable/ic_contact_picture"/>
+                        tools:src="@drawable/ic_avatar" />
 
                     <!-- State icons -->
                     <LinearLayout
@@ -126,8 +126,7 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="6dip"
-                    android:layout_marginStart="2dp" >
+                    android:layout_marginStart="8dp" >
 
                     <!-- From -->
                     <TextView
@@ -136,15 +135,10 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentTop="true"
                         android:layout_alignParentStart="true"
-                        android:layout_toStartOf="@+id/status_icon_strip"
-                        android:layout_alignBottom="@+id/status_icon_strip"
-                        android:paddingTop="0dp"
-                        android:paddingStart="0dp"
-                        android:paddingEnd="6dp"
                         android:singleLine="true"
                         android:ellipsize="end"
+                        android:textSize="16sp"
                         android:textColor="?android:attr/textColorPrimary"
-                        android:textAppearance="@style/TextAppearance.K9.MediumSmall"
                         android:textStyle="bold"
                         android:text="@string/general_no_sender"
                         android:gravity="center_vertical"
@@ -157,12 +151,11 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentStart="true"
                         android:layout_toStartOf="@+id/status_icon_strip"
-                        android:paddingTop="0dp"
                         android:layout_below="@+id/from"
+                        android:textSize="14sp"
                         android:ellipsize="end"
-                        android:textColor="?android:attr/textColorPrimary"
-                        android:textAppearance="@style/TextAppearance.K9.Small"
-                        android:textStyle="bold"
+                        android:textColor="?android:attr/textColorSecondary"
+                        android:textStyle="normal"
                         android:visibility="gone"
                         android:gravity="center_vertical"
                         />
@@ -174,25 +167,23 @@
                         android:layout_height="wrap_content"
                         android:layout_alignStart="@+id/from"
                         android:layout_alignBaseline="@+id/to"
-                        android:paddingTop="2dp"
-                        android:paddingStart="0dp"
-                        android:paddingEnd="4dp"
                         android:text="@string/message_to_label"
-                        android:textColor="?android:attr/textColorPrimary"
-                        android:textAppearance="@style/TextAppearance.K9.MediumSmall"
-                        android:textStyle="bold" />
+                        android:paddingEnd="4dp"
+                        android:textSize="14sp"
+                        android:textColor="?android:attr/textColorSecondary"
+                        android:textStyle="normal" />
 
                     <TextView
                         android:id="@+id/to"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_toEndOf="@+id/to_label"
                         android:layout_below="@+id/sender"
-                        android:maxLines="2"
+                        android:layout_toEndOf="@+id/to_label"
                         android:ellipsize="end"
-                        android:paddingTop="2dp"
+                        android:maxLines="2"
                         android:textColor="?android:attr/textColorSecondary"
-                        android:textAppearance="@style/TextAppearance.K9.MediumSmall" />
+                        android:textSize="14sp"
+                        android:textStyle="normal" />
                     
                     <!-- CC -->
                     <TextView
@@ -202,13 +193,11 @@
                         android:layout_below="@+id/to_label"
                         android:layout_alignStart="@+id/to_label"
                         android:layout_alignBaseline="@+id/cc"
-                        android:paddingTop="2dp"
-                        android:paddingStart="0dp"
-                        android:paddingEnd="4dp"
                         android:text="@string/message_view_cc_label"
-                        android:textColor="?android:attr/textColorPrimary"
-                        android:textStyle="bold"
-                        android:textAppearance="@style/TextAppearance.K9.MediumSmall" />
+                        android:paddingEnd="4dp"
+                        android:textSize="14sp"
+                        android:textColor="?android:attr/textColorSecondary"
+                        android:textStyle="normal" />
                     
                     <TextView
                         android:id="@+id/cc"
@@ -218,9 +207,9 @@
                         android:layout_below="@+id/to"
                         android:maxLines="2"
                         android:ellipsize="end"
-                        android:paddingTop="2dp"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textAppearance="@style/TextAppearance.K9.MediumSmall" />
+                        android:textSize="14sp"
+                        android:textStyle="normal"
+                        android:textColor="?android:attr/textColorSecondary" />
 
                     <!-- BCC -->
                     <TextView
@@ -230,13 +219,11 @@
                         android:layout_below="@+id/cc_label"
                         android:layout_alignStart="@+id/cc_label"
                         android:layout_alignBaseline="@+id/bcc"
-                        android:paddingTop="2dp"
-                        android:paddingStart="0dp"
                         android:paddingEnd="4dp"
                         android:text="@string/message_view_bcc_label"
-                        android:textColor="?android:attr/textColorPrimary"
-                        android:textStyle="bold"
-                        android:textAppearance="@style/TextAppearance.K9.MediumSmall" />
+                        android:textSize="14sp"
+                        android:textColor="?android:attr/textColorSecondary"
+                        android:textStyle="normal" />
 
                     <TextView
                         android:id="@+id/bcc"
@@ -246,9 +233,9 @@
                         android:layout_below="@+id/cc"
                         android:maxLines="2"
                         android:ellipsize="end"
-                        android:paddingTop="2dp"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textAppearance="@style/TextAppearance.K9.MediumSmall" />
+                        android:textSize="14sp"
+                        android:textStyle="normal"
+                        android:textColor="?android:attr/textColorSecondary" />
                     
                     <!-- Date -->
                     <TextView
@@ -257,11 +244,12 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@id/bcc"
                         android:layout_alignParentEnd="true"
-                        android:paddingTop="8dp"
+                        android:layout_marginEnd="8dp"
                         android:singleLine="true"
                         android:ellipsize="none"
-                        android:textAppearance="@style/TextAppearance.K9.Small"
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textSize="12sp"
+                        android:textStyle="normal"
+                        android:textColor="?android:attr/textColorTertiary" />
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -269,8 +257,7 @@
                         android:layout_alignParentTop="true"
                         android:layout_alignParentEnd="true"
                         android:layout_centerVertical="true"
-                        android:id="@+id/status_icon_strip"
-                        >
+                        android:id="@+id/status_icon_strip">
 
                         <ImageView
                             android:id="@+id/icon_single_message_options"
@@ -293,9 +280,10 @@
     </LinearLayout>
 
     <View
-        android:layout_height="1dip"
+        android:layout_height="1dp"
         android:layout_width="match_parent"
-        android:layout_marginBottom="4dip"
-        android:background="@drawable/divider_horizontal_email" />
+        android:layout_marginTop="9dp"
+        android:layout_marginBottom="13dp"
+        android:background="@color/color_default_divider" />
 
 </com.fsck.k9.view.MessageHeader>
diff --git a/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml b/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml
index 19d183f287..0daf7d03ed 100644
--- a/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml
+++ b/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml
@@ -23,7 +23,7 @@
             android:layout_marginLeft="12dp"
             android:layout_marginRight="12dp"
             android:id="@+id/alternate_contact_photo"
-            tools:src="@drawable/ic_contact_picture"
+            tools:src="@drawable/ic_avatar"
             />
 
         <LinearLayout
diff --git a/app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml b/app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml
index 9863ac463f..e4547c5c1d 100644
--- a/app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml
+++ b/app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml
@@ -13,7 +13,7 @@
         android:layout_height="36dp"
         android:layout_marginStart="12dp"
         android:id="@+id/contact_photo"
-        tools:src="@drawable/ic_contact_picture"
+        tools:src="@drawable/ic_avatar"
         />
 
     <LinearLayout
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 ebb43ce237..b7367c271f 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
@@ -25,7 +25,7 @@
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@android:id/text1"
-        tools:src="@drawable/ic_contact_picture" />
+        tools:src="@drawable/ic_avatar" />
 
     <View
         android:id="@+id/background_position_helper"
-- 
GitLab


From 5ef8450c1b94a241edb6a891cd549ebd640d4ede Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Sun, 8 May 2022 00:40:02 +0600
Subject: [PATCH 6/6] Remove accountChip bar from messageListItem

---
 .../main/java/com/fsck/k9/fragment/MessageListAdapter.kt  | 8 --------
 app/ui/legacy/src/main/res/layout/message_list_item.xml   | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt
index 5e2b12d760..b09882b3c5 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt
@@ -111,8 +111,6 @@ class MessageListAdapter internal constructor(
         view.findViewById<View>(R.id.contact_picture_container).isVisible = appearance.showContactPicture
         holder.contactPicture.setOnClickListener(contactPictureClickListener)
 
-        holder.chip.isVisible = appearance.showAccountChip
-
         appearance.fontSizes.setViewTextSize(holder.subject, subjectViewFontSize)
 
         appearance.fontSizes.setViewTextSize(holder.date, appearance.fontSizes.messageListDate)
@@ -158,12 +156,6 @@ class MessageListAdapter internal constructor(
             val displayThreadCount = if (appearance.showingThreadedList) threadCount else 0
             val subject = MlfUtils.buildSubject(subject, res.getString(R.string.general_no_subject), displayThreadCount)
 
-            if (appearance.showAccountChip) {
-                val accountChipDrawable = holder.chip.drawable.mutate()
-                DrawableCompat.setTint(accountChipDrawable, account.chipColor)
-                holder.chip.setImageDrawable(accountChipDrawable)
-            }
-
             if (appearance.stars) {
                 holder.flagged.isVisible = isStarred
             } else {
diff --git a/app/ui/legacy/src/main/res/layout/message_list_item.xml b/app/ui/legacy/src/main/res/layout/message_list_item.xml
index 1463baf15e..b303cdc4c0 100644
--- a/app/ui/legacy/src/main/res/layout/message_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/message_list_item.xml
@@ -167,6 +167,7 @@
                 android:layout_marginEnd="4dp"
                 app:srcCompat="@drawable/ic_account_color"
                 tools:tint="@color/color_default_accent"
+                android:visibility="gone"
                 android:contentDescription="@null" />
 
             <TextView
-- 
GitLab