From 7d0657f65c4f27e89e07bf936b586a00a8574779 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 4 Jan 2024 15:53:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=9C=A8=20Android?=
 =?UTF-8?q?=204.4=20=E4=B8=8A=E4=BD=BF=E7=94=A8=E7=9F=A2=E9=87=8F=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  4 +-
 .../res/color/selector_tab_text_color.xml     |  7 +-
 .../res/drawable/auto_task_icon_battery.xml   | 17 +++--
 .../drawable/auto_task_icon_battery_grey.xml  | 17 +++--
 .../res/drawable/auto_task_icon_charge.xml    | 17 +++--
 .../drawable/auto_task_icon_charge_grey.xml   | 17 +++--
 .../res/drawable/auto_task_icon_cleaner.xml   |  2 +-
 .../drawable/auto_task_icon_cleaner_grey.xml  | 12 ++--
 .../drawable/auto_task_icon_custom_time.xml   | 17 +++--
 .../auto_task_icon_custom_time_grey.xml       |  4 +-
 .../main/res/drawable/auto_task_icon_frpc.xml |  2 +-
 .../res/drawable/auto_task_icon_frpc_grey.xml |  4 +-
 .../drawable/auto_task_icon_http_server.xml   |  2 +-
 .../auto_task_icon_http_server_grey.xml       |  4 +-
 .../res/drawable/auto_task_icon_incall.xml    | 17 +++--
 .../drawable/auto_task_icon_leave_address.xml | 22 ++++--
 .../auto_task_icon_leave_address_grey.xml     | 22 ++++--
 .../drawable/auto_task_icon_left_arrow.xml    | 13 +++-
 .../auto_task_icon_left_arrow_grey.xml        | 13 +++-
 .../res/drawable/auto_task_icon_location.xml  | 16 +++--
 .../drawable/auto_task_icon_lock_screen.xml   | 17 +++--
 .../auto_task_icon_lock_screen_grey.xml       | 17 +++--
 .../res/drawable/auto_task_icon_network.xml   | 22 ++++--
 .../drawable/auto_task_icon_network_grey.xml  | 22 ++++--
 .../drawable/auto_task_icon_notification.xml  |  2 +-
 .../auto_task_icon_notification_grey.xml      |  4 +-
 .../main/res/drawable/auto_task_icon_rule.xml |  2 +-
 .../res/drawable/auto_task_icon_rule_grey.xml |  8 +--
 .../res/drawable/auto_task_icon_sender.xml    |  2 +-
 .../drawable/auto_task_icon_sender_grey.xml   |  4 +-
 .../res/drawable/auto_task_icon_settings.xml  |  2 +-
 .../drawable/auto_task_icon_settings_grey.xml |  4 +-
 .../main/res/drawable/auto_task_icon_sim.xml  |  2 +-
 .../res/drawable/auto_task_icon_sim_grey.xml  |  4 +-
 .../main/res/drawable/auto_task_icon_sms.xml  |  2 +-
 .../res/drawable/auto_task_icon_sms_grey.xml  |  4 +-
 .../auto_task_icon_start_activity.xml         |  2 +-
 .../drawable/auto_task_icon_to_address.xml    |  2 +-
 .../auto_task_icon_to_address_grey.xml        | 22 ++++--
 app/src/main/res/drawable/bg_bottom_sheet.xml |  2 +-
 .../bg_dialog_common_tip_corner_white.xml     |  3 +-
 app/src/main/res/drawable/ic_logcat.xml       |  4 +-
 .../res/drawable/ic_menu_logs_selected.xml    |  2 +-
 .../res/drawable/ic_menu_rule_selected.xml    |  2 +-
 .../res/drawable/ic_menu_send_selected.xml    |  2 +-
 .../drawable/ic_menu_settings_selected.xml    |  2 +-
 app/src/main/res/layout/dialog_guide_tips.xml |  2 +-
 app/src/main/res/layout/fragment_settings.xml | 70 +++++++++++++++++--
 .../main/res/layout/include_toolbar_web.xml   |  4 +-
 49 files changed, 339 insertions(+), 127 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5dc44a96..8528d609 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,7 +43,7 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true
-        vectorDrawables.useSupportLibrary = true
+        //vectorDrawables.useSupportLibrary = true
 
         javaCompileOptions {
             annotationProcessorOptions {
@@ -229,7 +229,7 @@ dependencies {
     //屏幕适配AutoSize：https://github.com/JessYanCoding/AndroidAutoSize
     implementation 'me.jessyan:autosize:1.2.1'
     //umeng统计
-    implementation 'com.umeng.umsdk:common:9.6.5'
+    implementation 'com.umeng.umsdk:common:9.6.6'
     implementation 'com.umeng.umsdk:asms:1.8.0'
 
     //预加载占位控件
diff --git a/app/src/main/res/color/selector_tab_text_color.xml b/app/src/main/res/color/selector_tab_text_color.xml
index 698460aa..e7d24296 100644
--- a/app/src/main/res/color/selector_tab_text_color.xml
+++ b/app/src/main/res/color/selector_tab_text_color.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2018 xuexiangjys(xuexiangjys@163.com)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +15,7 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:color="?attr/colorAccent" />
-    <item android:state_selected="true" android:color="?attr/colorAccent" />
+    <item android:color="#299EE3" android:state_pressed="true" />
+    <item android:color="#299EE3" android:state_selected="true" />
     <item android:color="@color/xui_config_color_gray_6" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_battery.xml b/app/src/main/res/drawable/auto_task_icon_battery.xml
index 1ee98ba1..c7580b31 100644
--- a/app/src/main/res/drawable/auto_task_icon_battery.xml
+++ b/app/src/main/res/drawable/auto_task_icon_battery.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/color_orange_primary_default" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
-    <path android:fillColor="#ffffffff" android:pathData="M6.109,7.924C5.306,7.924 4.656,8.575 4.656,9.377V15.189C4.656,15.992 5.306,16.642 6.109,16.642H15.553C16.356,16.642 17.006,15.992 17.006,15.189V9.377C17.006,8.575 16.356,7.924 15.553,7.924H6.109ZM19.367,10.104C18.865,10.104 18.459,10.511 18.459,11.012V13.555C18.459,14.057 18.865,14.463 19.367,14.463C19.868,14.463 20.275,14.057 20.275,13.555V11.012C20.275,10.511 19.868,10.104 19.367,10.104Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
+    <path
+        android:fillColor="#ffff8514"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M6.109,7.924C5.306,7.924 4.656,8.575 4.656,9.377V15.189C4.656,15.992 5.306,16.642 6.109,16.642H15.553C16.356,16.642 17.006,15.992 17.006,15.189V9.377C17.006,8.575 16.356,7.924 15.553,7.924H6.109ZM19.367,10.104C18.865,10.104 18.459,10.511 18.459,11.012V13.555C18.459,14.057 18.865,14.463 19.367,14.463C19.868,14.463 20.275,14.057 20.275,13.555V11.012C20.275,10.511 19.868,10.104 19.367,10.104Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_battery_grey.xml b/app/src/main/res/drawable/auto_task_icon_battery_grey.xml
index 92ebfdf2..743212d1 100644
--- a/app/src/main/res/drawable/auto_task_icon_battery_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_battery_grey.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/auto_task_icon_grey_bg" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
-    <path android:fillColor="@color/auto_task_icon_grey" android:pathData="M6.109,7.924C5.306,7.924 4.656,8.575 4.656,9.377V15.189C4.656,15.992 5.306,16.642 6.109,16.642H15.553C16.356,16.642 17.006,15.992 17.006,15.189V9.377C17.006,8.575 16.356,7.924 15.553,7.924H6.109ZM19.367,10.104C18.865,10.104 18.459,10.511 18.459,11.012V13.555C18.459,14.057 18.865,14.463 19.367,14.463C19.868,14.463 20.275,14.057 20.275,13.555V11.012C20.275,10.511 19.868,10.104 19.367,10.104Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
+    <path
+        android:fillColor="#ffe6e6e6"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M6.109,7.924C5.306,7.924 4.656,8.575 4.656,9.377V15.189C4.656,15.992 5.306,16.642 6.109,16.642H15.553C16.356,16.642 17.006,15.992 17.006,15.189V9.377C17.006,8.575 16.356,7.924 15.553,7.924H6.109ZM19.367,10.104C18.865,10.104 18.459,10.511 18.459,11.012V13.555C18.459,14.057 18.865,14.463 19.367,14.463C19.868,14.463 20.275,14.057 20.275,13.555V11.012C20.275,10.511 19.868,10.104 19.367,10.104Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_charge.xml b/app/src/main/res/drawable/auto_task_icon_charge.xml
index 031e0695..ae1b61f9 100644
--- a/app/src/main/res/drawable/auto_task_icon_charge.xml
+++ b/app/src/main/res/drawable/auto_task_icon_charge.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/color_green_primary_default" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
-    <path android:fillColor="#ffffffff" android:pathData="M4.655,9.377C4.655,8.575 5.306,7.924 6.108,7.924H15.552C16.355,7.924 17.006,8.575 17.006,9.377V15.189C17.006,15.992 16.355,16.642 15.552,16.642H6.108C5.306,16.642 4.655,15.992 4.655,15.189V9.377ZM18.459,11.012C18.459,10.511 18.865,10.104 19.367,10.104C19.868,10.104 20.275,10.511 20.275,11.012V13.555C20.275,14.057 19.868,14.463 19.367,14.463C18.865,14.463 18.459,14.057 18.459,13.555V11.012ZM11.768,12.272C11.71,12.272 11.657,12.237 11.635,12.184C11.622,12.153 11.62,12.118 11.629,12.086L12.245,10.031C12.355,9.663 11.892,9.398 11.631,9.68L8.726,12.812C8.51,13.044 8.675,13.422 8.992,13.422H10.551C10.609,13.422 10.662,13.457 10.684,13.511C10.697,13.542 10.699,13.576 10.689,13.608L10.074,15.663C9.964,16.031 10.427,16.296 10.688,16.014L13.593,12.882C13.809,12.65 13.644,12.272 13.327,12.272H11.768Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
+    <path
+        android:fillColor="#ff36d167"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M4.655,9.377C4.655,8.575 5.306,7.924 6.108,7.924H15.552C16.355,7.924 17.006,8.575 17.006,9.377V15.189C17.006,15.992 16.355,16.642 15.552,16.642H6.108C5.306,16.642 4.655,15.992 4.655,15.189V9.377ZM18.459,11.012C18.459,10.511 18.865,10.104 19.367,10.104C19.868,10.104 20.275,10.511 20.275,11.012V13.555C20.275,14.057 19.868,14.463 19.367,14.463C18.865,14.463 18.459,14.057 18.459,13.555V11.012ZM11.768,12.272C11.71,12.272 11.657,12.237 11.635,12.184C11.622,12.153 11.62,12.118 11.629,12.086L12.245,10.031C12.355,9.663 11.892,9.398 11.631,9.68L8.726,12.812C8.51,13.044 8.675,13.422 8.992,13.422H10.551C10.609,13.422 10.662,13.457 10.684,13.511C10.697,13.542 10.699,13.576 10.689,13.608L10.074,15.663C9.964,16.031 10.427,16.296 10.688,16.014L13.593,12.882C13.809,12.65 13.644,12.272 13.327,12.272H11.768Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_charge_grey.xml b/app/src/main/res/drawable/auto_task_icon_charge_grey.xml
index 88489e7b..229a15f0 100644
--- a/app/src/main/res/drawable/auto_task_icon_charge_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_charge_grey.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/auto_task_icon_grey_bg" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
-    <path android:fillColor="@color/auto_task_icon_grey" android:pathData="M4.655,9.377C4.655,8.575 5.306,7.924 6.108,7.924H15.552C16.355,7.924 17.006,8.575 17.006,9.377V15.189C17.006,15.992 16.355,16.642 15.552,16.642H6.108C5.306,16.642 4.655,15.992 4.655,15.189V9.377ZM18.459,11.012C18.459,10.511 18.865,10.104 19.367,10.104C19.868,10.104 20.275,10.511 20.275,11.012V13.555C20.275,14.057 19.868,14.463 19.367,14.463C18.865,14.463 18.459,14.057 18.459,13.555V11.012ZM11.768,12.272C11.71,12.272 11.657,12.237 11.635,12.184C11.622,12.153 11.62,12.118 11.629,12.086L12.245,10.031C12.355,9.663 11.892,9.398 11.631,9.68L8.726,12.812C8.51,13.044 8.675,13.422 8.992,13.422H10.551C10.609,13.422 10.662,13.457 10.684,13.511C10.697,13.542 10.699,13.576 10.689,13.608L10.074,15.663C9.964,16.031 10.427,16.296 10.688,16.014L13.593,12.882C13.809,12.65 13.644,12.272 13.327,12.272H11.768Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
+    <path
+        android:fillColor="#ffe6e6e6"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M4.655,9.377C4.655,8.575 5.306,7.924 6.108,7.924H15.552C16.355,7.924 17.006,8.575 17.006,9.377V15.189C17.006,15.992 16.355,16.642 15.552,16.642H6.108C5.306,16.642 4.655,15.992 4.655,15.189V9.377ZM18.459,11.012C18.459,10.511 18.865,10.104 19.367,10.104C19.868,10.104 20.275,10.511 20.275,11.012V13.555C20.275,14.057 19.868,14.463 19.367,14.463C18.865,14.463 18.459,14.057 18.459,13.555V11.012ZM11.768,12.272C11.71,12.272 11.657,12.237 11.635,12.184C11.622,12.153 11.62,12.118 11.629,12.086L12.245,10.031C12.355,9.663 11.892,9.398 11.631,9.68L8.726,12.812C8.51,13.044 8.675,13.422 8.992,13.422H10.551C10.609,13.422 10.662,13.457 10.684,13.511C10.697,13.542 10.699,13.576 10.689,13.608L10.074,15.663C9.964,16.031 10.427,16.296 10.688,16.014L13.593,12.882C13.809,12.65 13.644,12.272 13.327,12.272H11.768Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_cleaner.xml b/app/src/main/res/drawable/auto_task_icon_cleaner.xml
index f2f26b49..d2b1058c 100644
--- a/app/src/main/res/drawable/auto_task_icon_cleaner.xml
+++ b/app/src/main/res/drawable/auto_task_icon_cleaner.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/color_green_primary_default"
+        android:fillColor="#ff36d167"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <group
         android:scaleX="0.02"
diff --git a/app/src/main/res/drawable/auto_task_icon_cleaner_grey.xml b/app/src/main/res/drawable/auto_task_icon_cleaner_grey.xml
index 34aced9e..9ef2d7ef 100644
--- a/app/src/main/res/drawable/auto_task_icon_cleaner_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_cleaner_grey.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/auto_task_icon_grey_bg"
+        android:fillColor="#ffe6e6e6"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <group
         android:scaleX="0.02"
@@ -14,19 +14,19 @@
         android:translateX="2.5"
         android:translateY="2.5">
         <path
-            android:fillColor="@color/auto_task_icon_grey"
+            android:fillColor="#ffffffff"
             android:pathData="M710.6,398.3l-84.8,-84.8 183.9,-183.9c23.4,-23.4 61.4,-23.4 84.8,0l0,0c23.4,23.4 23.4,61.4 0,84.8L710.6,398.3z" />
         <path
-            android:fillColor="@color/auto_task_icon_grey"
+            android:fillColor="#ffffffff"
             android:pathData="M711.5,571.8L451.5,311.8c62.4,-62.4 163.6,-62.4 226.1,0l33.9,33.9c62.4,62.4 62.4,163.6 0,226.1zM411.1,359.2L664.3,612.4c1.9,1.9 2.3,4.7 0.9,7 -13.7,21.9 -82.7,137.8 -101.2,291a1.8,1.8 0,0 1,-2.6 1.4l-86,-51.8c-0.8,-0.5 -1.1,-1.5 -0.7,-2.3 8.1,-16.9 85.5,-179 77.6,-171.1 -8.3,8.3 -61.9,65.2 -102,123.3l-23.1,31.8s-90.5,-60.9 -118.4,-98.8c-0.4,-0.6 -0.5,-1.1 0,-1.6 18.4,-22.3 114.1,-146.7 114.1,-146.7l-162.7,97.6c-0.8,0.4 -1.6,0.3 -2.2,-0.3 -7.9,-8.8 -62.2,-68.8 -77.9,-97 -0.3,-0.6 -0.3,-1.1 0.3,-1.6 15.5,-12.5 103.1,-86.7 103.1,-86.7l-123.3,43.7c-0.9,0.3 -1.8,-0.1 -2.2,-0.9l-45.6,-85.6c-0.6,-1 -0.2,-2.3 1,-2.5 21.7,-4.3 202.9,-42 290.8,-102.7 2.2,-1.5 5.1,-1.2 7,0.8z" />
         <path
-            android:fillColor="@color/auto_task_icon_grey"
+            android:fillColor="#ffffffff"
             android:pathData="M356,248m-52,0a52,52 0,1 0,104 0,52 52,0 1,0 -104,0Z" />
         <path
-            android:fillColor="@color/auto_task_icon_grey"
+            android:fillColor="#ffffffff"
             android:pathData="M680,808m-64,0a64,64 0,1 0,128 0,64 64,0 1,0 -128,0Z" />
         <path
-            android:fillColor="@color/auto_task_icon_grey"
+            android:fillColor="#ffffffff"
             android:pathData="M800,736m-36,0a36,36 0,1 0,72 0,36 36,0 1,0 -72,0Z" />
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/auto_task_icon_custom_time.xml b/app/src/main/res/drawable/auto_task_icon_custom_time.xml
index 6dcc6a3c..3cb5345c 100644
--- a/app/src/main/res/drawable/auto_task_icon_custom_time.xml
+++ b/app/src/main/res/drawable/auto_task_icon_custom_time.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/color_blue_primary_default" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
-    <path android:fillColor="#ffffffff" android:pathData="M12.66,18.66C15.973,18.66 18.66,15.973 18.66,12.66C18.66,9.346 15.973,6.66 12.66,6.66C9.346,6.66 6.66,9.346 6.66,12.66C6.66,15.973 9.346,18.66 12.66,18.66ZM12.66,20.535C17.009,20.535 20.535,17.009 20.535,12.66C20.535,8.31 17.009,4.785 12.66,4.785C8.31,4.785 4.785,8.31 4.785,12.66C4.785,17.009 8.31,20.535 12.66,20.535ZM11.535,10.222C11.535,9.704 11.954,9.285 12.472,9.285C12.99,9.285 13.41,9.704 13.41,10.222V11.91H15.097C15.615,11.91 16.035,12.329 16.035,12.847C16.035,13.365 15.615,13.785 15.097,13.785H12.472C12.44,13.785 12.408,13.783 12.376,13.78C11.903,13.732 11.535,13.333 11.535,12.847V10.222Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
+    <path
+        android:fillColor="#ff3482ff"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12.66,18.66C15.973,18.66 18.66,15.973 18.66,12.66C18.66,9.346 15.973,6.66 12.66,6.66C9.346,6.66 6.66,9.346 6.66,12.66C6.66,15.973 9.346,18.66 12.66,18.66ZM12.66,20.535C17.009,20.535 20.535,17.009 20.535,12.66C20.535,8.31 17.009,4.785 12.66,4.785C8.31,4.785 4.785,8.31 4.785,12.66C4.785,17.009 8.31,20.535 12.66,20.535ZM11.535,10.222C11.535,9.704 11.954,9.285 12.472,9.285C12.99,9.285 13.41,9.704 13.41,10.222V11.91H15.097C15.615,11.91 16.035,12.329 16.035,12.847C16.035,13.365 15.615,13.785 15.097,13.785H12.472C12.44,13.785 12.408,13.783 12.376,13.78C11.903,13.732 11.535,13.333 11.535,12.847V10.222Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_custom_time_grey.xml b/app/src/main/res/drawable/auto_task_icon_custom_time_grey.xml
index 06fab5f3..05d716e8 100644
--- a/app/src/main/res/drawable/auto_task_icon_custom_time_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_custom_time_grey.xml
@@ -6,10 +6,10 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/auto_task_icon_grey_bg"
+        android:fillColor="#ffe6e6e6"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <path
-        android:fillColor="@color/auto_task_icon_grey"
+        android:fillColor="#ffffffff"
         android:fillType="evenOdd"
         android:pathData="M12.66,18.66C15.973,18.66 18.66,15.973 18.66,12.66C18.66,9.346 15.973,6.66 12.66,6.66C9.346,6.66 6.66,9.346 6.66,12.66C6.66,15.973 9.346,18.66 12.66,18.66ZM12.66,20.535C17.009,20.535 20.535,17.009 20.535,12.66C20.535,8.31 17.009,4.785 12.66,4.785C8.31,4.785 4.785,8.31 4.785,12.66C4.785,17.009 8.31,20.535 12.66,20.535ZM11.535,10.222C11.535,9.704 11.954,9.285 12.472,9.285C12.99,9.285 13.41,9.704 13.41,10.222V11.91H15.097C15.615,11.91 16.035,12.329 16.035,12.847C16.035,13.365 15.615,13.785 15.097,13.785H12.472C12.44,13.785 12.408,13.783 12.376,13.78C11.903,13.732 11.535,13.333 11.535,12.847V10.222Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_frpc.xml b/app/src/main/res/drawable/auto_task_icon_frpc.xml
index 53379501..d12420a9 100644
--- a/app/src/main/res/drawable/auto_task_icon_frpc.xml
+++ b/app/src/main/res/drawable/auto_task_icon_frpc.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/color_orange_primary_default"
+        android:fillColor="#ffff8514"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <group
         android:scaleX="0.8"
diff --git a/app/src/main/res/drawable/auto_task_icon_frpc_grey.xml b/app/src/main/res/drawable/auto_task_icon_frpc_grey.xml
index 94feedde..08e4451e 100644
--- a/app/src/main/res/drawable/auto_task_icon_frpc_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_frpc_grey.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/auto_task_icon_grey_bg"
+        android:fillColor="#ffe6e6e6"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <group
         android:scaleX="0.8"
@@ -14,7 +14,7 @@
         android:translateX="3.2"
         android:translateY="3">
         <path
-            android:fillColor="@color/auto_task_icon_grey"
+            android:fillColor="#ffffffff"
             android:pathData="M7.77,6.76L6.23,5.48 0.82,12l5.41,6.52 1.54,-1.28L3.42,12l4.35,-5.24zM7,13h2v-2L7,11v2zM17,11h-2v2h2v-2zM11,13h2v-2h-2v2zM17.77,5.48l-1.54,1.28L20.58,12l-4.35,5.24 1.54,1.28L23.18,12l-5.41,-6.52z" />
     </group>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_http_server.xml b/app/src/main/res/drawable/auto_task_icon_http_server.xml
index c67af1b6..dc8cf0b0 100644
--- a/app/src/main/res/drawable/auto_task_icon_http_server.xml
+++ b/app/src/main/res/drawable/auto_task_icon_http_server.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_purple_primary_default"
+        android:fillColor="#ff8482ff"
         android:pathData="M6,0L18,0A6,6 0,0 1,24 6L24,18A6,6 0,0 1,18 24L6,24A6,6 0,0 1,0 18L0,6A6,6 0,0 1,6 0z" />
     <group
         android:scaleX="0.8"
diff --git a/app/src/main/res/drawable/auto_task_icon_http_server_grey.xml b/app/src/main/res/drawable/auto_task_icon_http_server_grey.xml
index f4c0e2c6..331e9c92 100644
--- a/app/src/main/res/drawable/auto_task_icon_http_server_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_http_server_grey.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/auto_task_icon_grey_bg"
+        android:fillColor="#ffe6e6e6"
         android:pathData="M6,0L18,0A6,6 0,0 1,24 6L24,18A6,6 0,0 1,18 24L6,24A6,6 0,0 1,0 18L0,6A6,6 0,0 1,6 0z" />
     <group
         android:scaleX="0.8"
@@ -14,7 +14,7 @@
         android:translateX="2.5"
         android:translateY="2.5">
         <path
-            android:fillColor="@color/auto_task_icon_grey"
+            android:fillColor="#ffffffff"
             android:pathData="M14,12l-2,2l-2,-2l2,-2L14,12zM12,6l2.12,2.12l2.5,-2.5L12,1L7.38,5.62l2.5,2.5L12,6zM6,12l2.12,-2.12l-2.5,-2.5L1,12l4.62,4.62l2.5,-2.5L6,12zM18,12l-2.12,2.12l2.5,2.5L23,12l-4.62,-4.62l-2.5,2.5L18,12zM12,18l-2.12,-2.12l-2.5,2.5L12,23l4.62,-4.62l-2.5,-2.5L12,18z" />
     </group>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_incall.xml b/app/src/main/res/drawable/auto_task_icon_incall.xml
index 7c04e4d0..0f20de14 100644
--- a/app/src/main/res/drawable/auto_task_icon_incall.xml
+++ b/app/src/main/res/drawable/auto_task_icon_incall.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/color_green_primary_default" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
-    <path android:fillColor="#ffffffff" android:pathData="M9.372,6.643C9.337,6.583 9.292,6.531 9.238,6.488C9.078,6.322 8.846,6.252 8.622,6.298L8.486,6.314C8.453,6.313 8.427,6.318 8.412,6.321C8.375,6.328 8.344,6.34 8.326,6.348C8.285,6.365 8.24,6.388 8.197,6.412C8.107,6.462 7.991,6.534 7.864,6.615C7.609,6.779 7.295,6.995 7.034,7.186L7.029,7.19L7.025,7.193C6.433,7.657 6.249,8.29 6.29,8.968C6.327,9.585 6.549,10.26 6.823,10.93L6.81,10.951L6.872,11.093C7.346,12.181 8.27,13.582 9.741,15.108L9.738,15.112L9.926,15.3L9.993,15.366L10.009,15.381L10.02,15.392L10.113,15.299L10.114,15.3L10.021,15.394C11.622,16.972 13.094,17.953 14.226,18.447L14.368,18.509L14.389,18.496C15.058,18.77 15.734,18.992 16.351,19.029C17.028,19.07 17.662,18.886 18.126,18.294L18.129,18.29L18.132,18.285C18.323,18.024 18.539,17.71 18.703,17.455C18.785,17.328 18.857,17.212 18.906,17.122C18.931,17.079 18.954,17.034 18.971,16.993C18.979,16.975 18.991,16.944 18.998,16.907C19.001,16.892 19.006,16.866 19.005,16.833L19.02,16.697C19.066,16.473 18.996,16.241 18.831,16.081C18.788,16.028 18.736,15.982 18.676,15.948L18.64,15.92L15.363,14.127L13.785,15.497C13.005,15.085 12.239,14.414 11.574,13.762C10.916,13.093 10.237,12.321 9.822,11.533L11.192,9.955L9.399,6.679L9.372,6.643ZM10.039,15.186L10.039,15.185L10.048,15.176L10.049,15.177C10.059,15.207 10.073,15.237 10.091,15.267L10.09,15.268C10.071,15.244 10.053,15.217 10.039,15.186ZM10.005,14.98L10.02,14.991C10.021,14.98 10.022,14.971 10.024,14.965C10.023,14.965 10.023,14.964 10.022,14.963C10.017,14.968 10.011,14.974 10.005,14.98ZM10.091,15.269L10.092,15.268L10.101,15.281L10.091,15.269ZM10.116,15.298L10.115,15.297L10.234,15.178L10.116,15.298ZM10.431,15.407L10.441,15.398L10.44,15.4L10.431,15.407ZM10.425,15.413L10.428,15.41L10.427,15.411L10.425,15.413ZM10.394,15.435L10.391,15.436L10.403,15.429L10.394,15.435ZM10.408,15.426L10.407,15.427L10.41,15.424L10.408,15.426Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
+    <path
+        android:fillColor="#ff36d167"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M9.372,6.643C9.337,6.583 9.292,6.531 9.238,6.488C9.078,6.322 8.846,6.252 8.622,6.298L8.486,6.314C8.453,6.313 8.427,6.318 8.412,6.321C8.375,6.328 8.344,6.34 8.326,6.348C8.285,6.365 8.24,6.388 8.197,6.412C8.107,6.462 7.991,6.534 7.864,6.615C7.609,6.779 7.295,6.995 7.034,7.186L7.029,7.19L7.025,7.193C6.433,7.657 6.249,8.29 6.29,8.968C6.327,9.585 6.549,10.26 6.823,10.93L6.81,10.951L6.872,11.093C7.346,12.181 8.27,13.582 9.741,15.108L9.738,15.112L9.926,15.3L9.993,15.366L10.009,15.381L10.02,15.392L10.113,15.299L10.114,15.3L10.021,15.394C11.622,16.972 13.094,17.953 14.226,18.447L14.368,18.509L14.389,18.496C15.058,18.77 15.734,18.992 16.351,19.029C17.028,19.07 17.662,18.886 18.126,18.294L18.129,18.29L18.132,18.285C18.323,18.024 18.539,17.71 18.703,17.455C18.785,17.328 18.857,17.212 18.906,17.122C18.931,17.079 18.954,17.034 18.971,16.993C18.979,16.975 18.991,16.944 18.998,16.907C19.001,16.892 19.006,16.866 19.005,16.833L19.02,16.697C19.066,16.473 18.996,16.241 18.831,16.081C18.788,16.028 18.736,15.982 18.676,15.948L18.64,15.92L15.363,14.127L13.785,15.497C13.005,15.085 12.239,14.414 11.574,13.762C10.916,13.093 10.237,12.321 9.822,11.533L11.192,9.955L9.399,6.679L9.372,6.643ZM10.039,15.186L10.039,15.185L10.048,15.176L10.049,15.177C10.059,15.207 10.073,15.237 10.091,15.267L10.09,15.268C10.071,15.244 10.053,15.217 10.039,15.186ZM10.005,14.98L10.02,14.991C10.021,14.98 10.022,14.971 10.024,14.965C10.023,14.965 10.023,14.964 10.022,14.963C10.017,14.968 10.011,14.974 10.005,14.98ZM10.091,15.269L10.092,15.268L10.101,15.281L10.091,15.269ZM10.116,15.298L10.115,15.297L10.234,15.178L10.116,15.298ZM10.431,15.407L10.441,15.398L10.44,15.4L10.431,15.407ZM10.425,15.413L10.428,15.41L10.427,15.411L10.425,15.413ZM10.394,15.435L10.391,15.436L10.403,15.429L10.394,15.435ZM10.408,15.426L10.407,15.427L10.41,15.424L10.408,15.426Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_leave_address.xml b/app/src/main/res/drawable/auto_task_icon_leave_address.xml
index a0622127..74153e18 100644
--- a/app/src/main/res/drawable/auto_task_icon_leave_address.xml
+++ b/app/src/main/res/drawable/auto_task_icon_leave_address.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/auto_task_icon_light_blue" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
-    <path android:fillColor="#ffffffff" android:pathData="M13.602,7.035C12.261,7.035 11.029,7.488 10.047,8.25C9.638,8.567 9.049,8.493 8.731,8.084C8.414,7.675 8.488,7.086 8.898,6.769C10.197,5.76 11.831,5.16 13.602,5.16C17.845,5.16 21.285,8.602 21.285,12.847C21.285,17.092 17.845,20.535 13.602,20.535C11.831,20.535 10.197,19.934 8.898,18.926C8.488,18.608 8.414,18.019 8.731,17.61C9.049,17.201 9.638,17.127 10.047,17.444C11.029,18.206 12.261,18.66 13.602,18.66C16.809,18.66 19.41,16.058 19.41,12.847C19.41,9.636 16.809,7.035 13.602,7.035Z" android:fillType="evenOdd" />
-    <path android:fillColor="#ffffffff" android:pathData="M6.697,15.066C6.919,15.317 7.332,15.16 7.332,14.826L7.332,13.737L10.468,13.737C10.668,13.737 10.831,13.574 10.831,13.373L10.831,11.194C10.831,10.993 10.668,10.831 10.468,10.831L7.332,10.831L7.332,9.561C7.332,9.225 6.916,9.069 6.696,9.322L4.382,11.972C4.261,12.11 4.262,12.315 4.383,12.452L6.697,15.066ZM14.1,13.373C14.1,13.574 13.937,13.737 13.737,13.737L12.647,13.737C12.446,13.737 12.284,13.574 12.284,13.373L12.284,11.194C12.284,10.993 12.446,10.831 12.647,10.831L13.737,10.831C13.937,10.831 14.1,10.993 14.1,11.194L14.1,13.373Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
+    <path
+        android:fillColor="#ff2eafff"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M13.602,7.035C12.261,7.035 11.029,7.488 10.047,8.25C9.638,8.567 9.049,8.493 8.731,8.084C8.414,7.675 8.488,7.086 8.898,6.769C10.197,5.76 11.831,5.16 13.602,5.16C17.845,5.16 21.285,8.602 21.285,12.847C21.285,17.092 17.845,20.535 13.602,20.535C11.831,20.535 10.197,19.934 8.898,18.926C8.488,18.608 8.414,18.019 8.731,17.61C9.049,17.201 9.638,17.127 10.047,17.444C11.029,18.206 12.261,18.66 13.602,18.66C16.809,18.66 19.41,16.058 19.41,12.847C19.41,9.636 16.809,7.035 13.602,7.035Z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M6.697,15.066C6.919,15.317 7.332,15.16 7.332,14.826L7.332,13.737L10.468,13.737C10.668,13.737 10.831,13.574 10.831,13.373L10.831,11.194C10.831,10.993 10.668,10.831 10.468,10.831L7.332,10.831L7.332,9.561C7.332,9.225 6.916,9.069 6.696,9.322L4.382,11.972C4.261,12.11 4.262,12.315 4.383,12.452L6.697,15.066ZM14.1,13.373C14.1,13.574 13.937,13.737 13.737,13.737L12.647,13.737C12.446,13.737 12.284,13.574 12.284,13.373L12.284,11.194C12.284,10.993 12.446,10.831 12.647,10.831L13.737,10.831C13.937,10.831 14.1,10.993 14.1,11.194L14.1,13.373Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_leave_address_grey.xml b/app/src/main/res/drawable/auto_task_icon_leave_address_grey.xml
index fdd23e08..fc3c4b1f 100644
--- a/app/src/main/res/drawable/auto_task_icon_leave_address_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_leave_address_grey.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/auto_task_icon_grey_bg" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
-    <path android:fillColor="@color/auto_task_icon_grey" android:pathData="M13.602,7.035C12.261,7.035 11.029,7.488 10.047,8.25C9.638,8.567 9.049,8.493 8.731,8.084C8.414,7.675 8.488,7.086 8.898,6.769C10.197,5.76 11.831,5.16 13.602,5.16C17.845,5.16 21.285,8.602 21.285,12.847C21.285,17.092 17.845,20.535 13.602,20.535C11.831,20.535 10.197,19.934 8.898,18.926C8.488,18.608 8.414,18.019 8.731,17.61C9.049,17.201 9.638,17.127 10.047,17.444C11.029,18.206 12.261,18.66 13.602,18.66C16.809,18.66 19.41,16.058 19.41,12.847C19.41,9.636 16.809,7.035 13.602,7.035Z" android:fillType="evenOdd" />
-    <path android:fillColor="@color/auto_task_icon_grey" android:pathData="M6.697,15.066C6.919,15.317 7.332,15.16 7.332,14.826L7.332,13.737L10.468,13.737C10.668,13.737 10.831,13.574 10.831,13.374L10.831,11.194C10.831,10.993 10.668,10.831 10.468,10.831L7.332,10.831L7.332,9.561C7.332,9.225 6.916,9.069 6.696,9.322L4.382,11.973C4.261,12.11 4.262,12.316 4.383,12.452L6.697,15.066ZM14.1,13.374C14.1,13.574 13.937,13.737 13.737,13.737L12.647,13.737C12.446,13.737 12.284,13.574 12.284,13.374L12.284,11.194C12.284,10.993 12.446,10.831 12.647,10.831L13.737,10.831C13.937,10.831 14.1,10.993 14.1,11.194L14.1,13.374Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
+    <path
+        android:fillColor="#ffe6e6e6"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M13.602,7.035C12.261,7.035 11.029,7.488 10.047,8.25C9.638,8.567 9.049,8.493 8.731,8.084C8.414,7.675 8.488,7.086 8.898,6.769C10.197,5.76 11.831,5.16 13.602,5.16C17.845,5.16 21.285,8.602 21.285,12.847C21.285,17.092 17.845,20.535 13.602,20.535C11.831,20.535 10.197,19.934 8.898,18.926C8.488,18.608 8.414,18.019 8.731,17.61C9.049,17.201 9.638,17.127 10.047,17.444C11.029,18.206 12.261,18.66 13.602,18.66C16.809,18.66 19.41,16.058 19.41,12.847C19.41,9.636 16.809,7.035 13.602,7.035Z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M6.697,15.066C6.919,15.317 7.332,15.16 7.332,14.826L7.332,13.737L10.468,13.737C10.668,13.737 10.831,13.574 10.831,13.374L10.831,11.194C10.831,10.993 10.668,10.831 10.468,10.831L7.332,10.831L7.332,9.561C7.332,9.225 6.916,9.069 6.696,9.322L4.382,11.973C4.261,12.11 4.262,12.316 4.383,12.452L6.697,15.066ZM14.1,13.374C14.1,13.574 13.937,13.737 13.737,13.737L12.647,13.737C12.446,13.737 12.284,13.574 12.284,13.374L12.284,11.194C12.284,10.993 12.446,10.831 12.647,10.831L13.737,10.831C13.937,10.831 14.1,10.993 14.1,11.194L14.1,13.374Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_left_arrow.xml b/app/src/main/res/drawable/auto_task_icon_left_arrow.xml
index b74e1ae2..6bc7f609 100644
--- a/app/src/main/res/drawable/auto_task_icon_left_arrow.xml
+++ b/app/src/main/res/drawable/auto_task_icon_left_arrow.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="10.0dip" android:width="7.0dip" android:autoMirrored="true" android:viewportWidth="7.0" android:viewportHeight="10.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/base_color_wb_bw" android:pathData="M-0,1.184L-0,8.815C-0,9.743 1.087,10.246 1.794,9.645L6.283,5.829C6.795,5.394 6.795,4.605 6.283,4.17L1.794,0.354C1.087,-0.247 -0,0.256 -0,1.184Z" android:fillAlpha="0.2" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="7.0dip"
+    android:height="10.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="7.0"
+    android:viewportHeight="10.0">
+    <path
+        android:fillAlpha="0.2"
+        android:fillColor="#ff000000"
+        android:pathData="M-0,1.184L-0,8.815C-0,9.743 1.087,10.246 1.794,9.645L6.283,5.829C6.795,5.394 6.795,4.605 6.283,4.17L1.794,0.354C1.087,-0.247 -0,0.256 -0,1.184Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_left_arrow_grey.xml b/app/src/main/res/drawable/auto_task_icon_left_arrow_grey.xml
index d69fee56..f5ccdd66 100644
--- a/app/src/main/res/drawable/auto_task_icon_left_arrow_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_left_arrow_grey.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="10.0dip" android:width="7.0dip" android:autoMirrored="true" android:viewportWidth="7.0" android:viewportHeight="10.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/base_color_wb_bw" android:pathData="M-0,1.184L-0,8.815C-0,9.743 1.087,10.246 1.794,9.645L6.283,5.829C6.795,5.394 6.795,4.605 6.283,4.17L1.794,0.354C1.087,-0.247 -0,0.256 -0,1.184Z" android:fillAlpha="0.1" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="7.0dip"
+    android:height="10.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="7.0"
+    android:viewportHeight="10.0">
+    <path
+        android:fillAlpha="0.1"
+        android:fillColor="#ff000000"
+        android:pathData="M-0,1.184L-0,8.815C-0,9.743 1.087,10.246 1.794,9.645L6.283,5.829C6.795,5.394 6.795,4.605 6.283,4.17L1.794,0.354C1.087,-0.247 -0,0.256 -0,1.184Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_location.xml b/app/src/main/res/drawable/auto_task_icon_location.xml
index a4d9b263..4dd20985 100644
--- a/app/src/main/res/drawable/auto_task_icon_location.xml
+++ b/app/src/main/res/drawable/auto_task_icon_location.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/color_blue_primary_default" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
-    <path android:fillColor="#ffffffff" android:pathData="M18.026,7.954C18.161,7.656 18.095,7.309 17.859,7.077C17.622,6.844 17.263,6.771 16.949,6.893L6.265,11.05C5.927,11.181 5.718,11.508 5.748,11.856C5.777,12.205 6.04,12.495 6.395,12.572L10.967,13.562L11.91,17.825C11.986,18.165 12.281,18.42 12.642,18.455C13.002,18.49 13.345,18.297 13.489,17.978L18.026,7.954Z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
+    <path
+        android:fillColor="#ff3482ff"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M18.026,7.954C18.161,7.656 18.095,7.309 17.859,7.077C17.622,6.844 17.263,6.771 16.949,6.893L6.265,11.05C5.927,11.181 5.718,11.508 5.748,11.856C5.777,12.205 6.04,12.495 6.395,12.572L10.967,13.562L11.91,17.825C11.986,18.165 12.281,18.42 12.642,18.455C13.002,18.49 13.345,18.297 13.489,17.978L18.026,7.954Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_lock_screen.xml b/app/src/main/res/drawable/auto_task_icon_lock_screen.xml
index 958e0478..ad28658a 100644
--- a/app/src/main/res/drawable/auto_task_icon_lock_screen.xml
+++ b/app/src/main/res/drawable/auto_task_icon_lock_screen.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/color_deep_orange_primary_default" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
-    <path android:fillColor="#ffffffff" android:pathData="M10.351,10.41H14.968V9.285C14.968,8.01 13.934,6.976 12.659,6.976C11.384,6.976 10.351,8.01 10.351,9.285V10.41ZM8.534,10.41H7.737C6.935,10.41 6.284,11.06 6.284,11.863V18.332C6.284,19.134 6.935,19.785 7.737,19.785H17.581C18.384,19.785 19.034,19.134 19.034,18.332V11.863C19.034,11.06 18.384,10.41 17.581,10.41H16.784V9.285C16.784,7.006 14.938,5.16 12.659,5.16C10.381,5.16 8.534,7.006 8.534,9.285V10.41Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
+    <path
+        android:fillColor="#ffff5b29"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M10.351,10.41H14.968V9.285C14.968,8.01 13.934,6.976 12.659,6.976C11.384,6.976 10.351,8.01 10.351,9.285V10.41ZM8.534,10.41H7.737C6.935,10.41 6.284,11.06 6.284,11.863V18.332C6.284,19.134 6.935,19.785 7.737,19.785H17.581C18.384,19.785 19.034,19.134 19.034,18.332V11.863C19.034,11.06 18.384,10.41 17.581,10.41H16.784V9.285C16.784,7.006 14.938,5.16 12.659,5.16C10.381,5.16 8.534,7.006 8.534,9.285V10.41Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_lock_screen_grey.xml b/app/src/main/res/drawable/auto_task_icon_lock_screen_grey.xml
index 9f193c73..2f600b4a 100644
--- a/app/src/main/res/drawable/auto_task_icon_lock_screen_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_lock_screen_grey.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/auto_task_icon_grey_bg" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
-    <path android:fillColor="@color/auto_task_icon_grey" android:pathData="M10.351,10.41H14.968V9.285C14.968,8.01 13.934,6.976 12.659,6.976C11.384,6.976 10.351,8.01 10.351,9.285V10.41ZM8.534,10.41H7.737C6.935,10.41 6.284,11.06 6.284,11.863V18.332C6.284,19.134 6.935,19.785 7.737,19.785H17.581C18.384,19.785 19.034,19.134 19.034,18.332V11.863C19.034,11.06 18.384,10.41 17.581,10.41H16.784V9.285C16.784,7.006 14.938,5.16 12.659,5.16C10.381,5.16 8.534,7.006 8.534,9.285V10.41Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
+    <path
+        android:fillColor="#ffe6e6e6"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M10.351,10.41H14.968V9.285C14.968,8.01 13.934,6.976 12.659,6.976C11.384,6.976 10.351,8.01 10.351,9.285V10.41ZM8.534,10.41H7.737C6.935,10.41 6.284,11.06 6.284,11.863V18.332C6.284,19.134 6.935,19.785 7.737,19.785H17.581C18.384,19.785 19.034,19.134 19.034,18.332V11.863C19.034,11.06 18.384,10.41 17.581,10.41H16.784V9.285C16.784,7.006 14.938,5.16 12.659,5.16C10.381,5.16 8.534,7.006 8.534,9.285V10.41Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_network.xml b/app/src/main/res/drawable/auto_task_icon_network.xml
index f7eee1b2..85954bb7 100644
--- a/app/src/main/res/drawable/auto_task_icon_network.xml
+++ b/app/src/main/res/drawable/auto_task_icon_network.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="24.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/color_yellow_primary_default" android:pathData="M6.66,0L18.66,0A6,6 0,0 1,24.66 6L24.66,18A6,6 0,0 1,18.66 24L6.66,24A6,6 0,0 1,0.66 18L0.66,6A6,6 0,0 1,6.66 0z" />
-    <path android:fillColor="#ffffffff" android:pathData="M14.609,5.449C14.127,5.449 13.737,5.839 13.737,6.321V16.927C13.737,17.409 14.127,17.799 14.609,17.799C15.09,17.799 15.481,17.409 15.481,16.927V9.248H17.732C18.052,9.248 18.215,8.864 17.994,8.633L15.377,5.908C15.23,5.634 14.941,5.449 14.609,5.449Z" android:fillType="evenOdd" />
-    <path android:fillColor="#ffffffff" android:pathData="M9.962,17.799C10.443,17.799 10.834,17.409 10.834,16.927V6.321C10.834,5.839 10.443,5.449 9.962,5.449C9.48,5.449 9.09,5.839 9.09,6.321V14H6.838C6.518,14 6.355,14.384 6.576,14.615L9.193,17.34C9.34,17.613 9.629,17.799 9.962,17.799Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="24.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffffb21d"
+        android:pathData="M6.66,0L18.66,0A6,6 0,0 1,24.66 6L24.66,18A6,6 0,0 1,18.66 24L6.66,24A6,6 0,0 1,0.66 18L0.66,6A6,6 0,0 1,6.66 0z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M14.609,5.449C14.127,5.449 13.737,5.839 13.737,6.321V16.927C13.737,17.409 14.127,17.799 14.609,17.799C15.09,17.799 15.481,17.409 15.481,16.927V9.248H17.732C18.052,9.248 18.215,8.864 17.994,8.633L15.377,5.908C15.23,5.634 14.941,5.449 14.609,5.449Z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M9.962,17.799C10.443,17.799 10.834,17.409 10.834,16.927V6.321C10.834,5.839 10.443,5.449 9.962,5.449C9.48,5.449 9.09,5.839 9.09,6.321V14H6.838C6.518,14 6.355,14.384 6.576,14.615L9.193,17.34C9.34,17.613 9.629,17.799 9.962,17.799Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_network_grey.xml b/app/src/main/res/drawable/auto_task_icon_network_grey.xml
index f85a79bc..fecd4e60 100644
--- a/app/src/main/res/drawable/auto_task_icon_network_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_network_grey.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="24.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/auto_task_icon_grey_bg" android:pathData="M6.66,0L18.66,0A6,6 0,0 1,24.66 6L24.66,18A6,6 0,0 1,18.66 24L6.66,24A6,6 0,0 1,0.66 18L0.66,6A6,6 0,0 1,6.66 0z" />
-    <path android:fillColor="@color/auto_task_icon_grey" android:pathData="M14.609,5.449C14.127,5.449 13.737,5.839 13.737,6.321V16.927C13.737,17.409 14.127,17.799 14.609,17.799C15.09,17.799 15.481,17.409 15.481,16.927V9.248H17.732C18.052,9.248 18.215,8.864 17.994,8.633L15.377,5.908C15.23,5.634 14.941,5.449 14.609,5.449Z" android:fillType="evenOdd" />
-    <path android:fillColor="@color/auto_task_icon_grey" android:pathData="M9.962,17.799C10.443,17.799 10.834,17.409 10.834,16.927V6.321C10.834,5.839 10.443,5.449 9.962,5.449C9.48,5.449 9.09,5.839 9.09,6.321V14H6.838C6.518,14 6.355,14.384 6.576,14.615L9.193,17.34C9.34,17.613 9.629,17.799 9.962,17.799Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="24.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffe6e6e6"
+        android:pathData="M6.66,0L18.66,0A6,6 0,0 1,24.66 6L24.66,18A6,6 0,0 1,18.66 24L6.66,24A6,6 0,0 1,0.66 18L0.66,6A6,6 0,0 1,6.66 0z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M14.609,5.449C14.127,5.449 13.737,5.839 13.737,6.321V16.927C13.737,17.409 14.127,17.799 14.609,17.799C15.09,17.799 15.481,17.409 15.481,16.927V9.248H17.732C18.052,9.248 18.215,8.864 17.994,8.633L15.377,5.908C15.23,5.634 14.941,5.449 14.609,5.449Z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M9.962,17.799C10.443,17.799 10.834,17.409 10.834,16.927V6.321C10.834,5.839 10.443,5.449 9.962,5.449C9.48,5.449 9.09,5.839 9.09,6.321V14H6.838C6.518,14 6.355,14.384 6.576,14.615L9.193,17.34C9.34,17.613 9.629,17.799 9.962,17.799Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_notification.xml b/app/src/main/res/drawable/auto_task_icon_notification.xml
index 1dde84b6..7a2f3707 100644
--- a/app/src/main/res/drawable/auto_task_icon_notification.xml
+++ b/app/src/main/res/drawable/auto_task_icon_notification.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/color_blue_primary_default"
+        android:fillColor="#ff3482ff"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <group
         android:scaleX="0.017"
diff --git a/app/src/main/res/drawable/auto_task_icon_notification_grey.xml b/app/src/main/res/drawable/auto_task_icon_notification_grey.xml
index e0047155..f118682d 100644
--- a/app/src/main/res/drawable/auto_task_icon_notification_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_notification_grey.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/auto_task_icon_grey_bg"
+        android:fillColor="#ffe6e6e6"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <group
         android:scaleX="0.017"
@@ -14,7 +14,7 @@
         android:translateX="3.5"
         android:translateY="3.7">
         <path
-            android:fillColor="@color/auto_task_icon_grey"
+            android:fillColor="#ffffffff"
             android:pathData="M978.7,67.5c0,-0.1 -0.1,-0.1 -0.1,-0.2 -2.1,-4.1 -5.1,-7.8 -8.8,-10.8 -3.6,-3 -7.7,-5.2 -12,-6.6 -0.1,0 -0.2,-0.1 -0.3,-0.1 -1.7,-0.6 -3.5,-0.9 -5.3,-1.2 -0.5,-0.1 -1,-0.3 -1.6,-0.3 -1.7,-0.2 -3.3,-0.2 -5,-0.1 -0.7,0 -1.3,-0.1 -2,0 -4.8,0.3 -9.6,1.7 -14,3.9L61.5,482.6c-8.5,4.1 -15,11.5 -18,20.5 -0.9,2.5 -1.3,5.2 -1.6,7.8 -0.9,5.3 -0.7,10.8 1,16 2.8,9.1 9.1,16.6 17.6,20.9l220.3,115.8c5.3,2.8 11.1,4.2 17.1,4.2 13.3,0.1 25.5,-7.1 32,-18.7 9.5,-17.3 2.8,-38.8 -14.8,-48.1l-161,-84.6 647.5,-321.2 -394.9,453.5c-0.3,0.3 -0.4,0.7 -0.7,1 -9.8,6.4 -16.2,17.2 -16.2,29.6v261.1c0.1,9.5 4,18.6 10.8,25.3 6.8,6.7 16,10.3 25.5,10.2v0.1c20,0 36.2,-15.9 36.2,-35.5V694.3L893.4,199l-89.6,653.3 -227.3,-109.2c-17.9,-8.6 -39.4,-1.4 -48.5,16.2 -4.2,8.5 -4.8,18.3 -1.7,27.3 3.1,9 9.7,16.3 18.3,20.3l270.1,129.9c5,2.4 10.4,3.6 16,3.6 0.2,0 0.4,-0.1 0.6,-0.1 0.6,0 1.3,0.2 1.9,0.2 18,0.1 33.3,-13 35.9,-30.8l112,-816.1c2.5,-8.4 2,-17.7 -2.4,-26.1z" />
     </group>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_rule.xml b/app/src/main/res/drawable/auto_task_icon_rule.xml
index def3c0a7..955d34cf 100644
--- a/app/src/main/res/drawable/auto_task_icon_rule.xml
+++ b/app/src/main/res/drawable/auto_task_icon_rule.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_grey_primary_default"
+        android:fillColor="#ff8c93b0"
         android:pathData="M6,0L18,0A6,6 0,0 1,24 6L24,18A6,6 0,0 1,18 24L6,24A6,6 0,0 1,0 18L0,6A6,6 0,0 1,6 0z" />
     <group
         android:scaleX="0.8"
diff --git a/app/src/main/res/drawable/auto_task_icon_rule_grey.xml b/app/src/main/res/drawable/auto_task_icon_rule_grey.xml
index e989939d..f39aff40 100644
--- a/app/src/main/res/drawable/auto_task_icon_rule_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_rule_grey.xml
@@ -6,15 +6,15 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/auto_task_icon_grey_bg"
+        android:fillColor="#ffe6e6e6"
         android:pathData="M6,0L18,0A6,6 0,0 1,24 6L24,18A6,6 0,0 1,18 24L6,24A6,6 0,0 1,0 18L0,6A6,6 0,0 1,6 0z" />
     <group
         android:scaleX="0.8"
         android:scaleY="0.8"
         android:translateX="3"
         android:translateY="2.8">
-    <path
-        android:fillColor="@color/auto_task_icon_grey"
-        android:pathData="M16.54,11L13,7.46l1.41,-1.41l2.12,2.12l4.24,-4.24l1.41,1.41L16.54,11zM11,7H2v2h9V7zM21,13.41L19.59,12L17,14.59L14.41,12L13,13.41L15.59,16L13,18.59L14.41,20L17,17.41L19.59,20L21,18.59L18.41,16L21,13.41zM11,15H2v2h9V15z" />
+        <path
+            android:fillColor="#ffffffff"
+            android:pathData="M16.54,11L13,7.46l1.41,-1.41l2.12,2.12l4.24,-4.24l1.41,1.41L16.54,11zM11,7H2v2h9V7zM21,13.41L19.59,12L17,14.59L14.41,12L13,13.41L15.59,16L13,18.59L14.41,20L17,17.41L19.59,20L21,18.59L18.41,16L21,13.41zM11,15H2v2h9V15z" />
     </group>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_sender.xml b/app/src/main/res/drawable/auto_task_icon_sender.xml
index c64dd433..781aceab 100644
--- a/app/src/main/res/drawable/auto_task_icon_sender.xml
+++ b/app/src/main/res/drawable/auto_task_icon_sender.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/color_deep_orange_primary_default"
+        android:fillColor="#ffff5b29"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <group
         android:scaleX="0.8"
diff --git a/app/src/main/res/drawable/auto_task_icon_sender_grey.xml b/app/src/main/res/drawable/auto_task_icon_sender_grey.xml
index a59f4d77..9b8f4f52 100644
--- a/app/src/main/res/drawable/auto_task_icon_sender_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_sender_grey.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/auto_task_icon_grey_bg"
+        android:fillColor="#ffe6e6e6"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <group
         android:scaleX="0.8"
@@ -14,7 +14,7 @@
         android:translateX="3.2"
         android:translateY="3">
         <path
-            android:fillColor="@color/auto_task_icon_grey"
+            android:fillColor="#ffffffff"
             android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
     </group>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_settings.xml b/app/src/main/res/drawable/auto_task_icon_settings.xml
index bf42f73f..f6b077eb 100644
--- a/app/src/main/res/drawable/auto_task_icon_settings.xml
+++ b/app/src/main/res/drawable/auto_task_icon_settings.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/auto_task_icon_light_blue"
+        android:fillColor="#ff2eafff"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <group
         android:scaleX="0.8"
diff --git a/app/src/main/res/drawable/auto_task_icon_settings_grey.xml b/app/src/main/res/drawable/auto_task_icon_settings_grey.xml
index 0ec1a07b..98248a07 100644
--- a/app/src/main/res/drawable/auto_task_icon_settings_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_settings_grey.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/auto_task_icon_grey_bg"
+        android:fillColor="#ffe6e6e6"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <group
         android:scaleX="0.8"
@@ -14,7 +14,7 @@
         android:translateX="3.2"
         android:translateY="3">
         <path
-            android:fillColor="@color/auto_task_icon_grey"
+            android:fillColor="#ffffffff"
             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" />
     </group>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_sim.xml b/app/src/main/res/drawable/auto_task_icon_sim.xml
index 366242ca..83d61485 100644
--- a/app/src/main/res/drawable/auto_task_icon_sim.xml
+++ b/app/src/main/res/drawable/auto_task_icon_sim.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/color_grey_primary_default"
+        android:fillColor="#ff8c93b0"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <group
         android:scaleX="0.8"
diff --git a/app/src/main/res/drawable/auto_task_icon_sim_grey.xml b/app/src/main/res/drawable/auto_task_icon_sim_grey.xml
index af38558b..c4eea9b4 100644
--- a/app/src/main/res/drawable/auto_task_icon_sim_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_sim_grey.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/auto_task_icon_grey_bg"
+        android:fillColor="#ffe6e6e6"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <group
         android:scaleX="0.8"
@@ -14,7 +14,7 @@
         android:translateX="3.2"
         android:translateY="3">
         <path
-            android:fillColor="@color/auto_task_icon_grey"
+            android:fillColor="#ffffffff"
             android:fillType="evenOdd"
             android:pathData="M19.99,4c0,-1.1 -0.89,-2 -1.99,-2h-8L4,8v12c0,1.1 0.9,2 2,2h12.01c1.1,0 1.99,-0.9 1.99,-2l-0.01,-16zM9,19L7,19v-2h2v2zM17,19h-2v-2h2v2zM9,15L7,15v-4h2v4zM13,19h-2v-4h2v4zM13,13h-2v-2h2v2zM17,15h-2v-4h2v4z" />
     </group>
diff --git a/app/src/main/res/drawable/auto_task_icon_sms.xml b/app/src/main/res/drawable/auto_task_icon_sms.xml
index e4016012..006f52fe 100644
--- a/app/src/main/res/drawable/auto_task_icon_sms.xml
+++ b/app/src/main/res/drawable/auto_task_icon_sms.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/color_yellow_primary_default"
+        android:fillColor="#ffffb21d"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <group
         android:scaleX="0.8"
diff --git a/app/src/main/res/drawable/auto_task_icon_sms_grey.xml b/app/src/main/res/drawable/auto_task_icon_sms_grey.xml
index d64c1acb..b295bd78 100644
--- a/app/src/main/res/drawable/auto_task_icon_sms_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_sms_grey.xml
@@ -5,10 +5,10 @@
     android:viewportWidth="28.0"
     android:viewportHeight="28.0">
     <path
-        android:fillColor="@color/auto_task_icon_grey_bg"
+        android:fillColor="#ffe6e6e6"
         android:pathData="M7.5,0L20.5,0A7.5,7.5 0,0 1,28 7.5L28,20.5A7.5,7.5 0,0 1,20.5 28L7.5,28A7.5,7.5 0,0 1,0 20.5L0,7.5A7.5,7.5 0,0 1,7.5 0z" />
     <path
-        android:fillColor="@color/auto_task_icon_grey"
+        android:fillColor="#ffffffff"
         android:fillType="evenOdd"
         android:pathData="M5,9.2C5,8.08 5,7.52 5.218,7.092C5.41,6.716 5.716,6.41 6.092,6.218C6.52,6 7.08,6 8.2,6H19.8C20.92,6 21.48,6 21.908,6.218C22.284,6.41 22.59,6.716 22.782,7.092C23,7.52 23,8.08 23,9.2V16.8C23,17.92 23,18.48 22.782,18.908C22.59,19.284 22.284,19.59 21.908,19.782C21.48,20 20.92,20 19.8,20H8.484C8.304,20 8.214,20 8.127,20.015C8.05,20.029 7.975,20.052 7.903,20.083C7.822,20.119 7.747,20.169 7.597,20.269L7.597,20.269L6.244,21.171C5.84,21.44 5.638,21.575 5.47,21.565C5.324,21.556 5.189,21.484 5.101,21.367C5,21.234 5,20.991 5,20.505V9.2ZM9,11C9,10.448 9.448,10 10,10H18C18.552,10 19,10.448 19,11C19,11.552 18.552,12 18,12H10C9.448,12 9,11.552 9,11ZM10,14C9.448,14 9,14.448 9,15C9,15.552 9.448,16 10,16H14C14.552,16 15,15.552 15,15C15,14.448 14.552,14 14,14H10Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_start_activity.xml b/app/src/main/res/drawable/auto_task_icon_start_activity.xml
index 0ff88ce0..8ca7b9f6 100644
--- a/app/src/main/res/drawable/auto_task_icon_start_activity.xml
+++ b/app/src/main/res/drawable/auto_task_icon_start_activity.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="25.0"
     android:viewportHeight="25.0">
     <path
-        android:fillColor="@color/auto_task_icon_light_blue"
+        android:fillColor="#ff2eafff"
         android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <path
         android:fillColor="#ffffffff"
diff --git a/app/src/main/res/drawable/auto_task_icon_to_address.xml b/app/src/main/res/drawable/auto_task_icon_to_address.xml
index 86975261..4bc6a19e 100644
--- a/app/src/main/res/drawable/auto_task_icon_to_address.xml
+++ b/app/src/main/res/drawable/auto_task_icon_to_address.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/auto_task_icon_light_blue" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path android:fillColor="#ff2eafff" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
     <path android:fillColor="#ffffffff" android:pathData="M13.226,7.035C11.886,7.035 10.654,7.488 9.672,8.25C9.263,8.567 8.674,8.493 8.356,8.084C8.039,7.675 8.113,7.086 8.522,6.769C9.822,5.76 11.455,5.16 13.226,5.16C17.47,5.16 20.91,8.602 20.91,12.847C20.91,17.092 17.47,20.535 13.226,20.535C11.455,20.535 9.822,19.934 8.522,18.926C8.113,18.608 8.039,18.019 8.356,17.61C8.674,17.201 9.263,17.127 9.672,17.444C10.654,18.206 11.886,18.66 13.226,18.66C16.434,18.66 19.035,16.058 19.035,12.847C19.035,9.636 16.434,7.035 13.226,7.035Z" android:fillType="evenOdd" />
     <path android:fillColor="#ffffffff" android:pathData="M11.792,9.367C11.57,9.117 11.157,9.274 11.157,9.608V10.831L7.924,10.831C7.723,10.831 7.561,10.993 7.561,11.194L7.561,13.373C7.561,13.574 7.723,13.737 7.924,13.737L11.157,13.737V14.873C11.157,15.209 11.573,15.365 11.794,15.112L14.108,12.461C14.228,12.324 14.227,12.118 14.106,11.982L11.792,9.367ZM4.292,11.193C4.292,10.993 4.454,10.83 4.655,10.83L5.745,10.83C5.945,10.83 6.108,10.993 6.108,11.193L6.108,13.373C6.108,13.573 5.945,13.736 5.745,13.736L4.655,13.736C4.454,13.736 4.292,13.573 4.292,13.373L4.292,11.193Z" android:fillType="evenOdd" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/auto_task_icon_to_address_grey.xml b/app/src/main/res/drawable/auto_task_icon_to_address_grey.xml
index c5aaeb90..8a2c8478 100644
--- a/app/src/main/res/drawable/auto_task_icon_to_address_grey.xml
+++ b/app/src/main/res/drawable/auto_task_icon_to_address_grey.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/auto_task_icon_grey_bg" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
-    <path android:fillColor="@color/auto_task_icon_grey" android:pathData="M13.226,7.035C11.886,7.035 10.654,7.488 9.672,8.25C9.263,8.567 8.674,8.493 8.356,8.084C8.039,7.675 8.113,7.086 8.522,6.769C9.822,5.76 11.455,5.16 13.226,5.16C17.47,5.16 20.91,8.602 20.91,12.847C20.91,17.092 17.47,20.535 13.226,20.535C11.455,20.535 9.822,19.934 8.522,18.926C8.113,18.608 8.039,18.019 8.356,17.61C8.674,17.201 9.263,17.127 9.672,17.444C10.654,18.206 11.886,18.66 13.226,18.66C16.434,18.66 19.035,16.058 19.035,12.847C19.035,9.636 16.434,7.035 13.226,7.035Z" android:fillType="evenOdd" />
-    <path android:fillColor="@color/auto_task_icon_grey" android:pathData="M11.792,9.367C11.57,9.117 11.157,9.274 11.157,9.608V10.831L7.924,10.831C7.723,10.831 7.561,10.993 7.561,11.194L7.561,13.373C7.561,13.574 7.723,13.737 7.924,13.737L11.157,13.737V14.873C11.157,15.209 11.573,15.365 11.794,15.112L14.108,12.461C14.228,12.324 14.227,12.118 14.106,11.982L11.792,9.367ZM4.292,11.193C4.292,10.993 4.454,10.83 4.655,10.83L5.745,10.83C5.945,10.83 6.108,10.993 6.108,11.193L6.108,13.373C6.108,13.573 5.945,13.736 5.745,13.736L4.655,13.736C4.454,13.736 4.292,13.573 4.292,13.373L4.292,11.193Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
+    <path
+        android:fillColor="#ffe6e6e6"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M13.226,7.035C11.886,7.035 10.654,7.488 9.672,8.25C9.263,8.567 8.674,8.493 8.356,8.084C8.039,7.675 8.113,7.086 8.522,6.769C9.822,5.76 11.455,5.16 13.226,5.16C17.47,5.16 20.91,8.602 20.91,12.847C20.91,17.092 17.47,20.535 13.226,20.535C11.455,20.535 9.822,19.934 8.522,18.926C8.113,18.608 8.039,18.019 8.356,17.61C8.674,17.201 9.263,17.127 9.672,17.444C10.654,18.206 11.886,18.66 13.226,18.66C16.434,18.66 19.035,16.058 19.035,12.847C19.035,9.636 16.434,7.035 13.226,7.035Z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M11.792,9.367C11.57,9.117 11.157,9.274 11.157,9.608V10.831L7.924,10.831C7.723,10.831 7.561,10.993 7.561,11.194L7.561,13.373C7.561,13.574 7.723,13.737 7.924,13.737L11.157,13.737V14.873C11.157,15.209 11.573,15.365 11.794,15.112L14.108,12.461C14.228,12.324 14.227,12.118 14.106,11.982L11.792,9.367ZM4.292,11.193C4.292,10.993 4.454,10.83 4.655,10.83L5.745,10.83C5.945,10.83 6.108,10.993 6.108,11.193L6.108,13.373C6.108,13.573 5.945,13.736 5.745,13.736L4.655,13.736C4.454,13.736 4.292,13.573 4.292,13.373L4.292,11.193Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_bottom_sheet.xml b/app/src/main/res/drawable/bg_bottom_sheet.xml
index d7a2ec0b..86cda1e9 100644
--- a/app/src/main/res/drawable/bg_bottom_sheet.xml
+++ b/app/src/main/res/drawable/bg_bottom_sheet.xml
@@ -2,5 +2,5 @@
     <corners
         android:topLeftRadius="@dimen/config_margin_16dp"
         android:topRightRadius="@dimen/config_margin_16dp" />
-    <solid android:color="@color/xui_config_color_white" />
+    <solid android:color="#FFFFFF" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_dialog_common_tip_corner_white.xml b/app/src/main/res/drawable/bg_dialog_common_tip_corner_white.xml
index dbcadadd..dbc97541 100644
--- a/app/src/main/res/drawable/bg_dialog_common_tip_corner_white.xml
+++ b/app/src/main/res/drawable/bg_dialog_common_tip_corner_white.xml
@@ -2,8 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/xui_config_color_white" />
-
+    <solid android:color="#FFFFFF" />
     <corners android:radius="@dimen/config_margin_10dp" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_logcat.xml b/app/src/main/res/drawable/ic_logcat.xml
index 10d05ca4..9e750fb7 100644
--- a/app/src/main/res/drawable/ic_logcat.xml
+++ b/app/src/main/res/drawable/ic_logcat.xml
@@ -5,9 +5,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?attr/colorAccent"
+        android:fillColor="#299EE3"
         android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM7.68,14.98H6V9h1.71c1.28,0 1.71,1.03 1.71,1.71l0,2.56C9.42,13.95 9,14.98 7.68,14.98zM12.38,11.46v1.07h-1.18v1.39h1.93v1.07h-2.25c-0.4,0.01 -0.74,-0.31 -0.75,-0.71V9.75c-0.01,-0.4 0.31,-0.74 0.71,-0.75h2.28l0,1.07h-1.92v1.39H12.38zM16.88,14.23c-0.48,1.11 -1.33,0.89 -1.71,0L13.77,9h1.18l1.07,4.11L17.09,9h1.18L16.88,14.23z" />
     <path
-        android:fillColor="?attr/colorAccent"
+        android:fillColor="#299EE3"
         android:pathData="M7.77,10.12H7.14v3.77h0.63c0.14,0 0.28,-0.05 0.42,-0.16c0.14,-0.1 0.21,-0.26 0.21,-0.47v-2.52c0,-0.21 -0.07,-0.37 -0.21,-0.47C8.05,10.17 7.91,10.12 7.77,10.12z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_logs_selected.xml b/app/src/main/res/drawable/ic_menu_logs_selected.xml
index 0f2cf989..ae65f6a5 100644
--- a/app/src/main/res/drawable/ic_menu_logs_selected.xml
+++ b/app/src/main/res/drawable/ic_menu_logs_selected.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorAccent"
+        android:fillColor="#299EE3"
         android:pathData="M19,5v14L5,19L5,5h14m1.1,-2L3.9,3c-0.5,0 -0.9,0.4 -0.9,0.9v16.2c0,0.4 0.4,0.9 0.9,0.9h16.2c0.4,0 0.9,-0.5 0.9,-0.9L21,3.9c0,-0.5 -0.5,-0.9 -0.9,-0.9zM11,7h6v2h-6L11,7zM11,11h6v2h-6v-2zM11,15h6v2h-6zM7,7h2v2L7,9zM7,11h2v2L7,13zM7,15h2v2L7,17z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_rule_selected.xml b/app/src/main/res/drawable/ic_menu_rule_selected.xml
index 8c55c6d7..45c0c540 100644
--- a/app/src/main/res/drawable/ic_menu_rule_selected.xml
+++ b/app/src/main/res/drawable/ic_menu_rule_selected.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorAccent"
+        android:fillColor="#299EE3"
         android:pathData="M16.54,11L13,7.46l1.41,-1.41l2.12,2.12l4.24,-4.24l1.41,1.41L16.54,11zM11,7H2v2h9V7zM21,13.41L19.59,12L17,14.59L14.41,12L13,13.41L15.59,16L13,18.59L14.41,20L17,17.41L19.59,20L21,18.59L18.41,16L21,13.41zM11,15H2v2h9V15z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_send_selected.xml b/app/src/main/res/drawable/ic_menu_send_selected.xml
index 760b7ba3..7651d799 100644
--- a/app/src/main/res/drawable/ic_menu_send_selected.xml
+++ b/app/src/main/res/drawable/ic_menu_send_selected.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorAccent"
+        android:fillColor="#299EE3"
         android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_settings_selected.xml b/app/src/main/res/drawable/ic_menu_settings_selected.xml
index c29dab58..86b6af3b 100644
--- a/app/src/main/res/drawable/ic_menu_settings_selected.xml
+++ b/app/src/main/res/drawable/ic_menu_settings_selected.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorAccent"
+        android:fillColor="#299EE3"
         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/layout/dialog_guide_tips.xml b/app/src/main/res/layout/dialog_guide_tips.xml
index 37c60afb..3747b4ff 100644
--- a/app/src/main/res/layout/dialog_guide_tips.xml
+++ b/app/src/main/res/layout/dialog_guide_tips.xml
@@ -51,7 +51,7 @@
                         android:layout_width="0dp"
                         android:layout_weight="1"
                         android:text="@string/tip_title"
-                        android:textColor="?attr/colorAccent"
+                        android:textColor="#299EE3"
                         tools:ignore="TextContrastCheck" />
 
                     <com.xuexiang.xui.widget.alpha.XUIAlphaImageView
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index a4ae897d..6e9afc46 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -240,7 +240,7 @@
                     style="@style/SwitchButtonStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:ignore="TouchTargetSizeCheck" />
+                    tools:ignore="TouchTargetSizeCheck,DuplicateSpeakableTextCheck" />
 
             </LinearLayout>
 
@@ -808,7 +808,7 @@
             </LinearLayout>
 
             <LinearLayout
-                style="@style/BarStyle.Switch"
+                style="@style/BarStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:ignore="RtlSymmetry">
@@ -987,6 +987,66 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                style="@style/BarStyle.Switch"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/enable_accessibility_service"
+                            android:textStyle="bold"
+                            tools:ignore="RelativeOverlap" />
+
+                        <com.xuexiang.xui.widget.button.shadowbutton.RippleShadowShadowButton
+                            android:id="@+id/btn_option"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5dp"
+                            android:gravity="center"
+                            android:padding="3dp"
+                            android:text="@string/display_floating_controls"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/text_size_mini"
+                            app:sb_color_unpressed="@color/colorPrimary"
+                            app:sb_ripple_color="@color/white"
+                            app:sb_ripple_duration="500"
+                            app:sb_shape_type="rectangle"
+                            tools:ignore="PrivateResource,SmallSp,TextContrastCheck,TouchTargetSizeCheck" />
+
+                    </LinearLayout>
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/assists_description"
+                        android:textSize="@dimen/text_size_mini"
+                        tools:ignore="SmallSp" />
+
+                </LinearLayout>
+
+                <com.xuexiang.xui.widget.button.switchbutton.SwitchButton
+                    android:id="@+id/sb_enable_accessibility_service"
+                    style="@style/SwitchButtonStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:ignore="TouchTargetSizeCheck" />
+
+            </LinearLayout>
+
             <LinearLayout
                 style="@style/BarStyle.Switch"
                 android:layout_width="match_parent"
@@ -1237,7 +1297,7 @@
             </LinearLayout>
 
             <LinearLayout
-                style="@style/BarStyle.Switch"
+                style="@style/BarStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:ignore="RtlSymmetry">
@@ -1275,7 +1335,7 @@
             </LinearLayout>
 
             <LinearLayout
-                style="@style/BarStyle.Switch"
+                style="@style/BarStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
@@ -1349,7 +1409,7 @@
             </LinearLayout>
 
             <LinearLayout
-                style="@style/BarStyle.Switch"
+                style="@style/BarStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/include_toolbar_web.xml b/app/src/main/res/layout/include_toolbar_web.xml
index bef609c6..83617dfa 100644
--- a/app/src/main/res/layout/include_toolbar_web.xml
+++ b/app/src/main/res/layout/include_toolbar_web.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="?attr/xui_actionbar_height"
-    android:background="?attr/colorAccent"
+    android:background="#299EE3"
     app:contentInsetLeft="0dp"
     app:contentInsetStart="0dp"
     app:titleTextColor="@android:color/white">
@@ -12,7 +12,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/colorAccent">
+        android:background="#299EE3">
 
         <com.xuexiang.xui.widget.alpha.XUIAlphaImageView
             android:id="@+id/iv_back"