From 0affee3182325839711626dce23ecd70e43db396 Mon Sep 17 00:00:00 2001
From: machiav3lli <https://machiav3lli@github.com>
Date: Fri, 26 Jun 2020 20:30:40 +0200
Subject: [PATCH] Change: to xml-based Drawables

---
 .../drawable-v21/ic_notifications_black_24dp.xml    |  9 ---------
 .../main/res/drawable-v21/ic_sync_black_24dp.xml    |  9 ---------
 app/src/main/res/drawable/bg_splash_screen.xml      |  2 +-
 app/src/main/res/drawable/button_normal.xml         |  2 +-
 app/src/main/res/drawable/button_section.xml        |  8 ++++----
 .../main/res/drawable/button_section_textcolor.xml  |  4 ++--
 app/src/main/res/drawable/ic_about.xml              |  3 ++-
 app/src/main/res/drawable/ic_add_24.xml             | 10 ++++++++++
 .../{ic_alarm_black.xml => ic_alarm_24.xml}         | 13 +++++++------
 app/src/main/res/drawable/ic_alarm_white.xml        |  9 ---------
 app/src/main/res/drawable/ic_close_24.xml           | 10 ++++++++++
 app/src/main/res/drawable/ic_close_white.xml        |  9 ---------
 app/src/main/res/drawable/ic_create_black.xml       |  4 ----
 app/src/main/res/drawable/ic_delete_24.xml          | 10 ++++++++++
 app/src/main/res/drawable/ic_delete_white.xml       |  9 ---------
 app/src/main/res/drawable/ic_edit_24.xml            | 10 ++++++++++
 app/src/main/res/drawable/ic_edit_white_24dp.xml    |  9 ---------
 app/src/main/res/drawable/ic_help.xml               |  3 ++-
 app/src/main/res/drawable/ic_home_black.xml         | 12 +++++++++---
 .../drawable/{ic_info_black.xml => ic_info_24.xml}  |  3 ++-
 app/src/main/res/drawable/ic_info_black_24dp.xml    |  9 ---------
 app/src/main/res/drawable/ic_list_24.xml            | 10 ++++++++++
 app/src/main/res/drawable/ic_list_black_24px.xml    |  5 -----
 app/src/main/res/drawable/ic_list_white_24px.xml    |  9 ---------
 app/src/main/res/drawable/ic_menu_tutorial.xml      |  3 ++-
 .../res/drawable/ic_notifications_black_24dp.xml    |  9 ---------
 app/src/main/res/drawable/ic_pause_48.xml           |  5 +++++
 app/src/main/res/drawable/ic_pause_black_48dp.xml   |  4 ----
 app/src/main/res/drawable/ic_play_arrow_48.xml      |  5 +++++
 app/src/main/res/drawable/ic_play_arrow_black.xml   |  5 -----
 app/src/main/res/drawable/ic_repeat_48.xml          | 11 +++++++++++
 app/src/main/res/drawable/ic_repeat_black_48dp.xml  |  5 -----
 app/src/main/res/drawable/ic_replay_48.xml          | 10 ++++++++++
 ...c_settings_black_24dp.xml => ic_settings_24.xml} | 13 +++++++------
 app/src/main/res/drawable/ic_skip_next_24.xml       | 10 ++++++++++
 app/src/main/res/drawable/ic_skip_next_48.xml       | 10 ++++++++++
 app/src/main/res/drawable/ic_skip_previous_24.xml   | 10 ++++++++++
 app/src/main/res/drawable/ic_skip_previous_48.xml   | 10 ++++++++++
 app/src/main/res/drawable/ic_sync_24.xml            | 10 ++++++++++
 app/src/main/res/drawable/ic_sync_black_24dp.xml    |  9 ---------
 app/src/main/res/drawable/ic_theme_24.xml           | 10 ++++++++++
 app/src/main/res/drawable/ic_update_40.xml          | 11 +++++++++++
 app/src/main/res/drawable/ic_update_black_40dp.xml  |  5 -----
 app/src/main/res/drawable/ic_view_list_24.xml       | 10 ++++++++++
 .../main/res/drawable/ic_view_list_black_24px.xml   |  5 -----
 app/src/main/res/drawable/progress_circular.xml     |  2 +-
 .../main/res/drawable/progress_circular_small.xml   |  2 +-
 app/src/main/res/drawable/side_nav_bar.xml          |  9 ---------
 48 files changed, 203 insertions(+), 161 deletions(-)
 delete mode 100644 app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml
 delete mode 100644 app/src/main/res/drawable-v21/ic_sync_black_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_add_24.xml
 rename app/src/main/res/drawable/{ic_alarm_black.xml => ic_alarm_24.xml} (56%)
 delete mode 100644 app/src/main/res/drawable/ic_alarm_white.xml
 create mode 100644 app/src/main/res/drawable/ic_close_24.xml
 delete mode 100644 app/src/main/res/drawable/ic_close_white.xml
 delete mode 100644 app/src/main/res/drawable/ic_create_black.xml
 create mode 100644 app/src/main/res/drawable/ic_delete_24.xml
 delete mode 100644 app/src/main/res/drawable/ic_delete_white.xml
 create mode 100644 app/src/main/res/drawable/ic_edit_24.xml
 delete mode 100644 app/src/main/res/drawable/ic_edit_white_24dp.xml
 rename app/src/main/res/drawable/{ic_info_black.xml => ic_info_24.xml} (78%)
 delete mode 100644 app/src/main/res/drawable/ic_info_black_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_list_24.xml
 delete mode 100644 app/src/main/res/drawable/ic_list_black_24px.xml
 delete mode 100644 app/src/main/res/drawable/ic_list_white_24px.xml
 delete mode 100644 app/src/main/res/drawable/ic_notifications_black_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_pause_48.xml
 delete mode 100644 app/src/main/res/drawable/ic_pause_black_48dp.xml
 create mode 100644 app/src/main/res/drawable/ic_play_arrow_48.xml
 delete mode 100644 app/src/main/res/drawable/ic_play_arrow_black.xml
 create mode 100644 app/src/main/res/drawable/ic_repeat_48.xml
 delete mode 100644 app/src/main/res/drawable/ic_repeat_black_48dp.xml
 create mode 100644 app/src/main/res/drawable/ic_replay_48.xml
 rename app/src/main/res/drawable/{ic_settings_black_24dp.xml => ic_settings_24.xml} (81%)
 create mode 100644 app/src/main/res/drawable/ic_skip_next_24.xml
 create mode 100644 app/src/main/res/drawable/ic_skip_next_48.xml
 create mode 100644 app/src/main/res/drawable/ic_skip_previous_24.xml
 create mode 100644 app/src/main/res/drawable/ic_skip_previous_48.xml
 create mode 100644 app/src/main/res/drawable/ic_sync_24.xml
 delete mode 100644 app/src/main/res/drawable/ic_sync_black_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_theme_24.xml
 create mode 100644 app/src/main/res/drawable/ic_update_40.xml
 delete mode 100644 app/src/main/res/drawable/ic_update_black_40dp.xml
 create mode 100644 app/src/main/res/drawable/ic_view_list_24.xml
 delete mode 100644 app/src/main/res/drawable/ic_view_list_black_24px.xml
 delete mode 100644 app/src/main/res/drawable/side_nav_bar.xml

diff --git a/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml b/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml
deleted file mode 100644
index e3400cf..0000000
--- a/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11.5,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6.5,-6v-5.5c0,-3.07 -2.13,-5.64 -5,-6.32V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5v0.68c-2.87,0.68 -5,3.25 -5,6.32V16l-2,2v1h17v-1l-2,-2z" />
-</vector>
diff --git a/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml b/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml
deleted file mode 100644
index 5a283aa..0000000
--- a/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01,-.25 1.97,-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0,-4.42,-3.58,-8,-8,-8zm0 14c-3.31 0,-6,-2.69,-6,-6 0,-1.01.25,-1.97.7,-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4,-4,-4,-4v3z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_splash_screen.xml b/app/src/main/res/drawable/bg_splash_screen.xml
index 831014f..5501d2d 100644
--- a/app/src/main/res/drawable/bg_splash_screen.xml
+++ b/app/src/main/res/drawable/bg_splash_screen.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:drawable="@color/colorAccent"/>
+        android:drawable="?colorAccent"/>
 
     <item>
         <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/button_normal.xml b/app/src/main/res/drawable/button_normal.xml
index 0232012..2dafe80 100644
--- a/app/src/main/res/drawable/button_normal.xml
+++ b/app/src/main/res/drawable/button_normal.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/colorAccent" />
+            <solid android:color="?colorAccent" />
             <corners android:radius="6dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/button_section.xml b/app/src/main/res/drawable/button_section.xml
index 8ace8f7..2d900b8 100644
--- a/app/src/main/res/drawable/button_section.xml
+++ b/app/src/main/res/drawable/button_section.xml
@@ -2,9 +2,9 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" android:color="@color/white">
         <shape>
-            <solid android:color="@color/colorAccent" />
+            <solid android:color="?colorAccent" />
             <corners android:radius="12dp" />
-            <stroke android:width="1dp" android:color="@color/colorPrimary"/>
+            <stroke android:width="1dp" android:color="?colorPrimary"/>
             <padding
                 android:bottom="10dp"
                 android:left="10dp"
@@ -12,11 +12,11 @@
                 android:top="10dp"/>
         </shape>
     </item>
-    <item android:state_checked="false" android:color="@color/colorPrimary">
+    <item android:state_checked="false" android:color="?colorPrimary">
         <shape>
             <solid android:color="@color/white" />
             <corners android:radius="12dp" />
-            <stroke android:width="1dp" android:color="@color/colorAccent"/>
+            <stroke android:width="1dp" android:color="?colorAccent"/>
             <padding
                 android:bottom="-20dp"
                 android:left="-20dp"
diff --git a/app/src/main/res/drawable/button_section_textcolor.xml b/app/src/main/res/drawable/button_section_textcolor.xml
index 937719f..0e805e8 100644
--- a/app/src/main/res/drawable/button_section_textcolor.xml
+++ b/app/src/main/res/drawable/button_section_textcolor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" android:color="@color/white"/>
-    <item android:state_checked="false" android:color="@color/colorPrimary"/>
-    <item android:color="@color/colorPrimary" />
+    <item android:state_checked="false" android:color="?colorPrimary"/>
+    <item android:color="?colorPrimary" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
index 9e5d312..471546a 100644
--- a/app/src/main/res/drawable/ic_about.xml
+++ b/app/src/main/res/drawable/ic_about.xml
@@ -2,9 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/white"
         android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_add_24.xml b/app/src/main/res/drawable/ic_add_24.xml
new file mode 100644
index 0000000..eb23254
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_alarm_black.xml b/app/src/main/res/drawable/ic_alarm_24.xml
similarity index 56%
rename from app/src/main/res/drawable/ic_alarm_black.xml
rename to app/src/main/res/drawable/ic_alarm_24.xml
index 87e80a6..f7c9624 100644
--- a/app/src/main/res/drawable/ic_alarm_black.xml
+++ b/app/src/main/res/drawable/ic_alarm_24.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"
-        android:fillColor="#000000"/>
+        android:fillColor="@color/white"
+        android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_alarm_white.xml b/app/src/main/res/drawable/ic_alarm_white.xml
deleted file mode 100644
index bd50ddd..0000000
--- a/app/src/main/res/drawable/ic_alarm_white.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"
-        android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_close_24.xml b/app/src/main/res/drawable/ic_close_24.xml
new file mode 100644
index 0000000..da6ccc8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_close_white.xml b/app/src/main/res/drawable/ic_close_white.xml
deleted file mode 100644
index d11cc5c..0000000
--- a/app/src/main/res/drawable/ic_close_white.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_create_black.xml b/app/src/main/res/drawable/ic_create_black.xml
deleted file mode 100644
index 7575f1a..0000000
--- a/app/src/main/res/drawable/ic_create_black.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_delete_24.xml b/app/src/main/res/drawable/ic_delete_24.xml
new file mode 100644
index 0000000..2be8d8c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_delete_white.xml b/app/src/main/res/drawable/ic_delete_white.xml
deleted file mode 100644
index 2b8ab5b..0000000
--- a/app/src/main/res/drawable/ic_delete_white.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"
-        android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit_24.xml b/app/src/main/res/drawable/ic_edit_24.xml
new file mode 100644
index 0000000..2844baf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_edit_white_24dp.xml b/app/src/main/res/drawable/ic_edit_white_24dp.xml
deleted file mode 100644
index 35a774a..0000000
--- a/app/src/main/res/drawable/ic_edit_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
index ffc9118..bfa2049 100644
--- a/app/src/main/res/drawable/ic_help.xml
+++ b/app/src/main/res/drawable/ic_help.xml
@@ -2,9 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@android:color/white"
         android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home_black.xml b/app/src/main/res/drawable/ic_home_black.xml
index 31e1a7a..e53fd58 100644
--- a/app/src/main/res/drawable/ic_home_black.xml
+++ b/app/src/main/res/drawable/ic_home_black.xml
@@ -1,4 +1,10 @@
-<vector android:height="24dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_info_black.xml b/app/src/main/res/drawable/ic_info_24.xml
similarity index 78%
rename from app/src/main/res/drawable/ic_info_black.xml
rename to app/src/main/res/drawable/ic_info_24.xml
index 34b8202..9f3e294 100644
--- a/app/src/main/res/drawable/ic_info_black.xml
+++ b/app/src/main/res/drawable/ic_info_24.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@android:color/white"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,15h-2v-6h2v6zm0,-8h-2V7h2v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml
deleted file mode 100644
index 34b8202..0000000
--- a/app/src/main/res/drawable/ic_info_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,15h-2v-6h2v6zm0,-8h-2V7h2v2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_list_24.xml b/app/src/main/res/drawable/ic_list_24.xml
new file mode 100644
index 0000000..b0e68e0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_list_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_list_black_24px.xml b/app/src/main/res/drawable/ic_list_black_24px.xml
deleted file mode 100644
index 5ab5d87..0000000
--- a/app/src/main/res/drawable/ic_list_black_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_list_white_24px.xml b/app/src/main/res/drawable/ic_list_white_24px.xml
deleted file mode 100644
index f5ea0e9..0000000
--- a/app/src/main/res/drawable/ic_list_white_24px.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z"
-        android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_tutorial.xml b/app/src/main/res/drawable/ic_menu_tutorial.xml
index f8d18b2..ea4731d 100644
--- a/app/src/main/res/drawable/ic_menu_tutorial.xml
+++ b/app/src/main/res/drawable/ic_menu_tutorial.xml
@@ -2,9 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@android:color/white"
         android:pathData="M5,13.18v4L12,21l7,-3.82v-4L12,17l-7,-3.82zM12,3L1,9l11,6 9,-4.91V17h2V9L12,3z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml
deleted file mode 100644
index e3400cf..0000000
--- a/app/src/main/res/drawable/ic_notifications_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11.5,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6.5,-6v-5.5c0,-3.07 -2.13,-5.64 -5,-6.32V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5v0.68c-2.87,0.68 -5,3.25 -5,6.32V16l-2,2v1h17v-1l-2,-2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_pause_48.xml b/app/src/main/res/drawable/ic_pause_48.xml
new file mode 100644
index 0000000..8d5e417
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pause_48.xml
@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_pause_black_48dp.xml b/app/src/main/res/drawable/ic_pause_black_48dp.xml
deleted file mode 100644
index 0887d64..0000000
--- a/app/src/main/res/drawable/ic_pause_black_48dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="48dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_48.xml b/app/src/main/res/drawable/ic_play_arrow_48.xml
new file mode 100644
index 0000000..c775d2c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_play_arrow_48.xml
@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M8,5v14l11,-7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_black.xml b/app/src/main/res/drawable/ic_play_arrow_black.xml
deleted file mode 100644
index 54a30db..0000000
--- a/app/src/main/res/drawable/ic_play_arrow_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="48dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M8,5v14l11,-7z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_repeat_48.xml b/app/src/main/res/drawable/ic_repeat_48.xml
new file mode 100644
index 0000000..79e6e54
--- /dev/null
+++ b/app/src/main/res/drawable/ic_repeat_48.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_repeat_black_48dp.xml b/app/src/main/res/drawable/ic_repeat_black_48dp.xml
deleted file mode 100644
index 9092e30..0000000
--- a/app/src/main/res/drawable/ic_repeat_black_48dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="40dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_replay_48.xml b/app/src/main/res/drawable/ic_replay_48.xml
new file mode 100644
index 0000000..bccd425
--- /dev/null
+++ b/app/src/main/res/drawable/ic_replay_48.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,5V1L7,6l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6 -6,-2.69 -6,-6H4c0,4.42 3.58,8 8,8s8,-3.58 8,-8 -3.58,-8 -8,-8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_24.xml
similarity index 81%
rename from app/src/main/res/drawable/ic_settings_black_24dp.xml
rename to app/src/main/res/drawable/ic_settings_24.xml
index ace746c..d3a36a0 100644
--- a/app/src/main/res/drawable/ic_settings_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_settings_24.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+        android:fillColor="@android:color/white"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_skip_next_24.xml b/app/src/main/res/drawable/ic_skip_next_24.xml
new file mode 100644
index 0000000..4fff247
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_next_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_skip_next_48.xml b/app/src/main/res/drawable/ic_skip_next_48.xml
new file mode 100644
index 0000000..94aebd9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_next_48.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_skip_previous_24.xml b/app/src/main/res/drawable/ic_skip_previous_24.xml
new file mode 100644
index 0000000..1805b7d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_previous_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_skip_previous_48.xml b/app/src/main/res/drawable/ic_skip_previous_48.xml
new file mode 100644
index 0000000..fb87381
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_previous_48.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sync_24.xml b/app/src/main/res/drawable/ic_sync_24.xml
new file mode 100644
index 0000000..c2f773a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sync_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sync_black_24dp.xml b/app/src/main/res/drawable/ic_sync_black_24dp.xml
deleted file mode 100644
index 5a283aa..0000000
--- a/app/src/main/res/drawable/ic_sync_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01,-.25 1.97,-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0,-4.42,-3.58,-8,-8,-8zm0 14c-3.31 0,-6,-2.69,-6,-6 0,-1.01.25,-1.97.7,-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4,-4,-4,-4v3z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_theme_24.xml b/app/src/main/res/drawable/ic_theme_24.xml
new file mode 100644
index 0000000..a3e222a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_theme_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_update_40.xml b/app/src/main/res/drawable/ic_update_40.xml
new file mode 100644
index 0000000..4310621
--- /dev/null
+++ b/app/src/main/res/drawable/ic_update_40.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M21,10.12h-6.78l2.74,-2.82c-2.73,-2.7 -7.15,-2.8 -9.88,-0.1 -2.73,2.71 -2.73,7.08 0,9.79 2.73,2.71 7.15,2.71 9.88,0C18.32,15.65 19,14.08 19,12.1h2c0,1.98 -0.88,4.55 -2.64,6.29 -3.51,3.48 -9.21,3.48 -12.72,0 -3.5,-3.47 -3.53,-9.11 -0.02,-12.58 3.51,-3.47 9.14,-3.47 12.65,0L21,3v7.12zM12.5,8v4.25l3.5,2.08 -0.72,1.21L11,13V8h1.5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_update_black_40dp.xml b/app/src/main/res/drawable/ic_update_black_40dp.xml
deleted file mode 100644
index 52577d1..0000000
--- a/app/src/main/res/drawable/ic_update_black_40dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="40dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M21,10.12h-6.78l2.74,-2.82c-2.73,-2.7 -7.15,-2.8 -9.88,-0.1 -2.73,2.71 -2.73,7.08 0,9.79 2.73,2.71 7.15,2.71 9.88,0C18.32,15.65 19,14.08 19,12.1h2c0,1.98 -0.88,4.55 -2.64,6.29 -3.51,3.48 -9.21,3.48 -12.72,0 -3.5,-3.47 -3.53,-9.11 -0.02,-12.58 3.51,-3.47 9.14,-3.47 12.65,0L21,3v7.12zM12.5,8v4.25l3.5,2.08 -0.72,1.21L11,13V8h1.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_view_list_24.xml b/app/src/main/res/drawable/ic_view_list_24.xml
new file mode 100644
index 0000000..9884aeb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_view_list_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_view_list_black_24px.xml b/app/src/main/res/drawable/ic_view_list_black_24px.xml
deleted file mode 100644
index 0873a39..0000000
--- a/app/src/main/res/drawable/ic_view_list_black_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/progress_circular.xml b/app/src/main/res/drawable/progress_circular.xml
index 298f701..11b1e1a 100644
--- a/app/src/main/res/drawable/progress_circular.xml
+++ b/app/src/main/res/drawable/progress_circular.xml
@@ -15,7 +15,7 @@
             android:useLevel="true"
             android:shape="ring"
             android:thicknessRatio="12">
-            <solid android:color="@color/colorAccent"/>
+            <solid android:color="?colorAccent"/>
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progress_circular_small.xml b/app/src/main/res/drawable/progress_circular_small.xml
index 464a170..6365414 100644
--- a/app/src/main/res/drawable/progress_circular_small.xml
+++ b/app/src/main/res/drawable/progress_circular_small.xml
@@ -15,7 +15,7 @@
             android:shape="ring"
             android:useLevel="true"
             android:thicknessRatio="6">
-            <solid android:color="@color/colorAccent"/>
+            <solid android:color="?colorAccent"/>
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml
deleted file mode 100644
index 3dc0e1a..0000000
--- a/app/src/main/res/drawable/side_nav_bar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="90"
-        android:centerColor="@color/middlegrey"
-        android:endColor="@color/middlegrey"
-        android:startColor="@color/middlegrey"
-        android:type="linear" />
-</shape>
\ No newline at end of file