diff --git a/app/build.gradle b/app/build.gradle
index 81e0e0356..7e6411011 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,7 +64,6 @@ dependencies {
     implementation project(':exoplayer-extension-rtmp')
     implementation project(':exoplayer-extension-ffmpeg')
     implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation 'androidx.preference:preference:1.2.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
diff --git a/app/src/leanback/res/drawable/ic_home.xml b/app/src/leanback/res/drawable/ic_home.xml
index 59d888e1c..41e9bad09 100644
--- a/app/src/leanback/res/drawable/ic_home.xml
+++ b/app/src/leanback/res/drawable/ic_home.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="#FFFFFF"
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M8,42V18L24.1,6L40,18V42H28.3V27.75H19.65V42ZM11,39H16.65V24.75H31.3V39H37V19.5L24.1,9.75L11,19.5ZM24,24.35Z" />
 </vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_back.xml b/app/src/leanback/res/drawable/ic_keyboard_back.xml
index a41f5e210..485fd8d2c 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_back.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_back.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="m22.4,31.7 l5.6,-5.6 5.6,5.6 2.15,-2.15L30.1,24l5.55,-5.55 -2.15,-2.15 -5.5,5.6 -5.6,-5.6 -2.15,2.15L25.9,24l-5.65,5.55ZM6,24l8.45,-11.95q0.65,-0.9 1.55,-1.475 0.9,-0.575 2,-0.575h21q1.25,0 2.125,0.875T42,13v22q0,1.25 -0.875,2.125T39,38L18,38q-1.1,0 -2,-0.575 -0.9,-0.575 -1.55,-1.475ZM9.75,24 L17.45,35L39,35L39,13L17.45,13ZM39,24L39,13v22Z" />
 </vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_left.xml b/app/src/leanback/res/drawable/ic_keyboard_left.xml
index 78843ed16..4de321446 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_left.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_left.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M28.05,36 L16,23.95 28.05,11.9l2.15,2.15 -9.9,9.9 9.9,9.9Z" />
 </vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_remote.xml b/app/src/leanback/res/drawable/ic_keyboard_remote.xml
index e80c9de52..5949891cc 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_remote.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_remote.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M6,22.5V6H22.5V22.5ZM9,19.5H19.5V9H9ZM6,42V25.5H22.5V42ZM9,39H19.5V28.5H9ZM25.5,22.5V6H42V22.5ZM28.5,19.5H39V9H28.5ZM37.9,42V37.9H42V42ZM25.5,29.65V25.5H29.6V29.65ZM29.6,33.75V29.65H33.75V33.75ZM25.5,37.9V33.75H29.6V37.9ZM29.6,42V37.9H33.75V42ZM33.75,37.9V33.75H37.9V37.9ZM33.75,29.65V25.5H37.9V29.65ZM37.9,33.75V29.65H42V33.75Z" />
 </vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_right.xml b/app/src/leanback/res/drawable/ic_keyboard_right.xml
index 0bf84e0c6..d2378ee0a 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_right.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_right.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="m18.75,36 l-2.15,-2.15 9.9,-9.9 -9.9,-9.9 2.15,-2.15L30.8,23.95Z" />
 </vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_search.xml b/app/src/leanback/res/drawable/ic_keyboard_search.xml
index 6b396d368..2b0ad0259 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_search.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_search.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M39.8,41.95 L26.65,28.8Q25.15,30.1 23.15,30.825Q21.15,31.55 18.9,31.55Q13.5,31.55 9.75,27.8Q6,24.05 6,18.75Q6,13.45 9.75,9.7Q13.5,5.95 18.85,5.95Q24.15,5.95 27.875,9.7Q31.6,13.45 31.6,18.75Q31.6,20.9 30.9,22.9Q30.2,24.9 28.8,26.65L42,39.75ZM18.85,28.55Q22.9,28.55 25.75,25.675Q28.6,22.8 28.6,18.75Q28.6,14.7 25.75,11.825Q22.9,8.95 18.85,8.95Q14.75,8.95 11.875,11.825Q9,14.7 9,18.75Q9,22.8 11.875,25.675Q14.75,28.55 18.85,28.55Z" />
 </vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_space.xml b/app/src/leanback/res/drawable/ic_keyboard_space.xml
index 7dbdbe636..82861615c 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_space.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_space.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M8,30V18H11V27H37V18H40V30Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/leanback/res/drawable/ic_mic.xml b/app/src/leanback/res/drawable/ic_mic.xml
index 448243a30..d104b52f0 100644
--- a/app/src/leanback/res/drawable/ic_mic.xml
+++ b/app/src/leanback/res/drawable/ic_mic.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="36dp"
     android:height="36dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M24,26.85Q21.85,26.85 20.4,25.3Q18.95,23.75 18.95,21.55V9Q18.95,6.9 20.425,5.45Q21.9,4 24,4Q26.1,4 27.575,5.45Q29.05,6.9 29.05,9V21.55Q29.05,23.75 27.6,25.3Q26.15,26.85 24,26.85ZM24,15.45Q24,15.45 24,15.45Q24,15.45 24,15.45Q24,15.45 24,15.45Q24,15.45 24,15.45Q24,15.45 24,15.45Q24,15.45 24,15.45Q24,15.45 24,15.45Q24,15.45 24,15.45ZM22.5,42V35.2Q17.2,34.65 13.6,30.75Q10,26.85 10,21.55H13Q13,26.1 16.225,29.2Q19.45,32.3 24,32.3Q28.55,32.3 31.775,29.2Q35,26.1 35,21.55H38Q38,26.85 34.4,30.75Q30.8,34.65 25.5,35.2V42ZM24,23.85Q24.9,23.85 25.475,23.175Q26.05,22.5 26.05,21.55V9Q26.05,8.15 25.45,7.575Q24.85,7 24,7Q23.15,7 22.55,7.575Q21.95,8.15 21.95,9V21.55Q21.95,22.5 22.525,23.175Q23.1,23.85 24,23.85Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 6269d8455..0c64f2f8d 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="64dp"
     android:height="64dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_desc.xml b/app/src/main/res/drawable/ic_desc.xml
index bbd92a2df..d08b48ded 100644
--- a/app/src/main/res/drawable/ic_desc.xml
+++ b/app/src/main/res/drawable/ic_desc.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_off.xml b/app/src/main/res/drawable/ic_filter_off.xml
index a81aef1c6..9bd65a247 100644
--- a/app/src/main/res/drawable/ic_filter_off.xml
+++ b/app/src/main/res/drawable/ic_filter_off.xml
@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M19.79,5.61C20.3,4.95 19.83,4 19,4H6.83l7.97,7.97L19.79,5.61z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M2.81,2.81L1.39,4.22L10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-2.17l5.78,5.78l1.41,-1.41L2.81,2.81z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_off_small.xml b/app/src/main/res/drawable/ic_filter_off_small.xml
index 63fcf796c..14e61c955 100644
--- a/app/src/main/res/drawable/ic_filter_off_small.xml
+++ b/app/src/main/res/drawable/ic_filter_off_small.xml
@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="18dp"
     android:height="18dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M19.79,5.61C20.3,4.95 19.83,4 19,4H6.83l7.97,7.97L19.79,5.61z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M2.81,2.81L1.39,4.22L10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-2.17l5.78,5.78l1.41,-1.41L2.81,2.81z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_on.xml b/app/src/main/res/drawable/ic_filter_on.xml
index 5a44c62c7..57e85c4a4 100644
--- a/app/src/main/res/drawable/ic_filter_on.xml
+++ b/app/src/main/res/drawable/ic_filter_on.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_on_small.xml b/app/src/main/res/drawable/ic_filter_on_small.xml
index 53cde4f91..11c2b145f 100644
--- a/app/src/main/res/drawable/ic_filter_on_small.xml
+++ b/app/src/main/res/drawable/ic_filter_on_small.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="18dp"
     android:height="18dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_forward.xml b/app/src/main/res/drawable/ic_forward.xml
index 0ff3b874a..9d4f9194c 100644
--- a/app/src/main/res/drawable/ic_forward.xml
+++ b/app/src/main/res/drawable/ic_forward.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
index ec6f46828..e982c778a 100644
--- a/app/src/main/res/drawable/ic_history.xml
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_keep_added.xml b/app/src/main/res/drawable/ic_keep_added.xml
index e694a6f91..365ac84a5 100644
--- a/app/src/main/res/drawable/ic_keep_added.xml
+++ b/app/src/main/res/drawable/ic_keep_added.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M14.43,10l-2.43,-8l-2.43,8l-7.57,0l6.18,4.41l-2.35,7.59l6.17,-4.69l6.18,4.69l-2.35,-7.59l6.17,-4.41z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_keep_not_yet.xml b/app/src/main/res/drawable/ic_keep_not_yet.xml
index 6dc3c5571..590f9d894 100644
--- a/app/src/main/res/drawable/ic_keep_not_yet.xml
+++ b/app/src/main/res/drawable/ic_keep_not_yet.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_pause.xml
index 834815067..a13c4f95b 100644
--- a/app/src/main/res/drawable/ic_pause.xml
+++ b/app/src/main/res/drawable/ic_pause.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_play.xml b/app/src/main/res/drawable/ic_play.xml
index 8bbd9202a..34d70a515 100644
--- a/app/src/main/res/drawable/ic_play.xml
+++ b/app/src/main/res/drawable/ic_play.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M8,5v14l11,-7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
index 21957cd41..4c3b7804b 100644
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_rewind.xml b/app/src/main/res/drawable/ic_rewind.xml
index e66230d3e..f9c0a0c05 100644
--- a/app/src/main/res/drawable/ic_rewind.xml
+++ b/app/src/main/res/drawable/ic_rewind.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_search_off.xml b/app/src/main/res/drawable/ic_search_off.xml
index 4ca664a2f..d5b411af1 100644
--- a/app/src/main/res/drawable/ic_search_off.xml
+++ b/app/src/main/res/drawable/ic_search_off.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M12,6c3.79,0 7.17,2.13 8.82,5.5 -0.59,1.22 -1.42,2.27 -2.41,3.12l1.41,1.41c1.39,-1.23 2.49,-2.77 3.18,-4.53C21.27,7.11 17,4 12,4c-1.27,0 -2.49,0.2 -3.64,0.57l1.65,1.65C10.66,6.09 11.32,6 12,6zM10.93,7.14L13,9.21c0.57,0.25 1.03,0.71 1.28,1.28l2.07,2.07c0.08,-0.34 0.14,-0.7 0.14,-1.07C16.5,9.01 14.48,7 12,7c-0.37,0 -0.72,0.05 -1.07,0.14zM2.01,3.87l2.68,2.68C3.06,7.83 1.77,9.53 1,11.5 2.73,15.89 7,19 12,19c1.52,0 2.98,-0.29 4.32,-0.82l3.42,3.42 1.41,-1.41L3.42,2.45 2.01,3.87zM9.51,11.37l2.61,2.61c-0.04,0.01 -0.08,0.02 -0.12,0.02 -1.38,0 -2.5,-1.12 -2.5,-2.5 0,-0.05 0.01,-0.08 0.01,-0.13zM6.11,7.97l1.75,1.75c-0.23,0.55 -0.36,1.15 -0.36,1.78 0,2.48 2.02,4.5 4.5,4.5 0.63,0 1.23,-0.13 1.77,-0.36l0.98,0.98c-0.88,0.24 -1.8,0.38 -2.75,0.38 -3.79,0 -7.17,-2.13 -8.82,-5.5 0.7,-1.43 1.72,-2.61 2.93,-3.53z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_search_on.xml b/app/src/main/res/drawable/ic_search_on.xml
index e8481eaa0..4e093dce6 100644
--- a/app/src/main/res/drawable/ic_search_on.xml
+++ b/app/src/main/res/drawable/ic_search_on.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/white"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFF"
         android:pathData="M12,6c3.79,0 7.17,2.13 8.82,5.5C19.17,14.87 15.79,17 12,17s-7.17,-2.13 -8.82,-5.5C4.83,8.13 8.21,6 12,6m0,-2C7,4 2.73,7.11 1,11.5 2.73,15.89 7,19 12,19s9.27,-3.11 11,-7.5C21.27,7.11 17,4 12,4zM12,9c1.38,0 2.5,1.12 2.5,2.5S13.38,14 12,14s-2.5,-1.12 -2.5,-2.5S10.62,9 12,9m0,-2c-2.48,0 -4.5,2.02 -4.5,4.5S9.52,16 12,16s4.5,-2.02 4.5,-4.5S14.48,7 12,7z" />
 </vector>