From ee22181a9197f1da3b0c8ede0f55fcc769c6a796 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 28 Nov 2022 15:14:37 +0100
Subject: [PATCH] Fix icon colors

---
 .../java/app/fedilab/android/ui/drawer/StatusAdapter.java    | 4 ++--
 app/src/main/res/drawable-anydpi-v24/ic_notification.xml     | 2 +-
 app/src/main/res/drawable/ic_baseline_account_circle_24.xml  | 2 +-
 app/src/main/res/drawable/ic_baseline_audiotrack_24.xml      | 2 +-
 app/src/main/res/drawable/ic_baseline_cached_24.xml          | 2 +-
 app/src/main/res/drawable/ic_baseline_edit_note_24.xml       | 2 +-
 app/src/main/res/drawable/ic_baseline_filter_asc_24.xml      | 2 +-
 .../main/res/drawable/ic_baseline_filter_center_focus_24.xml | 2 +-
 app/src/main/res/drawable/ic_baseline_filter_desc_24.xml     | 2 +-
 .../drawable/ic_baseline_keyboard_double_arrow_down_24.xml   | 2 +-
 .../res/drawable/ic_baseline_keyboard_double_arrow_up_24.xml | 2 +-
 app/src/main/res/drawable/ic_baseline_manage_search_24.xml   | 2 +-
 app/src/main/res/drawable/ic_baseline_message_24.xml         | 2 +-
 app/src/main/res/drawable/ic_baseline_mode_comment_24.xml    | 2 +-
 .../main/res/drawable/ic_baseline_mode_edit_message_24.xml   | 2 +-
 app/src/main/res/drawable/ic_baseline_more_horiz_24.xml      | 2 +-
 app/src/main/res/drawable/ic_baseline_notes_24.xml           | 2 +-
 .../main/res/drawable/ic_baseline_person_add_alt_1_24.xml    | 2 +-
 .../main/res/drawable/ic_baseline_play_circle_filled_24.xml  | 2 +-
 app/src/main/res/drawable/ic_baseline_post_add_24.xml        | 2 +-
 app/src/main/res/drawable/ic_baseline_reply_16.xml           | 2 +-
 app/src/main/res/drawable/ic_baseline_report_24.xml          | 2 +-
 app/src/main/res/drawable/ic_baseline_storage_24.xml         | 2 +-
 .../main/res/drawable/ic_baseline_supervisor_account_24.xml  | 2 +-
 app/src/main/res/drawable/ic_baseline_tag_24.xml             | 2 +-
 app/src/main/res/drawable/ic_baseline_translate_24.xml       | 2 +-
 app/src/main/res/drawable/ic_baseline_trending_up_24.xml     | 2 +-
 app/src/main/res/drawable/ic_baseline_volume_mute_24.xml     | 2 +-
 app/src/main/res/drawable/ic_crop.xml                        | 2 +-
 app/src/main/res/drawable/ic_fetch_more_arrow_downward.xml   | 2 +-
 app/src/main/res/drawable/ic_fetch_more_arrow_upward.xml     | 2 +-
 app/src/main/res/drawable/ic_outline_note_alt_24.xml         | 2 +-
 app/src/main/res/drawable/ic_photo_filter.xml                | 2 +-
 app/src/main/res/drawable/ic_tl_list.xml                     | 2 +-
 app/src/main/res/drawable/ic_tl_tag.xml                      | 2 +-
 app/src/main/res/layout/drawer_status.xml                    | 5 +++--
 36 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
index f4e12e22..b70d3f0d 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
@@ -508,7 +508,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         int theme_text_header_1_line = -1;
         int theme_text_header_2_line = -1;
         int link_color = -1;
-        if (sharedpreferences.getBoolean("use_custom_theme", false)) {
+       /* if (sharedpreferences.getBoolean("use_custom_theme", false)) {
             //Getting custom colors
             theme_icons_color = sharedpreferences.getInt("theme_icons_color", -1);
             theme_statuses_color = sharedpreferences.getInt("theme_statuses_color", -1);
@@ -519,7 +519,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             theme_text_color = sharedpreferences.getInt("theme_text_color", -1);
             link_color = sharedpreferences.getInt("theme_link_color", -1);
 
-        }
+        }*/
         if (currentAccount != null && currentAccount.api == Account.API.PLEROMA) {
             holder.binding.statusAddCustomEmoji.setVisibility(View.VISIBLE);
             holder.binding.statusEmoji.setVisibility(View.VISIBLE);
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_notification.xml b/app/src/main/res/drawable-anydpi-v24/ic_notification.xml
index 9578a11c..d3b9a9fc 100644
--- a/app/src/main/res/drawable-anydpi-v24/ic_notification.xml
+++ b/app/src/main/res/drawable-anydpi-v24/ic_notification.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <group
diff --git a/app/src/main/res/drawable/ic_baseline_account_circle_24.xml b/app/src/main/res/drawable/ic_baseline_account_circle_24.xml
index 0b3fa82b..f9110996 100644
--- a/app/src/main/res/drawable/ic_baseline_account_circle_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_account_circle_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_audiotrack_24.xml b/app/src/main/res/drawable/ic_baseline_audiotrack_24.xml
index c1c0a105..ba144296 100644
--- a/app/src/main/res/drawable/ic_baseline_audiotrack_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_audiotrack_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_cached_24.xml b/app/src/main/res/drawable/ic_baseline_cached_24.xml
index a40e971b..9af0e34c 100644
--- a/app/src/main/res/drawable/ic_baseline_cached_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_cached_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_edit_note_24.xml b/app/src/main/res/drawable/ic_baseline_edit_note_24.xml
index 8b13e1b9..13f6d4c8 100644
--- a/app/src/main/res/drawable/ic_baseline_edit_note_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_edit_note_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_filter_asc_24.xml b/app/src/main/res/drawable/ic_baseline_filter_asc_24.xml
index 0d01f28e..62aec8c2 100644
--- a/app/src/main/res/drawable/ic_baseline_filter_asc_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_filter_asc_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <group
diff --git a/app/src/main/res/drawable/ic_baseline_filter_center_focus_24.xml b/app/src/main/res/drawable/ic_baseline_filter_center_focus_24.xml
index 757e1433..c53140a7 100644
--- a/app/src/main/res/drawable/ic_baseline_filter_center_focus_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_filter_center_focus_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_filter_desc_24.xml b/app/src/main/res/drawable/ic_baseline_filter_desc_24.xml
index b311f427..52d95909 100644
--- a/app/src/main/res/drawable/ic_baseline_filter_desc_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_filter_desc_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_down_24.xml b/app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_down_24.xml
index f3a0eac5..13d8d4ef 100644
--- a/app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_down_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_down_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_up_24.xml b/app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_up_24.xml
index 99e8aecb..e83c9630 100644
--- a/app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_up_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_up_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_manage_search_24.xml b/app/src/main/res/drawable/ic_baseline_manage_search_24.xml
index 6c4f34d3..376e8619 100644
--- a/app/src/main/res/drawable/ic_baseline_manage_search_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_manage_search_24.xml
@@ -2,7 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_message_24.xml b/app/src/main/res/drawable/ic_baseline_message_24.xml
index 762268ce..c9a3e3da 100644
--- a/app/src/main/res/drawable/ic_baseline_message_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_message_24.xml
@@ -2,7 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_mode_comment_24.xml b/app/src/main/res/drawable/ic_baseline_mode_comment_24.xml
index ee6babce..84c28ee3 100644
--- a/app/src/main/res/drawable/ic_baseline_mode_comment_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_mode_comment_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_mode_edit_message_24.xml b/app/src/main/res/drawable/ic_baseline_mode_edit_message_24.xml
index e93574bd..5fb90ad4 100644
--- a/app/src/main/res/drawable/ic_baseline_mode_edit_message_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_mode_edit_message_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_more_horiz_24.xml b/app/src/main/res/drawable/ic_baseline_more_horiz_24.xml
index 3bfd30d0..8fd17f69 100644
--- a/app/src/main/res/drawable/ic_baseline_more_horiz_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_more_horiz_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_notes_24.xml b/app/src/main/res/drawable/ic_baseline_notes_24.xml
index 5b99d33d..46db33d1 100644
--- a/app/src/main/res/drawable/ic_baseline_notes_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_notes_24.xml
@@ -2,7 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_person_add_alt_1_24.xml b/app/src/main/res/drawable/ic_baseline_person_add_alt_1_24.xml
index 33fa9bd3..11162198 100644
--- a/app/src/main/res/drawable/ic_baseline_person_add_alt_1_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_person_add_alt_1_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_play_circle_filled_24.xml b/app/src/main/res/drawable/ic_baseline_play_circle_filled_24.xml
index 4fb18131..3a029235 100644
--- a/app/src/main/res/drawable/ic_baseline_play_circle_filled_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_play_circle_filled_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_post_add_24.xml b/app/src/main/res/drawable/ic_baseline_post_add_24.xml
index 59bf92d4..b39a7101 100644
--- a/app/src/main/res/drawable/ic_baseline_post_add_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_post_add_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_reply_16.xml b/app/src/main/res/drawable/ic_baseline_reply_16.xml
index 5abdbbdf..8f9b9556 100644
--- a/app/src/main/res/drawable/ic_baseline_reply_16.xml
+++ b/app/src/main/res/drawable/ic_baseline_reply_16.xml
@@ -2,7 +2,7 @@
     android:width="16dp"
     android:height="16dp"
     android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_report_24.xml b/app/src/main/res/drawable/ic_baseline_report_24.xml
index 430bbbec..57f69c9a 100644
--- a/app/src/main/res/drawable/ic_baseline_report_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_report_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_storage_24.xml b/app/src/main/res/drawable/ic_baseline_storage_24.xml
index 7871eb9d..e8fd6493 100644
--- a/app/src/main/res/drawable/ic_baseline_storage_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_storage_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_supervisor_account_24.xml b/app/src/main/res/drawable/ic_baseline_supervisor_account_24.xml
index 3e1573c5..ca514642 100644
--- a/app/src/main/res/drawable/ic_baseline_supervisor_account_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_supervisor_account_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_tag_24.xml b/app/src/main/res/drawable/ic_baseline_tag_24.xml
index e996ae23..8ee7bdc1 100644
--- a/app/src/main/res/drawable/ic_baseline_tag_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_tag_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_translate_24.xml b/app/src/main/res/drawable/ic_baseline_translate_24.xml
index 4b6b9b36..786e1728 100644
--- a/app/src/main/res/drawable/ic_baseline_translate_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_translate_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_trending_up_24.xml b/app/src/main/res/drawable/ic_baseline_trending_up_24.xml
index 04a5a863..1620596c 100644
--- a/app/src/main/res/drawable/ic_baseline_trending_up_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_trending_up_24.xml
@@ -2,7 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_baseline_volume_mute_24.xml b/app/src/main/res/drawable/ic_baseline_volume_mute_24.xml
index 60aa7c4e..3f223385 100644
--- a/app/src/main/res/drawable/ic_baseline_volume_mute_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_volume_mute_24.xml
@@ -2,7 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_crop.xml b/app/src/main/res/drawable/ic_crop.xml
index cb2455ff..877f167e 100644
--- a/app/src/main/res/drawable/ic_crop.xml
+++ b/app/src/main/res/drawable/ic_crop.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_fetch_more_arrow_downward.xml b/app/src/main/res/drawable/ic_fetch_more_arrow_downward.xml
index 2a93c310..09ae07f1 100644
--- a/app/src/main/res/drawable/ic_fetch_more_arrow_downward.xml
+++ b/app/src/main/res/drawable/ic_fetch_more_arrow_downward.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_fetch_more_arrow_upward.xml b/app/src/main/res/drawable/ic_fetch_more_arrow_upward.xml
index 46c34a0d..ebec81e8 100644
--- a/app/src/main/res/drawable/ic_fetch_more_arrow_upward.xml
+++ b/app/src/main/res/drawable/ic_fetch_more_arrow_upward.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_outline_note_alt_24.xml b/app/src/main/res/drawable/ic_outline_note_alt_24.xml
index 6ae2e1c9..1989d7d5 100644
--- a/app/src/main/res/drawable/ic_outline_note_alt_24.xml
+++ b/app/src/main/res/drawable/ic_outline_note_alt_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_photo_filter.xml b/app/src/main/res/drawable/ic_photo_filter.xml
index f7f1370c..27d57090 100644
--- a/app/src/main/res/drawable/ic_photo_filter.xml
+++ b/app/src/main/res/drawable/ic_photo_filter.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_tl_list.xml b/app/src/main/res/drawable/ic_tl_list.xml
index 732e2de9..1fa2e3c3 100644
--- a/app/src/main/res/drawable/ic_tl_list.xml
+++ b/app/src/main/res/drawable/ic_tl_list.xml
@@ -2,7 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_tl_tag.xml b/app/src/main/res/drawable/ic_tl_tag.xml
index e996ae23..8ee7bdc1 100644
--- a/app/src/main/res/drawable/ic_tl_tag.xml
+++ b/app/src/main/res/drawable/ic_tl_tag.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 78fb8dca..c89f7133 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -22,9 +22,10 @@
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="@dimen/card_margin"
     android:layout_marginTop="@dimen/card_margin"
-    android:clipChildren="false"
     android:clipToPadding="false"
-    app:cardElevation="1dp">
+    app:cardElevation="5dp"
+    android:clipChildren="false"
+    app:strokeWidth="0dp">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/main_container"