From e6f443cb2419ad2392b8b0fbd4d66d6ad78d6541 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 17 Jan 2020 00:40:16 +0800
Subject: [PATCH] More backwards compatibility

---
 app/src/main/res/drawable-v21/ic_bug_md2.xml  | 23 --------
 app/src/main/res/drawable-v21/ic_home_md2.xml | 23 --------
 .../res/drawable-v21/ic_magisk_delete.xml     | 23 --------
 .../main/res/drawable-v21/ic_module_md2.xml   | 23 --------
 .../main/res/drawable-v21/ic_settings_md2.xml | 23 --------
 .../res/drawable-v21/ic_superuser_md2.xml     | 23 --------
 .../avd_bug_from_filled.xml                   |  2 +-
 .../avd_bug_to_filled.xml                     |  2 +-
 .../drawable/avd_circle_check_from_filled.xml |  2 +-
 .../drawable/avd_circle_check_to_filled.xml   |  2 +-
 .../res/drawable/avd_circle_from_filled.xml   |  2 +-
 .../res/drawable/avd_circle_to_filled.xml     |  2 +-
 .../avd_delete_magisk.xml                     | 54 +++++++++----------
 .../avd_home_from_filled.xml                  |  2 +-
 .../avd_home_to_filled.xml                    |  2 +-
 .../avd_magisk_delete.xml                     | 40 +++++++-------
 .../avd_module_from_filled.xml                |  2 +-
 .../avd_module_to_filled.xml                  |  2 +-
 .../avd_settings_from_filled.xml              |  2 +-
 .../avd_settings_to_filled.xml                |  2 +-
 .../avd_superuser_from_filled.xml             |  2 +-
 .../avd_superuser_to_filled.xml               |  2 +-
 app/src/main/res/drawable/ic_bug_md2.xml      | 27 ++++++++--
 app/src/main/res/drawable/ic_close.xml        | 12 -----
 app/src/main/res/drawable/ic_close_md2.xml    |  6 ++-
 app/src/main/res/drawable/ic_home_md2.xml     | 27 ++++++++--
 .../main/res/drawable/ic_magisk_delete.xml    | 23 ++++++--
 app/src/main/res/drawable/ic_module_md2.xml   | 27 ++++++++--
 app/src/main/res/drawable/ic_settings_md2.xml | 27 ++++++++--
 .../main/res/drawable/ic_superuser_md2.xml    | 27 ++++++++--
 .../main/res/layout/fragment_install_md2.xml  |  6 +--
 app/src/main/res/layout/item_hide_md2.xml     |  2 +-
 32 files changed, 198 insertions(+), 246 deletions(-)
 delete mode 100644 app/src/main/res/drawable-v21/ic_bug_md2.xml
 delete mode 100644 app/src/main/res/drawable-v21/ic_home_md2.xml
 delete mode 100644 app/src/main/res/drawable-v21/ic_magisk_delete.xml
 delete mode 100644 app/src/main/res/drawable-v21/ic_module_md2.xml
 delete mode 100644 app/src/main/res/drawable-v21/ic_settings_md2.xml
 delete mode 100644 app/src/main/res/drawable-v21/ic_superuser_md2.xml
 rename app/src/main/res/{drawable-v21 => drawable}/avd_bug_from_filled.xml (97%)
 rename app/src/main/res/{drawable-v21 => drawable}/avd_bug_to_filled.xml (97%)
 rename app/src/main/res/{drawable-v21 => drawable}/avd_delete_magisk.xml (92%)
 rename app/src/main/res/{drawable-v21 => drawable}/avd_home_from_filled.xml (94%)
 rename app/src/main/res/{drawable-v21 => drawable}/avd_home_to_filled.xml (94%)
 rename app/src/main/res/{drawable-v21 => drawable}/avd_magisk_delete.xml (94%)
 rename app/src/main/res/{drawable-v21 => drawable}/avd_module_from_filled.xml (98%)
 rename app/src/main/res/{drawable-v21 => drawable}/avd_module_to_filled.xml (98%)
 rename app/src/main/res/{drawable-v21 => drawable}/avd_settings_from_filled.xml (99%)
 rename app/src/main/res/{drawable-v21 => drawable}/avd_settings_to_filled.xml (99%)
 rename app/src/main/res/{drawable-v21 => drawable}/avd_superuser_from_filled.xml (94%)
 rename app/src/main/res/{drawable-v21 => drawable}/avd_superuser_to_filled.xml (95%)
 delete mode 100644 app/src/main/res/drawable/ic_close.xml

diff --git a/app/src/main/res/drawable-v21/ic_bug_md2.xml b/app/src/main/res/drawable-v21/ic_bug_md2.xml
deleted file mode 100644
index 8e18eacf0..000000000
--- a/app/src/main/res/drawable-v21/ic_bug_md2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/checked"
-        android:drawable="@drawable/ic_bug_filled_md2"
-        android:state_checked="true" />
-
-    <item
-        android:id="@+id/unchecked"
-        android:drawable="@drawable/ic_bug_outlined_md2" />
-
-    <transition
-        android:drawable="@drawable/avd_bug_from_filled"
-        android:fromId="@+id/checked"
-        android:toId="@+id/unchecked" />
-
-    <transition
-        android:drawable="@drawable/avd_bug_to_filled"
-        android:fromId="@+id/unchecked"
-        android:toId="@id/checked" />
-
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_home_md2.xml b/app/src/main/res/drawable-v21/ic_home_md2.xml
deleted file mode 100644
index a5d90b4d9..000000000
--- a/app/src/main/res/drawable-v21/ic_home_md2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/checked"
-        android:drawable="@drawable/ic_home_filled_md2"
-        android:state_checked="true" />
-
-    <item
-        android:id="@+id/unchecked"
-        android:drawable="@drawable/ic_home_outlined_md2" />
-
-    <transition
-        android:drawable="@drawable/avd_home_from_filled"
-        android:fromId="@+id/checked"
-        android:toId="@+id/unchecked" />
-
-    <transition
-        android:drawable="@drawable/avd_home_to_filled"
-        android:fromId="@+id/unchecked"
-        android:toId="@id/checked" />
-
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_magisk_delete.xml b/app/src/main/res/drawable-v21/ic_magisk_delete.xml
deleted file mode 100644
index 3feade979..000000000
--- a/app/src/main/res/drawable-v21/ic_magisk_delete.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/collapsed"
-        android:drawable="@drawable/ic_delete_md2"
-        android:state_selected="true" />
-
-    <item
-        android:id="@+id/expanded"
-        android:drawable="@drawable/ic_magisk_outline" />
-
-    <transition
-        android:drawable="@drawable/avd_magisk_delete"
-        android:fromId="@+id/expanded"
-        android:toId="@+id/collapsed" />
-
-    <transition
-        android:drawable="@drawable/avd_delete_magisk"
-        android:fromId="@+id/collapsed"
-        android:toId="@id/expanded" />
-
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_module_md2.xml b/app/src/main/res/drawable-v21/ic_module_md2.xml
deleted file mode 100644
index d93278f5b..000000000
--- a/app/src/main/res/drawable-v21/ic_module_md2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/checked"
-        android:drawable="@drawable/ic_module_filled_md2"
-        android:state_checked="true" />
-
-    <item
-        android:id="@+id/unchecked"
-        android:drawable="@drawable/ic_module_outlined_md2" />
-
-    <transition
-        android:drawable="@drawable/avd_module_from_filled"
-        android:fromId="@+id/checked"
-        android:toId="@+id/unchecked" />
-
-    <transition
-        android:drawable="@drawable/avd_module_to_filled"
-        android:fromId="@+id/unchecked"
-        android:toId="@id/checked" />
-
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_settings_md2.xml b/app/src/main/res/drawable-v21/ic_settings_md2.xml
deleted file mode 100644
index 9d294bff8..000000000
--- a/app/src/main/res/drawable-v21/ic_settings_md2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/checked"
-        android:drawable="@drawable/ic_settings_filled_md2"
-        android:state_checked="true" />
-
-    <item
-        android:id="@+id/unchecked"
-        android:drawable="@drawable/ic_settings_outlined_md2" />
-
-    <transition
-        android:drawable="@drawable/avd_settings_from_filled"
-        android:fromId="@+id/checked"
-        android:toId="@+id/unchecked" />
-
-    <transition
-        android:drawable="@drawable/avd_settings_to_filled"
-        android:fromId="@+id/unchecked"
-        android:toId="@id/checked" />
-
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_superuser_md2.xml b/app/src/main/res/drawable-v21/ic_superuser_md2.xml
deleted file mode 100644
index 374959c7c..000000000
--- a/app/src/main/res/drawable-v21/ic_superuser_md2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/checked"
-        android:drawable="@drawable/ic_superuser_filled_md2"
-        android:state_checked="true" />
-
-    <item
-        android:id="@+id/unchecked"
-        android:drawable="@drawable/ic_superuser_outlined_md2" />
-
-    <transition
-        android:drawable="@drawable/avd_superuser_from_filled"
-        android:fromId="@+id/checked"
-        android:toId="@+id/unchecked" />
-
-    <transition
-        android:drawable="@drawable/avd_superuser_to_filled"
-        android:fromId="@+id/unchecked"
-        android:toId="@id/checked" />
-
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/avd_bug_from_filled.xml b/app/src/main/res/drawable/avd_bug_from_filled.xml
similarity index 97%
rename from app/src/main/res/drawable-v21/avd_bug_from_filled.xml
rename to app/src/main/res/drawable/avd_bug_from_filled.xml
index b56ed84de..ec6640d2f 100644
--- a/app/src/main/res/drawable-v21/avd_bug_from_filled.xml
+++ b/app/src/main/res/drawable/avd_bug_from_filled.xml
@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 20 8 L 20 8 L 17.19 8 C 16.74 7.22 16.12 6.55 15.37 6.04 L 17 4.41 L 15.59 3 L 13.42 5.17 C 12.96 5.06 12.49 5 12 5 C 11.51 5 11.04 5.06 10.59 5.17 L 8.41 3 L 7 4.41 L 8.62 6.04 C 7.88 6.55 7.26 7.22 6.81 8 L 4 8 L 4 10 L 6.09 10 C 6.04 10.33 6 10.66 6 11 L 6 12 L 4 12 L 4 14 L 6 14 L 6 15 C 6 15.34 6.04 15.67 6.09 16 L 4 16 L 4 18 L 6.81 18 C 7.85 19.79 9.78 21 12 21 C 14.22 21 16.15 19.79 17.19 18 L 20 18 L 20 16 L 17.91 16 C 17.96 15.67 18 15.34 18 15 L 18 14 L 20 14 L 20 12 L 18 12 L 18 11 C 18 10.66 17.96 10.33 17.91 10 L 20 10 L 20 8 M 14 16 C 14 15.43 14 14.859 14 14.289 L 14 14 C 13.869 14 13.739 14 13.608 14 C 12.405 14 11.203 14 10 14 C 10 14.509 10 15.017 10 15.526 C 10 15.684 10 15.842 10 16 L 10.33 16 C 10.392 16 10.454 16 10.515 16 C 11.677 16 12.838 16 14 16 C 14 16 14 16 14 16 M 14 10 L 14 12 L 14 12 L 10 12 L 10 10 L 14 10 M 12 15 L 12 15 L 12 15 L 12 15 L 12 15 L 12 15"
                 android:valueTo="M 20 8 L 18.595 8 L 17.19 8 C 16.74 7.2 16.12 6.5 15.37 6 L 17 4.41 L 15.59 3 L 13.42 5.17 C 12.96 5.06 12.5 5 12 5 C 11.5 5 11.05 5.06 10.59 5.17 L 8.41 3 L 7 4.41 L 8.62 6 C 7.87 6.5 7.26 7.21 6.81 8 L 4 8 L 4 10 L 6.09 10 C 6.03 10.33 6 10.66 6 11 L 6 12 L 4 12 L 4 14 L 6 14 L 6 15 C 6 15.34 6.03 15.67 6.09 16 L 4 16 L 4 18 L 6.81 18 C 8.47 20.87 12.14 21.84 15 20.18 C 15.91 19.66 16.67 18.9 17.19 18 L 20 18 L 20 16 L 17.91 16 C 17.97 15.67 18 15.34 18 15 L 18 14 L 20 14 L 20 12 L 18 12 L 18 11 C 18 10.66 17.97 10.33 17.91 10 L 20 10 L 20 8 M 14.828 17.828 C 15.578 17.079 16 16.06 16 15 L 16 11 C 16 9.94 15.578 8.921 14.828 8.172 C 14.079 7.422 13.06 7 12 7 C 10.94 7 9.921 7.422 9.172 8.172 C 8.422 8.921 8 9.94 8 11 L 8 15 C 8 16.06 8.422 17.079 9.172 17.828 C 9.921 18.578 10.94 19 12 19 C 13.06 19 14.079 18.578 14.828 17.828 M 14 10 L 14 11 L 14 12 L 10 12 L 10 10 L 14 10 M 10 14 L 14 14 L 14 16 L 10 16 L 10 14 L 10 14"
diff --git a/app/src/main/res/drawable-v21/avd_bug_to_filled.xml b/app/src/main/res/drawable/avd_bug_to_filled.xml
similarity index 97%
rename from app/src/main/res/drawable-v21/avd_bug_to_filled.xml
rename to app/src/main/res/drawable/avd_bug_to_filled.xml
index a0022e32c..c42b54303 100644
--- a/app/src/main/res/drawable-v21/avd_bug_to_filled.xml
+++ b/app/src/main/res/drawable/avd_bug_to_filled.xml
@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 20 8 L 18.595 8 L 17.19 8 C 16.74 7.2 16.12 6.5 15.37 6 L 17 4.41 L 15.59 3 L 13.42 5.17 C 12.96 5.06 12.5 5 12 5 C 11.5 5 11.05 5.06 10.59 5.17 L 8.41 3 L 7 4.41 L 8.62 6 C 7.87 6.5 7.26 7.21 6.81 8 L 4 8 L 4 10 L 6.09 10 C 6.03 10.33 6 10.66 6 11 L 6 12 L 4 12 L 4 14 L 6 14 L 6 15 C 6 15.34 6.03 15.67 6.09 16 L 4 16 L 4 18 L 6.81 18 C 8.47 20.87 12.14 21.84 15 20.18 C 15.91 19.66 16.67 18.9 17.19 18 L 20 18 L 20 16 L 17.91 16 C 17.97 15.67 18 15.34 18 15 L 18 14 L 20 14 L 20 12 L 18 12 L 18 11 C 18 10.66 17.97 10.33 17.91 10 L 20 10 L 20 8 M 14.828 17.828 C 15.578 17.079 16 16.06 16 15 L 16 11 C 16 9.94 15.578 8.921 14.828 8.172 C 14.079 7.422 13.06 7 12 7 C 10.94 7 9.921 7.422 9.172 8.172 C 8.422 8.921 8 9.94 8 11 L 8 15 C 8 16.06 8.422 17.079 9.172 17.828 C 9.921 18.578 10.94 19 12 19 C 13.06 19 14.079 18.578 14.828 17.828 M 14 10 L 14 11 L 14 12 L 10 12 L 10 10 L 14 10 M 10 14 L 14 14 L 14 16 L 10 16 L 10 14 L 10 14"
                 android:valueTo="M 20 8 L 20 8 L 17.19 8 C 16.74 7.22 16.12 6.55 15.37 6.04 L 17 4.41 L 15.59 3 L 13.42 5.17 C 12.96 5.06 12.49 5 12 5 C 11.51 5 11.04 5.06 10.59 5.17 L 8.41 3 L 7 4.41 L 8.62 6.04 C 7.88 6.55 7.26 7.22 6.81 8 L 4 8 L 4 10 L 6.09 10 C 6.04 10.33 6 10.66 6 11 L 6 12 L 4 12 L 4 14 L 6 14 L 6 15 C 6 15.34 6.04 15.67 6.09 16 L 4 16 L 4 18 L 6.81 18 C 7.85 19.79 9.78 21 12 21 C 14.22 21 16.15 19.79 17.19 18 L 20 18 L 20 16 L 17.91 16 C 17.96 15.67 18 15.34 18 15 L 18 14 L 20 14 L 20 12 L 18 12 L 18 11 C 18 10.66 17.96 10.33 17.91 10 L 20 10 L 20 8 M 14 16 C 14 15.43 14 14.859 14 14.289 L 14 14 C 13.869 14 13.739 14 13.608 14 C 12.405 14 11.203 14 10 14 C 10 14.509 10 15.017 10 15.526 C 10 15.684 10 15.842 10 16 L 10.33 16 C 10.392 16 10.454 16 10.515 16 C 11.677 16 12.838 16 14 16 C 14 16 14 16 14 16 M 14 10 L 14 12 L 14 12 L 10 12 L 10 10 L 14 10 M 12 15 L 12 15 L 12 15 L 12 15 L 12 15 L 12 15"
diff --git a/app/src/main/res/drawable/avd_circle_check_from_filled.xml b/app/src/main/res/drawable/avd_circle_check_from_filled.xml
index c39d8e0b6..91d8e5534 100644
--- a/app/src/main/res/drawable/avd_circle_check_from_filled.xml
+++ b/app/src/main/res/drawable/avd_circle_check_from_filled.xml
@@ -17,7 +17,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="500"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 12 2 C 9.217 2 6.689 3.152 4.872 5.004 C 3.098 6.811 2 9.283 2 12 C 2 14.744 3.12 17.24 4.927 19.052 C 6.74 20.87 9.244 22 12 22 C 13.911 22 15.701 21.457 17.224 20.517 C 18.628 19.651 19.804 18.448 20.638 17.024 C 21.503 15.545 22 13.828 22 12 C 22 10.2 21.518 8.507 20.677 7.044 C 19.755 5.441 18.402 4.114 16.779 3.224 C 15.357 2.444 13.728 2 12 2 M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 6 13 L 10 17 L 18 9 L 16.59 7.58 L 16.59 7.58 L 10 14.17 L 7.41 11.59 L 6 13"
                 android:valueTo="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 7 13 L 7 13 L 17 13 L 17 11 L 17 11 L 7 11 L 7 11 L 7 11"
diff --git a/app/src/main/res/drawable/avd_circle_check_to_filled.xml b/app/src/main/res/drawable/avd_circle_check_to_filled.xml
index b021ca24b..e730bd75a 100644
--- a/app/src/main/res/drawable/avd_circle_check_to_filled.xml
+++ b/app/src/main/res/drawable/avd_circle_check_to_filled.xml
@@ -17,7 +17,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="500"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 7 13 L 7 13 L 17 13 L 17 11 L 17 11 L 7 11 L 7 11 L 7 11"
                 android:valueTo="M 12 2 C 9.217 2 6.689 3.152 4.872 5.004 C 3.098 6.811 2 9.283 2 12 C 2 14.856 3.213 17.442 5.149 19.268 C 6.942 20.96 9.356 22 12 22 C 14.061 22 15.982 21.368 17.578 20.288 C 19.114 19.249 20.349 17.796 21.119 16.092 C 21.685 14.841 22 13.456 22 12 C 22 10.122 21.475 8.361 20.566 6.856 C 19.691 5.408 18.46 4.197 16.997 3.347 C 15.524 2.491 13.817 2 12 2 M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 6 13 L 10 17 L 18 9 L 16.59 7.58 L 16.59 7.58 L 10 14.17 L 7.41 11.59 L 6 13"
diff --git a/app/src/main/res/drawable/avd_circle_from_filled.xml b/app/src/main/res/drawable/avd_circle_from_filled.xml
index 07278882a..8d4f5232f 100644
--- a/app/src/main/res/drawable/avd_circle_from_filled.xml
+++ b/app/src/main/res/drawable/avd_circle_from_filled.xml
@@ -59,7 +59,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="100"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="fillAlpha"
                 android:startOffset="200"
                 android:valueFrom="0.3"
diff --git a/app/src/main/res/drawable/avd_circle_to_filled.xml b/app/src/main/res/drawable/avd_circle_to_filled.xml
index 07a881ae9..d88ac4d9f 100644
--- a/app/src/main/res/drawable/avd_circle_to_filled.xml
+++ b/app/src/main/res/drawable/avd_circle_to_filled.xml
@@ -60,7 +60,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="100"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="fillAlpha"
                 android:startOffset="200"
                 android:valueFrom="1"
diff --git a/app/src/main/res/drawable-v21/avd_delete_magisk.xml b/app/src/main/res/drawable/avd_delete_magisk.xml
similarity index 92%
rename from app/src/main/res/drawable-v21/avd_delete_magisk.xml
rename to app/src/main/res/drawable/avd_delete_magisk.xml
index b01b1ce4a..3929fe772 100644
--- a/app/src/main/res/drawable-v21/avd_delete_magisk.xml
+++ b/app/src/main/res/drawable/avd_delete_magisk.xml
@@ -92,7 +92,7 @@
             <set>
                 <objectAnimator
                     android:duration="200"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:startOffset="400"
                     android:valueFrom="M 332.48 421.18 C 332.48 421.18 336.25 443.63 331.66 493.13 C 325.9 555.19 355.3 653.77 355.3 653.77 C 355.3 653.77 395.4 554.99 388.4 491.18 C 382.65 438.73 391 420.39 389.22 422.85 C 358.41 465.42 332.47 421.18 332.47 421.18 Z"
@@ -100,7 +100,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="400"
                     android:valueFrom="0"
@@ -114,7 +114,7 @@
             <set>
                 <objectAnimator
                     android:duration="200"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:startOffset="400"
                     android:valueFrom="M 332.48 421.18 C 332.48 421.18 336.25 443.63 331.66 493.13 C 325.9 555.19 355.3 653.77 355.3 653.77 C 355.3 653.77 395.4 554.99 388.4 491.18 C 382.65 438.73 391 420.39 389.22 422.85 C 358.41 465.42 332.47 421.18 332.47 421.18 Z"
@@ -122,7 +122,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="400"
                     android:valueFrom="0"
@@ -135,7 +135,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="400"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 465 120 C 458 113 451 106 444 99 C 438 93 432 90 423 90 C 381 90 339 90 297 90 C 288 90 282 93 276 99 C 269 106 262 113 255 120 C 230 120 205 120 180 120 C 162 120 150 135 150 150 C 150 165 162 180 180 180 C 300 180 420 180 540 180 C 555 180 570 168 570 150 C 570 132 555 120 540 120 C 540 120 540 120 540 120 L 465 120"
                 android:valueTo="M 402.86 140.35 C 406.2 113.59 418.23 94.03 442.18 77.6 C 421.01 70.52 403.41 64.77 394.21 72.3 C 385.01 79.83 360.01 105 363.36 145.98 C 363.917 152.81 364.293 162.755 364.567 174.573 C 364.84 186.391 365.012 200.083 365.16 214.408 C 365.307 228.732 365.431 243.689 365.609 258.038 C 365.787 272.386 366.019 286.126 366.384 298.016 C 366.749 309.906 367.246 319.946 367.954 326.895 C 368.663 333.845 369.582 337.703 370.79 337.23 C 372.09 302.273 376.644 275.621 381.953 253.329 C 387.262 231.037 393.326 213.104 397.643 195.588 C 401.961 178.071 404.533 160.97 402.86 140.34 L 402.86 140.35"
@@ -147,7 +147,7 @@
             <set>
                 <objectAnimator
                     android:duration="200"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:startOffset="600"
                     android:valueFrom="M 397.28 422.02 C 391.2 416.08 404.02 446.74 407.6 474.45 C 407.6 474.45 407.6 474.45 407.6 474.45 C 410.105 493.835 409.962 508.837 408.289 524.181 C 406.615 539.525 403.41 555.21 399.79 575.96 C 396.13 596.95 474.57 512.86 504.65 462.73 C 507.16 458.55 499.967 466.7 487.97 472.239 C 475.973 477.777 459.17 480.705 442.46 466.08 C 419.28 445.8 415.3 439.64 397.28 422.02"
@@ -155,7 +155,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="600"
                     android:valueFrom="0"
@@ -169,7 +169,7 @@
             <set>
                 <objectAnimator
                     android:duration="200"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:startOffset="600"
                     android:valueFrom="M 310.981 527.251 C 309.308 511.908 309.165 496.905 311.67 477.52 C 315.25 449.81 328.07 419.15 321.99 425.09 L 321.99 425.09 C 303.97 442.71 299.99 448.87 276.81 469.15 C 260.1 483.775 243.298 480.848 231.3 475.309 C 219.303 469.77 212.11 461.62 214.62 465.8 C 244.7 515.93 323.14 600.02 319.48 579.03 C 315.86 558.28 312.655 542.595 310.981 527.251"
@@ -177,7 +177,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="600"
                     android:valueFrom="0"
@@ -190,7 +190,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="400"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 465 120 C 458 113 451 106 444 99 C 438 93 432 90 423 90 C 381 90 339 90 297 90 C 288 90 282 93 276 99 C 269 106 262 113 255 120 C 230 120 205 120 180 120 C 162 120 150 135 150 150 C 150 165 162 180 180 180 C 300 180 420 180 540 180 C 555 180 570 168 570 150 C 570 132 555 120 540 120 C 540 120 540 120 540 120 L 465 120"
                 android:valueTo="M 349.59 337.24 C 353.21 338.655 354.23 301.087 354.764 258.044 C 355.298 215 355.345 166.48 357.02 145.99 C 360.36 105.01 335.37 79.83 326.17 72.31 C 316.97 64.78 299.37 70.53 278.2 77.61 C 302.15 94.04 314.18 113.59 317.52 140.36 C 315.847 160.99 318.419 178.091 322.737 195.608 C 327.054 213.124 333.118 231.057 338.427 253.349 C 343.736 275.641 348.29 302.293 349.59 337.25 C 349.59 337.249 349.59 337.249 349.59 337.248 C 349.59 337.247 349.59 337.247 349.59 337.246 C 349.59 337.245 349.59 337.245 349.59 337.244 C 349.59 337.243 349.59 337.243 349.59 337.242 L 349.59 337.24"
@@ -202,7 +202,7 @@
             <set>
                 <objectAnimator
                     android:duration="200"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:startOffset="800"
                     android:valueFrom="M 375.53 396.64 C 361.1 395.99 360.19 368.47 360.19 368.47 C 360.19 368.47 377.41 349.61 399.15 355.87 C 399.15 355.87 399.15 355.87 399.15 355.87 C 435.82 366.44 450.04 417.37 487.06 423.67 C 494.71 424.97 503.33 427.27 513.37 426.79 C 532.14 425.89 555.88 415.28 587.59 370.29 C 596.97 356.99 564.32 455.95 482.46 457.15 C 422.5 458.03 415.49 398.45 375.53 396.64"
@@ -210,7 +210,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="800"
                     android:valueFrom="0"
@@ -224,7 +224,7 @@
             <set>
                 <objectAnimator
                     android:duration="200"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:startOffset="800"
                     android:valueFrom="M 321.51 355.59 C 343.25 349.33 360.47 368.19 360.47 368.19 C 360.47 368.19 359.56 395.71 345.13 396.36 C 305.17 398.17 298.16 457.75 238.2 456.87 C 156.34 455.67 123.69 356.71 133.07 370.01 C 164.78 415 188.52 425.61 207.29 426.51 C 217.33 426.99 225.95 424.69 233.6 423.39 C 270.62 417.09 284.84 366.16 321.51 355.59 C 321.51 355.59 321.51 355.59 321.51 355.59"
@@ -232,7 +232,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="800"
                     android:valueFrom="0"
@@ -245,7 +245,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="400"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 180 270 C 180 370 180 470 180 570 C 180 570 180 570 180 570 C 180 603 207 630 240 630 C 320 630 400 630 480 630 C 513 630 540 603 540 570 C 540 470 540 370 540 270 C 540 237 513 210 480 210 C 400 210 320 210 240 210 C 207 210 180 237 180 270"
                 android:valueTo="M 332.48 421.18 C 332.48 421.18 336.25 443.63 331.66 493.13 C 330.031 510.682 331.214 531.156 333.75 551.494 C 340.179 603.067 355.3 653.77 355.3 653.77 C 355.3 653.77 374.498 606.479 384.008 556.202 C 388.243 533.816 390.557 510.839 388.4 491.18 C 387.14 479.683 386.557 469.826 386.396 461.466 C 385.824 431.689 390.61 420.929 389.22 422.85 C 358.41 465.42 332.47 421.18 332.47 421.18 C 332.473 421.18 332.477 421.18 332.48 421.18"
@@ -257,7 +257,7 @@
             <set>
                 <objectAnimator
                     android:duration="200"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:startOffset="400"
                     android:valueFrom="M 357.02 145.99 C 355.345 166.48 355.298 215 354.764 258.044 C 354.23 301.087 353.21 338.655 349.59 337.24 C 349.59 337.241 349.59 337.241 349.59 337.242 C 349.59 337.243 349.59 337.243 349.59 337.244 C 349.59 337.245 349.59 337.245 349.59 337.246 C 349.59 337.247 349.59 337.247 349.59 337.248 C 349.59 337.249 349.59 337.249 349.59 337.25 C 348.29 302.293 343.736 275.641 338.427 253.349 C 333.118 231.057 327.054 213.124 322.737 195.608 C 318.419 178.091 315.847 160.99 317.52 140.36 C 314.18 113.59 302.15 94.04 278.2 77.61 C 299.37 70.53 316.97 64.78 326.17 72.31 C 335.37 79.83 360.36 105.01 357.02 145.99"
@@ -265,7 +265,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="400"
                     android:valueFrom="0"
@@ -279,7 +279,7 @@
             <set>
                 <objectAnimator
                     android:duration="200"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:startOffset="400"
                     android:valueFrom="M 367.954 326.895 C 368.663 333.845 369.582 337.703 370.79 337.23 C 372.09 302.273 376.644 275.621 381.953 253.329 C 387.262 231.037 393.326 213.104 397.643 195.588 C 401.961 178.071 404.533 160.97 402.86 140.34 C 402.86 140.343 402.86 140.347 402.86 140.35 C 406.2 113.59 418.23 94.03 442.18 77.6 C 421.01 70.52 403.41 64.77 394.21 72.3 C 385.01 79.83 360.01 105 363.36 145.98 C 363.917 152.81 364.293 162.755 364.567 174.573 C 364.84 186.391 365.012 200.083 365.16 214.408 C 365.307 228.732 365.431 243.689 365.609 258.038 C 365.787 272.386 366.019 286.126 366.384 298.016 C 366.749 309.906 367.246 319.946 367.954 326.895"
@@ -287,7 +287,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="400"
                     android:valueFrom="0"
@@ -301,7 +301,7 @@
             <set>
                 <objectAnimator
                     android:duration="200"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:startOffset="600"
                     android:valueFrom="M 292.42 179.39 C 291.51 158.576 286.47 129.373 279.164 108.658 C 273.781 93.395 267.168 82.742 260.07 83.45 C 243.34 85.12 201.03 110.36 208.76 120.82 C 227.553 146.262 243.019 170.697 258.825 193.445 C 277.487 220.301 296.623 244.806 322.27 265.84 C 328.64 271.06 293.87 212.39 292.43 179.39 Z"
@@ -309,7 +309,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="600"
                     android:valueFrom="0"
@@ -323,7 +323,7 @@
             <set>
                 <objectAnimator
                     android:duration="200"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:startOffset="600"
                     android:valueFrom="M 398.13 265.85 L 398.12 265.85 C 421.8 246.425 439.933 224.04 457.267 199.576 C 474.603 175.113 491.14 148.57 511.63 120.83 C 519.36 110.37 477.05 85.13 460.32 83.46 C 443.59 81.79 429.55 143.25 427.97 179.4 C 426.53 212.41 391.76 271.08 398.13 265.85"
@@ -331,7 +331,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="600"
                     android:valueFrom="0"
@@ -345,7 +345,7 @@
             <set>
                 <objectAnimator
                     android:duration="200"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:startOffset="800"
                     android:valueFrom="M 484.58 235.73 C 519.57 226.15 545.8 202.6 548.72 177.72 C 550.9 159.19 521.67 124.17 521.67 124.17 C 521.67 124.17 501.16 181.07 474.26 209.51 C 444.98 240.47 456.11 236.29 403.42 269.47 C 403.42 269.47 403.42 269.47 403.42 269.47 C 403.42 269.47 447.15 245.97 484.58 235.73"
@@ -353,7 +353,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="800"
                     android:valueFrom="0"
@@ -367,7 +367,7 @@
             <set>
                 <objectAnimator
                     android:duration="200"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:startOffset="800"
                     android:valueFrom="M 246.13 209.51 L 246.13 209.51 C 275.42 240.47 264.28 236.29 316.97 269.47 C 316.97 269.47 273.24 245.98 235.81 235.73 C 200.83 226.15 174.6 202.6 171.67 177.72 C 169.49 159.18 198.72 124.17 198.72 124.17 C 198.72 124.17 203.847 138.395 212.338 156.175 C 220.827 173.955 232.68 195.29 246.13 209.51"
@@ -375,7 +375,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="800"
                     android:valueFrom="0"
diff --git a/app/src/main/res/drawable-v21/avd_home_from_filled.xml b/app/src/main/res/drawable/avd_home_from_filled.xml
similarity index 94%
rename from app/src/main/res/drawable-v21/avd_home_from_filled.xml
rename to app/src/main/res/drawable/avd_home_from_filled.xml
index d43306504..c8bb9cc30 100644
--- a/app/src/main/res/drawable-v21/avd_home_from_filled.xml
+++ b/app/src/main/res/drawable/avd_home_from_filled.xml
@@ -19,7 +19,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 9 14 L 9 21 L 4 21 L 4 9 L 12 3 L 12 3 L 20 9 L 20 21 L 15 21 L 15 14 L 9 14 M 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4"
                 android:valueTo="M 9 13 L 9 19 L 6 19 L 6 10 L 12 5.5 L 15 7.75 L 18 10 L 18 19 L 15 19 L 15 13 L 9 13 M 4 21 L 4 9 L 12 3 L 20 9 L 20 21 L 4 21 L 4 21"
diff --git a/app/src/main/res/drawable-v21/avd_home_to_filled.xml b/app/src/main/res/drawable/avd_home_to_filled.xml
similarity index 94%
rename from app/src/main/res/drawable-v21/avd_home_to_filled.xml
rename to app/src/main/res/drawable/avd_home_to_filled.xml
index 3f9ff4cf9..6078b8137 100644
--- a/app/src/main/res/drawable-v21/avd_home_to_filled.xml
+++ b/app/src/main/res/drawable/avd_home_to_filled.xml
@@ -19,7 +19,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 9 13 L 9 19 L 6 19 L 6 10 L 12 5.5 L 15 7.75 L 18 10 L 18 19 L 15 19 L 15 13 L 9 13 M 4 21 L 4 9 L 12 3 L 20 9 L 20 21 L 4 21 L 4 21"
                 android:valueTo="M 9 14 L 9 21 L 4 21 L 4 9 L 12 3 L 12 3 L 20 9 L 20 21 L 15 21 L 15 14 L 9 14 M 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4"
diff --git a/app/src/main/res/drawable-v21/avd_magisk_delete.xml b/app/src/main/res/drawable/avd_magisk_delete.xml
similarity index 94%
rename from app/src/main/res/drawable-v21/avd_magisk_delete.xml
rename to app/src/main/res/drawable/avd_magisk_delete.xml
index 0d0c585d9..de6975b99 100644
--- a/app/src/main/res/drawable-v21/avd_magisk_delete.xml
+++ b/app/src/main/res/drawable/avd_magisk_delete.xml
@@ -81,7 +81,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="600"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 333.031 545.392 C 335.812 570.52 340.88 595.908 345.48 615.79 C 350.691 638.314 355.3 653.77 355.3 653.77 C 355.3 653.77 361.365 638.831 368.365 616.819 C 374.111 598.753 380.487 575.921 384.658 552.675 C 388.473 531.415 390.443 509.807 388.4 491.18 C 387.5 482.968 386.945 475.592 386.643 469.002 C 385.016 433.497 390.721 420.775 389.22 422.85 C 379.853 435.793 370.935 440.711 363.06 441.288 C 345.034 442.608 332.47 421.18 332.47 421.18 C 332.473 421.18 332.477 421.18 332.48 421.18 C 332.48 421.18 334.295 431.991 333.873 455.15 C 333.687 465.364 333.065 477.98 331.66 493.13 C 330.194 508.927 331.006 527.09 333.031 545.392 M 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018"
                 android:valueTo="M 180 570 C 180 570 180 570 180 570 C 180 603 207 630 240 630 C 320 630 400 630 480 630 C 513 630 540 603 540 570 C 540 470 540 370 540 270 C 540 261.75 538.313 253.875 535.266 246.703 C 532.219 239.531 527.813 233.063 522.375 227.625 C 516.938 222.188 510.469 217.781 503.297 214.734 C 496.125 211.688 488.25 210 480 210 C 400 210 320 210 240 210 C 224.5 210 210.324 215.957 199.647 225.694 C 187.593 236.687 180 252.5 180 270 C 180 370 180 470 180 570 M 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018"
@@ -93,14 +93,14 @@
             <set>
                 <objectAnimator
                     android:duration="600"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:valueFrom="M 399.79 575.96 C 397.28 590.356 433.39 555.323 466.029 515.717 C 480.979 497.577 495.201 478.478 504.65 462.73 C 509.67 454.37 475.88 495.33 442.46 466.08 C 433.235 458.009 427.051 452.174 421.812 446.964 C 413.888 439.082 408.128 432.628 397.28 422.02 C 396.52 421.277 396.055 421.107 395.831 421.431 C 395.607 421.755 395.623 422.574 395.824 423.81 C 396.025 425.046 396.412 426.699 396.929 428.692 C 399.516 438.66 405.363 457.131 407.6 474.45 C 407.6 474.45 407.6 474.45 407.6 474.45 C 409.194 486.786 409.716 497.347 409.454 507.351 C 409.15 518.911 407.799 529.726 405.845 541.676 C 404.175 551.886 402.064 562.923 399.79 575.96 M 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018"
                     android:valueTo="M 240 630 C 320 630 400 630 480 630 C 513 630 540 603 540 570 C 540 470 540 370 540 270 C 540 261.75 538.313 253.875 535.266 246.703 C 532.219 239.531 527.813 233.063 522.375 227.625 C 516.938 222.188 510.469 217.781 503.297 214.734 C 496.125 211.688 488.25 210 480 210 C 400 210 320 210 240 210 C 224.5 210 210.324 215.957 199.647 225.694 C 187.593 236.687 180 252.5 180 270 C 180 370 180 470 180 570 C 180 570 180 570 180 570 C 180 603 207 630 240 630 M 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018"
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="590"
                     android:valueFrom="1"
@@ -114,14 +114,14 @@
             <set>
                 <objectAnimator
                     android:duration="600"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
                     android:valueFrom="M 321.99 425.09 C 303.97 442.71 299.99 448.87 276.81 469.15 C 264.286 480.111 251.71 481.213 241.144 478.745 C 223.515 474.627 211.481 460.573 214.62 465.8 C 226.834 486.156 247.022 512.111 266.45 534.357 C 294.866 566.895 321.654 591.497 319.48 579.03 C 312.24 537.53 306.66 516.29 311.67 477.52 C 312.22 473.266 312.987 468.942 313.871 464.691 C 314.766 460.385 315.78 456.154 316.807 452.148 C 317.848 448.089 318.902 444.261 319.859 440.818 C 322.231 432.286 324.01 426.118 323.521 424.67 C 323.341 424.14 322.859 424.241 321.99 425.09 C 321.99 425.09 321.99 425.09 321.99 425.09 C 321.99 425.09 321.99 425.09 321.99 425.09 M 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018"
                     android:valueTo="M 480 210 C 400 210 320 210 240 210 C 224.5 210 210.324 215.957 199.647 225.694 C 187.593 236.687 180 252.5 180 270 C 180 370 180 470 180 570 C 180 570 180 570 180 570 C 180 603 207 630 240 630 C 320 630 400 630 480 630 C 513 630 540 603 540 570 C 540 470 540 370 540 270 C 540 261.75 538.313 253.875 535.266 246.703 C 532.219 239.531 527.813 233.063 522.375 227.625 C 516.938 222.188 510.469 217.781 503.297 214.734 C 496.125 211.688 488.25 210 480 210 M 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018 L 324.756 381.018"
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="590"
                     android:valueFrom="1"
@@ -153,7 +153,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="240"
                     android:valueFrom="1"
@@ -174,7 +174,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="240"
                     android:valueFrom="1"
@@ -195,7 +195,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="240"
                     android:valueFrom="1"
@@ -216,7 +216,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="240"
                     android:valueFrom="1"
@@ -237,7 +237,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="240"
                     android:valueFrom="1"
@@ -258,7 +258,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="240"
                     android:valueFrom="1"
@@ -279,7 +279,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="240"
                     android:valueFrom="1"
@@ -300,7 +300,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="240"
                     android:valueFrom="1"
@@ -321,7 +321,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="240"
                     android:valueFrom="1"
@@ -342,7 +342,7 @@
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="10"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="fillAlpha"
                     android:startOffset="290"
                     android:valueFrom="1"
@@ -379,28 +379,28 @@
             <set>
                 <objectAnimator
                     android:duration="300"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="rotation"
                     android:valueFrom="0"
                     android:valueTo="30"
                     android:valueType="floatType" />
                 <objectAnimator
                     android:duration="300"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="translateX"
                     android:valueFrom="0"
                     android:valueTo="300"
                     android:valueType="floatType" />
                 <objectAnimator
                     android:duration="300"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="translateY"
                     android:valueFrom="0"
                     android:valueTo="-200"
                     android:valueType="floatType" />
                 <objectAnimator
                     android:duration="300"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="translateX"
                     android:startOffset="900"
                     android:valueFrom="300"
@@ -408,7 +408,7 @@
                     android:valueType="floatType" />
                 <objectAnimator
                     android:duration="300"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"
+                    android:interpolator="@interpolator/fast_out_slow_in"
                     android:propertyName="rotation"
                     android:startOffset="900"
                     android:valueFrom="30"
diff --git a/app/src/main/res/drawable-v21/avd_module_from_filled.xml b/app/src/main/res/drawable/avd_module_from_filled.xml
similarity index 98%
rename from app/src/main/res/drawable-v21/avd_module_from_filled.xml
rename to app/src/main/res/drawable/avd_module_from_filled.xml
index 3d464b059..dadb042b0 100644
--- a/app/src/main/res/drawable-v21/avd_module_from_filled.xml
+++ b/app/src/main/res/drawable/avd_module_from_filled.xml
@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 23 13.5 C 23 14.163 22.736 14.799 22.268 15.268 C 21.799 15.736 21.163 16 20.5 16 C 20 16 19.5 16 19 16 L 19 20 C 19 20.53 18.789 21.039 18.414 21.414 C 18.039 21.789 17.53 22 17 22 L 15.1 22 L 13.2 22 C 13.2 21.5 13.2 21 13.2 20.5 C 13.2 19 12 17.8 10.5 17.8 C 9 17.8 7.8 19 7.8 20.5 L 7.8 22 L 4 22 C 3.47 22 2.961 21.789 2.586 21.414 C 2.211 21.039 2 20.53 2 20 L 2 16.2 L 3.5 16.2 C 5 16.2 6.2 15 6.2 13.5 C 6.2 12 5 10.8 3.5 10.8 L 2 10.8 L 2 7 C 2 6.47 2.211 5.961 2.586 5.586 C 2.961 5.211 3.47 5 4 5 L 8 5 C 8 4.5 8 4 8 3.5 C 8 2.837 8.264 2.201 8.732 1.732 C 9.201 1.264 9.837 1 10.5 1 C 11.163 1 11.799 1.264 12.268 1.732 C 12.736 2.201 13 2.837 13 3.5 C 13 4 13 4.5 13 5 L 17 5 C 17.55 5 18.05 5.223 18.413 5.584 C 18.775 5.945 19 6.445 19 7 L 19 11 C 19.5 11 20 11 20.5 11 C 20.5 11 20.5 11 20.5 11 C 21.163 11 21.799 11.264 22.268 11.732 C 22.736 12.201 23 12.837 23 13.5 M 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12"
                 android:valueTo="M 22 13.5 C 22 14.087 21.856 14.64 21.6 15.126 C 21.344 15.612 20.978 16.03 20.533 16.347 C 20.089 16.664 19.567 16.88 19 16.96 L 19 20 C 19 20.53 18.789 21.039 18.414 21.414 C 18.039 21.789 17.53 22 17 22 L 13.2 22 L 13.2 21.7 C 13.2 20.984 12.915 20.297 12.409 19.791 C 11.903 19.285 11.216 19 10.5 19 C 9 19 7.8 20.21 7.8 21.7 L 7.8 22 L 4 22 C 3.47 22 2.961 21.789 2.586 21.414 C 2.211 21.039 2 20.53 2 20 L 2 16.2 L 2.3 16.2 C 3.79 16.2 5 15 5 13.5 C 5 12 3.79 10.8 2.3 10.8 L 2 10.8 L 2 7 C 2 6.47 2.211 5.961 2.586 5.586 C 2.961 5.211 3.47 5 4 5 L 7.04 5 C 7.12 4.433 7.336 3.911 7.653 3.467 C 7.97 3.022 8.388 2.656 8.874 2.4 C 9.36 2.144 9.913 2 10.5 2 C 11.087 2 11.64 2.144 12.126 2.4 C 12.612 2.656 13.03 3.022 13.347 3.467 C 13.664 3.911 13.88 4.433 13.96 5 L 17 5 C 17.53 5 18.039 5.211 18.414 5.586 C 18.789 5.961 19 6.47 19 7 L 19 10.04 C 19.425 10.1 19.825 10.236 20.186 10.434 C 20.547 10.633 20.869 10.893 21.137 11.2 C 21.406 11.508 21.622 11.863 21.77 12.251 C 21.919 12.639 22 13.06 22 13.5 M 17 12 L 18.5 12 C 18.898 12 19.279 12.158 19.561 12.439 C 19.842 12.721 20 13.102 20 13.5 C 20 13.898 19.842 14.279 19.561 14.561 C 19.279 14.842 18.898 15 18.5 15 L 17 15 L 17 15 L 17 20 L 14.88 20 C 14.2 18.25 12.5 17 10.5 17 C 8.5 17 6.8 18.25 6.12 20 L 4 20 L 4 17.88 C 5.75 17.2 7 15.5 7 13.5 C 7 11.5 5.76 9.8 4 9.12 L 4 7 L 9 7 L 9 5.5 C 9 5.102 9.158 4.721 9.439 4.439 C 9.721 4.158 10.102 4 10.5 4 C 10.898 4 11.279 4.158 11.561 4.439 C 11.842 4.721 12 5.102 12 5.5 L 12 7 L 17 7 L 17 12"
diff --git a/app/src/main/res/drawable-v21/avd_module_to_filled.xml b/app/src/main/res/drawable/avd_module_to_filled.xml
similarity index 98%
rename from app/src/main/res/drawable-v21/avd_module_to_filled.xml
rename to app/src/main/res/drawable/avd_module_to_filled.xml
index bab708f16..cc4107675 100644
--- a/app/src/main/res/drawable-v21/avd_module_to_filled.xml
+++ b/app/src/main/res/drawable/avd_module_to_filled.xml
@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 22 13.5 C 22 14.087 21.856 14.64 21.6 15.126 C 21.344 15.612 20.978 16.03 20.533 16.347 C 20.089 16.664 19.567 16.88 19 16.96 L 19 20 C 19 20.53 18.789 21.039 18.414 21.414 C 18.039 21.789 17.53 22 17 22 L 13.2 22 L 13.2 21.7 C 13.2 20.984 12.915 20.297 12.409 19.791 C 11.903 19.285 11.216 19 10.5 19 C 9 19 7.8 20.21 7.8 21.7 L 7.8 22 L 4 22 C 3.47 22 2.961 21.789 2.586 21.414 C 2.211 21.039 2 20.53 2 20 L 2 16.2 L 2.3 16.2 C 3.79 16.2 5 15 5 13.5 C 5 12 3.79 10.8 2.3 10.8 L 2 10.8 L 2 7 C 2 6.47 2.211 5.961 2.586 5.586 C 2.961 5.211 3.47 5 4 5 L 7.04 5 C 7.12 4.433 7.336 3.911 7.653 3.467 C 7.97 3.022 8.388 2.656 8.874 2.4 C 9.36 2.144 9.913 2 10.5 2 C 11.087 2 11.64 2.144 12.126 2.4 C 12.612 2.656 13.03 3.022 13.347 3.467 C 13.664 3.911 13.88 4.433 13.96 5 L 17 5 C 17.53 5 18.039 5.211 18.414 5.586 C 18.789 5.961 19 6.47 19 7 L 19 10.04 C 19.425 10.1 19.825 10.236 20.186 10.434 C 20.547 10.633 20.869 10.893 21.137 11.2 C 21.406 11.508 21.622 11.863 21.77 12.251 C 21.919 12.639 22 13.06 22 13.5 M 17 12 L 18.5 12 C 18.898 12 19.279 12.158 19.561 12.439 C 19.842 12.721 20 13.102 20 13.5 C 20 13.898 19.842 14.279 19.561 14.561 C 19.279 14.842 18.898 15 18.5 15 L 17 15 L 17 15 L 17 20 L 14.88 20 C 14.2 18.25 12.5 17 10.5 17 C 8.5 17 6.8 18.25 6.12 20 L 4 20 L 4 17.88 C 5.75 17.2 7 15.5 7 13.5 C 7 11.5 5.76 9.8 4 9.12 L 4 7 L 9 7 L 9 5.5 C 9 5.102 9.158 4.721 9.439 4.439 C 9.721 4.158 10.102 4 10.5 4 C 10.898 4 11.279 4.158 11.561 4.439 C 11.842 4.721 12 5.102 12 5.5 L 12 7 L 17 7 L 17 12"
                 android:valueTo="M 23 13.5 C 23 14.163 22.736 14.799 22.268 15.268 C 21.799 15.736 21.163 16 20.5 16 C 20 16 19.5 16 19 16 L 19 20 C 19 20.53 18.789 21.039 18.414 21.414 C 18.039 21.789 17.53 22 17 22 L 15.1 22 L 13.2 22 C 13.2 21.5 13.2 21 13.2 20.5 C 13.2 19 12 17.8 10.5 17.8 C 9 17.8 7.8 19 7.8 20.5 L 7.8 22 L 4 22 C 3.47 22 2.961 21.789 2.586 21.414 C 2.211 21.039 2 20.53 2 20 L 2 16.2 L 3.5 16.2 C 5 16.2 6.2 15 6.2 13.5 C 6.2 12 5 10.8 3.5 10.8 L 2 10.8 L 2 7 C 2 6.47 2.211 5.961 2.586 5.586 C 2.961 5.211 3.47 5 4 5 L 8 5 C 8 4.5 8 4 8 3.5 C 8 2.837 8.264 2.201 8.732 1.732 C 9.201 1.264 9.837 1 10.5 1 C 11.163 1 11.799 1.264 12.268 1.732 C 12.736 2.201 13 2.837 13 3.5 C 13 4 13 4.5 13 5 L 17 5 C 17.55 5 18.05 5.223 18.413 5.584 C 18.775 5.945 19 6.445 19 7 L 19 11 C 19.5 11 20 11 20.5 11 C 20.5 11 20.5 11 20.5 11 C 21.163 11 21.799 11.264 22.268 11.732 C 22.736 12.201 23 12.837 23 13.5 M 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12"
diff --git a/app/src/main/res/drawable-v21/avd_settings_from_filled.xml b/app/src/main/res/drawable/avd_settings_from_filled.xml
similarity index 99%
rename from app/src/main/res/drawable-v21/avd_settings_from_filled.xml
rename to app/src/main/res/drawable/avd_settings_from_filled.xml
index 0b5bea43c..beb981c52 100644
--- a/app/src/main/res/drawable-v21/avd_settings_from_filled.xml
+++ b/app/src/main/res/drawable/avd_settings_from_filled.xml
@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 14.87 5.07 L 14.5 2.42 C 14.46 2.18 14.25 2 14 2 L 10 2 C 9.75 2 9.54 2.18 9.5 2.42 L 9.13 5.07 C 8.5 5.32 7.96 5.66 7.44 6.05 L 4.95 5.05 C 4.73 4.96 4.46 5.05 4.34 5.27 L 2.34 8.73 C 2.21 8.95 2.27 9.22 2.46 9.37 L 4.57 11 C 4.53 11.34 4.5 11.67 4.5 12 C 4.5 12.33 4.53 12.65 4.57 12.97 L 2.46 14.63 C 2.27 14.78 2.21 15.05 2.34 15.27 L 4.34 18.73 C 4.46 18.95 4.73 19.03 4.95 18.95 L 7.44 17.94 C 7.96 18.34 8.5 18.68 9.13 18.93 L 9.5 21.58 C 9.54 21.82 9.75 22 10 22 L 14 22 C 14.25 22 14.46 21.82 14.5 21.58 L 14.87 18.93 C 15.5 18.67 16.04 18.34 16.56 17.94 L 19.05 18.95 C 19.27 19.03 19.54 18.95 19.66 18.73 L 21.66 15.27 C 21.78 15.05 21.73 14.78 21.54 14.63 L 19.43 12.97 L 19.43 12.97 C 19.47 12.65 19.5 12.33 19.5 12 C 19.5 11.67 19.47 11.34 19.43 11 L 21.54 9.37 C 21.73 9.22 21.78 8.95 21.66 8.73 L 19.66 5.27 C 19.54 5.05 19.27 4.96 19.05 5.05 L 16.56 6.05 C 16.04 5.66 15.5 5.32 14.87 5.07 M 12 8.5 C 12.614 8.5 13.218 8.662 13.75 8.969 C 14.282 9.276 14.724 9.718 15.031 10.25 C 15.338 10.782 15.5 11.386 15.5 12 C 15.5 12.614 15.338 13.218 15.031 13.75 C 14.724 14.282 14.282 14.724 13.75 15.031 C 13.218 15.338 12.614 15.5 12 15.5 C 11.072 15.5 10.181 15.131 9.525 14.475 C 8.869 13.819 8.5 12.928 8.5 12 C 8.5 11.072 8.869 10.181 9.525 9.525 C 10.181 8.869 11.072 8.5 12 8.5 M 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 M 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12"
                 android:valueTo="M 14.87 5.07 L 14.5 2.42 C 14.46 2.18 14.25 2 14 2 L 10 2 C 9.75 2 9.54 2.18 9.5 2.42 L 9.13 5.07 C 8.5 5.32 7.96 5.66 7.44 6.05 L 4.95 5.05 C 4.73 4.96 4.46 5.05 4.34 5.27 L 2.34 8.73 C 2.21 8.95 2.27 9.22 2.46 9.37 L 4.57 11 C 4.547 11.333 4.523 11.667 4.5 12 C 4.523 12.323 4.547 12.647 4.57 12.97 L 2.46 14.63 C 2.27 14.78 2.21 15.05 2.34 15.27 L 4.34 18.73 C 4.46 18.95 4.73 19.03 4.95 18.95 L 7.44 17.94 C 7.96 18.34 8.5 18.68 9.13 18.93 L 9.5 21.58 C 9.54 21.82 9.75 22 10 22 L 14 22 C 14.25 22 14.46 21.82 14.5 21.58 L 14.87 18.93 C 15.5 18.68 16.04 18.34 16.56 17.95 L 19.05 18.95 C 19.27 19.04 19.54 18.95 19.66 18.73 L 21.66 15.27 C 21.79 15.05 21.73 14.78 21.54 14.63 L 19.43 13 L 19.465 12.499 C 19.477 12.333 19.488 12.166 19.5 12 C 19.477 11.667 19.453 11.333 19.43 11 L 21.54 9.37 C 21.73 9.22 21.79 8.95 21.66 8.73 L 19.66 5.27 C 19.54 5.05 19.27 4.96 19.05 5.05 L 16.56 6.05 C 16.04 5.66 15.5 5.32 14.87 5.07 M 12 8 C 12.53 8 13.05 8.105 13.531 8.305 C 14.011 8.504 14.454 8.797 14.828 9.172 C 15.578 9.921 16 10.94 16 12 C 16 12.53 15.895 13.05 15.695 13.531 C 15.496 14.011 15.203 14.454 14.828 14.828 C 14.079 15.578 13.06 16 12 16 C 10.94 16 9.921 15.578 9.172 14.828 C 8.422 14.079 8 13.06 8 12 C 8 10.94 8.422 9.921 9.172 9.172 C 9.921 8.422 10.94 8 12 8 M 12 10 C 11.912 10 11.824 10.006 11.737 10.017 C 11.651 10.029 11.565 10.046 11.481 10.069 C 11.397 10.091 11.315 10.119 11.235 10.152 C 11.155 10.186 11.077 10.224 11.001 10.267 C 10.926 10.311 10.854 10.359 10.784 10.412 C 10.715 10.466 10.649 10.524 10.586 10.586 C 10.524 10.649 10.466 10.715 10.412 10.784 C 10.359 10.854 10.311 10.926 10.267 11.001 C 10.224 11.077 10.186 11.155 10.152 11.235 C 10.119 11.315 10.091 11.397 10.069 11.481 C 10.046 11.565 10.029 11.651 10.017 11.737 C 10.006 11.824 10 11.912 10 12 C 10 12.088 10.006 12.176 10.017 12.263 C 10.029 12.349 10.046 12.435 10.069 12.519 C 10.091 12.603 10.119 12.685 10.152 12.765 C 10.186 12.845 10.224 12.923 10.267 12.999 C 10.311 13.074 10.359 13.146 10.412 13.216 C 10.466 13.285 10.524 13.351 10.586 13.414 C 10.649 13.476 10.715 13.534 10.784 13.588 C 10.854 13.641 10.926 13.689 11.001 13.733 C 11.077 13.776 11.155 13.814 11.235 13.848 C 11.315 13.881 11.397 13.909 11.481 13.931 C 11.565 13.954 11.651 13.971 11.737 13.983 C 11.824 13.994 11.912 14 12 14 C 12.53 14 13.039 13.789 13.414 13.414 C 13.468 13.36 13.518 13.304 13.565 13.245 C 13.611 13.187 13.655 13.126 13.694 13.062 C 13.734 12.999 13.77 12.934 13.802 12.867 C 13.834 12.8 13.863 12.731 13.887 12.661 C 13.912 12.591 13.933 12.519 13.949 12.447 C 13.966 12.374 13.979 12.3 13.987 12.226 C 13.996 12.151 14 12.076 14 12 C 14 11.912 13.994 11.824 13.983 11.737 C 13.971 11.651 13.954 11.565 13.931 11.481 C 13.909 11.397 13.881 11.315 13.848 11.235 C 13.814 11.155 13.776 11.077 13.733 11.001 C 13.689 10.926 13.641 10.854 13.588 10.784 C 13.534 10.715 13.476 10.649 13.414 10.586 C 13.039 10.211 12.53 10 12 10 M 11.25 4 L 11.25 4 L 12.75 4 L 13.12 6.62 C 14.32 6.86 15.38 7.5 16.15 8.39 L 18.56 7.35 L 19.31 8.65 L 17.2 10.2 C 17.6 11.37 17.6 12.64 17.2 13.81 L 19.32 15.36 L 18.57 16.66 L 16.14 15.62 C 15.37 16.5 14.32 17.14 13.13 17.39 L 12.76 20 L 11.24 20 L 10.87 17.38 C 9.68 17.14 8.63 16.5 7.86 15.62 L 5.43 16.66 L 4.68 15.36 L 6.8 13.8 C 6.4 12.64 6.4 11.37 6.8 10.2 L 4.69 8.65 L 5.44 7.35 L 7.85 8.39 C 8.62 7.5 9.68 6.86 10.88 6.61 L 11.25 4"
diff --git a/app/src/main/res/drawable-v21/avd_settings_to_filled.xml b/app/src/main/res/drawable/avd_settings_to_filled.xml
similarity index 99%
rename from app/src/main/res/drawable-v21/avd_settings_to_filled.xml
rename to app/src/main/res/drawable/avd_settings_to_filled.xml
index a5fb8da73..00d8ed2da 100644
--- a/app/src/main/res/drawable-v21/avd_settings_to_filled.xml
+++ b/app/src/main/res/drawable/avd_settings_to_filled.xml
@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 14.87 5.07 L 14.5 2.42 C 14.46 2.18 14.25 2 14 2 L 10 2 C 9.75 2 9.54 2.18 9.5 2.42 L 9.13 5.07 C 8.5 5.32 7.96 5.66 7.44 6.05 L 4.95 5.05 C 4.73 4.96 4.46 5.05 4.34 5.27 L 2.34 8.73 C 2.21 8.95 2.27 9.22 2.46 9.37 L 4.57 11 C 4.547 11.333 4.523 11.667 4.5 12 C 4.523 12.323 4.547 12.647 4.57 12.97 L 2.46 14.63 C 2.27 14.78 2.21 15.05 2.34 15.27 L 4.34 18.73 C 4.46 18.95 4.73 19.03 4.95 18.95 L 7.44 17.94 C 7.96 18.34 8.5 18.68 9.13 18.93 L 9.5 21.58 C 9.54 21.82 9.75 22 10 22 L 14 22 C 14.25 22 14.46 21.82 14.5 21.58 L 14.87 18.93 C 15.5 18.68 16.04 18.34 16.56 17.95 L 19.05 18.95 C 19.27 19.04 19.54 18.95 19.66 18.73 L 21.66 15.27 C 21.79 15.05 21.73 14.78 21.54 14.63 L 19.43 13 L 19.465 12.499 C 19.477 12.333 19.488 12.166 19.5 12 C 19.477 11.667 19.453 11.333 19.43 11 L 21.54 9.37 C 21.73 9.22 21.79 8.95 21.66 8.73 L 19.66 5.27 C 19.54 5.05 19.27 4.96 19.05 5.05 L 16.56 6.05 C 16.04 5.66 15.5 5.32 14.87 5.07 M 12 8 C 12.53 8 13.05 8.105 13.531 8.305 C 14.011 8.504 14.454 8.797 14.828 9.172 C 15.578 9.921 16 10.94 16 12 C 16 12.53 15.895 13.05 15.695 13.531 C 15.496 14.011 15.203 14.454 14.828 14.828 C 14.079 15.578 13.06 16 12 16 C 10.94 16 9.921 15.578 9.172 14.828 C 8.422 14.079 8 13.06 8 12 C 8 10.94 8.422 9.921 9.172 9.172 C 9.921 8.422 10.94 8 12 8 M 12 10 C 11.912 10 11.824 10.006 11.737 10.017 C 11.651 10.029 11.565 10.046 11.481 10.069 C 11.397 10.091 11.315 10.119 11.235 10.152 C 11.155 10.186 11.077 10.224 11.001 10.267 C 10.926 10.311 10.854 10.359 10.784 10.412 C 10.715 10.466 10.649 10.524 10.586 10.586 C 10.524 10.649 10.466 10.715 10.412 10.784 C 10.359 10.854 10.311 10.926 10.267 11.001 C 10.224 11.077 10.186 11.155 10.152 11.235 C 10.119 11.315 10.091 11.397 10.069 11.481 C 10.046 11.565 10.029 11.651 10.017 11.737 C 10.006 11.824 10 11.912 10 12 C 10 12.088 10.006 12.176 10.017 12.263 C 10.029 12.349 10.046 12.435 10.069 12.519 C 10.091 12.603 10.119 12.685 10.152 12.765 C 10.186 12.845 10.224 12.923 10.267 12.999 C 10.311 13.074 10.359 13.146 10.412 13.216 C 10.466 13.285 10.524 13.351 10.586 13.414 C 10.649 13.476 10.715 13.534 10.784 13.588 C 10.854 13.641 10.926 13.689 11.001 13.733 C 11.077 13.776 11.155 13.814 11.235 13.848 C 11.315 13.881 11.397 13.909 11.481 13.931 C 11.565 13.954 11.651 13.971 11.737 13.983 C 11.824 13.994 11.912 14 12 14 C 12.53 14 13.039 13.789 13.414 13.414 C 13.468 13.36 13.518 13.304 13.565 13.245 C 13.611 13.187 13.655 13.126 13.694 13.062 C 13.734 12.999 13.77 12.934 13.802 12.867 C 13.834 12.8 13.863 12.731 13.887 12.661 C 13.912 12.591 13.933 12.519 13.949 12.447 C 13.966 12.374 13.979 12.3 13.987 12.226 C 13.996 12.151 14 12.076 14 12 C 14 11.912 13.994 11.824 13.983 11.737 C 13.971 11.651 13.954 11.565 13.931 11.481 C 13.909 11.397 13.881 11.315 13.848 11.235 C 13.814 11.155 13.776 11.077 13.733 11.001 C 13.689 10.926 13.641 10.854 13.588 10.784 C 13.534 10.715 13.476 10.649 13.414 10.586 C 13.039 10.211 12.53 10 12 10 M 11.25 4 L 11.25 4 L 12.75 4 L 13.12 6.62 C 14.32 6.86 15.38 7.5 16.15 8.39 L 18.56 7.35 L 19.31 8.65 L 17.2 10.2 C 17.6 11.37 17.6 12.64 17.2 13.81 L 19.32 15.36 L 18.57 16.66 L 16.14 15.62 C 15.37 16.5 14.32 17.14 13.13 17.39 L 12.76 20 L 11.24 20 L 10.87 17.38 C 9.68 17.14 8.63 16.5 7.86 15.62 L 5.43 16.66 L 4.68 15.36 L 6.8 13.8 C 6.4 12.64 6.4 11.37 6.8 10.2 L 4.69 8.65 L 5.44 7.35 L 7.85 8.39 C 8.62 7.5 9.68 6.86 10.88 6.61 L 11.25 4"
                 android:valueTo="M 14.87 5.07 L 14.5 2.42 C 14.46 2.18 14.25 2 14 2 L 10 2 C 9.75 2 9.54 2.18 9.5 2.42 L 9.13 5.07 C 8.5 5.32 7.96 5.66 7.44 6.05 L 4.95 5.05 C 4.73 4.96 4.46 5.05 4.34 5.27 L 2.34 8.73 C 2.21 8.95 2.27 9.22 2.46 9.37 L 4.57 11 C 4.53 11.34 4.5 11.67 4.5 12 C 4.5 12.33 4.53 12.65 4.57 12.97 L 2.46 14.63 C 2.27 14.78 2.21 15.05 2.34 15.27 L 4.34 18.73 C 4.46 18.95 4.73 19.03 4.95 18.95 L 7.44 17.94 C 7.96 18.34 8.5 18.68 9.13 18.93 L 9.5 21.58 C 9.54 21.82 9.75 22 10 22 L 14 22 C 14.25 22 14.46 21.82 14.5 21.58 L 14.87 18.93 C 15.5 18.67 16.04 18.34 16.56 17.94 L 19.05 18.95 C 19.27 19.03 19.54 18.95 19.66 18.73 L 21.66 15.27 C 21.78 15.05 21.73 14.78 21.54 14.63 L 19.43 12.97 L 19.43 12.97 C 19.47 12.65 19.5 12.33 19.5 12 C 19.5 11.67 19.47 11.34 19.43 11 L 21.54 9.37 C 21.73 9.22 21.78 8.95 21.66 8.73 L 19.66 5.27 C 19.54 5.05 19.27 4.96 19.05 5.05 L 16.56 6.05 C 16.04 5.66 15.5 5.32 14.87 5.07 M 12 8.5 C 12.614 8.5 13.218 8.662 13.75 8.969 C 14.282 9.276 14.724 9.718 15.031 10.25 C 15.338 10.782 15.5 11.386 15.5 12 C 15.5 12.614 15.338 13.218 15.031 13.75 C 14.724 14.282 14.282 14.724 13.75 15.031 C 13.218 15.338 12.614 15.5 12 15.5 C 11.072 15.5 10.181 15.131 9.525 14.475 C 8.869 13.819 8.5 12.928 8.5 12 C 8.5 11.072 8.869 10.181 9.525 9.525 C 10.181 8.869 11.072 8.5 12 8.5 M 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 M 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12"
diff --git a/app/src/main/res/drawable-v21/avd_superuser_from_filled.xml b/app/src/main/res/drawable/avd_superuser_from_filled.xml
similarity index 94%
rename from app/src/main/res/drawable-v21/avd_superuser_from_filled.xml
rename to app/src/main/res/drawable/avd_superuser_from_filled.xml
index e5e63721b..99f19734d 100644
--- a/app/src/main/res/drawable-v21/avd_superuser_from_filled.xml
+++ b/app/src/main/res/drawable/avd_superuser_from_filled.xml
@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 21 11 C 21 16.55 17.16 21.74 12 23 C 6.84 21.74 3 16.55 3 11 L 3 5 L 12 1 L 12 1 L 21 5 L 21 11 M 12 10.18 L 12 10.18 C 12 10.18 12 10.18 12 10.18 L 12 10.18 L 12 10.18 L 12 10.18 L 12 10.18 C 12 10.18 12 10.18 12 10.18"
                 android:valueTo="M 21 11 C 21 16.55 17.16 21.74 12 23 C 6.84 21.74 3 16.55 3 11 L 3 5 L 7.5 3 L 12 1 L 21 5 L 21 11 M 12 21 L 12 21 C 8.25 20 5 15.54 5 11.22 L 5 6.3 L 12 3.18 L 19 6.3 L 19 11.22 C 19 15.54 15.75 20 12 21"
diff --git a/app/src/main/res/drawable-v21/avd_superuser_to_filled.xml b/app/src/main/res/drawable/avd_superuser_to_filled.xml
similarity index 95%
rename from app/src/main/res/drawable-v21/avd_superuser_to_filled.xml
rename to app/src/main/res/drawable/avd_superuser_to_filled.xml
index 287e9a9d0..a105e0f00 100644
--- a/app/src/main/res/drawable-v21/avd_superuser_to_filled.xml
+++ b/app/src/main/res/drawable/avd_superuser_to_filled.xml
@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:interpolator="@interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 21 11 C 21 16.55 17.16 21.74 12 23 C 6.84 21.74 3 16.55 3 11 L 3 5 L 7.5 3 L 12 1 L 21 5 L 21 11 M 12 21 L 12 21 C 8.25 20 5 15.54 5 11.22 L 5 6.3 L 12 3.18 L 19 6.3 L 19 11.22 C 19 15.54 15.75 20 12 21"
                 android:valueTo="M 21 11 C 21 16.55 17.16 21.74 12 23 C 6.84 21.74 3 16.55 3 11 L 3 5 L 12 1 L 12 1 L 21 5 L 21 11 M 12 10.18 L 12 10.18 C 12 10.18 12 10.18 12 10.18 L 12 10.18 L 12 10.18 L 12 10.18 L 12 10.18 C 12 10.18 12 10.18 12 10.18"
diff --git a/app/src/main/res/drawable/ic_bug_md2.xml b/app/src/main/res/drawable/ic_bug_md2.xml
index 9eea5b0e8..e9ea123fc 100644
--- a/app/src/main/res/drawable/ic_bug_md2.xml
+++ b/app/src/main/res/drawable/ic_bug_md2.xml
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_bug_filled_md2" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_bug_filled_md2" android:state_checked="true" />
-    <item android:drawable="@drawable/ic_bug_outlined_md2" />
-</selector>
\ No newline at end of file
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/checked"
+        android:drawable="@drawable/ic_bug_filled_md2"
+        android:state_checked="true" />
+
+    <item
+        android:id="@+id/unchecked"
+        android:drawable="@drawable/ic_bug_outlined_md2" />
+
+    <transition
+        android:drawable="@drawable/avd_bug_from_filled"
+        android:fromId="@+id/checked"
+        android:toId="@+id/unchecked" />
+
+    <transition
+        android:drawable="@drawable/avd_bug_to_filled"
+        android:fromId="@+id/unchecked"
+        android:toId="@id/checked" />
+
+</animated-selector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
deleted file mode 100644
index d76e3bf7a..000000000
--- a/app/src/main/res/drawable/ic_close.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?colorOnSurface"
-        android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z"
-        tools:fillColor="#000" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_close_md2.xml b/app/src/main/res/drawable/ic_close_md2.xml
index 78e1de996..786303ae0 100644
--- a/app/src/main/res/drawable/ic_close_md2.xml
+++ b/app/src/main/res/drawable/ic_close_md2.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
         android:fillColor="?colorOnSurface"
-        android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
-</vector>
\ No newline at end of file
+        android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z"
+        tools:fillColor="#000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_home_md2.xml b/app/src/main/res/drawable/ic_home_md2.xml
index cc8b40c34..a5d90b4d9 100644
--- a/app/src/main/res/drawable/ic_home_md2.xml
+++ b/app/src/main/res/drawable/ic_home_md2.xml
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_home_filled_md2" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_home_filled_md2" android:state_checked="true" />
-    <item android:drawable="@drawable/ic_home_outlined_md2" />
-</selector>
\ No newline at end of file
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/checked"
+        android:drawable="@drawable/ic_home_filled_md2"
+        android:state_checked="true" />
+
+    <item
+        android:id="@+id/unchecked"
+        android:drawable="@drawable/ic_home_outlined_md2" />
+
+    <transition
+        android:drawable="@drawable/avd_home_from_filled"
+        android:fromId="@+id/checked"
+        android:toId="@+id/unchecked" />
+
+    <transition
+        android:drawable="@drawable/avd_home_to_filled"
+        android:fromId="@+id/unchecked"
+        android:toId="@id/checked" />
+
+</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_magisk_delete.xml b/app/src/main/res/drawable/ic_magisk_delete.xml
index 5932b6150..3feade979 100644
--- a/app/src/main/res/drawable/ic_magisk_delete.xml
+++ b/app/src/main/res/drawable/ic_magisk_delete.xml
@@ -1,8 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_delete_md2" android:state_selected="true" />
+    <item
+        android:id="@+id/collapsed"
+        android:drawable="@drawable/ic_delete_md2"
+        android:state_selected="true" />
 
-    <item android:drawable="@drawable/ic_magisk_outline" />
+    <item
+        android:id="@+id/expanded"
+        android:drawable="@drawable/ic_magisk_outline" />
 
-</selector>
\ No newline at end of file
+    <transition
+        android:drawable="@drawable/avd_magisk_delete"
+        android:fromId="@+id/expanded"
+        android:toId="@+id/collapsed" />
+
+    <transition
+        android:drawable="@drawable/avd_delete_magisk"
+        android:fromId="@+id/collapsed"
+        android:toId="@id/expanded" />
+
+</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_module_md2.xml b/app/src/main/res/drawable/ic_module_md2.xml
index 55d94eab3..d93278f5b 100644
--- a/app/src/main/res/drawable/ic_module_md2.xml
+++ b/app/src/main/res/drawable/ic_module_md2.xml
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_module_filled_md2" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_module_filled_md2" android:state_checked="true" />
-    <item android:drawable="@drawable/ic_module_outlined_md2" />
-</selector>
\ No newline at end of file
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/checked"
+        android:drawable="@drawable/ic_module_filled_md2"
+        android:state_checked="true" />
+
+    <item
+        android:id="@+id/unchecked"
+        android:drawable="@drawable/ic_module_outlined_md2" />
+
+    <transition
+        android:drawable="@drawable/avd_module_from_filled"
+        android:fromId="@+id/checked"
+        android:toId="@+id/unchecked" />
+
+    <transition
+        android:drawable="@drawable/avd_module_to_filled"
+        android:fromId="@+id/unchecked"
+        android:toId="@id/checked" />
+
+</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_md2.xml b/app/src/main/res/drawable/ic_settings_md2.xml
index 9df992937..9d294bff8 100644
--- a/app/src/main/res/drawable/ic_settings_md2.xml
+++ b/app/src/main/res/drawable/ic_settings_md2.xml
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_settings_filled_md2" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_settings_filled_md2" android:state_checked="true" />
-    <item android:drawable="@drawable/ic_settings_outlined_md2" />
-</selector>
\ No newline at end of file
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/checked"
+        android:drawable="@drawable/ic_settings_filled_md2"
+        android:state_checked="true" />
+
+    <item
+        android:id="@+id/unchecked"
+        android:drawable="@drawable/ic_settings_outlined_md2" />
+
+    <transition
+        android:drawable="@drawable/avd_settings_from_filled"
+        android:fromId="@+id/checked"
+        android:toId="@+id/unchecked" />
+
+    <transition
+        android:drawable="@drawable/avd_settings_to_filled"
+        android:fromId="@+id/unchecked"
+        android:toId="@id/checked" />
+
+</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_superuser_md2.xml b/app/src/main/res/drawable/ic_superuser_md2.xml
index 4d52c7577..374959c7c 100644
--- a/app/src/main/res/drawable/ic_superuser_md2.xml
+++ b/app/src/main/res/drawable/ic_superuser_md2.xml
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_superuser_filled_md2" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_superuser_filled_md2" android:state_checked="true" />
-    <item android:drawable="@drawable/ic_superuser_outlined_md2" />
-</selector>
\ No newline at end of file
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/checked"
+        android:drawable="@drawable/ic_superuser_filled_md2"
+        android:state_checked="true" />
+
+    <item
+        android:id="@+id/unchecked"
+        android:drawable="@drawable/ic_superuser_outlined_md2" />
+
+    <transition
+        android:drawable="@drawable/avd_superuser_from_filled"
+        android:fromId="@+id/checked"
+        android:toId="@+id/unchecked" />
+
+    <transition
+        android:drawable="@drawable/avd_superuser_to_filled"
+        android:fromId="@+id/unchecked"
+        android:toId="@id/checked" />
+
+</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_install_md2.xml b/app/src/main/res/layout/fragment_install_md2.xml
index 50c1c3eb5..0c50d2fa6 100644
--- a/app/src/main/res/layout/fragment_install_md2.xml
+++ b/app/src/main/res/layout/fragment_install_md2.xml
@@ -193,7 +193,7 @@
                                 style="@style/WidgetFoundation.RadioButton"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:button="@drawable/ic_radio_check_button"
+                                app:buttonCompat="@drawable/ic_radio_check_button"
                                 android:text="@string/select_patch_file" />
 
                             <com.google.android.material.radiobutton.MaterialRadioButton
@@ -202,7 +202,7 @@
                                 gone="@{!viewModel.rooted}"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:button="@drawable/ic_radio_check_button"
+                                app:buttonCompat="@drawable/ic_radio_check_button"
                                 android:text="@string/direct_install" />
 
                             <com.google.android.material.radiobutton.MaterialRadioButton
@@ -211,7 +211,7 @@
                                 gone="@{!viewModel.rooted || !viewModel.aB}"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:button="@drawable/ic_radio_check_button"
+                                app:buttonCompat="@drawable/ic_radio_check_button"
                                 android:text="@string/install_inactive_slot" />
 
                         </RadioGroup>
diff --git a/app/src/main/res/layout/item_hide_md2.xml b/app/src/main/res/layout/item_hide_md2.xml
index 37a92c37b..8ae1fc828 100644
--- a/app/src/main/res/layout/item_hide_md2.xml
+++ b/app/src/main/res/layout/item_hide_md2.xml
@@ -96,7 +96,7 @@
                     android:id="@+id/hide_expand_icon"
                     style="@style/WidgetFoundation.Icon"
                     invisible="@{item.item.processes.empty}"
-                    srcCompat="@{item.isExpanded ? R.drawable.ic_close : R.drawable.ic_back_md2}"
+                    srcCompat="@{item.isExpanded ? R.drawable.ic_close_md2 : R.drawable.ic_back_md2}"
                     android:background="@null"
                     android:rotation="180"
                     android:rotationX="@{item.isExpanded ? 180 : 0}"