From ec380e8b8913835cc50448aa51b75b3925644957 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Tue, 6 Dec 2022 03:17:15 +0100
Subject: re-adding pngs as fallback for pre-API 24, appearantly Android 6's
 vector graphic rendering is really broken

---
 .../res/drawable-anydpi-v24/bg_connected.xml       |  13 +++
 .../drawable-anydpi-v24/bg_connected_effect.xml    |  25 +++++
 .../res/drawable-anydpi-v24/bg_connecting.xml      |  13 +++
 .../drawable-anydpi-v24/bg_connecting_effect.xml   |  44 +++++++++
 .../res/drawable-anydpi-v24/bg_disconnected.xml    |  15 +++
 .../drawable-anydpi-v24/bg_disconnected_effect.xml |  45 +++++++++
 app/src/custom/res/drawable-anydpi-v24/ic_motd.xml |  18 ++++
 app/src/custom/res/drawable-anydpi-v24/ravens.xml  |  39 ++++++++
 .../drawable-anydpi-v24/rotate_progress_image.xml  |  14 +++
 .../res/drawable-anydpi-v24/state_connected.xml    |  27 ++++++
 .../res/drawable-anydpi-v24/state_connecting.xml   |  15 +++
 .../res/drawable-anydpi-v24/state_disconnected.xml |  17 ++++
 .../state_transition_connected_disconnected.xml    |  89 ++++++++++++++++++
 app/src/custom/res/drawable-hdpi/bg_connected.png  | Bin 0 -> 61315 bytes
 app/src/custom/res/drawable-hdpi/bg_connecting.png | Bin 0 -> 137369 bytes
 .../custom/res/drawable-hdpi/bg_disconnected.png   | Bin 0 -> 116565 bytes
 app/src/custom/res/drawable-xhdpi/bg_connected.png | Bin 0 -> 85060 bytes
 .../custom/res/drawable-xhdpi/bg_connecting.png    | Bin 0 -> 230677 bytes
 .../custom/res/drawable-xhdpi/bg_disconnected.png  | Bin 0 -> 164266 bytes
 .../custom/res/drawable-xxhdpi/bg_connected.png    | Bin 0 -> 136989 bytes
 .../custom/res/drawable-xxhdpi/bg_connecting.png   | Bin 0 -> 422556 bytes
 .../custom/res/drawable-xxhdpi/bg_disconnected.png | Bin 0 -> 258953 bytes
 app/src/custom/res/drawable/bg_connected.png       | Bin 0 -> 39210 bytes
 app/src/custom/res/drawable/bg_connected.xml       |  13 ---
 .../custom/res/drawable/bg_connected_effect.xml    |  25 -----
 app/src/custom/res/drawable/bg_connecting.png      | Bin 0 -> 68160 bytes
 app/src/custom/res/drawable/bg_connecting.xml      |  13 ---
 .../custom/res/drawable/bg_connecting_effect.xml   |  44 ---------
 app/src/custom/res/drawable/bg_disconnected.png    | Bin 0 -> 71570 bytes
 app/src/custom/res/drawable/bg_disconnected.xml    |  15 ---
 .../custom/res/drawable/bg_disconnected_effect.xml |  45 ---------
 app/src/custom/res/drawable/ic_motd.png            | Bin 0 -> 34639 bytes
 app/src/custom/res/drawable/ic_motd.xml            |  18 ----
 app/src/custom/res/drawable/ravens.xml             |  39 --------
 .../custom/res/drawable/rotate_progress_image.png  | Bin 0 -> 161 bytes
 .../custom/res/drawable/rotate_progress_image.xml  |  14 ---
 app/src/custom/res/drawable/state_connected.png    | Bin 0 -> 48758 bytes
 app/src/custom/res/drawable/state_connected.xml    |  27 ------
 app/src/custom/res/drawable/state_connecting.png   | Bin 0 -> 111663 bytes
 app/src/custom/res/drawable/state_connecting.xml   |  15 ---
 app/src/custom/res/drawable/state_disconnected.xml |  23 ++---
 .../state_transition_connected_disconnected.xml    |  89 ------------------
 .../main/res/drawable-anydpi-v24/ic_btn_cancel.xml |   9 ++
 app/src/main/res/drawable-anydpi-v24/ic_btn_on.xml |  10 ++
 app/src/main/res/drawable/ic_btn_cancel.png        | Bin 0 -> 1009 bytes
 app/src/main/res/drawable/ic_btn_cancel.xml        |   9 --
 app/src/main/res/drawable/ic_btn_on.png            | Bin 0 -> 2211 bytes
 app/src/main/res/drawable/ic_btn_on.xml            |  10 --
 app/src/main/res/drawable/ic_btn_on_connecting.xml |  22 -----
 app/src/main/res/drawable/ic_btn_on_disabled.xml   |  20 ----
 .../main/res/drawable/ic_btn_on_primary_color.xml  |  22 -----
 .../main/res/layout/allowed_application_layout.xml |   1 -
 .../res/drawable-anydpi-v24/background_main.xml    |  52 +++++++++++
 .../res/drawable-anydpi-v24/bg_connected.xml       |  14 +++
 .../drawable-anydpi-v24/bg_connected_effect.xml    |  44 +++++++++
 .../res/drawable-anydpi-v24/bg_connecting.xml      |  13 +++
 .../drawable-anydpi-v24/bg_connecting_effect.xml   |  44 +++++++++
 .../res/drawable-anydpi-v24/bg_disconnected.xml    |  13 +++
 .../drawable-anydpi-v24/bg_disconnected_effect.xml |  33 +++++++
 .../drawable-anydpi-v24/rotate_progress_image.xml  | 103 +++++++++++++++++++++
 .../normal/res/drawable-anydpi-v24/splash_icon.xml |  14 +++
 app/src/normal/res/drawable-hdpi/bg_connected.png  | Bin 0 -> 101464 bytes
 app/src/normal/res/drawable-hdpi/bg_connecting.png | Bin 0 -> 137369 bytes
 .../normal/res/drawable-hdpi/bg_disconnected.png   | Bin 0 -> 59922 bytes
 .../res/drawable-hdpi/rotate_progress_image.png    | Bin 0 -> 6427 bytes
 .../normal/res/drawable-xhdpi/background_main.png  | Bin 0 -> 64868 bytes
 app/src/normal/res/drawable-xhdpi/bg_connected.png | Bin 0 -> 168784 bytes
 .../normal/res/drawable-xhdpi/bg_connecting.png    | Bin 0 -> 230677 bytes
 .../normal/res/drawable-xhdpi/bg_disconnected.png  | Bin 0 -> 79223 bytes
 .../res/drawable-xhdpi/rotate_progress_image.png   | Bin 0 -> 9736 bytes
 .../res/drawable-xxhdpi/rotate_progress_image.png  | Bin 0 -> 12752 bytes
 .../res/drawable-xxxhdpi/background_main.png       | Bin 0 -> 131879 bytes
 app/src/normal/res/drawable/background_eip.xml     |  52 -----------
 app/src/normal/res/drawable/background_main.png    | Bin 0 -> 39702 bytes
 app/src/normal/res/drawable/background_main.xml    |  52 -----------
 app/src/normal/res/drawable/bg_connected.png       | Bin 0 -> 50250 bytes
 app/src/normal/res/drawable/bg_connected.xml       |  14 ---
 .../normal/res/drawable/bg_connected_effect.xml    |  44 ---------
 app/src/normal/res/drawable/bg_connecting.png      | Bin 0 -> 68160 bytes
 app/src/normal/res/drawable/bg_connecting.xml      |  13 ---
 .../normal/res/drawable/bg_connecting_effect.xml   |  44 ---------
 app/src/normal/res/drawable/bg_disconnected.png    | Bin 0 -> 59917 bytes
 app/src/normal/res/drawable/bg_disconnected.xml    |  13 ---
 .../normal/res/drawable/bg_disconnected_effect.xml |  33 -------
 .../normal/res/drawable/rotate_progress_image.png  | Bin 0 -> 4945 bytes
 .../normal/res/drawable/rotate_progress_image.xml  | 103 ---------------------
 app/src/normal/res/drawable/splash_icon.xml        |  14 ---
 87 files changed, 729 insertions(+), 840 deletions(-)
 create mode 100644 app/src/custom/res/drawable-anydpi-v24/bg_connected.xml
 create mode 100644 app/src/custom/res/drawable-anydpi-v24/bg_connected_effect.xml
 create mode 100644 app/src/custom/res/drawable-anydpi-v24/bg_connecting.xml
 create mode 100644 app/src/custom/res/drawable-anydpi-v24/bg_connecting_effect.xml
 create mode 100644 app/src/custom/res/drawable-anydpi-v24/bg_disconnected.xml
 create mode 100644 app/src/custom/res/drawable-anydpi-v24/bg_disconnected_effect.xml
 create mode 100644 app/src/custom/res/drawable-anydpi-v24/ic_motd.xml
 create mode 100644 app/src/custom/res/drawable-anydpi-v24/ravens.xml
 create mode 100644 app/src/custom/res/drawable-anydpi-v24/rotate_progress_image.xml
 create mode 100644 app/src/custom/res/drawable-anydpi-v24/state_connected.xml
 create mode 100644 app/src/custom/res/drawable-anydpi-v24/state_connecting.xml
 create mode 100644 app/src/custom/res/drawable-anydpi-v24/state_disconnected.xml
 create mode 100644 app/src/custom/res/drawable-anydpi-v24/state_transition_connected_disconnected.xml
 create mode 100644 app/src/custom/res/drawable-hdpi/bg_connected.png
 create mode 100644 app/src/custom/res/drawable-hdpi/bg_connecting.png
 create mode 100644 app/src/custom/res/drawable-hdpi/bg_disconnected.png
 create mode 100644 app/src/custom/res/drawable-xhdpi/bg_connected.png
 create mode 100644 app/src/custom/res/drawable-xhdpi/bg_connecting.png
 create mode 100644 app/src/custom/res/drawable-xhdpi/bg_disconnected.png
 create mode 100644 app/src/custom/res/drawable-xxhdpi/bg_connected.png
 create mode 100644 app/src/custom/res/drawable-xxhdpi/bg_connecting.png
 create mode 100644 app/src/custom/res/drawable-xxhdpi/bg_disconnected.png
 create mode 100644 app/src/custom/res/drawable/bg_connected.png
 delete mode 100644 app/src/custom/res/drawable/bg_connected.xml
 delete mode 100644 app/src/custom/res/drawable/bg_connected_effect.xml
 create mode 100644 app/src/custom/res/drawable/bg_connecting.png
 delete mode 100644 app/src/custom/res/drawable/bg_connecting.xml
 delete mode 100644 app/src/custom/res/drawable/bg_connecting_effect.xml
 create mode 100644 app/src/custom/res/drawable/bg_disconnected.png
 delete mode 100644 app/src/custom/res/drawable/bg_disconnected.xml
 delete mode 100644 app/src/custom/res/drawable/bg_disconnected_effect.xml
 create mode 100644 app/src/custom/res/drawable/ic_motd.png
 delete mode 100644 app/src/custom/res/drawable/ic_motd.xml
 delete mode 100644 app/src/custom/res/drawable/ravens.xml
 create mode 100644 app/src/custom/res/drawable/rotate_progress_image.png
 delete mode 100644 app/src/custom/res/drawable/rotate_progress_image.xml
 create mode 100644 app/src/custom/res/drawable/state_connected.png
 delete mode 100644 app/src/custom/res/drawable/state_connected.xml
 create mode 100644 app/src/custom/res/drawable/state_connecting.png
 delete mode 100644 app/src/custom/res/drawable/state_connecting.xml
 delete mode 100644 app/src/custom/res/drawable/state_transition_connected_disconnected.xml
 create mode 100644 app/src/main/res/drawable-anydpi-v24/ic_btn_cancel.xml
 create mode 100644 app/src/main/res/drawable-anydpi-v24/ic_btn_on.xml
 create mode 100644 app/src/main/res/drawable/ic_btn_cancel.png
 delete mode 100644 app/src/main/res/drawable/ic_btn_cancel.xml
 create mode 100644 app/src/main/res/drawable/ic_btn_on.png
 delete mode 100644 app/src/main/res/drawable/ic_btn_on.xml
 delete mode 100644 app/src/main/res/drawable/ic_btn_on_connecting.xml
 delete mode 100644 app/src/main/res/drawable/ic_btn_on_disabled.xml
 delete mode 100644 app/src/main/res/drawable/ic_btn_on_primary_color.xml
 create mode 100644 app/src/normal/res/drawable-anydpi-v24/background_main.xml
 create mode 100644 app/src/normal/res/drawable-anydpi-v24/bg_connected.xml
 create mode 100644 app/src/normal/res/drawable-anydpi-v24/bg_connected_effect.xml
 create mode 100644 app/src/normal/res/drawable-anydpi-v24/bg_connecting.xml
 create mode 100644 app/src/normal/res/drawable-anydpi-v24/bg_connecting_effect.xml
 create mode 100644 app/src/normal/res/drawable-anydpi-v24/bg_disconnected.xml
 create mode 100644 app/src/normal/res/drawable-anydpi-v24/bg_disconnected_effect.xml
 create mode 100644 app/src/normal/res/drawable-anydpi-v24/rotate_progress_image.xml
 create mode 100644 app/src/normal/res/drawable-anydpi-v24/splash_icon.xml
 create mode 100644 app/src/normal/res/drawable-hdpi/bg_connected.png
 create mode 100644 app/src/normal/res/drawable-hdpi/bg_connecting.png
 create mode 100644 app/src/normal/res/drawable-hdpi/bg_disconnected.png
 create mode 100644 app/src/normal/res/drawable-hdpi/rotate_progress_image.png
 create mode 100644 app/src/normal/res/drawable-xhdpi/background_main.png
 create mode 100644 app/src/normal/res/drawable-xhdpi/bg_connected.png
 create mode 100644 app/src/normal/res/drawable-xhdpi/bg_connecting.png
 create mode 100644 app/src/normal/res/drawable-xhdpi/bg_disconnected.png
 create mode 100644 app/src/normal/res/drawable-xhdpi/rotate_progress_image.png
 create mode 100644 app/src/normal/res/drawable-xxhdpi/rotate_progress_image.png
 create mode 100644 app/src/normal/res/drawable-xxxhdpi/background_main.png
 delete mode 100644 app/src/normal/res/drawable/background_eip.xml
 create mode 100644 app/src/normal/res/drawable/background_main.png
 delete mode 100644 app/src/normal/res/drawable/background_main.xml
 create mode 100644 app/src/normal/res/drawable/bg_connected.png
 delete mode 100644 app/src/normal/res/drawable/bg_connected.xml
 delete mode 100644 app/src/normal/res/drawable/bg_connected_effect.xml
 create mode 100644 app/src/normal/res/drawable/bg_connecting.png
 delete mode 100644 app/src/normal/res/drawable/bg_connecting.xml
 delete mode 100644 app/src/normal/res/drawable/bg_connecting_effect.xml
 create mode 100644 app/src/normal/res/drawable/bg_disconnected.png
 delete mode 100644 app/src/normal/res/drawable/bg_disconnected.xml
 delete mode 100644 app/src/normal/res/drawable/bg_disconnected_effect.xml
 create mode 100644 app/src/normal/res/drawable/rotate_progress_image.png
 delete mode 100644 app/src/normal/res/drawable/rotate_progress_image.xml
 delete mode 100644 app/src/normal/res/drawable/splash_icon.xml

(limited to 'app/src')

diff --git a/app/src/custom/res/drawable-anydpi-v24/bg_connected.xml b/app/src/custom/res/drawable-anydpi-v24/bg_connected.xml
new file mode 100644
index 00000000..f851203d
--- /dev/null
+++ b/app/src/custom/res/drawable-anydpi-v24/bg_connected.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:gravity="fill">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/bg_running"/>
+        </shape>
+    </item>
+    <item android:gravity="fill"
+        android:bottom="80dp"
+        android:drawable="@drawable/bg_connected_effect"
+        >
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable-anydpi-v24/bg_connected_effect.xml b/app/src/custom/res/drawable-anydpi-v24/bg_connected_effect.xml
new file mode 100644
index 00000000..75e79573
--- /dev/null
+++ b/app/src/custom/res/drawable-anydpi-v24/bg_connected_effect.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="375"
+    android:viewportHeight="622"
+    android:width="375dp"
+    android:height="622dp">
+    <path
+        android:pathData="M185.501 621.837C315.565 621.837 421.003 346.305 421.003 6.4184C421.003 -333.468 315.565 -609 185.501 -609C55.4376 -609 -50 -333.468 -50 6.4184C-50 346.305 55.4376 621.837 185.501 621.837Z">
+        <aapt:attr
+            name="android:fillColor">
+            <gradient
+                android:startX="289.514"
+                android:startY="184.89"
+                android:endX="289.514"
+                android:endY="564.398"
+                android:tileMode="clamp">
+                <item
+                    android:color="#00A6C28A"
+                    android:offset="0" />
+                <item
+                    android:color="#36669933"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable-anydpi-v24/bg_connecting.xml b/app/src/custom/res/drawable-anydpi-v24/bg_connecting.xml
new file mode 100644
index 00000000..8482d30e
--- /dev/null
+++ b/app/src/custom/res/drawable-anydpi-v24/bg_connecting.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:gravity="fill">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/bg_connecting"/>
+        </shape>
+    </item>
+    <item android:gravity="fill"
+        android:bottom="80dp"
+        android:drawable="@drawable/bg_connecting_effect"
+        >
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable-anydpi-v24/bg_connecting_effect.xml b/app/src/custom/res/drawable-anydpi-v24/bg_connecting_effect.xml
new file mode 100644
index 00000000..fd462a54
--- /dev/null
+++ b/app/src/custom/res/drawable-anydpi-v24/bg_connecting_effect.xml
@@ -0,0 +1,44 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="375"
+    android:viewportHeight="629"
+    android:width="375dp"
+    android:height="629dp">
+    <path
+        android:pathData="M96.6338 471.305C226.719 515.286 420.512 289.654 529.484 -32.658C638.456 -354.97 621.341 -651.909 491.256 -695.89C361.172 -739.871 167.378 -514.239 58.4058 -191.927C-50.5662 130.385 -33.4509 427.324 96.6338 471.305Z">
+        <aapt:attr
+            name="android:fillColor">
+            <gradient
+                android:startX="132.695"
+                android:startY="21.7787"
+                android:endX="11.0197"
+                android:endY="381.664"
+                android:tileMode="clamp">
+                <item
+                    android:color="#00FFAA33"
+                    android:offset="0" />
+                <item
+                    android:color="#33FFAA33"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M183.501 628.837C313.565 628.837 419.003 353.304 419.003 13.4182C419.003 -326.468 313.565 -602 183.501 -602C53.4376 -602 -52 -326.468 -52 13.4182C-52 353.304 53.4376 628.837 183.501 628.837Z">
+        <aapt:attr
+            name="android:fillColor">
+            <gradient
+                android:startX="183.501"
+                android:startY="255.483"
+                android:endX="183.501"
+                android:endY="634.991"
+                android:tileMode="clamp">
+                <item
+                    android:color="#00FFAA33"
+                    android:offset="0" />
+                <item
+                    android:color="#33FFAA33"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable-anydpi-v24/bg_disconnected.xml b/app/src/custom/res/drawable-anydpi-v24/bg_disconnected.xml
new file mode 100644
index 00000000..bfc3c1d1
--- /dev/null
+++ b/app/src/custom/res/drawable-anydpi-v24/bg_disconnected.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:gravity="fill">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/bg_disconnected"/>
+        </shape>
+    </item>
+    <item
+        android:top="-40dp"
+        android:gravity="fill"
+        android:drawable="@drawable/bg_disconnected_effect"
+        android:bottom="80dp"
+        >
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable-anydpi-v24/bg_disconnected_effect.xml b/app/src/custom/res/drawable-anydpi-v24/bg_disconnected_effect.xml
new file mode 100644
index 00000000..d19c2f7f
--- /dev/null
+++ b/app/src/custom/res/drawable-anydpi-v24/bg_disconnected_effect.xml
@@ -0,0 +1,45 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="375"
+    android:viewportHeight="636"
+    android:width="375dp"
+    android:height="636dp"
+    >
+    <path
+        android:pathData="M183.528 635.43C313.591 635.43 419.029 359.898 419.029 20.0117C419.029 -319.875 313.591 -595.407 183.528 -595.407C53.4638 -595.407 -51.9738 -319.875 -51.9738 20.0117C-51.9738 359.898 53.4638 635.43 183.528 635.43Z">
+        <aapt:attr
+            name="android:fillColor">
+            <gradient
+                android:startX="79.5145"
+                android:startY="198.483"
+                android:endX="79.5145"
+                android:endY="577.991"
+                android:tileMode="clamp">
+                <item
+                    android:color="#00FFAA33"
+                    android:offset="0" />
+                <item
+                    android:color="#33AF0909"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M183.514 458.837C313.578 458.837 419.016 183.305 419.016 -156.582C419.016 -496.468 313.578 -772 183.514 -772C53.4506 -772 -51.9869 -496.468 -51.9869 -156.582C-51.9869 183.305 53.4506 458.837 183.514 458.837Z">
+        <aapt:attr
+            name="android:fillColor">
+            <gradient
+                android:startX="183.514"
+                android:startY="85.483"
+                android:endX="183.514"
+                android:endY="464.991"
+                android:tileMode="clamp">
+                <item
+                    android:color="#00FFAA33"
+                    android:offset="0" />
+                <item
+                    android:color="#33AF0909"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable-anydpi-v24/ic_motd.xml b/app/src/custom/res/drawable-anydpi-v24/ic_motd.xml
new file mode 100644
index 00000000..85c9e58a
--- /dev/null
+++ b/app/src/custom/res/drawable-anydpi-v24/ic_motd.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="288"
+    android:viewportHeight="288"
+    android:width="288dp"
+    android:height="288dp">
+    <group
+        android:scaleX="1"
+        android:scaleY="1"
+        android:translateX="82"
+        android:translateY="52"
+        >
+        <path
+            android:pathData="M69.8243 44.3636C69.8243 44.3636 66.935 38.7879 66.6942 38.0606C66.4534 37.3333 65.0088 29.3333 65.0088 29.3333L66.935 25.9394L71.2689 19.6364L77.2882 14.7879L78.7328 14.303L93.42 8.72727L94.8647 7.27273L93.42 4.84849L91.2531 3.63636L87.4007 2.66666L77.7698 1.69697H70.3058L65.2496 2.90909L60.6749 1.21212L54.8963 0.484846L46.4692 0.242421L42.1353 0L35.1529 2.66666L24.3181 15.2727L22.8735 20.1212L22.1511 24.4848L18.5395 32.4848L16.1318 40L14.9279 48V49.697L9.39016 58.1818L6.26011 64.4848V73.4545L7.2232 92.1212L8.90861 98.9091L12.2794 105.212L16.6134 109.333L18.5395 117.333L25.7627 133.576L34.4306 144L34.9121 144.485L38.0422 160.242L27.4482 179.636L24.0773 182.303L21.6696 184.242H17.3357L14.9279 185.455L12.0387 185.697L10.3533 187.394L6.74165 186.909L3.13006 186.667L0.481548 188.606L0 192L1.92619 189.818L5.05624 188.848L5.29701 192L10.3533 190.303L13.2425 190.061L18.2988 190.788C18.2988 190.788 22.6327 190.545 23.355 190.303C24.0773 190.303 28.8928 190.788 28.8928 190.788L32.2636 190.303L34.1898 191.03L36.5975 190.303L39.246 191.515L43.0984 191.03L43.58 188.364L43.3392 186.909L45.9877 187.879L48.1547 189.576L49.5993 191.515V189.091L47.9139 186.182C47.9139 186.182 46.71 184.485 45.9877 184.727C45.2654 184.727 42.3761 184.242 42.3761 184.242L40.4499 184.97L38.283 184L36.116 185.212L34.1898 184.485L33.2267 182.545L31.7821 182.061L33.2267 178.182L36.5975 173.333L41.1722 165.576L45.2654 160.727L46.71 158.788C46.71 158.788 48.6362 155.879 48.6362 155.152C48.6362 154.424 49.1178 146.182 49.1178 146.182L46.71 140.848L45.5061 136.485L67.6573 141.818H68.8612L87.8823 155.636L90.5308 159.03L91.4938 172.848L91.0123 176L89.5677 178.424L88.6046 179.879L87.8823 182.061L87.4007 183.515L83.7891 184.727L80.1775 184L78.0106 183.758L73.9174 184.242L72.232 185.939L71.5097 188.121L71.9912 190.303L72.7135 188.121L73.9174 186.667L75.1213 186.424V188.364L76.5659 189.333L79.696 187.879L81.1406 187.636L81.6221 189.818H86.1968L89.3269 188.848L91.9754 189.333L95.8278 189.818L97.0316 189.333L97.9947 188.364L99.6801 191.758V187.879L97.9947 183.515L95.587 182.061L96.0686 180.848L94.3831 177.455L94.6239 164.849L104.255 176.242L117.016 186.182C117.016 186.182 125.684 189.333 126.406 189.333C127.128 189.333 133.148 188.606 133.148 188.606L137 182.303L134.111 173.576L135.315 170.667L129.295 162.667L116.293 149.333L113.163 138.909L113.404 131.879L110.515 124.364L107.385 118.788L109.311 112.727L107.866 104L101.366 89.2121L103.773 88.7273L99.4394 81.9394L102.088 81.2121L97.5132 73.697L99.4394 72.7273L96.0686 66.9091L97.2724 66.1818L92.9385 62.5455L94.3831 61.8182L83.5483 54.0606L69.8243 44.3636Z"
+            android:fillColor="#000000" />
+    </group>
+
+</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable-anydpi-v24/ravens.xml b/app/src/custom/res/drawable-anydpi-v24/ravens.xml
new file mode 100644
index 00000000..788aef84
--- /dev/null
+++ b/app/src/custom/res/drawable-anydpi-v24/ravens.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="342"
+    android:viewportHeight="206"
+    android:width="342dp"
+    android:height="206dp">
+    <group
+        android:name="raven1"
+        android:scaleX="0.8"
+        android:scaleY="0.8"
+        android:translateX="-224.2934"
+        android:translateY="11.72371">
+        <path
+            android:name="raven1path"
+            android:pathData="M385.13834 197.43106c-0.72897 -1.36208 -0.61597 -2.15071 0.51401 -3.58724l1.0109 -1.28515 -2.7045 -3.53096c-1.67306 -2.18432 -3.16903 -3.64755 -3.92253 -3.83667 -0.78962 -0.19818 -1.46242 -0.8906 -1.91284 -1.96862 -0.78944 -1.88939 -0.68998 -1.87306 -7.21616 -1.18532 -3.17774 0.33487 -5.21281 0.85767 -7.44 1.9113 -3.28857 1.55574 -5.44061 1.80404 -6.78577 0.78292 -1.02537 -0.77836 -1.06491 -1.42761 -0.13401 -2.20019 0.38829 -0.32225 0.65829 -1.03611 0.6 -1.58634 -0.0805 -0.75951 0.24078 -1.07485 1.33401 -1.3095 0.792 -0.17 1.87322 -0.54195 2.40272 -0.82656 0.66764 -0.35886 1.7028 -0.37114 3.37723 -0.0401 3.1702 0.62683 7.16506 -0.46946 9.11061 -2.50018 0.98579 -1.02893 1.81957 -1.42897 2.97837 -1.42897 0.88512 0 2.4561 -0.432 3.49107 -0.96 1.03497 -0.528 2.21436 -0.96 2.62088 -0.96 0.40651 0 0.73912 -0.30839 0.73912 -0.68532 0 -0.54071 -0.53763 -0.62982 -2.54805 -0.42233 -3.2514 0.33557 -4.17195 -0.44353 -4.17195 -3.53092 0 -1.44319 -0.32154 -2.57878 -0.96 -3.39045 -0.528 -0.67124 -0.96 -1.49047 -0.96 -1.8205 0 -0.33004 -0.54 -0.95389 -1.2 -1.38634 -0.7646 -0.50098 -1.2 -1.23373 -1.2 -2.01949 0 -0.67827 -0.432 -1.78243 -0.96 -2.45367 -0.528 -0.67124 -0.96 -1.5865 -0.96 -2.03391 0 -0.44741 -1.15388 -2.09228 -2.56419 -3.65527 -2.97648 -3.29873 -3.67581 -4.47263 -3.67581 -6.17024 0 -1.04577 -0.21517 -1.23156 -1.42631 -1.23156 -0.78448 0 -2.67448 -0.56194 -4.2 -1.24877 -3.87341 -1.74389 -9.21645 -3.55123 -10.49851 -3.55123 -1.57962 0 -2.59518 -0.491 -2.59518 -1.2547 0 -0.53914 0.68803 -0.61839 3.48 -0.40086 3.2635 0.25428 3.40535 0.22572 2.28 -0.45912 -0.66 -0.40165 -2.226 -0.87399 -3.48 -1.04964 -2.96604 -0.41545 -2.93747 -1.15568 0.0446 -1.15568 1.92868 0 9.64234 2.10373 13.15539 3.58785 0.50332 0.21263 0.84 0.14513 0.84 -0.16841 0 -0.28779 -1.13158 -1.09668 -2.51463 -1.79753 -2.92533 -1.48238 -12.13912 -7.58751 -12.61637 -8.35971 -1.35099 -2.18595 3.01241 -0.0675 12.14639 5.89721 3.24247 2.1174 6.04388 3.70133 6.22536 3.51984 0.18149 -0.18148 -0.38708 -0.89116 -1.26349 -1.57704 -2.20209 -1.7234 -10.13726 -10.73208 -10.13726 -11.50869 0 -1.14242 0.85579 -0.66795 2.72266 1.5095 2.27855 2.65762 9.24491 8.66726 13.01433 11.22703 2.8929 1.96453 11.64578 6.78995 12.31636 6.78995 0.20542 0 0.23167 -0.756 0.0583 -1.68 -0.22647 -1.20719 -0.14019 -1.69436 0.30658 -1.73102 0.34197 -0.0281 1.03481 -0.0821 1.53965 -0.12 1.86068 -0.13982 1.16626 -1.06327 -1.60872 -2.13929 -1.56874 -0.6083 -3.78307 -1.85532 -4.92072 -2.77115 -1.13765 -0.91584 -3.09446 -2.43544 -4.34846 -3.37688 -4.34658 -3.2632 -1.75366 -4.17202 3.18156 -1.11514 2.26983 1.40594 3.91431 1.53202 1.97844 0.15169 -6.31808 -4.50497 -6.96 -5.05256 -6.96 -5.93721 0 -0.52855 0.11494 -0.961 0.25542 -0.961 0.78964 0 4.15067 1.74166 8.39825 4.35188 2.65524 1.63171 4.93892 2.85554 5.07483 2.71963 0.13591 -0.13592 -1.94842 -2.37661 -4.63184 -4.97931 -5.53891 -5.37229 -7.03228 -7.22857 -6.35791 -7.90295 0.56718 -0.56718 1.61175 0.22173 8.939 6.7512 3.12276 2.78275 5.93076 5.14466 6.24 5.24868 0.30924 0.10402 -1.50978 -1.95528 -4.04226 -4.57623 -4.62994 -4.79166 -7.54368 -8.5847 -7.00693 -9.12146 0.15897 -0.15897 2.25393 1.41143 4.65545 3.48976 4.14801 3.58979 5.79244 4.76276 5.09498 3.63424 -0.17306 -0.28001 -0.11466 -0.6327 0.12976 -0.78376 0.64416 -0.39811 17.86024 17.63295 19.07981 19.98301 1.60753 3.09765 1.75025 5.81492 0.61158 11.64343 -0.65753 3.36572 -0.90221 5.90827 -0.699 7.26344 0.29317 1.95498 0.42327 2.10307 2.08577 2.37409 0.9752 0.15898 2.42109 0.39924 3.21309 0.5339 5.1256 0.87155 13.65736 4.80211 12.94067 5.96174 -0.15253 0.24679 -1.93858 0.44985 -3.969 0.45124 -3.88293 0.003 -3.90932 0.0128 -8.39867 3.23101 -1.6107 1.15463 -3.37986 1.81494 -6.89008 2.5716 -4.81503 1.03793 -7.97908 2.51326 -12.88292 6.00704 -4.80978 3.42677 -4.95621 3.84823 -2.4 6.90782 2.66507 3.18989 2.14762 5.66217 -1.51355 7.23153 -2.68358 1.15032 -2.89394 1.15032 -3.50956 0.00003zm4.78311 -5.20219c0 -0.57904 -2.89719 -3.94937 -3.39495 -3.94937 -0.77051 0 -0.49203 0.68428 1.0299 2.53064 1.38291 1.67772 2.36505 2.26687 2.36505 1.41873z"
+            android:fillColor="#000000" />
+    </group>
+    <group
+        android:name="raven3"
+        android:scaleX="0.8"
+        android:scaleY="0.8"
+        android:translateX="-77.92102"
+        android:translateY="-54.82651">
+        <path
+            android:name="raven3path"
+            android:pathData="M447.80204 216.9559c-0.72269 -0.39213 -1.64623 -1.35548 -2.05233 -2.14078 -0.92258 -1.78409 -1.47725 -1.82526 -1.45263 -0.10784 0.0256 1.78611 -1.56103 1.9993 -3.05379 0.41034 -0.92579 -0.98546 -1.26967 -1.09461 -2.00395 -0.63604 -0.71993 0.4496 -1.15887 0.3521 -2.33731 -0.51916 -1.20317 -0.88954 -1.60809 -0.97455 -2.37139 -0.49787 -0.73689 0.4602 -1.14575 0.42723 -2.0501 -0.16532 -0.64725 -0.42409 -1.74409 -0.64998 -2.56857 -0.52897 -1.09407 0.16058 -1.71749 -0.0853 -2.60113 -1.02589 -0.6392 -0.6804 -1.5772 -1.23709 -2.08445 -1.23709 -0.50725 0 -1.49559 -0.32252 -2.19633 -0.71671 -0.70073 -0.39419 -1.81406 -0.93368 -2.47406 -1.19885 -0.66 -0.26518 -1.524 -0.66225 -1.92 -0.88239 -2.1004 -1.1676 -3.9862 -2.00205 -4.5245 -2.00205 -0.33369 0 -0.99766 -0.432 -1.4755 -0.96 -0.47783 -0.528 -1.16856 -0.96 -1.53495 -0.96 -0.77161 0 -6.74173 -3.13454 -7.86284 -4.12828 -0.89689 -0.79501 -2.53748 -0.86858 -3.83877 -0.17215 -0.51341 0.27477 -1.88229 2.38077 -3.04196 4.68 -1.15968 2.29924 -2.72649 4.76604 -3.4818 5.48179 -1.40184 1.32842 -5.12659 2.93173 -5.63342 2.4249 -0.1543 -0.15429 -1.70398 -0.32663 -3.44374 -0.38296 -2.32752 -0.0754 -3.51734 -0.36424 -4.50361 -1.09342 -0.81562 -0.60301 -1.73721 -0.88722 -2.35394 -0.72594 -1.35459 0.35423 -3.92189 -0.18553 -5.09262 -1.0707 -0.66178 -0.50036 -0.98915 -1.4008 -1.08522 -2.98487 -0.0757 -1.2476 -0.25951 -4.04558 -0.40856 -6.21772 -0.25931 -3.77896 -0.21836 -3.99814 0.94896 -5.07999 1.35121 -1.25225 4.13171 -1.97137 10.61247 -2.74472 5.3395 -0.63715 6.25903 -0.85126 8.52 -1.98381 1.76578 -0.8845 2.45969 -2.32213 1.12084 -2.32213 -0.37355 0 -1.5596 -1.134 -2.63568 -2.52 -2.13022 -2.74373 -2.50653 -3.16958 -3.62217 -4.09893 -0.40864 -0.3404 -0.74299 -1.12556 -0.74299 -1.74479 0 -0.67126 -0.48454 -1.44336 -1.2 -1.91214 -0.66 -0.43245 -1.2 -1.23621 -1.2 -1.78612 0 -0.54992 -0.54 -1.42462 -1.2 -1.94378 -0.66 -0.51916 -1.2 -1.34367 -1.2 -1.83225 0 -0.48859 -0.54 -1.53009 -1.2 -2.31445 -0.66 -0.78437 -1.2 -1.85934 -1.2 -2.38883 0 -0.52949 -0.756 -1.71871 -1.68 -2.64271 -0.924 -0.924 -1.68 -2.09595 -1.68 -2.60433 0 -0.50838 -0.55232 -1.44321 -1.22738 -2.07739 -0.81219 -0.76302 -1.14213 -1.47902 -0.97538 -2.11669 0.17148 -0.65575 -0.2374 -1.46856 -1.27973 -2.54398 -1.31288 -1.35454 -1.4494 -1.71218 -0.95549 -2.50306 0.48388 -0.77482 0.38564 -1.14926 -0.61288 -2.33593 -1.29697 -1.54136 -1.48117 -2.47059 -0.65374 -3.29802 0.39386 -0.39386 0.19307 -0.98422 -0.75958 -2.2332 -0.88414 -1.15917 -1.19604 -2.00954 -0.98311 -2.68042 0.2246 -0.70765 -0.16728 -1.56735 -1.40042 -3.07223 -2.52054 -3.076 -2.28628 -3.69399 0.92771 -2.44729 0.528 0.20481 -0.498 -1.15368 -2.28 -3.01887 -2.97172 -3.11045 -3.98593 -4.92459 -2.75312 -4.92459 0.26778 0 2.38692 1.48253 4.7092 3.29452 6.33422 4.94234 8.3162 5.80749 3.95158 1.7249 -4.36141 -4.07959 -8.0677 -9.81942 -6.34054 -9.81942 0.28116 0 2.49842 2.05416 4.92723 4.5648 2.42882 2.51065 4.49954 4.48131 4.60161 4.37925 0.10205 -0.10206 -0.98133 -1.73668 -2.40752 -3.63249 -1.42619 -1.89581 -2.85494 -4.32096 -3.17499 -5.38921 -0.32005 -1.06825 -0.69762 -2.24379 -0.83904 -2.61231 -0.72243 -1.88264 1.03187 -0.1508 4.3051 4.24996 2.01269 2.706 4.67913 5.892 5.92543 7.08l2.266 2.16 -1.79464 -2.4c-2.2233 -2.97326 -4.5686 -7.73418 -4.94128 -10.03072 -0.44513 -2.74301 0.50313 -2.04466 2.37988 1.75269 1.66581 3.37055 8.26211 12.81454 9.47338 13.56314 0.32795 0.20269 0.50635 0.17645 0.39644 -0.0583 -0.1099 -0.23474 -1.00191 -2.04072 -1.98227 -4.01327 -0.98034 -1.97255 -1.78245 -3.86255 -1.78245 -4.2 0 -1.51072 0.98617 -0.31134 2.75157 3.34646 2.25366 4.66945 5.11203 8.56401 10.59899 14.44126 4.9305 5.28122 8.54604 10.06515 10.94256 14.47874 6.17495 11.37222 8.31949 13.01948 14.29789 10.98244 2.27587 -0.77547 3.24479 -0.75419 9.27398 0.20364 2.25404 0.35809 4.45501 1.59731 4.45501 2.50832 0 0.19008 -0.60035 0.46567 -1.3341 0.61242 -0.73377 0.14675 -1.86777 0.78823 -2.52 1.42549 -1.81377 1.77213 -5.26658 5.9971 -5.26039 6.43677 0.006 0.39975 0.80419 0.80728 7.34031 3.74603 4.42236 1.98837 8.73868 4.82625 10.41418 6.84709 2.22226 2.68029 9.70388 8.73695 12.42297 10.05689 2.10404 1.02137 2.46767 1.34537 1.65388 1.47363 -0.57373 0.0904 -1.97773 -0.30571 -3.12 -0.88029l-2.07685 -1.04469 1.3513 1.43507c0.74321 0.78928 2.79521 2.15598 4.56 3.03711 2.62921 1.31274 3.00331 1.63456 2.07139 1.78197 -0.62552 0.099 -2.40778 -0.44981 -3.96059 -1.21945 -2.26132 -1.12081 -2.65597 -1.21281 -1.9827 -0.4622 0.46233 0.51543 1.9746 1.57936 3.3606 2.36428 1.386 0.78492 2.52 1.65077 2.52 1.92411 0 0.83627 -3.35317 0.0235 -5.34728 -1.29618 -2.37621 -1.5725 -2.35309 -0.95606 0.0673 1.79363 2.28368 2.59439 2.44317 3.37594 0.6 2.94004 -1.49775 -0.3542 -4.44 -2.40221 -4.44 -3.09054 0 -0.25057 -0.23446 -0.45558 -0.52103 -0.45558 -0.28658 0 0.0374 0.99921 0.72 2.22046 0.68257 1.22125 1.24103 2.40925 1.24103 2.64 0 0.63619 -1.52046 0.46767 -2.99396 -0.33184z"
+            android:fillColor="#000000" />
+    </group>
+    <group
+        android:name="raven2"
+        android:scaleX="0.8"
+        android:scaleY="0.8"
+        android:translateX="-14.21506"
+        android:translateY="22.70211">
+        <path
+            android:name="raven2path"
+            android:pathData="M242.17687 151.65225c-1.74028 -2.28162 -2.178 -4.03768 -2.178 -8.73776 0 -2.17974 -0.18432 -3.96317 -0.4096 -3.96317 -0.22529 0 -0.71129 2.81516 -1.08 6.25591 -0.36872 3.44074 -0.8864 6.28072 -1.1504 6.31105 -1.04841 0.12049 -2.28619 -3.10071 -2.57984 -6.71376l-0.30016 -3.6932 -1.07056 1.81145c-2.08936 3.5353 -3.47008 2.84679 -3.48209 -1.73638 -0.006 -2.37601 -0.1508 -2.84246 -0.94546 -3.05027 -0.61539 -0.16092 -1.21919 -1.09153 -1.75512 -2.70506 -0.44935 -1.35286 -1.32319 -2.85792 -1.94188 -3.34458 -0.78894 -0.62057 -1.12489 -1.37616 -1.12489 -2.53 0 -2.06355 -0.60376 -2.09129 -1.85358 -0.0852 -1.18439 1.90109 -2.71192 2.89912 -3.87313 2.53057 -0.64166 -0.20366 -1.0246 0.1062 -1.47495 1.19345 -0.7302 1.76286 -2.63143 3.35598 -4.00504 3.35598 -0.54848 0 -1.46581 0.58765 -2.03851 1.30588 -0.89827 1.12654 -1.14794 1.21735 -1.81803 0.66123 -0.42722 -0.35456 -0.77543 -1.32021 -0.7738 -2.14588 0.003 -1.54988 0.31834 -2.30174 2.59201 -6.18123 2.37785 -4.05724 0.51183 -2.41446 -2.48575 2.18836 -3.12365 4.79641 -4.09991 5.87182 -4.88819 5.38464 -1.17655 -0.72715 -0.0446 -4.77763 2.18334 -7.813 1.22554 -1.66965 0.0938 -1.27585 -1.72437 0.6 -2.65534 2.73963 -4.34104 1.74204 -2.45575 -1.4533 0.93339 -1.58198 0.94531 -1.72299 0.1698 -2.00903 -1.26447 -0.4664 -1.46738 -1.03369 -1.04291 -2.91573 0.30278 -1.34248 0.21909 -1.84412 -0.38085 -2.28281 -0.75536 -0.55233 -0.9059 -1.41732 -1.24948 -7.17913 -0.20592 -3.45317 -1.35998 -10.32002 -1.73441 -10.31993 -0.14652 0.00003 -3.1824 0.88931 -6.7464 1.97616 -3.564 1.08684 -6.8656 2.086 -7.33688 2.22033 -0.47128 0.13433 -2.09128 -0.15192 -3.6 -0.63611 -1.50872 -0.48419 -3.01312 -0.8259 -3.34312 -0.75935 -1.2262 0.24726 -0.53956 -1.304 1.32139 -2.98524 1.05676 -0.95472 2.08554 -1.73586 2.28617 -1.73586 0.20064 0 0.57802 -0.486 0.83862 -1.08 0.54254 -1.23661 2.67944 -1.701199 8.15382 -1.772749 5.57725 -0.0729 9.57243 -1.17346 13.90516 -3.83049 4.52997 -2.77799 15.85234 -6.751008 22.57484 -7.921507 2.65339 -0.462 7.19029 -0.754493 11.76 -0.758165 7.33879 -0.0059 7.50857 0.01795 12.48 1.754669 4.64388 1.622275 7.89361 3.607435 7.55725 4.616496 -0.0759 0.227717 -1.8631 0.454018 -3.97155 0.502891 -3.40039 0.07882 -4.27825 0.305799 -7.76936 2.008856 -2.16469 1.056 -3.93825 2.136 -3.94123 2.4 -0.003 0.264 0.9368 1.1895 2.0884 2.056649 1.1516 0.86716 2.32074 2.16316 2.59809 2.88 0.61481 1.58903 2.47015 14.53738 2.49976 17.44571 0.0373 3.66931 1.70932 11.11002 3.22173 14.33764 1.81937 3.88271 1.28959 4.93466 -1.08652 2.15745 -0.90229 -1.05459 -1.64863 -1.65817 -1.65854 -1.34126 -0.0271 0.86542 3.28286 9.82211 4.07847 11.03636 0.38106 0.58156 0.50275 1.17487 0.27043 1.31845 -0.59625 0.3685 -3.42187 -2.90311 -4.8461 -5.611 -0.65955 -1.254 -1.36566 -2.28 -1.56915 -2.28 -0.40909 0 -0.35407 0.31827 1.09899 6.35685 1.05557 4.3867 0.95137 5.67912 -0.36978 4.58646 -0.90254 -0.74644 -2.98958 -5.08951 -2.9962 -6.23498 -0.002 -0.44642 -0.2554 -0.96662 -0.56182 -1.156 -0.41664 -0.2575 -0.47655 0.88529 -0.23759 4.53167 0.18049 2.75413 0.13441 4.876 -0.1059 4.876 -0.23399 0 -1.00861 -0.76458 -1.72138 -1.69907z"
+            android:fillColor="#000000" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable-anydpi-v24/rotate_progress_image.xml b/app/src/custom/res/drawable-anydpi-v24/rotate_progress_image.xml
new file mode 100644
index 00000000..f84f9034
--- /dev/null
+++ b/app/src/custom/res/drawable-anydpi-v24/rotate_progress_image.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:name="circle"
+    android:viewportWidth="91"
+    android:viewportHeight="91"
+    android:width="91dp"
+    android:height="91dp">
+    <path
+        android:pathData="M0 0"
+        android:fillColor="#00000000" />
+    <!--
+    Implement your progress animation vector graphic here.
+    The graphic will rotate behind the cancel button in EipFragment.
+    -->
+</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable-anydpi-v24/state_connected.xml b/app/src/custom/res/drawable-anydpi-v24/state_connected.xml
new file mode 100644
index 00000000..e0a9005f
--- /dev/null
+++ b/app/src/custom/res/drawable-anydpi-v24/state_connected.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="166"
+    android:viewportHeight="220"
+    android:width="166dp"
+    android:height="220dp">
+
+        <path
+            android:name="shield1"
+            android:pathData="M75.7916 211.927C37.7611 190.779 9.33369 157.386 2.89166 126.295C1.07036 117.505 0.998811 115.374 1.00089 69.9755L1.0025 26.6083L4.76437 24.1851C20.6619 13.9449 37.4788 7.09821 54.6105 3.64229C89.5868 -3.41322 125.875 3.66238 158.333 24.8539L161 26.5952V70.1783C161 115.754 160.927 117.944 159.119 126.65C152.713 157.49 128.092 187.572 91.7515 208.96C81.1937 215.174 81.5205 215.113 75.7916 211.927Z"
+            android:fillColor="#739B4C" />
+        <path
+            android:name="shield2"
+            android:pathData="M81.0089 1.00082C72.1811 0.99767 63.3554 1.87831 54.6114 3.64218C37.4796 7.09809 20.6622 13.9447 4.76468 24.185L1.00318 26.608L1.00002 69.9756C0.998421 115.374 1.06949 117.505 2.89058 126.295C9.3326 157.386 37.76 190.778 75.7905 211.927H75.7913C78.2626 213.301 79.6075 214.092 81.1849 214.051V1.00327C81.1259 1.00314 81.0673 1 81.008 1L81.0089 1.00082Z"
+            android:fillColor="#81A55D" />
+        <group
+            android:scaleX="0.65"
+            android:scaleY="0.65"
+            android:translateX="42"
+            android:translateY="30"
+            >
+            <path
+                android:pathData="M69.8243 44.3636C69.8243 44.3636 66.935 38.7879 66.6942 38.0606C66.4534 37.3333 65.0088 29.3333 65.0088 29.3333L66.935 25.9394L71.2689 19.6364L77.2882 14.7879L78.7328 14.303L93.42 8.72727L94.8647 7.27273L93.42 4.84849L91.2531 3.63636L87.4007 2.66666L77.7698 1.69697H70.3058L65.2496 2.90909L60.6749 1.21212L54.8963 0.484846L46.4692 0.242421L42.1353 0L35.1529 2.66666L24.3181 15.2727L22.8735 20.1212L22.1511 24.4848L18.5395 32.4848L16.1318 40L14.9279 48V49.697L9.39016 58.1818L6.26011 64.4848V73.4545L7.2232 92.1212L8.90861 98.9091L12.2794 105.212L16.6134 109.333L18.5395 117.333L25.7627 133.576L34.4306 144L34.9121 144.485L38.0422 160.242L27.4482 179.636L24.0773 182.303L21.6696 184.242H17.3357L14.9279 185.455L12.0387 185.697L10.3533 187.394L6.74165 186.909L3.13006 186.667L0.481548 188.606L0 192L1.92619 189.818L5.05624 188.848L5.29701 192L10.3533 190.303L13.2425 190.061L18.2988 190.788C18.2988 190.788 22.6327 190.545 23.355 190.303C24.0773 190.303 28.8928 190.788 28.8928 190.788L32.2636 190.303L34.1898 191.03L36.5975 190.303L39.246 191.515L43.0984 191.03L43.58 188.364L43.3392 186.909L45.9877 187.879L48.1547 189.576L49.5993 191.515V189.091L47.9139 186.182C47.9139 186.182 46.71 184.485 45.9877 184.727C45.2654 184.727 42.3761 184.242 42.3761 184.242L40.4499 184.97L38.283 184L36.116 185.212L34.1898 184.485L33.2267 182.545L31.7821 182.061L33.2267 178.182L36.5975 173.333L41.1722 165.576L45.2654 160.727L46.71 158.788C46.71 158.788 48.6362 155.879 48.6362 155.152C48.6362 154.424 49.1178 146.182 49.1178 146.182L46.71 140.848L45.5061 136.485L67.6573 141.818H68.8612L87.8823 155.636L90.5308 159.03L91.4938 172.848L91.0123 176L89.5677 178.424L88.6046 179.879L87.8823 182.061L87.4007 183.515L83.7891 184.727L80.1775 184L78.0106 183.758L73.9174 184.242L72.232 185.939L71.5097 188.121L71.9912 190.303L72.7135 188.121L73.9174 186.667L75.1213 186.424V188.364L76.5659 189.333L79.696 187.879L81.1406 187.636L81.6221 189.818H86.1968L89.3269 188.848L91.9754 189.333L95.8278 189.818L97.0316 189.333L97.9947 188.364L99.6801 191.758V187.879L97.9947 183.515L95.587 182.061L96.0686 180.848L94.3831 177.455L94.6239 164.849L104.255 176.242L117.016 186.182C117.016 186.182 125.684 189.333 126.406 189.333C127.128 189.333 133.148 188.606 133.148 188.606L137 182.303L134.111 173.576L135.315 170.667L129.295 162.667L116.293 149.333L113.163 138.909L113.404 131.879L110.515 124.364L107.385 118.788L109.311 112.727L107.866 104L101.366 89.2121L103.773 88.7273L99.4394 81.9394L102.088 81.2121L97.5132 73.697L99.4394 72.7273L96.0686 66.9091L97.2724 66.1818L92.9385 62.5455L94.3831 61.8182L83.5483 54.0606L69.8243 44.3636Z"
+                android:fillColor="#000000" />
+        </group>
+
+
+</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable-anydpi-v24/state_connecting.xml b/app/src/custom/res/drawable-anydpi-v24/state_connecting.xml
new file mode 100644
index 00000000..267ba791
--- /dev/null
+++ b/app/src/custom/res/drawable-anydpi-v24/state_connecting.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/ravens"
+    >
+    <target
+        android:animation="@animator/alpha1"
+        android:name="raven1path"/>
+    <target
+        android:animation="@animator/alpha2"
+        android:name="raven2path"/>
+    <target
+        android:animation="@animator/alpha3"
+        android:name="raven3path"/>
+
+</animated-vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable-anydpi-v24/state_disconnected.xml b/app/src/custom/res/drawable-anydpi-v24/state_disconnected.xml
new file mode 100644
index 00000000..7c49a537
--- /dev/null
+++ b/app/src/custom/res/drawable-anydpi-v24/state_disconnected.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="166"
+    android:viewportHeight="220"
+    android:width="166dp"
+    android:height="220dp">
+    <group
+        android:scaleX="0.725"
+        android:scaleY="0.725"
+        android:translateX="36"
+        android:translateY="36"
+        >
+        <path
+            android:pathData="M69.8243 44.3636C69.8243 44.3636 66.935 38.7879 66.6942 38.0606C66.4534 37.3333 65.0088 29.3333 65.0088 29.3333L66.935 25.9394L71.2689 19.6364L77.2882 14.7879L78.7328 14.303L93.42 8.72727L94.8647 7.27273L93.42 4.84849L91.2531 3.63636L87.4007 2.66666L77.7698 1.69697H70.3058L65.2496 2.90909L60.6749 1.21212L54.8963 0.484846L46.4692 0.242421L42.1353 0L35.1529 2.66666L24.3181 15.2727L22.8735 20.1212L22.1511 24.4848L18.5395 32.4848L16.1318 40L14.9279 48V49.697L9.39016 58.1818L6.26011 64.4848V73.4545L7.2232 92.1212L8.90861 98.9091L12.2794 105.212L16.6134 109.333L18.5395 117.333L25.7627 133.576L34.4306 144L34.9121 144.485L38.0422 160.242L27.4482 179.636L24.0773 182.303L21.6696 184.242H17.3357L14.9279 185.455L12.0387 185.697L10.3533 187.394L6.74165 186.909L3.13006 186.667L0.481548 188.606L0 192L1.92619 189.818L5.05624 188.848L5.29701 192L10.3533 190.303L13.2425 190.061L18.2988 190.788C18.2988 190.788 22.6327 190.545 23.355 190.303C24.0773 190.303 28.8928 190.788 28.8928 190.788L32.2636 190.303L34.1898 191.03L36.5975 190.303L39.246 191.515L43.0984 191.03L43.58 188.364L43.3392 186.909L45.9877 187.879L48.1547 189.576L49.5993 191.515V189.091L47.9139 186.182C47.9139 186.182 46.71 184.485 45.9877 184.727C45.2654 184.727 42.3761 184.242 42.3761 184.242L40.4499 184.97L38.283 184L36.116 185.212L34.1898 184.485L33.2267 182.545L31.7821 182.061L33.2267 178.182L36.5975 173.333L41.1722 165.576L45.2654 160.727L46.71 158.788C46.71 158.788 48.6362 155.879 48.6362 155.152C48.6362 154.424 49.1178 146.182 49.1178 146.182L46.71 140.848L45.5061 136.485L67.6573 141.818H68.8612L87.8823 155.636L90.5308 159.03L91.4938 172.848L91.0123 176L89.5677 178.424L88.6046 179.879L87.8823 182.061L87.4007 183.515L83.7891 184.727L80.1775 184L78.0106 183.758L73.9174 184.242L72.232 185.939L71.5097 188.121L71.9912 190.303L72.7135 188.121L73.9174 186.667L75.1213 186.424V188.364L76.5659 189.333L79.696 187.879L81.1406 187.636L81.6221 189.818H86.1968L89.3269 188.848L91.9754 189.333L95.8278 189.818L97.0316 189.333L97.9947 188.364L99.6801 191.758V187.879L97.9947 183.515L95.587 182.061L96.0686 180.848L94.3831 177.455L94.6239 164.849L104.255 176.242L117.016 186.182C117.016 186.182 125.684 189.333 126.406 189.333C127.128 189.333 133.148 188.606 133.148 188.606L137 182.303L134.111 173.576L135.315 170.667L129.295 162.667L116.293 149.333L113.163 138.909L113.404 131.879L110.515 124.364L107.385 118.788L109.311 112.727L107.866 104L101.366 89.2121L103.773 88.7273L99.4394 81.9394L102.088 81.2121L97.5132 73.697L99.4394 72.7273L96.0686 66.9091L97.2724 66.1818L92.9385 62.5455L94.3831 61.8182L83.5483 54.0606L69.8243 44.3636Z"
+            android:fillColor="#000000" />
+    </group>
+
+</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable-anydpi-v24/state_transition_connected_disconnected.xml b/app/src/custom/res/drawable-anydpi-v24/state_transition_connected_disconnected.xml
new file mode 100644
index 00000000..0496e729
--- /dev/null
+++ b/app/src/custom/res/drawable-anydpi-v24/state_transition_connected_disconnected.xml
@@ -0,0 +1,89 @@
+<animated-vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector
+            android:name="vector"
+            android:width="166dp"
+            android:height="220dp"
+            android:viewportWidth="166"
+            android:viewportHeight="220">
+            <path
+                android:name="shield1"
+                android:pathData="M 75.792 211.927 C 37.761 190.779 9.334 157.386 2.892 126.295 C 1.07 117.505 0.999 115.374 1.001 69.975 L 1.002 26.608 L 4.764 24.185 C 20.662 13.945 37.479 7.098 54.611 3.642 C 89.587 -3.413 125.875 3.662 158.333 24.854 L 161 26.595 L 161 70.178 C 161 115.754 160.927 117.944 159.119 126.65 C 152.713 157.49 128.092 187.572 91.751 208.96 C 81.194 215.174 81.52 215.113 75.792 211.927 Z"
+                android:fillColor="#739B4C"/>
+            <path
+                android:name="shield2"
+                android:pathData="M 81.009 1.001 C 72.181 0.998 63.355 1.878 54.611 3.642 C 37.48 7.098 20.662 13.945 4.765 24.185 L 1.003 26.608 L 1 69.976 C 0.998 115.374 1.069 117.505 2.891 126.295 C 9.333 157.386 37.76 190.778 75.79 211.927 L 75.791 211.927 C 78.263 213.301 79.608 214.092 81.185 214.051 L 81.185 1.003 C 81.126 1.003 81.067 1 81.008 1 L 81.009 1.001 Z"
+                android:fillColor="#81A55D"/>
+            <group
+                android:name="ravenGroup"
+                android:scaleX="0.65"
+                android:scaleY="0.65"
+                android:translateX="42"
+                android:translateY="30"
+                >
+                <path
+                    android:pathData="M69.8243 44.3636C69.8243 44.3636 66.935 38.7879 66.6942 38.0606C66.4534 37.3333 65.0088 29.3333 65.0088 29.3333L66.935 25.9394L71.2689 19.6364L77.2882 14.7879L78.7328 14.303L93.42 8.72727L94.8647 7.27273L93.42 4.84849L91.2531 3.63636L87.4007 2.66666L77.7698 1.69697H70.3058L65.2496 2.90909L60.6749 1.21212L54.8963 0.484846L46.4692 0.242421L42.1353 0L35.1529 2.66666L24.3181 15.2727L22.8735 20.1212L22.1511 24.4848L18.5395 32.4848L16.1318 40L14.9279 48V49.697L9.39016 58.1818L6.26011 64.4848V73.4545L7.2232 92.1212L8.90861 98.9091L12.2794 105.212L16.6134 109.333L18.5395 117.333L25.7627 133.576L34.4306 144L34.9121 144.485L38.0422 160.242L27.4482 179.636L24.0773 182.303L21.6696 184.242H17.3357L14.9279 185.455L12.0387 185.697L10.3533 187.394L6.74165 186.909L3.13006 186.667L0.481548 188.606L0 192L1.92619 189.818L5.05624 188.848L5.29701 192L10.3533 190.303L13.2425 190.061L18.2988 190.788C18.2988 190.788 22.6327 190.545 23.355 190.303C24.0773 190.303 28.8928 190.788 28.8928 190.788L32.2636 190.303L34.1898 191.03L36.5975 190.303L39.246 191.515L43.0984 191.03L43.58 188.364L43.3392 186.909L45.9877 187.879L48.1547 189.576L49.5993 191.515V189.091L47.9139 186.182C47.9139 186.182 46.71 184.485 45.9877 184.727C45.2654 184.727 42.3761 184.242 42.3761 184.242L40.4499 184.97L38.283 184L36.116 185.212L34.1898 184.485L33.2267 182.545L31.7821 182.061L33.2267 178.182L36.5975 173.333L41.1722 165.576L45.2654 160.727L46.71 158.788C46.71 158.788 48.6362 155.879 48.6362 155.152C48.6362 154.424 49.1178 146.182 49.1178 146.182L46.71 140.848L45.5061 136.485L67.6573 141.818H68.8612L87.8823 155.636L90.5308 159.03L91.4938 172.848L91.0123 176L89.5677 178.424L88.6046 179.879L87.8823 182.061L87.4007 183.515L83.7891 184.727L80.1775 184L78.0106 183.758L73.9174 184.242L72.232 185.939L71.5097 188.121L71.9912 190.303L72.7135 188.121L73.9174 186.667L75.1213 186.424V188.364L76.5659 189.333L79.696 187.879L81.1406 187.636L81.6221 189.818H86.1968L89.3269 188.848L91.9754 189.333L95.8278 189.818L97.0316 189.333L97.9947 188.364L99.6801 191.758V187.879L97.9947 183.515L95.587 182.061L96.0686 180.848L94.3831 177.455L94.6239 164.849L104.255 176.242L117.016 186.182C117.016 186.182 125.684 189.333 126.406 189.333C127.128 189.333 133.148 188.606 133.148 188.606L137 182.303L134.111 173.576L135.315 170.667L129.295 162.667L116.293 149.333L113.163 138.909L113.404 131.879L110.515 124.364L107.385 118.788L109.311 112.727L107.866 104L101.366 89.2121L103.773 88.7273L99.4394 81.9394L102.088 81.2121L97.5132 73.697L99.4394 72.7273L96.0686 66.9091L97.2724 66.1818L92.9385 62.5455L94.3831 61.8182L83.5483 54.0606L69.8243 44.3636Z"
+                    android:fillColor="#000000" />
+            </group>
+
+        </vector>
+    </aapt:attr>
+    <target android:name="shield1">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                android:propertyName="fillAlpha"
+                android:duration="300"
+                android:valueFrom="1"
+                android:valueTo="0"
+                android:valueType="floatType"
+                android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        </aapt:attr>
+    </target>
+    <target android:name="shield2">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                android:propertyName="fillAlpha"
+                android:duration="300"
+                android:valueFrom="1"
+                android:valueTo="0"
+                android:valueType="floatType"
+                android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        </aapt:attr>
+    </target>
+    <target android:name="ravenGroup">
+        <aapt:attr name="android:animation">
+            <set>
+                <objectAnimator
+                    android:propertyName="scaleX"
+                    android:duration="300"
+                    android:valueFrom="0.65"
+                    android:valueTo="0.725"
+                    android:valueType="floatType"
+                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
+                <objectAnimator
+                    android:propertyName="scaleY"
+                    android:duration="300"
+                    android:valueFrom="0.65"
+                    android:valueTo="0.725"
+                    android:valueType="floatType"
+                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
+                <objectAnimator
+                    android:propertyName="translateX"
+                    android:duration="300"
+                    android:valueFrom="42"
+                    android:valueTo="36"
+                    android:valueType="floatType"
+                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
+                <objectAnimator
+                    android:propertyName="translateY"
+                    android:duration="300"
+                    android:valueFrom="30"
+                    android:valueTo="36"
+                    android:valueType="floatType"
+                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
+            </set>
+        </aapt:attr>
+    </target>
+</animated-vector>
diff --git a/app/src/custom/res/drawable-hdpi/bg_connected.png b/app/src/custom/res/drawable-hdpi/bg_connected.png
new file mode 100644
index 00000000..aa29fd90
Binary files /dev/null and b/app/src/custom/res/drawable-hdpi/bg_connected.png differ
diff --git a/app/src/custom/res/drawable-hdpi/bg_connecting.png b/app/src/custom/res/drawable-hdpi/bg_connecting.png
new file mode 100644
index 00000000..49620c2c
Binary files /dev/null and b/app/src/custom/res/drawable-hdpi/bg_connecting.png differ
diff --git a/app/src/custom/res/drawable-hdpi/bg_disconnected.png b/app/src/custom/res/drawable-hdpi/bg_disconnected.png
new file mode 100644
index 00000000..35180222
Binary files /dev/null and b/app/src/custom/res/drawable-hdpi/bg_disconnected.png differ
diff --git a/app/src/custom/res/drawable-xhdpi/bg_connected.png b/app/src/custom/res/drawable-xhdpi/bg_connected.png
new file mode 100644
index 00000000..f9588d56
Binary files /dev/null and b/app/src/custom/res/drawable-xhdpi/bg_connected.png differ
diff --git a/app/src/custom/res/drawable-xhdpi/bg_connecting.png b/app/src/custom/res/drawable-xhdpi/bg_connecting.png
new file mode 100644
index 00000000..294e4708
Binary files /dev/null and b/app/src/custom/res/drawable-xhdpi/bg_connecting.png differ
diff --git a/app/src/custom/res/drawable-xhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xhdpi/bg_disconnected.png
new file mode 100644
index 00000000..d18bc78e
Binary files /dev/null and b/app/src/custom/res/drawable-xhdpi/bg_disconnected.png differ
diff --git a/app/src/custom/res/drawable-xxhdpi/bg_connected.png b/app/src/custom/res/drawable-xxhdpi/bg_connected.png
new file mode 100644
index 00000000..14c58b03
Binary files /dev/null and b/app/src/custom/res/drawable-xxhdpi/bg_connected.png differ
diff --git a/app/src/custom/res/drawable-xxhdpi/bg_connecting.png b/app/src/custom/res/drawable-xxhdpi/bg_connecting.png
new file mode 100644
index 00000000..062e84c4
Binary files /dev/null and b/app/src/custom/res/drawable-xxhdpi/bg_connecting.png differ
diff --git a/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png
new file mode 100644
index 00000000..cd014703
Binary files /dev/null and b/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png differ
diff --git a/app/src/custom/res/drawable/bg_connected.png b/app/src/custom/res/drawable/bg_connected.png
new file mode 100644
index 00000000..78a09cae
Binary files /dev/null and b/app/src/custom/res/drawable/bg_connected.png differ
diff --git a/app/src/custom/res/drawable/bg_connected.xml b/app/src/custom/res/drawable/bg_connected.xml
deleted file mode 100644
index f851203d..00000000
--- a/app/src/custom/res/drawable/bg_connected.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:gravity="fill">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/bg_running"/>
-        </shape>
-    </item>
-    <item android:gravity="fill"
-        android:bottom="80dp"
-        android:drawable="@drawable/bg_connected_effect"
-        >
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable/bg_connected_effect.xml b/app/src/custom/res/drawable/bg_connected_effect.xml
deleted file mode 100644
index 75e79573..00000000
--- a/app/src/custom/res/drawable/bg_connected_effect.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="375"
-    android:viewportHeight="622"
-    android:width="375dp"
-    android:height="622dp">
-    <path
-        android:pathData="M185.501 621.837C315.565 621.837 421.003 346.305 421.003 6.4184C421.003 -333.468 315.565 -609 185.501 -609C55.4376 -609 -50 -333.468 -50 6.4184C-50 346.305 55.4376 621.837 185.501 621.837Z">
-        <aapt:attr
-            name="android:fillColor">
-            <gradient
-                android:startX="289.514"
-                android:startY="184.89"
-                android:endX="289.514"
-                android:endY="564.398"
-                android:tileMode="clamp">
-                <item
-                    android:color="#00A6C28A"
-                    android:offset="0" />
-                <item
-                    android:color="#36669933"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable/bg_connecting.png b/app/src/custom/res/drawable/bg_connecting.png
new file mode 100644
index 00000000..d85ddd4b
Binary files /dev/null and b/app/src/custom/res/drawable/bg_connecting.png differ
diff --git a/app/src/custom/res/drawable/bg_connecting.xml b/app/src/custom/res/drawable/bg_connecting.xml
deleted file mode 100644
index 8482d30e..00000000
--- a/app/src/custom/res/drawable/bg_connecting.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:gravity="fill">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/bg_connecting"/>
-        </shape>
-    </item>
-    <item android:gravity="fill"
-        android:bottom="80dp"
-        android:drawable="@drawable/bg_connecting_effect"
-        >
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable/bg_connecting_effect.xml b/app/src/custom/res/drawable/bg_connecting_effect.xml
deleted file mode 100644
index fd462a54..00000000
--- a/app/src/custom/res/drawable/bg_connecting_effect.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="375"
-    android:viewportHeight="629"
-    android:width="375dp"
-    android:height="629dp">
-    <path
-        android:pathData="M96.6338 471.305C226.719 515.286 420.512 289.654 529.484 -32.658C638.456 -354.97 621.341 -651.909 491.256 -695.89C361.172 -739.871 167.378 -514.239 58.4058 -191.927C-50.5662 130.385 -33.4509 427.324 96.6338 471.305Z">
-        <aapt:attr
-            name="android:fillColor">
-            <gradient
-                android:startX="132.695"
-                android:startY="21.7787"
-                android:endX="11.0197"
-                android:endY="381.664"
-                android:tileMode="clamp">
-                <item
-                    android:color="#00FFAA33"
-                    android:offset="0" />
-                <item
-                    android:color="#33FFAA33"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:pathData="M183.501 628.837C313.565 628.837 419.003 353.304 419.003 13.4182C419.003 -326.468 313.565 -602 183.501 -602C53.4376 -602 -52 -326.468 -52 13.4182C-52 353.304 53.4376 628.837 183.501 628.837Z">
-        <aapt:attr
-            name="android:fillColor">
-            <gradient
-                android:startX="183.501"
-                android:startY="255.483"
-                android:endX="183.501"
-                android:endY="634.991"
-                android:tileMode="clamp">
-                <item
-                    android:color="#00FFAA33"
-                    android:offset="0" />
-                <item
-                    android:color="#33FFAA33"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable/bg_disconnected.png b/app/src/custom/res/drawable/bg_disconnected.png
new file mode 100644
index 00000000..029c5d5a
Binary files /dev/null and b/app/src/custom/res/drawable/bg_disconnected.png differ
diff --git a/app/src/custom/res/drawable/bg_disconnected.xml b/app/src/custom/res/drawable/bg_disconnected.xml
deleted file mode 100644
index bfc3c1d1..00000000
--- a/app/src/custom/res/drawable/bg_disconnected.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:gravity="fill">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/bg_disconnected"/>
-        </shape>
-    </item>
-    <item
-        android:top="-40dp"
-        android:gravity="fill"
-        android:drawable="@drawable/bg_disconnected_effect"
-        android:bottom="80dp"
-        >
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable/bg_disconnected_effect.xml b/app/src/custom/res/drawable/bg_disconnected_effect.xml
deleted file mode 100644
index d19c2f7f..00000000
--- a/app/src/custom/res/drawable/bg_disconnected_effect.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="375"
-    android:viewportHeight="636"
-    android:width="375dp"
-    android:height="636dp"
-    >
-    <path
-        android:pathData="M183.528 635.43C313.591 635.43 419.029 359.898 419.029 20.0117C419.029 -319.875 313.591 -595.407 183.528 -595.407C53.4638 -595.407 -51.9738 -319.875 -51.9738 20.0117C-51.9738 359.898 53.4638 635.43 183.528 635.43Z">
-        <aapt:attr
-            name="android:fillColor">
-            <gradient
-                android:startX="79.5145"
-                android:startY="198.483"
-                android:endX="79.5145"
-                android:endY="577.991"
-                android:tileMode="clamp">
-                <item
-                    android:color="#00FFAA33"
-                    android:offset="0" />
-                <item
-                    android:color="#33AF0909"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:pathData="M183.514 458.837C313.578 458.837 419.016 183.305 419.016 -156.582C419.016 -496.468 313.578 -772 183.514 -772C53.4506 -772 -51.9869 -496.468 -51.9869 -156.582C-51.9869 183.305 53.4506 458.837 183.514 458.837Z">
-        <aapt:attr
-            name="android:fillColor">
-            <gradient
-                android:startX="183.514"
-                android:startY="85.483"
-                android:endX="183.514"
-                android:endY="464.991"
-                android:tileMode="clamp">
-                <item
-                    android:color="#00FFAA33"
-                    android:offset="0" />
-                <item
-                    android:color="#33AF0909"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable/ic_motd.png b/app/src/custom/res/drawable/ic_motd.png
new file mode 100644
index 00000000..5d2efea4
Binary files /dev/null and b/app/src/custom/res/drawable/ic_motd.png differ
diff --git a/app/src/custom/res/drawable/ic_motd.xml b/app/src/custom/res/drawable/ic_motd.xml
deleted file mode 100644
index 85c9e58a..00000000
--- a/app/src/custom/res/drawable/ic_motd.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="288"
-    android:viewportHeight="288"
-    android:width="288dp"
-    android:height="288dp">
-    <group
-        android:scaleX="1"
-        android:scaleY="1"
-        android:translateX="82"
-        android:translateY="52"
-        >
-        <path
-            android:pathData="M69.8243 44.3636C69.8243 44.3636 66.935 38.7879 66.6942 38.0606C66.4534 37.3333 65.0088 29.3333 65.0088 29.3333L66.935 25.9394L71.2689 19.6364L77.2882 14.7879L78.7328 14.303L93.42 8.72727L94.8647 7.27273L93.42 4.84849L91.2531 3.63636L87.4007 2.66666L77.7698 1.69697H70.3058L65.2496 2.90909L60.6749 1.21212L54.8963 0.484846L46.4692 0.242421L42.1353 0L35.1529 2.66666L24.3181 15.2727L22.8735 20.1212L22.1511 24.4848L18.5395 32.4848L16.1318 40L14.9279 48V49.697L9.39016 58.1818L6.26011 64.4848V73.4545L7.2232 92.1212L8.90861 98.9091L12.2794 105.212L16.6134 109.333L18.5395 117.333L25.7627 133.576L34.4306 144L34.9121 144.485L38.0422 160.242L27.4482 179.636L24.0773 182.303L21.6696 184.242H17.3357L14.9279 185.455L12.0387 185.697L10.3533 187.394L6.74165 186.909L3.13006 186.667L0.481548 188.606L0 192L1.92619 189.818L5.05624 188.848L5.29701 192L10.3533 190.303L13.2425 190.061L18.2988 190.788C18.2988 190.788 22.6327 190.545 23.355 190.303C24.0773 190.303 28.8928 190.788 28.8928 190.788L32.2636 190.303L34.1898 191.03L36.5975 190.303L39.246 191.515L43.0984 191.03L43.58 188.364L43.3392 186.909L45.9877 187.879L48.1547 189.576L49.5993 191.515V189.091L47.9139 186.182C47.9139 186.182 46.71 184.485 45.9877 184.727C45.2654 184.727 42.3761 184.242 42.3761 184.242L40.4499 184.97L38.283 184L36.116 185.212L34.1898 184.485L33.2267 182.545L31.7821 182.061L33.2267 178.182L36.5975 173.333L41.1722 165.576L45.2654 160.727L46.71 158.788C46.71 158.788 48.6362 155.879 48.6362 155.152C48.6362 154.424 49.1178 146.182 49.1178 146.182L46.71 140.848L45.5061 136.485L67.6573 141.818H68.8612L87.8823 155.636L90.5308 159.03L91.4938 172.848L91.0123 176L89.5677 178.424L88.6046 179.879L87.8823 182.061L87.4007 183.515L83.7891 184.727L80.1775 184L78.0106 183.758L73.9174 184.242L72.232 185.939L71.5097 188.121L71.9912 190.303L72.7135 188.121L73.9174 186.667L75.1213 186.424V188.364L76.5659 189.333L79.696 187.879L81.1406 187.636L81.6221 189.818H86.1968L89.3269 188.848L91.9754 189.333L95.8278 189.818L97.0316 189.333L97.9947 188.364L99.6801 191.758V187.879L97.9947 183.515L95.587 182.061L96.0686 180.848L94.3831 177.455L94.6239 164.849L104.255 176.242L117.016 186.182C117.016 186.182 125.684 189.333 126.406 189.333C127.128 189.333 133.148 188.606 133.148 188.606L137 182.303L134.111 173.576L135.315 170.667L129.295 162.667L116.293 149.333L113.163 138.909L113.404 131.879L110.515 124.364L107.385 118.788L109.311 112.727L107.866 104L101.366 89.2121L103.773 88.7273L99.4394 81.9394L102.088 81.2121L97.5132 73.697L99.4394 72.7273L96.0686 66.9091L97.2724 66.1818L92.9385 62.5455L94.3831 61.8182L83.5483 54.0606L69.8243 44.3636Z"
-            android:fillColor="#000000" />
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable/ravens.xml b/app/src/custom/res/drawable/ravens.xml
deleted file mode 100644
index 788aef84..00000000
--- a/app/src/custom/res/drawable/ravens.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="342"
-    android:viewportHeight="206"
-    android:width="342dp"
-    android:height="206dp">
-    <group
-        android:name="raven1"
-        android:scaleX="0.8"
-        android:scaleY="0.8"
-        android:translateX="-224.2934"
-        android:translateY="11.72371">
-        <path
-            android:name="raven1path"
-            android:pathData="M385.13834 197.43106c-0.72897 -1.36208 -0.61597 -2.15071 0.51401 -3.58724l1.0109 -1.28515 -2.7045 -3.53096c-1.67306 -2.18432 -3.16903 -3.64755 -3.92253 -3.83667 -0.78962 -0.19818 -1.46242 -0.8906 -1.91284 -1.96862 -0.78944 -1.88939 -0.68998 -1.87306 -7.21616 -1.18532 -3.17774 0.33487 -5.21281 0.85767 -7.44 1.9113 -3.28857 1.55574 -5.44061 1.80404 -6.78577 0.78292 -1.02537 -0.77836 -1.06491 -1.42761 -0.13401 -2.20019 0.38829 -0.32225 0.65829 -1.03611 0.6 -1.58634 -0.0805 -0.75951 0.24078 -1.07485 1.33401 -1.3095 0.792 -0.17 1.87322 -0.54195 2.40272 -0.82656 0.66764 -0.35886 1.7028 -0.37114 3.37723 -0.0401 3.1702 0.62683 7.16506 -0.46946 9.11061 -2.50018 0.98579 -1.02893 1.81957 -1.42897 2.97837 -1.42897 0.88512 0 2.4561 -0.432 3.49107 -0.96 1.03497 -0.528 2.21436 -0.96 2.62088 -0.96 0.40651 0 0.73912 -0.30839 0.73912 -0.68532 0 -0.54071 -0.53763 -0.62982 -2.54805 -0.42233 -3.2514 0.33557 -4.17195 -0.44353 -4.17195 -3.53092 0 -1.44319 -0.32154 -2.57878 -0.96 -3.39045 -0.528 -0.67124 -0.96 -1.49047 -0.96 -1.8205 0 -0.33004 -0.54 -0.95389 -1.2 -1.38634 -0.7646 -0.50098 -1.2 -1.23373 -1.2 -2.01949 0 -0.67827 -0.432 -1.78243 -0.96 -2.45367 -0.528 -0.67124 -0.96 -1.5865 -0.96 -2.03391 0 -0.44741 -1.15388 -2.09228 -2.56419 -3.65527 -2.97648 -3.29873 -3.67581 -4.47263 -3.67581 -6.17024 0 -1.04577 -0.21517 -1.23156 -1.42631 -1.23156 -0.78448 0 -2.67448 -0.56194 -4.2 -1.24877 -3.87341 -1.74389 -9.21645 -3.55123 -10.49851 -3.55123 -1.57962 0 -2.59518 -0.491 -2.59518 -1.2547 0 -0.53914 0.68803 -0.61839 3.48 -0.40086 3.2635 0.25428 3.40535 0.22572 2.28 -0.45912 -0.66 -0.40165 -2.226 -0.87399 -3.48 -1.04964 -2.96604 -0.41545 -2.93747 -1.15568 0.0446 -1.15568 1.92868 0 9.64234 2.10373 13.15539 3.58785 0.50332 0.21263 0.84 0.14513 0.84 -0.16841 0 -0.28779 -1.13158 -1.09668 -2.51463 -1.79753 -2.92533 -1.48238 -12.13912 -7.58751 -12.61637 -8.35971 -1.35099 -2.18595 3.01241 -0.0675 12.14639 5.89721 3.24247 2.1174 6.04388 3.70133 6.22536 3.51984 0.18149 -0.18148 -0.38708 -0.89116 -1.26349 -1.57704 -2.20209 -1.7234 -10.13726 -10.73208 -10.13726 -11.50869 0 -1.14242 0.85579 -0.66795 2.72266 1.5095 2.27855 2.65762 9.24491 8.66726 13.01433 11.22703 2.8929 1.96453 11.64578 6.78995 12.31636 6.78995 0.20542 0 0.23167 -0.756 0.0583 -1.68 -0.22647 -1.20719 -0.14019 -1.69436 0.30658 -1.73102 0.34197 -0.0281 1.03481 -0.0821 1.53965 -0.12 1.86068 -0.13982 1.16626 -1.06327 -1.60872 -2.13929 -1.56874 -0.6083 -3.78307 -1.85532 -4.92072 -2.77115 -1.13765 -0.91584 -3.09446 -2.43544 -4.34846 -3.37688 -4.34658 -3.2632 -1.75366 -4.17202 3.18156 -1.11514 2.26983 1.40594 3.91431 1.53202 1.97844 0.15169 -6.31808 -4.50497 -6.96 -5.05256 -6.96 -5.93721 0 -0.52855 0.11494 -0.961 0.25542 -0.961 0.78964 0 4.15067 1.74166 8.39825 4.35188 2.65524 1.63171 4.93892 2.85554 5.07483 2.71963 0.13591 -0.13592 -1.94842 -2.37661 -4.63184 -4.97931 -5.53891 -5.37229 -7.03228 -7.22857 -6.35791 -7.90295 0.56718 -0.56718 1.61175 0.22173 8.939 6.7512 3.12276 2.78275 5.93076 5.14466 6.24 5.24868 0.30924 0.10402 -1.50978 -1.95528 -4.04226 -4.57623 -4.62994 -4.79166 -7.54368 -8.5847 -7.00693 -9.12146 0.15897 -0.15897 2.25393 1.41143 4.65545 3.48976 4.14801 3.58979 5.79244 4.76276 5.09498 3.63424 -0.17306 -0.28001 -0.11466 -0.6327 0.12976 -0.78376 0.64416 -0.39811 17.86024 17.63295 19.07981 19.98301 1.60753 3.09765 1.75025 5.81492 0.61158 11.64343 -0.65753 3.36572 -0.90221 5.90827 -0.699 7.26344 0.29317 1.95498 0.42327 2.10307 2.08577 2.37409 0.9752 0.15898 2.42109 0.39924 3.21309 0.5339 5.1256 0.87155 13.65736 4.80211 12.94067 5.96174 -0.15253 0.24679 -1.93858 0.44985 -3.969 0.45124 -3.88293 0.003 -3.90932 0.0128 -8.39867 3.23101 -1.6107 1.15463 -3.37986 1.81494 -6.89008 2.5716 -4.81503 1.03793 -7.97908 2.51326 -12.88292 6.00704 -4.80978 3.42677 -4.95621 3.84823 -2.4 6.90782 2.66507 3.18989 2.14762 5.66217 -1.51355 7.23153 -2.68358 1.15032 -2.89394 1.15032 -3.50956 0.00003zm4.78311 -5.20219c0 -0.57904 -2.89719 -3.94937 -3.39495 -3.94937 -0.77051 0 -0.49203 0.68428 1.0299 2.53064 1.38291 1.67772 2.36505 2.26687 2.36505 1.41873z"
-            android:fillColor="#000000" />
-    </group>
-    <group
-        android:name="raven3"
-        android:scaleX="0.8"
-        android:scaleY="0.8"
-        android:translateX="-77.92102"
-        android:translateY="-54.82651">
-        <path
-            android:name="raven3path"
-            android:pathData="M447.80204 216.9559c-0.72269 -0.39213 -1.64623 -1.35548 -2.05233 -2.14078 -0.92258 -1.78409 -1.47725 -1.82526 -1.45263 -0.10784 0.0256 1.78611 -1.56103 1.9993 -3.05379 0.41034 -0.92579 -0.98546 -1.26967 -1.09461 -2.00395 -0.63604 -0.71993 0.4496 -1.15887 0.3521 -2.33731 -0.51916 -1.20317 -0.88954 -1.60809 -0.97455 -2.37139 -0.49787 -0.73689 0.4602 -1.14575 0.42723 -2.0501 -0.16532 -0.64725 -0.42409 -1.74409 -0.64998 -2.56857 -0.52897 -1.09407 0.16058 -1.71749 -0.0853 -2.60113 -1.02589 -0.6392 -0.6804 -1.5772 -1.23709 -2.08445 -1.23709 -0.50725 0 -1.49559 -0.32252 -2.19633 -0.71671 -0.70073 -0.39419 -1.81406 -0.93368 -2.47406 -1.19885 -0.66 -0.26518 -1.524 -0.66225 -1.92 -0.88239 -2.1004 -1.1676 -3.9862 -2.00205 -4.5245 -2.00205 -0.33369 0 -0.99766 -0.432 -1.4755 -0.96 -0.47783 -0.528 -1.16856 -0.96 -1.53495 -0.96 -0.77161 0 -6.74173 -3.13454 -7.86284 -4.12828 -0.89689 -0.79501 -2.53748 -0.86858 -3.83877 -0.17215 -0.51341 0.27477 -1.88229 2.38077 -3.04196 4.68 -1.15968 2.29924 -2.72649 4.76604 -3.4818 5.48179 -1.40184 1.32842 -5.12659 2.93173 -5.63342 2.4249 -0.1543 -0.15429 -1.70398 -0.32663 -3.44374 -0.38296 -2.32752 -0.0754 -3.51734 -0.36424 -4.50361 -1.09342 -0.81562 -0.60301 -1.73721 -0.88722 -2.35394 -0.72594 -1.35459 0.35423 -3.92189 -0.18553 -5.09262 -1.0707 -0.66178 -0.50036 -0.98915 -1.4008 -1.08522 -2.98487 -0.0757 -1.2476 -0.25951 -4.04558 -0.40856 -6.21772 -0.25931 -3.77896 -0.21836 -3.99814 0.94896 -5.07999 1.35121 -1.25225 4.13171 -1.97137 10.61247 -2.74472 5.3395 -0.63715 6.25903 -0.85126 8.52 -1.98381 1.76578 -0.8845 2.45969 -2.32213 1.12084 -2.32213 -0.37355 0 -1.5596 -1.134 -2.63568 -2.52 -2.13022 -2.74373 -2.50653 -3.16958 -3.62217 -4.09893 -0.40864 -0.3404 -0.74299 -1.12556 -0.74299 -1.74479 0 -0.67126 -0.48454 -1.44336 -1.2 -1.91214 -0.66 -0.43245 -1.2 -1.23621 -1.2 -1.78612 0 -0.54992 -0.54 -1.42462 -1.2 -1.94378 -0.66 -0.51916 -1.2 -1.34367 -1.2 -1.83225 0 -0.48859 -0.54 -1.53009 -1.2 -2.31445 -0.66 -0.78437 -1.2 -1.85934 -1.2 -2.38883 0 -0.52949 -0.756 -1.71871 -1.68 -2.64271 -0.924 -0.924 -1.68 -2.09595 -1.68 -2.60433 0 -0.50838 -0.55232 -1.44321 -1.22738 -2.07739 -0.81219 -0.76302 -1.14213 -1.47902 -0.97538 -2.11669 0.17148 -0.65575 -0.2374 -1.46856 -1.27973 -2.54398 -1.31288 -1.35454 -1.4494 -1.71218 -0.95549 -2.50306 0.48388 -0.77482 0.38564 -1.14926 -0.61288 -2.33593 -1.29697 -1.54136 -1.48117 -2.47059 -0.65374 -3.29802 0.39386 -0.39386 0.19307 -0.98422 -0.75958 -2.2332 -0.88414 -1.15917 -1.19604 -2.00954 -0.98311 -2.68042 0.2246 -0.70765 -0.16728 -1.56735 -1.40042 -3.07223 -2.52054 -3.076 -2.28628 -3.69399 0.92771 -2.44729 0.528 0.20481 -0.498 -1.15368 -2.28 -3.01887 -2.97172 -3.11045 -3.98593 -4.92459 -2.75312 -4.92459 0.26778 0 2.38692 1.48253 4.7092 3.29452 6.33422 4.94234 8.3162 5.80749 3.95158 1.7249 -4.36141 -4.07959 -8.0677 -9.81942 -6.34054 -9.81942 0.28116 0 2.49842 2.05416 4.92723 4.5648 2.42882 2.51065 4.49954 4.48131 4.60161 4.37925 0.10205 -0.10206 -0.98133 -1.73668 -2.40752 -3.63249 -1.42619 -1.89581 -2.85494 -4.32096 -3.17499 -5.38921 -0.32005 -1.06825 -0.69762 -2.24379 -0.83904 -2.61231 -0.72243 -1.88264 1.03187 -0.1508 4.3051 4.24996 2.01269 2.706 4.67913 5.892 5.92543 7.08l2.266 2.16 -1.79464 -2.4c-2.2233 -2.97326 -4.5686 -7.73418 -4.94128 -10.03072 -0.44513 -2.74301 0.50313 -2.04466 2.37988 1.75269 1.66581 3.37055 8.26211 12.81454 9.47338 13.56314 0.32795 0.20269 0.50635 0.17645 0.39644 -0.0583 -0.1099 -0.23474 -1.00191 -2.04072 -1.98227 -4.01327 -0.98034 -1.97255 -1.78245 -3.86255 -1.78245 -4.2 0 -1.51072 0.98617 -0.31134 2.75157 3.34646 2.25366 4.66945 5.11203 8.56401 10.59899 14.44126 4.9305 5.28122 8.54604 10.06515 10.94256 14.47874 6.17495 11.37222 8.31949 13.01948 14.29789 10.98244 2.27587 -0.77547 3.24479 -0.75419 9.27398 0.20364 2.25404 0.35809 4.45501 1.59731 4.45501 2.50832 0 0.19008 -0.60035 0.46567 -1.3341 0.61242 -0.73377 0.14675 -1.86777 0.78823 -2.52 1.42549 -1.81377 1.77213 -5.26658 5.9971 -5.26039 6.43677 0.006 0.39975 0.80419 0.80728 7.34031 3.74603 4.42236 1.98837 8.73868 4.82625 10.41418 6.84709 2.22226 2.68029 9.70388 8.73695 12.42297 10.05689 2.10404 1.02137 2.46767 1.34537 1.65388 1.47363 -0.57373 0.0904 -1.97773 -0.30571 -3.12 -0.88029l-2.07685 -1.04469 1.3513 1.43507c0.74321 0.78928 2.79521 2.15598 4.56 3.03711 2.62921 1.31274 3.00331 1.63456 2.07139 1.78197 -0.62552 0.099 -2.40778 -0.44981 -3.96059 -1.21945 -2.26132 -1.12081 -2.65597 -1.21281 -1.9827 -0.4622 0.46233 0.51543 1.9746 1.57936 3.3606 2.36428 1.386 0.78492 2.52 1.65077 2.52 1.92411 0 0.83627 -3.35317 0.0235 -5.34728 -1.29618 -2.37621 -1.5725 -2.35309 -0.95606 0.0673 1.79363 2.28368 2.59439 2.44317 3.37594 0.6 2.94004 -1.49775 -0.3542 -4.44 -2.40221 -4.44 -3.09054 0 -0.25057 -0.23446 -0.45558 -0.52103 -0.45558 -0.28658 0 0.0374 0.99921 0.72 2.22046 0.68257 1.22125 1.24103 2.40925 1.24103 2.64 0 0.63619 -1.52046 0.46767 -2.99396 -0.33184z"
-            android:fillColor="#000000" />
-    </group>
-    <group
-        android:name="raven2"
-        android:scaleX="0.8"
-        android:scaleY="0.8"
-        android:translateX="-14.21506"
-        android:translateY="22.70211">
-        <path
-            android:name="raven2path"
-            android:pathData="M242.17687 151.65225c-1.74028 -2.28162 -2.178 -4.03768 -2.178 -8.73776 0 -2.17974 -0.18432 -3.96317 -0.4096 -3.96317 -0.22529 0 -0.71129 2.81516 -1.08 6.25591 -0.36872 3.44074 -0.8864 6.28072 -1.1504 6.31105 -1.04841 0.12049 -2.28619 -3.10071 -2.57984 -6.71376l-0.30016 -3.6932 -1.07056 1.81145c-2.08936 3.5353 -3.47008 2.84679 -3.48209 -1.73638 -0.006 -2.37601 -0.1508 -2.84246 -0.94546 -3.05027 -0.61539 -0.16092 -1.21919 -1.09153 -1.75512 -2.70506 -0.44935 -1.35286 -1.32319 -2.85792 -1.94188 -3.34458 -0.78894 -0.62057 -1.12489 -1.37616 -1.12489 -2.53 0 -2.06355 -0.60376 -2.09129 -1.85358 -0.0852 -1.18439 1.90109 -2.71192 2.89912 -3.87313 2.53057 -0.64166 -0.20366 -1.0246 0.1062 -1.47495 1.19345 -0.7302 1.76286 -2.63143 3.35598 -4.00504 3.35598 -0.54848 0 -1.46581 0.58765 -2.03851 1.30588 -0.89827 1.12654 -1.14794 1.21735 -1.81803 0.66123 -0.42722 -0.35456 -0.77543 -1.32021 -0.7738 -2.14588 0.003 -1.54988 0.31834 -2.30174 2.59201 -6.18123 2.37785 -4.05724 0.51183 -2.41446 -2.48575 2.18836 -3.12365 4.79641 -4.09991 5.87182 -4.88819 5.38464 -1.17655 -0.72715 -0.0446 -4.77763 2.18334 -7.813 1.22554 -1.66965 0.0938 -1.27585 -1.72437 0.6 -2.65534 2.73963 -4.34104 1.74204 -2.45575 -1.4533 0.93339 -1.58198 0.94531 -1.72299 0.1698 -2.00903 -1.26447 -0.4664 -1.46738 -1.03369 -1.04291 -2.91573 0.30278 -1.34248 0.21909 -1.84412 -0.38085 -2.28281 -0.75536 -0.55233 -0.9059 -1.41732 -1.24948 -7.17913 -0.20592 -3.45317 -1.35998 -10.32002 -1.73441 -10.31993 -0.14652 0.00003 -3.1824 0.88931 -6.7464 1.97616 -3.564 1.08684 -6.8656 2.086 -7.33688 2.22033 -0.47128 0.13433 -2.09128 -0.15192 -3.6 -0.63611 -1.50872 -0.48419 -3.01312 -0.8259 -3.34312 -0.75935 -1.2262 0.24726 -0.53956 -1.304 1.32139 -2.98524 1.05676 -0.95472 2.08554 -1.73586 2.28617 -1.73586 0.20064 0 0.57802 -0.486 0.83862 -1.08 0.54254 -1.23661 2.67944 -1.701199 8.15382 -1.772749 5.57725 -0.0729 9.57243 -1.17346 13.90516 -3.83049 4.52997 -2.77799 15.85234 -6.751008 22.57484 -7.921507 2.65339 -0.462 7.19029 -0.754493 11.76 -0.758165 7.33879 -0.0059 7.50857 0.01795 12.48 1.754669 4.64388 1.622275 7.89361 3.607435 7.55725 4.616496 -0.0759 0.227717 -1.8631 0.454018 -3.97155 0.502891 -3.40039 0.07882 -4.27825 0.305799 -7.76936 2.008856 -2.16469 1.056 -3.93825 2.136 -3.94123 2.4 -0.003 0.264 0.9368 1.1895 2.0884 2.056649 1.1516 0.86716 2.32074 2.16316 2.59809 2.88 0.61481 1.58903 2.47015 14.53738 2.49976 17.44571 0.0373 3.66931 1.70932 11.11002 3.22173 14.33764 1.81937 3.88271 1.28959 4.93466 -1.08652 2.15745 -0.90229 -1.05459 -1.64863 -1.65817 -1.65854 -1.34126 -0.0271 0.86542 3.28286 9.82211 4.07847 11.03636 0.38106 0.58156 0.50275 1.17487 0.27043 1.31845 -0.59625 0.3685 -3.42187 -2.90311 -4.8461 -5.611 -0.65955 -1.254 -1.36566 -2.28 -1.56915 -2.28 -0.40909 0 -0.35407 0.31827 1.09899 6.35685 1.05557 4.3867 0.95137 5.67912 -0.36978 4.58646 -0.90254 -0.74644 -2.98958 -5.08951 -2.9962 -6.23498 -0.002 -0.44642 -0.2554 -0.96662 -0.56182 -1.156 -0.41664 -0.2575 -0.47655 0.88529 -0.23759 4.53167 0.18049 2.75413 0.13441 4.876 -0.1059 4.876 -0.23399 0 -1.00861 -0.76458 -1.72138 -1.69907z"
-            android:fillColor="#000000" />
-    </group>
-</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable/rotate_progress_image.png b/app/src/custom/res/drawable/rotate_progress_image.png
new file mode 100644
index 00000000..ca160d00
Binary files /dev/null and b/app/src/custom/res/drawable/rotate_progress_image.png differ
diff --git a/app/src/custom/res/drawable/rotate_progress_image.xml b/app/src/custom/res/drawable/rotate_progress_image.xml
deleted file mode 100644
index f84f9034..00000000
--- a/app/src/custom/res/drawable/rotate_progress_image.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:name="circle"
-    android:viewportWidth="91"
-    android:viewportHeight="91"
-    android:width="91dp"
-    android:height="91dp">
-    <path
-        android:pathData="M0 0"
-        android:fillColor="#00000000" />
-    <!--
-    Implement your progress animation vector graphic here.
-    The graphic will rotate behind the cancel button in EipFragment.
-    -->
-</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable/state_connected.png b/app/src/custom/res/drawable/state_connected.png
new file mode 100644
index 00000000..0fbb82f2
Binary files /dev/null and b/app/src/custom/res/drawable/state_connected.png differ
diff --git a/app/src/custom/res/drawable/state_connected.xml b/app/src/custom/res/drawable/state_connected.xml
deleted file mode 100644
index e0a9005f..00000000
--- a/app/src/custom/res/drawable/state_connected.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="166"
-    android:viewportHeight="220"
-    android:width="166dp"
-    android:height="220dp">
-
-        <path
-            android:name="shield1"
-            android:pathData="M75.7916 211.927C37.7611 190.779 9.33369 157.386 2.89166 126.295C1.07036 117.505 0.998811 115.374 1.00089 69.9755L1.0025 26.6083L4.76437 24.1851C20.6619 13.9449 37.4788 7.09821 54.6105 3.64229C89.5868 -3.41322 125.875 3.66238 158.333 24.8539L161 26.5952V70.1783C161 115.754 160.927 117.944 159.119 126.65C152.713 157.49 128.092 187.572 91.7515 208.96C81.1937 215.174 81.5205 215.113 75.7916 211.927Z"
-            android:fillColor="#739B4C" />
-        <path
-            android:name="shield2"
-            android:pathData="M81.0089 1.00082C72.1811 0.99767 63.3554 1.87831 54.6114 3.64218C37.4796 7.09809 20.6622 13.9447 4.76468 24.185L1.00318 26.608L1.00002 69.9756C0.998421 115.374 1.06949 117.505 2.89058 126.295C9.3326 157.386 37.76 190.778 75.7905 211.927H75.7913C78.2626 213.301 79.6075 214.092 81.1849 214.051V1.00327C81.1259 1.00314 81.0673 1 81.008 1L81.0089 1.00082Z"
-            android:fillColor="#81A55D" />
-        <group
-            android:scaleX="0.65"
-            android:scaleY="0.65"
-            android:translateX="42"
-            android:translateY="30"
-            >
-            <path
-                android:pathData="M69.8243 44.3636C69.8243 44.3636 66.935 38.7879 66.6942 38.0606C66.4534 37.3333 65.0088 29.3333 65.0088 29.3333L66.935 25.9394L71.2689 19.6364L77.2882 14.7879L78.7328 14.303L93.42 8.72727L94.8647 7.27273L93.42 4.84849L91.2531 3.63636L87.4007 2.66666L77.7698 1.69697H70.3058L65.2496 2.90909L60.6749 1.21212L54.8963 0.484846L46.4692 0.242421L42.1353 0L35.1529 2.66666L24.3181 15.2727L22.8735 20.1212L22.1511 24.4848L18.5395 32.4848L16.1318 40L14.9279 48V49.697L9.39016 58.1818L6.26011 64.4848V73.4545L7.2232 92.1212L8.90861 98.9091L12.2794 105.212L16.6134 109.333L18.5395 117.333L25.7627 133.576L34.4306 144L34.9121 144.485L38.0422 160.242L27.4482 179.636L24.0773 182.303L21.6696 184.242H17.3357L14.9279 185.455L12.0387 185.697L10.3533 187.394L6.74165 186.909L3.13006 186.667L0.481548 188.606L0 192L1.92619 189.818L5.05624 188.848L5.29701 192L10.3533 190.303L13.2425 190.061L18.2988 190.788C18.2988 190.788 22.6327 190.545 23.355 190.303C24.0773 190.303 28.8928 190.788 28.8928 190.788L32.2636 190.303L34.1898 191.03L36.5975 190.303L39.246 191.515L43.0984 191.03L43.58 188.364L43.3392 186.909L45.9877 187.879L48.1547 189.576L49.5993 191.515V189.091L47.9139 186.182C47.9139 186.182 46.71 184.485 45.9877 184.727C45.2654 184.727 42.3761 184.242 42.3761 184.242L40.4499 184.97L38.283 184L36.116 185.212L34.1898 184.485L33.2267 182.545L31.7821 182.061L33.2267 178.182L36.5975 173.333L41.1722 165.576L45.2654 160.727L46.71 158.788C46.71 158.788 48.6362 155.879 48.6362 155.152C48.6362 154.424 49.1178 146.182 49.1178 146.182L46.71 140.848L45.5061 136.485L67.6573 141.818H68.8612L87.8823 155.636L90.5308 159.03L91.4938 172.848L91.0123 176L89.5677 178.424L88.6046 179.879L87.8823 182.061L87.4007 183.515L83.7891 184.727L80.1775 184L78.0106 183.758L73.9174 184.242L72.232 185.939L71.5097 188.121L71.9912 190.303L72.7135 188.121L73.9174 186.667L75.1213 186.424V188.364L76.5659 189.333L79.696 187.879L81.1406 187.636L81.6221 189.818H86.1968L89.3269 188.848L91.9754 189.333L95.8278 189.818L97.0316 189.333L97.9947 188.364L99.6801 191.758V187.879L97.9947 183.515L95.587 182.061L96.0686 180.848L94.3831 177.455L94.6239 164.849L104.255 176.242L117.016 186.182C117.016 186.182 125.684 189.333 126.406 189.333C127.128 189.333 133.148 188.606 133.148 188.606L137 182.303L134.111 173.576L135.315 170.667L129.295 162.667L116.293 149.333L113.163 138.909L113.404 131.879L110.515 124.364L107.385 118.788L109.311 112.727L107.866 104L101.366 89.2121L103.773 88.7273L99.4394 81.9394L102.088 81.2121L97.5132 73.697L99.4394 72.7273L96.0686 66.9091L97.2724 66.1818L92.9385 62.5455L94.3831 61.8182L83.5483 54.0606L69.8243 44.3636Z"
-                android:fillColor="#000000" />
-        </group>
-
-
-</vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable/state_connecting.png b/app/src/custom/res/drawable/state_connecting.png
new file mode 100644
index 00000000..7d78587e
Binary files /dev/null and b/app/src/custom/res/drawable/state_connecting.png differ
diff --git a/app/src/custom/res/drawable/state_connecting.xml b/app/src/custom/res/drawable/state_connecting.xml
deleted file mode 100644
index 267ba791..00000000
--- a/app/src/custom/res/drawable/state_connecting.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ravens"
-    >
-    <target
-        android:animation="@animator/alpha1"
-        android:name="raven1path"/>
-    <target
-        android:animation="@animator/alpha2"
-        android:name="raven2path"/>
-    <target
-        android:animation="@animator/alpha3"
-        android:name="raven3path"/>
-
-</animated-vector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable/state_disconnected.xml b/app/src/custom/res/drawable/state_disconnected.xml
index 7c49a537..ee11473d 100644
--- a/app/src/custom/res/drawable/state_disconnected.xml
+++ b/app/src/custom/res/drawable/state_disconnected.xml
@@ -1,17 +1,6 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="166"
-    android:viewportHeight="220"
-    android:width="166dp"
-    android:height="220dp">
-    <group
-        android:scaleX="0.725"
-        android:scaleY="0.725"
-        android:translateX="36"
-        android:translateY="36"
-        >
-        <path
-            android:pathData="M69.8243 44.3636C69.8243 44.3636 66.935 38.7879 66.6942 38.0606C66.4534 37.3333 65.0088 29.3333 65.0088 29.3333L66.935 25.9394L71.2689 19.6364L77.2882 14.7879L78.7328 14.303L93.42 8.72727L94.8647 7.27273L93.42 4.84849L91.2531 3.63636L87.4007 2.66666L77.7698 1.69697H70.3058L65.2496 2.90909L60.6749 1.21212L54.8963 0.484846L46.4692 0.242421L42.1353 0L35.1529 2.66666L24.3181 15.2727L22.8735 20.1212L22.1511 24.4848L18.5395 32.4848L16.1318 40L14.9279 48V49.697L9.39016 58.1818L6.26011 64.4848V73.4545L7.2232 92.1212L8.90861 98.9091L12.2794 105.212L16.6134 109.333L18.5395 117.333L25.7627 133.576L34.4306 144L34.9121 144.485L38.0422 160.242L27.4482 179.636L24.0773 182.303L21.6696 184.242H17.3357L14.9279 185.455L12.0387 185.697L10.3533 187.394L6.74165 186.909L3.13006 186.667L0.481548 188.606L0 192L1.92619 189.818L5.05624 188.848L5.29701 192L10.3533 190.303L13.2425 190.061L18.2988 190.788C18.2988 190.788 22.6327 190.545 23.355 190.303C24.0773 190.303 28.8928 190.788 28.8928 190.788L32.2636 190.303L34.1898 191.03L36.5975 190.303L39.246 191.515L43.0984 191.03L43.58 188.364L43.3392 186.909L45.9877 187.879L48.1547 189.576L49.5993 191.515V189.091L47.9139 186.182C47.9139 186.182 46.71 184.485 45.9877 184.727C45.2654 184.727 42.3761 184.242 42.3761 184.242L40.4499 184.97L38.283 184L36.116 185.212L34.1898 184.485L33.2267 182.545L31.7821 182.061L33.2267 178.182L36.5975 173.333L41.1722 165.576L45.2654 160.727L46.71 158.788C46.71 158.788 48.6362 155.879 48.6362 155.152C48.6362 154.424 49.1178 146.182 49.1178 146.182L46.71 140.848L45.5061 136.485L67.6573 141.818H68.8612L87.8823 155.636L90.5308 159.03L91.4938 172.848L91.0123 176L89.5677 178.424L88.6046 179.879L87.8823 182.061L87.4007 183.515L83.7891 184.727L80.1775 184L78.0106 183.758L73.9174 184.242L72.232 185.939L71.5097 188.121L71.9912 190.303L72.7135 188.121L73.9174 186.667L75.1213 186.424V188.364L76.5659 189.333L79.696 187.879L81.1406 187.636L81.6221 189.818H86.1968L89.3269 188.848L91.9754 189.333L95.8278 189.818L97.0316 189.333L97.9947 188.364L99.6801 191.758V187.879L97.9947 183.515L95.587 182.061L96.0686 180.848L94.3831 177.455L94.6239 164.849L104.255 176.242L117.016 186.182C117.016 186.182 125.684 189.333 126.406 189.333C127.128 189.333 133.148 188.606 133.148 188.606L137 182.303L134.111 173.576L135.315 170.667L129.295 162.667L116.293 149.333L113.163 138.909L113.404 131.879L110.515 124.364L107.385 118.788L109.311 112.727L107.866 104L101.366 89.2121L103.773 88.7273L99.4394 81.9394L102.088 81.2121L97.5132 73.697L99.4394 72.7273L96.0686 66.9091L97.2724 66.1818L92.9385 62.5455L94.3831 61.8182L83.5483 54.0606L69.8243 44.3636Z"
-            android:fillColor="#000000" />
-    </group>
-
-</vector>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/ic_motd"/>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/custom/res/drawable/state_transition_connected_disconnected.xml b/app/src/custom/res/drawable/state_transition_connected_disconnected.xml
deleted file mode 100644
index 0496e729..00000000
--- a/app/src/custom/res/drawable/state_transition_connected_disconnected.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="166dp"
-            android:height="220dp"
-            android:viewportWidth="166"
-            android:viewportHeight="220">
-            <path
-                android:name="shield1"
-                android:pathData="M 75.792 211.927 C 37.761 190.779 9.334 157.386 2.892 126.295 C 1.07 117.505 0.999 115.374 1.001 69.975 L 1.002 26.608 L 4.764 24.185 C 20.662 13.945 37.479 7.098 54.611 3.642 C 89.587 -3.413 125.875 3.662 158.333 24.854 L 161 26.595 L 161 70.178 C 161 115.754 160.927 117.944 159.119 126.65 C 152.713 157.49 128.092 187.572 91.751 208.96 C 81.194 215.174 81.52 215.113 75.792 211.927 Z"
-                android:fillColor="#739B4C"/>
-            <path
-                android:name="shield2"
-                android:pathData="M 81.009 1.001 C 72.181 0.998 63.355 1.878 54.611 3.642 C 37.48 7.098 20.662 13.945 4.765 24.185 L 1.003 26.608 L 1 69.976 C 0.998 115.374 1.069 117.505 2.891 126.295 C 9.333 157.386 37.76 190.778 75.79 211.927 L 75.791 211.927 C 78.263 213.301 79.608 214.092 81.185 214.051 L 81.185 1.003 C 81.126 1.003 81.067 1 81.008 1 L 81.009 1.001 Z"
-                android:fillColor="#81A55D"/>
-            <group
-                android:name="ravenGroup"
-                android:scaleX="0.65"
-                android:scaleY="0.65"
-                android:translateX="42"
-                android:translateY="30"
-                >
-                <path
-                    android:pathData="M69.8243 44.3636C69.8243 44.3636 66.935 38.7879 66.6942 38.0606C66.4534 37.3333 65.0088 29.3333 65.0088 29.3333L66.935 25.9394L71.2689 19.6364L77.2882 14.7879L78.7328 14.303L93.42 8.72727L94.8647 7.27273L93.42 4.84849L91.2531 3.63636L87.4007 2.66666L77.7698 1.69697H70.3058L65.2496 2.90909L60.6749 1.21212L54.8963 0.484846L46.4692 0.242421L42.1353 0L35.1529 2.66666L24.3181 15.2727L22.8735 20.1212L22.1511 24.4848L18.5395 32.4848L16.1318 40L14.9279 48V49.697L9.39016 58.1818L6.26011 64.4848V73.4545L7.2232 92.1212L8.90861 98.9091L12.2794 105.212L16.6134 109.333L18.5395 117.333L25.7627 133.576L34.4306 144L34.9121 144.485L38.0422 160.242L27.4482 179.636L24.0773 182.303L21.6696 184.242H17.3357L14.9279 185.455L12.0387 185.697L10.3533 187.394L6.74165 186.909L3.13006 186.667L0.481548 188.606L0 192L1.92619 189.818L5.05624 188.848L5.29701 192L10.3533 190.303L13.2425 190.061L18.2988 190.788C18.2988 190.788 22.6327 190.545 23.355 190.303C24.0773 190.303 28.8928 190.788 28.8928 190.788L32.2636 190.303L34.1898 191.03L36.5975 190.303L39.246 191.515L43.0984 191.03L43.58 188.364L43.3392 186.909L45.9877 187.879L48.1547 189.576L49.5993 191.515V189.091L47.9139 186.182C47.9139 186.182 46.71 184.485 45.9877 184.727C45.2654 184.727 42.3761 184.242 42.3761 184.242L40.4499 184.97L38.283 184L36.116 185.212L34.1898 184.485L33.2267 182.545L31.7821 182.061L33.2267 178.182L36.5975 173.333L41.1722 165.576L45.2654 160.727L46.71 158.788C46.71 158.788 48.6362 155.879 48.6362 155.152C48.6362 154.424 49.1178 146.182 49.1178 146.182L46.71 140.848L45.5061 136.485L67.6573 141.818H68.8612L87.8823 155.636L90.5308 159.03L91.4938 172.848L91.0123 176L89.5677 178.424L88.6046 179.879L87.8823 182.061L87.4007 183.515L83.7891 184.727L80.1775 184L78.0106 183.758L73.9174 184.242L72.232 185.939L71.5097 188.121L71.9912 190.303L72.7135 188.121L73.9174 186.667L75.1213 186.424V188.364L76.5659 189.333L79.696 187.879L81.1406 187.636L81.6221 189.818H86.1968L89.3269 188.848L91.9754 189.333L95.8278 189.818L97.0316 189.333L97.9947 188.364L99.6801 191.758V187.879L97.9947 183.515L95.587 182.061L96.0686 180.848L94.3831 177.455L94.6239 164.849L104.255 176.242L117.016 186.182C117.016 186.182 125.684 189.333 126.406 189.333C127.128 189.333 133.148 188.606 133.148 188.606L137 182.303L134.111 173.576L135.315 170.667L129.295 162.667L116.293 149.333L113.163 138.909L113.404 131.879L110.515 124.364L107.385 118.788L109.311 112.727L107.866 104L101.366 89.2121L103.773 88.7273L99.4394 81.9394L102.088 81.2121L97.5132 73.697L99.4394 72.7273L96.0686 66.9091L97.2724 66.1818L92.9385 62.5455L94.3831 61.8182L83.5483 54.0606L69.8243 44.3636Z"
-                    android:fillColor="#000000" />
-            </group>
-
-        </vector>
-    </aapt:attr>
-    <target android:name="shield1">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="fillAlpha"
-                android:duration="300"
-                android:valueFrom="1"
-                android:valueTo="0"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="shield2">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="fillAlpha"
-                android:duration="300"
-                android:valueFrom="1"
-                android:valueTo="0"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="ravenGroup">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="scaleX"
-                    android:duration="300"
-                    android:valueFrom="0.65"
-                    android:valueTo="0.725"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="scaleY"
-                    android:duration="300"
-                    android:valueFrom="0.65"
-                    android:valueTo="0.725"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="translateX"
-                    android:duration="300"
-                    android:valueFrom="42"
-                    android:valueTo="36"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="translateY"
-                    android:duration="300"
-                    android:valueFrom="30"
-                    android:valueTo="36"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_btn_cancel.xml b/app/src/main/res/drawable-anydpi-v24/ic_btn_cancel.xml
new file mode 100644
index 00000000..9870cd4f
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_btn_cancel.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="35"
+    android:viewportHeight="35"
+    android:width="35dp"
+    android:height="35dp">
+    <path
+        android:pathData="M4.9 35L17.5 22.4L30.1 35L35 30.1L22.4 17.5L35 4.9L30.1 0L17.5 12.6L4.9 0L0 4.9L12.6 17.5L0 30.1L4.9 35Z"
+        android:fillColor="#FFFFFF" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_btn_on.xml b/app/src/main/res/drawable-anydpi-v24/ic_btn_on.xml
new file mode 100644
index 00000000..0f3fc0f4
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_btn_on.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="40"
+    android:viewportHeight="43"
+    android:width="40dp"
+    android:height="43dp">
+    <path
+        android:pathData="M33.0178 7.38594C32.1199 6.61398 30.7913 6.74461 29.9562 7.58411C28.8438 8.70244 29.0811 10.5681 30.2333 11.6454C33.1633 14.3851 35 18.2798 35 22.6203C35 26.6198 33.4196 30.4556 30.6066 33.2836C27.7936 36.1117 23.9782 37.7005 20 37.7005C16.0218 37.7005 12.2064 36.1117 9.3934 33.2836C6.58035 30.4556 5 26.6198 5 22.6203C5 18.2699 6.84513 14.3673 9.77413 11.6139C10.9153 10.5411 11.1444 8.69064 10.0399 7.58018C9.20708 6.74295 7.88204 6.6127 6.98641 7.38232C2.70788 11.0589 0 16.5193 0 22.6203C0 27.953 2.10714 33.0673 5.85786 36.8381C9.60859 40.6089 14.6957 42.7273 20 42.7273C25.3043 42.7273 30.3914 40.6089 34.1421 36.8381C37.8929 33.0673 40 27.953 40 22.6203C40 16.5213 37.2939 11.0625 33.0178 7.38594ZM22.5 0C19.7386 0 17.5 2.23858 17.5 5V20.1337C17.5 22.8951 19.7386 25.1337 22.5 25.1337"
+        android:fillColor="#FFFFFF" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_btn_cancel.png b/app/src/main/res/drawable/ic_btn_cancel.png
new file mode 100644
index 00000000..af604d9b
Binary files /dev/null and b/app/src/main/res/drawable/ic_btn_cancel.png differ
diff --git a/app/src/main/res/drawable/ic_btn_cancel.xml b/app/src/main/res/drawable/ic_btn_cancel.xml
deleted file mode 100644
index 9870cd4f..00000000
--- a/app/src/main/res/drawable/ic_btn_cancel.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="35"
-    android:viewportHeight="35"
-    android:width="35dp"
-    android:height="35dp">
-    <path
-        android:pathData="M4.9 35L17.5 22.4L30.1 35L35 30.1L22.4 17.5L35 4.9L30.1 0L17.5 12.6L4.9 0L0 4.9L12.6 17.5L0 30.1L4.9 35Z"
-        android:fillColor="#FFFFFF" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_btn_on.png b/app/src/main/res/drawable/ic_btn_on.png
new file mode 100644
index 00000000..d6cfc10b
Binary files /dev/null and b/app/src/main/res/drawable/ic_btn_on.png differ
diff --git a/app/src/main/res/drawable/ic_btn_on.xml b/app/src/main/res/drawable/ic_btn_on.xml
deleted file mode 100644
index 0f3fc0f4..00000000
--- a/app/src/main/res/drawable/ic_btn_on.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="40"
-    android:viewportHeight="43"
-    android:width="40dp"
-    android:height="43dp">
-    <path
-        android:pathData="M33.0178 7.38594C32.1199 6.61398 30.7913 6.74461 29.9562 7.58411C28.8438 8.70244 29.0811 10.5681 30.2333 11.6454C33.1633 14.3851 35 18.2798 35 22.6203C35 26.6198 33.4196 30.4556 30.6066 33.2836C27.7936 36.1117 23.9782 37.7005 20 37.7005C16.0218 37.7005 12.2064 36.1117 9.3934 33.2836C6.58035 30.4556 5 26.6198 5 22.6203C5 18.2699 6.84513 14.3673 9.77413 11.6139C10.9153 10.5411 11.1444 8.69064 10.0399 7.58018C9.20708 6.74295 7.88204 6.6127 6.98641 7.38232C2.70788 11.0589 0 16.5193 0 22.6203C0 27.953 2.10714 33.0673 5.85786 36.8381C9.60859 40.6089 14.6957 42.7273 20 42.7273C25.3043 42.7273 30.3914 40.6089 34.1421 36.8381C37.8929 33.0673 40 27.953 40 22.6203C40 16.5213 37.2939 11.0625 33.0178 7.38594ZM22.5 0C19.7386 0 17.5 2.23858 17.5 5V20.1337C17.5 22.8951 19.7386 25.1337 22.5 25.1337"
-        android:fillColor="#FFFFFF" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_btn_on_connecting.xml b/app/src/main/res/drawable/ic_btn_on_connecting.xml
deleted file mode 100644
index 4b3d1384..00000000
--- a/app/src/main/res/drawable/ic_btn_on_connecting.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M13,4.0089C13.0002,3.4567 12.5527,3.0088 12.0004,3.0085C11.4481,3.0083 11.0002,3.4559 11,4.0082L10.9968,12.0116C10.9966,12.5639 11.4442,13.0118 11.9965,13.012C12.5487,13.0122 12.9966,12.5647 12.9968,12.0124L13,4.0089Z"
-      android:strokeColor="@color/colorPrimary_transparent"
-      android:strokeLineCap="round"
-      android:strokeWidth="0.3"
-      android:strokeLineJoin="round"
-      android:fillAlpha="0.5"
-      android:fillColor="@color/colorPrimary"/>
-  <path
-      android:pathData="M4,12.9917C4,10.7826 4.8954,8.7826 6.3431,7.3349L7.7573,8.7491C6.6715,9.8349 6,11.3349 6,12.9917C6,16.3054 8.6863,18.9917 12,18.9917C15.3137,18.9917 18,16.3054 18,12.9917C18,11.3348 17.3284,9.8348 16.2426,8.749L17.6568,7.3348C19.1046,8.7825 20,10.7825 20,12.9917C20,17.41 16.4183,20.9917 12,20.9917C7.5817,20.9917 4,17.41 4,12.9917Z"
-      android:strokeColor="@color/colorPrimary_transparent"
-      android:strokeLineCap="round"
-      android:strokeWidth="0.3"
-      android:strokeLineJoin="round"
-      android:fillAlpha="0.5"
-      android:fillColor="@color/colorPrimary"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_btn_on_disabled.xml b/app/src/main/res/drawable/ic_btn_on_disabled.xml
deleted file mode 100644
index 9c83422d..00000000
--- a/app/src/main/res/drawable/ic_btn_on_disabled.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M13,4.0089C13.0002,3.4567 12.5527,3.0088 12.0004,3.0085C11.4481,3.0083 11.0002,3.4559 11,4.0082L10.9968,12.0116C10.9966,12.5639 11.4442,13.0118 11.9965,13.012C12.5487,13.0122 12.9966,12.5647 12.9968,12.0124L13,4.0089Z"
-      android:strokeColor="@color/colorPrimary_transparent"
-      android:strokeWidth="0.3"
-      android:fillAlpha="0.5"
-      android:strokeLineJoin="round"
-      android:fillColor="@color/white"/>
-  <path
-      android:pathData="M4,12.9917C4,10.7826 4.8954,8.7826 6.3431,7.3349L7.7573,8.7491C6.6715,9.8349 6,11.3349 6,12.9917C6,16.3054 8.6863,18.9917 12,18.9917C15.3137,18.9917 18,16.3054 18,12.9917C18,11.3348 17.3284,9.8348 16.2426,8.749L17.6568,7.3348C19.1046,8.7825 20,10.7825 20,12.9917C20,17.41 16.4183,20.9917 12,20.9917C7.5817,20.9917 4,17.41 4,12.9917Z"
-      android:strokeColor="@color/colorPrimary_transparent"
-      android:fillAlpha="0.5"
-      android:strokeWidth="0.3"
-      android:strokeLineJoin="round"
-      android:fillColor="@color/white"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_btn_on_primary_color.xml b/app/src/main/res/drawable/ic_btn_on_primary_color.xml
deleted file mode 100644
index 9f449299..00000000
--- a/app/src/main/res/drawable/ic_btn_on_primary_color.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M13,4.0089C13.0002,3.4567 12.5527,3.0088 12.0004,3.0085C11.4481,3.0083 11.0002,3.4559 11,4.0082L10.9968,12.0116C10.9966,12.5639 11.4442,13.0118 11.9965,13.012C12.5487,13.0122 12.9966,12.5647 12.9968,12.0124L13,4.0089Z"
-      android:strokeColor="@color/colorPrimary_transparent"
-      android:strokeLineCap="round"
-      android:strokeAlpha="0.8"
-      android:strokeWidth="0.3"
-      android:strokeLineJoin="round"
-      android:fillColor="@color/colorPrimary"/>
-  <path
-      android:pathData="M4,12.9917C4,10.7826 4.8954,8.7826 6.3431,7.3349L7.7573,8.7491C6.6715,9.8349 6,11.3349 6,12.9917C6,16.3054 8.6863,18.9917 12,18.9917C15.3137,18.9917 18,16.3054 18,12.9917C18,11.3348 17.3284,9.8348 16.2426,8.749L17.6568,7.3348C19.1046,8.7825 20,10.7825 20,12.9917C20,17.41 16.4183,20.9917 12,20.9917C7.5817,20.9917 4,17.41 4,12.9917Z"
-      android:strokeColor="@color/colorPrimary_transparent"
-      android:strokeLineCap="round"
-      android:strokeAlpha="0.8"
-      android:strokeWidth="0.3"
-      android:strokeLineJoin="round"
-      android:fillColor="@color/colorPrimary"/>
-</vector>
diff --git a/app/src/main/res/layout/allowed_application_layout.xml b/app/src/main/res/layout/allowed_application_layout.xml
index 671a54fc..bb8e4e5d 100644
--- a/app/src/main/res/layout/allowed_application_layout.xml
+++ b/app/src/main/res/layout/allowed_application_layout.xml
@@ -25,7 +25,6 @@
         android:layout_rowSpan="1"
         android:layout_marginEnd="8dip"
         android:scaleType="centerInside"
-        tools:background="@drawable/ic_btn_on_connecting"
         android:contentDescription="@null" />
 
     <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/normal/res/drawable-anydpi-v24/background_main.xml b/app/src/normal/res/drawable-anydpi-v24/background_main.xml
new file mode 100644
index 00000000..4b60e9dc
--- /dev/null
+++ b/app/src/normal/res/drawable-anydpi-v24/background_main.xml
@@ -0,0 +1,52 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:pathData="M50,50m-82000,0a82000,82000 0,1 1,164000 0a82000,82000 0,1 1,-164000 0"/>
+    <path android:fillAlpha="1" android:fillColor="#e6ee9c"
+        android:pathData="M50,50 L30664.67,-73860.37A80000,80000 0,0 0,50 -79950Z"
+        android:strokeColor="#e6ee9c" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#fff59d"
+        android:pathData="m50,50 l56568.54,-56568.54a80000,80000 0,0 0,-25953.87 -17341.82z"
+        android:strokeColor="#fff59d" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#ffe082"
+        android:pathData="m50,50 l73910.37,-30614.67a80000,80000 0,0 0,-17341.82 -25953.87z"
+        android:strokeColor="#ffe082" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#ffcc80"
+        android:pathData="M50,50L80050,50A80000,80000 0,0 0,73960.37 -30564.67Z"
+        android:strokeColor="#ffcc80" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#ffab91"
+        android:pathData="M50,50 L73960.37,30664.67A80000,80000 0,0 0,80050 50Z"
+        android:strokeColor="#ffab91" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#ef9a9a"
+        android:pathData="m50,50 l56568.54,56568.54a80000,80000 0,0 0,17341.82 -25953.87z"
+        android:strokeColor="#ef9a9a" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#f48fb1"
+        android:pathData="m50,50 l30614.67,73910.37a80000,80000 0,0 0,25953.87 -17341.82z"
+        android:strokeColor="#f48fb1" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#ce93d8"
+        android:pathData="M50,50L50,80050A80000,80000 0,0 0,30664.67 73960.37Z"
+        android:strokeColor="#ce93d8" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#b39ddb"
+        android:pathData="M50,50 L-30564.67,73960.37A80000,80000 0,0 0,50 80050Z"
+        android:strokeColor="#b39ddb" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#9fa8da"
+        android:pathData="m50,50 l-56568.54,56568.54a80000,80000 0,0 0,25953.87 17341.82z"
+        android:strokeColor="#9fa8da" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#90caf9"
+        android:pathData="m50,50 l-73910.37,30614.67a80000,80000 0,0 0,17341.82 25953.87z"
+        android:strokeColor="#90caf9" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#81d4fa"
+        android:pathData="m50,50l-80000,0a80000,80000 0,0 0,6089.64 30614.67z"
+        android:strokeColor="#81d4fa" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#80deea"
+        android:pathData="M50,50 L-73860.37,-30564.67A80000,80000 0,0 0,-79950 50Z"
+        android:strokeColor="#80deea" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#80cbc4"
+        android:pathData="m50,50 l-56568.54,-56568.54a80000,80000 0,0 0,-17341.82 25953.87z"
+        android:strokeColor="#80cbc4" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#a5d6a7"
+        android:pathData="m50,50 l-30614.67,-73910.37a80000,80000 0,0 0,-25953.87 17341.82z"
+        android:strokeColor="#a5d6a7" android:strokeWidth="0"/>
+    <path android:fillAlpha="1" android:fillColor="#c5e1a5"
+        android:pathData="m50,50l0,-80000a80000,80000 0,0 0,-30614.67 6089.64z"
+        android:strokeColor="#c5e1a5" android:strokeWidth="0"/>
+</vector>
diff --git a/app/src/normal/res/drawable-anydpi-v24/bg_connected.xml b/app/src/normal/res/drawable-anydpi-v24/bg_connected.xml
new file mode 100644
index 00000000..19dac103
--- /dev/null
+++ b/app/src/normal/res/drawable-anydpi-v24/bg_connected.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:gravity="fill">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/bg_running"/>
+        </shape>
+    </item>
+    <item
+        android:top="80dp"
+        android:gravity="fill"
+        android:drawable="@drawable/bg_connected_effect"
+        >
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable-anydpi-v24/bg_connected_effect.xml b/app/src/normal/res/drawable-anydpi-v24/bg_connected_effect.xml
new file mode 100644
index 00000000..08ef8172
--- /dev/null
+++ b/app/src/normal/res/drawable-anydpi-v24/bg_connected_effect.xml
@@ -0,0 +1,44 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="411"
+    android:viewportHeight="703"
+    android:width="411dp"
+    android:height="703dp">
+    <path
+        android:pathData="M628.549 500.593C751.417 416.034 654.462 61.8767 411.994 -290.44C169.527 -642.756 -126.637 -859.816 -249.505 -775.257C-372.373 -690.697 -275.418 -336.54 -32.9505 15.7764C209.517 368.093 505.681 585.153 628.549 500.593Z">
+        <aapt:attr
+            name="android:fillColor">
+            <gradient
+                android:startX="415.099"
+                android:startY="-19.956"
+                android:endX="685.832"
+                android:endY="373.431"
+                android:tileMode="clamp">
+                <item
+                    android:color="#00A6C28A"
+                    android:offset="0" />
+                <item
+                    android:color="#44669933"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M-186.124 473.683C-63.0333 557.917 232.557 340.077 474.094 -12.8776C715.632 -365.832 811.653 -720.244 688.562 -804.479C565.471 -888.714 269.881 -670.874 28.3433 -317.919C-213.195 35.0357 -309.215 389.448 -186.124 473.683Z">
+        <aapt:attr
+            name="android:fillColor">
+            <gradient
+                android:startX="222.826"
+                android:startY="87.2986"
+                android:endX="-46.8688"
+                android:endY="481.398"
+                android:tileMode="clamp">
+                <item
+                    android:color="#00A6C28A"
+                    android:offset="0" />
+                <item
+                    android:color="#44669933"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
diff --git a/app/src/normal/res/drawable-anydpi-v24/bg_connecting.xml b/app/src/normal/res/drawable-anydpi-v24/bg_connecting.xml
new file mode 100644
index 00000000..8482d30e
--- /dev/null
+++ b/app/src/normal/res/drawable-anydpi-v24/bg_connecting.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:gravity="fill">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/bg_connecting"/>
+        </shape>
+    </item>
+    <item android:gravity="fill"
+        android:bottom="80dp"
+        android:drawable="@drawable/bg_connecting_effect"
+        >
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable-anydpi-v24/bg_connecting_effect.xml b/app/src/normal/res/drawable-anydpi-v24/bg_connecting_effect.xml
new file mode 100644
index 00000000..fd462a54
--- /dev/null
+++ b/app/src/normal/res/drawable-anydpi-v24/bg_connecting_effect.xml
@@ -0,0 +1,44 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="375"
+    android:viewportHeight="629"
+    android:width="375dp"
+    android:height="629dp">
+    <path
+        android:pathData="M96.6338 471.305C226.719 515.286 420.512 289.654 529.484 -32.658C638.456 -354.97 621.341 -651.909 491.256 -695.89C361.172 -739.871 167.378 -514.239 58.4058 -191.927C-50.5662 130.385 -33.4509 427.324 96.6338 471.305Z">
+        <aapt:attr
+            name="android:fillColor">
+            <gradient
+                android:startX="132.695"
+                android:startY="21.7787"
+                android:endX="11.0197"
+                android:endY="381.664"
+                android:tileMode="clamp">
+                <item
+                    android:color="#00FFAA33"
+                    android:offset="0" />
+                <item
+                    android:color="#33FFAA33"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M183.501 628.837C313.565 628.837 419.003 353.304 419.003 13.4182C419.003 -326.468 313.565 -602 183.501 -602C53.4376 -602 -52 -326.468 -52 13.4182C-52 353.304 53.4376 628.837 183.501 628.837Z">
+        <aapt:attr
+            name="android:fillColor">
+            <gradient
+                android:startX="183.501"
+                android:startY="255.483"
+                android:endX="183.501"
+                android:endY="634.991"
+                android:tileMode="clamp">
+                <item
+                    android:color="#00FFAA33"
+                    android:offset="0" />
+                <item
+                    android:color="#33FFAA33"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable-anydpi-v24/bg_disconnected.xml b/app/src/normal/res/drawable-anydpi-v24/bg_disconnected.xml
new file mode 100644
index 00000000..a5729185
--- /dev/null
+++ b/app/src/normal/res/drawable-anydpi-v24/bg_disconnected.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:gravity="fill">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/bg_disconnected"/>
+        </shape>
+    </item>
+    <item
+        android:gravity="fill"
+        android:drawable="@drawable/bg_disconnected_effect"
+        >
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable-anydpi-v24/bg_disconnected_effect.xml b/app/src/normal/res/drawable-anydpi-v24/bg_disconnected_effect.xml
new file mode 100644
index 00000000..bcc6064a
--- /dev/null
+++ b/app/src/normal/res/drawable-anydpi-v24/bg_disconnected_effect.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="375"
+    android:viewportHeight="636"
+    android:width="375dp"
+    android:height="636dp"
+    >
+    <group
+        android:scaleY="0.8"
+        android:scaleX="1.25"
+        android:translateX="-46.875"
+        >
+        <path
+            android:pathData="M183.514 458.837C313.578 458.837 419.016 183.305 419.016 -156.582C419.016 -496.468 313.578 -772 183.514 -772C53.4506 -772 -51.9869 -496.468 -51.9869 -156.582C-51.9869 183.305 53.4506 458.837 183.514 458.837Z">
+            <aapt:attr
+                name="android:fillColor">
+                <gradient
+                    android:startX="183.514"
+                    android:startY="0"
+                    android:endX="183.514"
+                    android:endY="212"
+                    android:tileMode="clamp">
+                    <item
+                        android:color="#55D3635C"
+                        android:offset="0" />
+                    <item
+                        android:color="#33AF0909"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+        </path>
+    </group>
+
+</vector>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable-anydpi-v24/rotate_progress_image.xml b/app/src/normal/res/drawable-anydpi-v24/rotate_progress_image.xml
new file mode 100644
index 00000000..44a35ba9
--- /dev/null
+++ b/app/src/normal/res/drawable-anydpi-v24/rotate_progress_image.xml
@@ -0,0 +1,103 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:name="circle"
+    android:viewportWidth="91"
+    android:viewportHeight="91"
+    android:width="91dp"
+    android:height="91dp">
+    <path
+        android:pathData="M83.9459 61.7492C81.6735 67.1718 78.2509 72.0496 73.9091 76.0535L45.5808 46.0417L83.9459 61.7492Z"
+        android:fillColor="#FFCC80" />
+    <path
+        android:pathData="M74.9439 75.0657C70.7802 79.1812 65.7785 82.3744 60.2709 84.4334L45.5806 46.0421L74.9439 75.0657Z"
+        android:fillColor="#FFE082" />
+    <path
+        android:pathData="M61.4719 83.9632C55.9543 86.2222 50.0087 87.2783 44.0406 87.0594L45.5806 46.0421L61.4719 83.9632Z"
+        android:fillColor="#FFF59D" />
+    <path
+        android:pathData="M45.5803 87.088C39.516 87.088 33.5253 85.7751 28.0292 83.2417L45.5803 46.0425L45.5803 87.088Z"
+        android:fillColor="#E6EE9C" />
+    <path
+        android:pathData="M29.6888 83.9635C24.2224 81.7254 19.303 78.3586 15.2601 74.0885L45.5801 46.0424L29.6888 83.9635Z"
+        android:fillColor="#C5E1A5" />
+    <path
+        android:pathData="M16.2165 75.0658C11.9261 70.825 8.62802 65.7065 6.55433 60.0703L45.5798 46.0422L16.2165 75.0658Z"
+        android:fillColor="#A5D6A7" />
+    <path
+        android:pathData="M7.21455 61.7497C4.89145 56.2061 3.82625 50.2265 4.09398 44.232L45.5796 46.0422L7.21455 61.7497Z"
+        android:fillColor="#80CBC4" />
+    <path
+        android:pathData="M4.05357 46.0421C4.05357 40.2602 5.28944 34.5435 7.68023 29.2665L45.5796 46.0421L4.05357 46.0421Z"
+        android:fillColor="#80DEEA" />
+    <path
+        android:pathData="M7.21454 30.3342C9.56893 24.716 13.1569 19.685 17.7191 15.6051L45.5796 46.0416L7.21454 30.3342Z"
+        android:fillColor="#81D4FA" />
+    <path
+        android:pathData="M16.216 17.0181C20.5162 12.7677 25.7084 9.50267 31.4256 7.45389L45.5793 46.0416L16.216 17.0181Z"
+        android:fillColor="#90CAF9" />
+    <path
+        android:pathData="M29.6883 8.12016C35.3597 5.79816 41.4814 4.7479 47.6127 5.04498L45.5796 46.0413L29.6883 8.12016Z"
+        android:fillColor="#9FA8DA" />
+    <path
+        android:pathData="M45.5798 4.99576C51.3771 4.99576 57.1101 6.19555 62.4099 8.51791L45.5798 46.0413L45.5798 4.99576Z"
+        android:fillColor="#B39DDB" />
+    <path
+        android:pathData="M61.4714 8.11991C66.8116 10.3063 71.6312 13.5706 75.6218 17.7038L45.5801 46.041L61.4714 8.11991Z"
+        android:fillColor="#CE93D8" />
+    <path
+        android:pathData="M74.9437 17.0175C79.0466 21.0729 82.2441 25.9333 84.3301 31.2851L45.5803 46.041L74.9437 17.0175Z"
+        android:fillColor="#F48FB1" />
+    <path
+        android:pathData="M83.9456 30.3337C86.2094 35.7356 87.2793 41.5533 87.0839 47.3971L45.5806 46.0411L83.9456 30.3337Z"
+        android:fillColor="#EF9A9A" />
+    <path
+        android:pathData="M87.1066 46.0416C87.1066 51.4632 86.02 56.831 83.9094 61.8351L45.5806 46.0416L87.1066 46.0416Z"
+        android:fillColor="#FFAB91" />
+    <path
+        android:pathData="M83.8543 60.835C81.5944 66.2576 78.1907 71.1354 73.8728 75.1393L45.7004 45.1276L83.8543 60.835Z"
+        android:fillColor="#FFCC80" />
+    <path
+        android:pathData="M74.9019 74.1516C70.7611 78.2671 65.787 81.4604 60.3097 83.5193L45.7002 45.1281L74.9019 74.1516Z"
+        android:fillColor="#FFE082" />
+    <path
+        android:pathData="M61.5041 83.0491C56.0168 85.3082 50.1039 86.3642 44.1687 86.1453L45.7002 45.1281L61.5041 83.0491Z"
+        android:fillColor="#FFF59D" />
+    <path
+        android:pathData="M45.7002 86.1734C39.6693 86.1734 33.7115 84.8606 28.2457 82.3272L45.7002 45.1279L45.7002 86.1734Z"
+        android:fillColor="#E6EE9C" />
+    <path
+        android:pathData="M29.8961 83.049C24.4598 80.811 19.5675 77.4442 15.5469 73.1741L45.7 45.1279L29.8961 83.049Z"
+        android:fillColor="#C5E1A5" />
+    <path
+        android:pathData="M16.4977 74.1517C12.231 69.911 8.95103 64.7924 6.88875 59.1563L45.6995 45.1282L16.4977 74.1517Z"
+        android:fillColor="#A5D6A7" />
+    <path
+        android:pathData="M7.54558 60.8351C5.23527 55.2915 4.17593 49.3119 4.44219 43.3175L45.6995 45.1277L7.54558 60.8351Z"
+        android:fillColor="#80CBC4" />
+    <path
+        android:pathData="M4.40175 45.1277C4.40175 39.3457 5.63082 33.6291 8.00845 28.3521L45.6992 45.1277L4.40175 45.1277Z"
+        android:fillColor="#80DEEA" />
+    <path
+        android:pathData="M7.54533 29.4201C9.88677 23.8019 13.455 18.7709 17.992 14.691L45.6992 45.1276L7.54533 29.4201Z"
+        android:fillColor="#81D4FA" />
+    <path
+        android:pathData="M16.4972 16.104C20.7738 11.8536 25.9374 8.5886 31.6231 6.53981L45.699 45.1276L16.4972 16.104Z"
+        android:fillColor="#90CAF9" />
+    <path
+        android:pathData="M29.8956 7.20611C35.5358 4.88411 41.6238 3.83384 47.7214 4.13092L45.6995 45.1272L29.8956 7.20611Z"
+        android:fillColor="#9FA8DA" />
+    <path
+        android:pathData="M45.6997 4.08133C51.465 4.08133 57.1665 5.28113 62.4371 7.60349L45.6997 45.1268L45.6997 4.08133Z"
+        android:fillColor="#B39DDB" />
+    <path
+        android:pathData="M61.5036 7.20587C66.8144 9.39225 71.6074 12.6565 75.576 16.7898L45.6997 45.127L61.5036 7.20587Z"
+        android:fillColor="#CE93D8" />
+    <path
+        android:pathData="M74.9017 16.1034C78.982 20.1589 82.162 25.0192 84.2365 30.3711L45.7 45.127L74.9017 16.1034Z"
+        android:fillColor="#F48FB1" />
+    <path
+        android:pathData="M83.8541 29.4196C86.1054 34.8216 87.1695 40.6392 86.9751 46.4831L45.7002 45.1271L83.8541 29.4196Z"
+        android:fillColor="#EF9A9A" />
+    <path
+        android:pathData="M86.9979 45.1272C86.9979 50.5487 85.9172 55.9166 83.8183 60.9207L45.7004 45.1272L86.9979 45.1272Z"
+        android:fillColor="#FFAB91" />
+</vector>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable-anydpi-v24/splash_icon.xml b/app/src/normal/res/drawable-anydpi-v24/splash_icon.xml
new file mode 100644
index 00000000..f882d322
--- /dev/null
+++ b/app/src/normal/res/drawable-anydpi-v24/splash_icon.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/rotate_progress_image"
+        android:height="198dp"
+        android:width="198dp"
+        android:gravity="fill"/>
+    <item
+        android:gravity="center"
+        android:height="52.75dp"
+        android:width="80dp"
+        >
+        <bitmap android:src="@drawable/logo"/>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable-hdpi/bg_connected.png b/app/src/normal/res/drawable-hdpi/bg_connected.png
new file mode 100644
index 00000000..7c64939a
Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/bg_connected.png differ
diff --git a/app/src/normal/res/drawable-hdpi/bg_connecting.png b/app/src/normal/res/drawable-hdpi/bg_connecting.png
new file mode 100644
index 00000000..49620c2c
Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/bg_connecting.png differ
diff --git a/app/src/normal/res/drawable-hdpi/bg_disconnected.png b/app/src/normal/res/drawable-hdpi/bg_disconnected.png
new file mode 100644
index 00000000..36a048d5
Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/bg_disconnected.png differ
diff --git a/app/src/normal/res/drawable-hdpi/rotate_progress_image.png b/app/src/normal/res/drawable-hdpi/rotate_progress_image.png
new file mode 100644
index 00000000..d7c85e02
Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/rotate_progress_image.png differ
diff --git a/app/src/normal/res/drawable-xhdpi/background_main.png b/app/src/normal/res/drawable-xhdpi/background_main.png
new file mode 100644
index 00000000..c2135c04
Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/background_main.png differ
diff --git a/app/src/normal/res/drawable-xhdpi/bg_connected.png b/app/src/normal/res/drawable-xhdpi/bg_connected.png
new file mode 100644
index 00000000..ca129080
Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/bg_connected.png differ
diff --git a/app/src/normal/res/drawable-xhdpi/bg_connecting.png b/app/src/normal/res/drawable-xhdpi/bg_connecting.png
new file mode 100644
index 00000000..294e4708
Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/bg_connecting.png differ
diff --git a/app/src/normal/res/drawable-xhdpi/bg_disconnected.png b/app/src/normal/res/drawable-xhdpi/bg_disconnected.png
new file mode 100644
index 00000000..15bdb108
Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/bg_disconnected.png differ
diff --git a/app/src/normal/res/drawable-xhdpi/rotate_progress_image.png b/app/src/normal/res/drawable-xhdpi/rotate_progress_image.png
new file mode 100644
index 00000000..d6eb6b65
Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/rotate_progress_image.png differ
diff --git a/app/src/normal/res/drawable-xxhdpi/rotate_progress_image.png b/app/src/normal/res/drawable-xxhdpi/rotate_progress_image.png
new file mode 100644
index 00000000..893b074b
Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/rotate_progress_image.png differ
diff --git a/app/src/normal/res/drawable-xxxhdpi/background_main.png b/app/src/normal/res/drawable-xxxhdpi/background_main.png
new file mode 100644
index 00000000..1b8046fa
Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/background_main.png differ
diff --git a/app/src/normal/res/drawable/background_eip.xml b/app/src/normal/res/drawable/background_eip.xml
deleted file mode 100644
index 9b20a8fd..00000000
--- a/app/src/normal/res/drawable/background_eip.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:pathData="M50,33m-82000,0a82000,82000 0,1 1,164000 0a82000,82000 0,1 1,-164000 0"/>
-    <path android:fillAlpha="1" android:fillColor="#b39ddb"
-        android:pathData="M50,33 L30664.67,-73860.37A80000,80000 0,0 0,50 -79950Z"
-        android:strokeColor="#b39ddb" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#9fa8da"
-        android:pathData="m50,33 l56568.54,-56568.54a80000,80000 0,0 0,-25953.87 -17341.82z"
-        android:strokeColor="#9fa8da" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#90caf9"
-        android:pathData="m50,33 l73910.37,-30614.67a80000,80000 0,0 0,-17341.82 -25953.87z"
-        android:strokeColor="#90caf9" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#81d4fa"
-        android:pathData="M50,33L80050,50A80000,80000 0,0 0,73960.37 -30564.67Z"
-        android:strokeColor="#81d4fa" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#80deea"
-        android:pathData="M50,33 L73960.37,30664.67A80000,80000 0,0 0,80050 50Z"
-        android:strokeColor="#80deea" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#80cbc4"
-        android:pathData="m50,33 l56568.54,56568.54a80000,80000 0,0 0,17341.82 -25953.87z"
-        android:strokeColor="#80cbc4" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#a5d6a7"
-        android:pathData="m50,33 l30614.67,73910.37a80000,80000 0,0 0,25953.87 -17341.82z"
-        android:strokeColor="#a5d6a7" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#c5e1a5"
-        android:pathData="M50,33L50,80050A80000,80000 0,0 0,30664.67 73960.37Z"
-        android:strokeColor="#c5e1a5" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#e6ee9c"
-        android:pathData="M50,33 L-30564.67,73960.37A80000,80000 0,0 0,50 80050Z"
-        android:strokeColor="#e6ee9c" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#fff59d"
-        android:pathData="m50,33 l-56568.54,56568.54a80000,80000 0,0 0,25953.87 17341.82z"
-        android:strokeColor="#fff59d" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ffe082"
-        android:pathData="m50,33 l-73910.37,30614.67a80000,80000 0,0 0,17341.82 25953.87z"
-        android:strokeColor="#ffe082" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ffcc80"
-        android:pathData="m50,33l-80000,0a80000,80000 0,0 0,6089.64 30614.67z"
-        android:strokeColor="#ffcc80" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ffab91"
-        android:pathData="M50,33 L-73860.37,-30564.67A80000,80000 0,0 0,-79950 50Z"
-        android:strokeColor="#ffab91" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ef9a9a"
-        android:pathData="m50,33 l-56568.54,-56568.54a80000,80000 0,0 0,-17341.82 25953.87z"
-        android:strokeColor="#ef9a9a" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#f48fb1"
-        android:pathData="m50,33 l-30614.67,-73910.37a80000,80000 0,0 0,-25953.87 17341.82z"
-        android:strokeColor="#f48fb1" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ce93d8"
-        android:pathData="m50,33l0,-80000a80000,80000 0,0 0,-30614.67 6089.64z"
-        android:strokeColor="#ce93d8" android:strokeWidth="0"/>
-</vector>
diff --git a/app/src/normal/res/drawable/background_main.png b/app/src/normal/res/drawable/background_main.png
new file mode 100644
index 00000000..3e5f7871
Binary files /dev/null and b/app/src/normal/res/drawable/background_main.png differ
diff --git a/app/src/normal/res/drawable/background_main.xml b/app/src/normal/res/drawable/background_main.xml
deleted file mode 100644
index 4b60e9dc..00000000
--- a/app/src/normal/res/drawable/background_main.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:pathData="M50,50m-82000,0a82000,82000 0,1 1,164000 0a82000,82000 0,1 1,-164000 0"/>
-    <path android:fillAlpha="1" android:fillColor="#e6ee9c"
-        android:pathData="M50,50 L30664.67,-73860.37A80000,80000 0,0 0,50 -79950Z"
-        android:strokeColor="#e6ee9c" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#fff59d"
-        android:pathData="m50,50 l56568.54,-56568.54a80000,80000 0,0 0,-25953.87 -17341.82z"
-        android:strokeColor="#fff59d" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ffe082"
-        android:pathData="m50,50 l73910.37,-30614.67a80000,80000 0,0 0,-17341.82 -25953.87z"
-        android:strokeColor="#ffe082" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ffcc80"
-        android:pathData="M50,50L80050,50A80000,80000 0,0 0,73960.37 -30564.67Z"
-        android:strokeColor="#ffcc80" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ffab91"
-        android:pathData="M50,50 L73960.37,30664.67A80000,80000 0,0 0,80050 50Z"
-        android:strokeColor="#ffab91" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ef9a9a"
-        android:pathData="m50,50 l56568.54,56568.54a80000,80000 0,0 0,17341.82 -25953.87z"
-        android:strokeColor="#ef9a9a" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#f48fb1"
-        android:pathData="m50,50 l30614.67,73910.37a80000,80000 0,0 0,25953.87 -17341.82z"
-        android:strokeColor="#f48fb1" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ce93d8"
-        android:pathData="M50,50L50,80050A80000,80000 0,0 0,30664.67 73960.37Z"
-        android:strokeColor="#ce93d8" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#b39ddb"
-        android:pathData="M50,50 L-30564.67,73960.37A80000,80000 0,0 0,50 80050Z"
-        android:strokeColor="#b39ddb" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#9fa8da"
-        android:pathData="m50,50 l-56568.54,56568.54a80000,80000 0,0 0,25953.87 17341.82z"
-        android:strokeColor="#9fa8da" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#90caf9"
-        android:pathData="m50,50 l-73910.37,30614.67a80000,80000 0,0 0,17341.82 25953.87z"
-        android:strokeColor="#90caf9" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#81d4fa"
-        android:pathData="m50,50l-80000,0a80000,80000 0,0 0,6089.64 30614.67z"
-        android:strokeColor="#81d4fa" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#80deea"
-        android:pathData="M50,50 L-73860.37,-30564.67A80000,80000 0,0 0,-79950 50Z"
-        android:strokeColor="#80deea" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#80cbc4"
-        android:pathData="m50,50 l-56568.54,-56568.54a80000,80000 0,0 0,-17341.82 25953.87z"
-        android:strokeColor="#80cbc4" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#a5d6a7"
-        android:pathData="m50,50 l-30614.67,-73910.37a80000,80000 0,0 0,-25953.87 17341.82z"
-        android:strokeColor="#a5d6a7" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#c5e1a5"
-        android:pathData="m50,50l0,-80000a80000,80000 0,0 0,-30614.67 6089.64z"
-        android:strokeColor="#c5e1a5" android:strokeWidth="0"/>
-</vector>
diff --git a/app/src/normal/res/drawable/bg_connected.png b/app/src/normal/res/drawable/bg_connected.png
new file mode 100644
index 00000000..9741dcba
Binary files /dev/null and b/app/src/normal/res/drawable/bg_connected.png differ
diff --git a/app/src/normal/res/drawable/bg_connected.xml b/app/src/normal/res/drawable/bg_connected.xml
deleted file mode 100644
index 19dac103..00000000
--- a/app/src/normal/res/drawable/bg_connected.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:gravity="fill">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/bg_running"/>
-        </shape>
-    </item>
-    <item
-        android:top="80dp"
-        android:gravity="fill"
-        android:drawable="@drawable/bg_connected_effect"
-        >
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/bg_connected_effect.xml b/app/src/normal/res/drawable/bg_connected_effect.xml
deleted file mode 100644
index 08ef8172..00000000
--- a/app/src/normal/res/drawable/bg_connected_effect.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="411"
-    android:viewportHeight="703"
-    android:width="411dp"
-    android:height="703dp">
-    <path
-        android:pathData="M628.549 500.593C751.417 416.034 654.462 61.8767 411.994 -290.44C169.527 -642.756 -126.637 -859.816 -249.505 -775.257C-372.373 -690.697 -275.418 -336.54 -32.9505 15.7764C209.517 368.093 505.681 585.153 628.549 500.593Z">
-        <aapt:attr
-            name="android:fillColor">
-            <gradient
-                android:startX="415.099"
-                android:startY="-19.956"
-                android:endX="685.832"
-                android:endY="373.431"
-                android:tileMode="clamp">
-                <item
-                    android:color="#00A6C28A"
-                    android:offset="0" />
-                <item
-                    android:color="#44669933"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:pathData="M-186.124 473.683C-63.0333 557.917 232.557 340.077 474.094 -12.8776C715.632 -365.832 811.653 -720.244 688.562 -804.479C565.471 -888.714 269.881 -670.874 28.3433 -317.919C-213.195 35.0357 -309.215 389.448 -186.124 473.683Z">
-        <aapt:attr
-            name="android:fillColor">
-            <gradient
-                android:startX="222.826"
-                android:startY="87.2986"
-                android:endX="-46.8688"
-                android:endY="481.398"
-                android:tileMode="clamp">
-                <item
-                    android:color="#00A6C28A"
-                    android:offset="0" />
-                <item
-                    android:color="#44669933"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-</vector>
diff --git a/app/src/normal/res/drawable/bg_connecting.png b/app/src/normal/res/drawable/bg_connecting.png
new file mode 100644
index 00000000..d85ddd4b
Binary files /dev/null and b/app/src/normal/res/drawable/bg_connecting.png differ
diff --git a/app/src/normal/res/drawable/bg_connecting.xml b/app/src/normal/res/drawable/bg_connecting.xml
deleted file mode 100644
index 8482d30e..00000000
--- a/app/src/normal/res/drawable/bg_connecting.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:gravity="fill">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/bg_connecting"/>
-        </shape>
-    </item>
-    <item android:gravity="fill"
-        android:bottom="80dp"
-        android:drawable="@drawable/bg_connecting_effect"
-        >
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/bg_connecting_effect.xml b/app/src/normal/res/drawable/bg_connecting_effect.xml
deleted file mode 100644
index fd462a54..00000000
--- a/app/src/normal/res/drawable/bg_connecting_effect.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="375"
-    android:viewportHeight="629"
-    android:width="375dp"
-    android:height="629dp">
-    <path
-        android:pathData="M96.6338 471.305C226.719 515.286 420.512 289.654 529.484 -32.658C638.456 -354.97 621.341 -651.909 491.256 -695.89C361.172 -739.871 167.378 -514.239 58.4058 -191.927C-50.5662 130.385 -33.4509 427.324 96.6338 471.305Z">
-        <aapt:attr
-            name="android:fillColor">
-            <gradient
-                android:startX="132.695"
-                android:startY="21.7787"
-                android:endX="11.0197"
-                android:endY="381.664"
-                android:tileMode="clamp">
-                <item
-                    android:color="#00FFAA33"
-                    android:offset="0" />
-                <item
-                    android:color="#33FFAA33"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:pathData="M183.501 628.837C313.565 628.837 419.003 353.304 419.003 13.4182C419.003 -326.468 313.565 -602 183.501 -602C53.4376 -602 -52 -326.468 -52 13.4182C-52 353.304 53.4376 628.837 183.501 628.837Z">
-        <aapt:attr
-            name="android:fillColor">
-            <gradient
-                android:startX="183.501"
-                android:startY="255.483"
-                android:endX="183.501"
-                android:endY="634.991"
-                android:tileMode="clamp">
-                <item
-                    android:color="#00FFAA33"
-                    android:offset="0" />
-                <item
-                    android:color="#33FFAA33"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-</vector>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/bg_disconnected.png b/app/src/normal/res/drawable/bg_disconnected.png
new file mode 100644
index 00000000..a22b7097
Binary files /dev/null and b/app/src/normal/res/drawable/bg_disconnected.png differ
diff --git a/app/src/normal/res/drawable/bg_disconnected.xml b/app/src/normal/res/drawable/bg_disconnected.xml
deleted file mode 100644
index a5729185..00000000
--- a/app/src/normal/res/drawable/bg_disconnected.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:gravity="fill">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/bg_disconnected"/>
-        </shape>
-    </item>
-    <item
-        android:gravity="fill"
-        android:drawable="@drawable/bg_disconnected_effect"
-        >
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/bg_disconnected_effect.xml b/app/src/normal/res/drawable/bg_disconnected_effect.xml
deleted file mode 100644
index bcc6064a..00000000
--- a/app/src/normal/res/drawable/bg_disconnected_effect.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="375"
-    android:viewportHeight="636"
-    android:width="375dp"
-    android:height="636dp"
-    >
-    <group
-        android:scaleY="0.8"
-        android:scaleX="1.25"
-        android:translateX="-46.875"
-        >
-        <path
-            android:pathData="M183.514 458.837C313.578 458.837 419.016 183.305 419.016 -156.582C419.016 -496.468 313.578 -772 183.514 -772C53.4506 -772 -51.9869 -496.468 -51.9869 -156.582C-51.9869 183.305 53.4506 458.837 183.514 458.837Z">
-            <aapt:attr
-                name="android:fillColor">
-                <gradient
-                    android:startX="183.514"
-                    android:startY="0"
-                    android:endX="183.514"
-                    android:endY="212"
-                    android:tileMode="clamp">
-                    <item
-                        android:color="#55D3635C"
-                        android:offset="0" />
-                    <item
-                        android:color="#33AF0909"
-                        android:offset="1" />
-                </gradient>
-            </aapt:attr>
-        </path>
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/rotate_progress_image.png b/app/src/normal/res/drawable/rotate_progress_image.png
new file mode 100644
index 00000000..fe7f3526
Binary files /dev/null and b/app/src/normal/res/drawable/rotate_progress_image.png differ
diff --git a/app/src/normal/res/drawable/rotate_progress_image.xml b/app/src/normal/res/drawable/rotate_progress_image.xml
deleted file mode 100644
index 44a35ba9..00000000
--- a/app/src/normal/res/drawable/rotate_progress_image.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:name="circle"
-    android:viewportWidth="91"
-    android:viewportHeight="91"
-    android:width="91dp"
-    android:height="91dp">
-    <path
-        android:pathData="M83.9459 61.7492C81.6735 67.1718 78.2509 72.0496 73.9091 76.0535L45.5808 46.0417L83.9459 61.7492Z"
-        android:fillColor="#FFCC80" />
-    <path
-        android:pathData="M74.9439 75.0657C70.7802 79.1812 65.7785 82.3744 60.2709 84.4334L45.5806 46.0421L74.9439 75.0657Z"
-        android:fillColor="#FFE082" />
-    <path
-        android:pathData="M61.4719 83.9632C55.9543 86.2222 50.0087 87.2783 44.0406 87.0594L45.5806 46.0421L61.4719 83.9632Z"
-        android:fillColor="#FFF59D" />
-    <path
-        android:pathData="M45.5803 87.088C39.516 87.088 33.5253 85.7751 28.0292 83.2417L45.5803 46.0425L45.5803 87.088Z"
-        android:fillColor="#E6EE9C" />
-    <path
-        android:pathData="M29.6888 83.9635C24.2224 81.7254 19.303 78.3586 15.2601 74.0885L45.5801 46.0424L29.6888 83.9635Z"
-        android:fillColor="#C5E1A5" />
-    <path
-        android:pathData="M16.2165 75.0658C11.9261 70.825 8.62802 65.7065 6.55433 60.0703L45.5798 46.0422L16.2165 75.0658Z"
-        android:fillColor="#A5D6A7" />
-    <path
-        android:pathData="M7.21455 61.7497C4.89145 56.2061 3.82625 50.2265 4.09398 44.232L45.5796 46.0422L7.21455 61.7497Z"
-        android:fillColor="#80CBC4" />
-    <path
-        android:pathData="M4.05357 46.0421C4.05357 40.2602 5.28944 34.5435 7.68023 29.2665L45.5796 46.0421L4.05357 46.0421Z"
-        android:fillColor="#80DEEA" />
-    <path
-        android:pathData="M7.21454 30.3342C9.56893 24.716 13.1569 19.685 17.7191 15.6051L45.5796 46.0416L7.21454 30.3342Z"
-        android:fillColor="#81D4FA" />
-    <path
-        android:pathData="M16.216 17.0181C20.5162 12.7677 25.7084 9.50267 31.4256 7.45389L45.5793 46.0416L16.216 17.0181Z"
-        android:fillColor="#90CAF9" />
-    <path
-        android:pathData="M29.6883 8.12016C35.3597 5.79816 41.4814 4.7479 47.6127 5.04498L45.5796 46.0413L29.6883 8.12016Z"
-        android:fillColor="#9FA8DA" />
-    <path
-        android:pathData="M45.5798 4.99576C51.3771 4.99576 57.1101 6.19555 62.4099 8.51791L45.5798 46.0413L45.5798 4.99576Z"
-        android:fillColor="#B39DDB" />
-    <path
-        android:pathData="M61.4714 8.11991C66.8116 10.3063 71.6312 13.5706 75.6218 17.7038L45.5801 46.041L61.4714 8.11991Z"
-        android:fillColor="#CE93D8" />
-    <path
-        android:pathData="M74.9437 17.0175C79.0466 21.0729 82.2441 25.9333 84.3301 31.2851L45.5803 46.041L74.9437 17.0175Z"
-        android:fillColor="#F48FB1" />
-    <path
-        android:pathData="M83.9456 30.3337C86.2094 35.7356 87.2793 41.5533 87.0839 47.3971L45.5806 46.0411L83.9456 30.3337Z"
-        android:fillColor="#EF9A9A" />
-    <path
-        android:pathData="M87.1066 46.0416C87.1066 51.4632 86.02 56.831 83.9094 61.8351L45.5806 46.0416L87.1066 46.0416Z"
-        android:fillColor="#FFAB91" />
-    <path
-        android:pathData="M83.8543 60.835C81.5944 66.2576 78.1907 71.1354 73.8728 75.1393L45.7004 45.1276L83.8543 60.835Z"
-        android:fillColor="#FFCC80" />
-    <path
-        android:pathData="M74.9019 74.1516C70.7611 78.2671 65.787 81.4604 60.3097 83.5193L45.7002 45.1281L74.9019 74.1516Z"
-        android:fillColor="#FFE082" />
-    <path
-        android:pathData="M61.5041 83.0491C56.0168 85.3082 50.1039 86.3642 44.1687 86.1453L45.7002 45.1281L61.5041 83.0491Z"
-        android:fillColor="#FFF59D" />
-    <path
-        android:pathData="M45.7002 86.1734C39.6693 86.1734 33.7115 84.8606 28.2457 82.3272L45.7002 45.1279L45.7002 86.1734Z"
-        android:fillColor="#E6EE9C" />
-    <path
-        android:pathData="M29.8961 83.049C24.4598 80.811 19.5675 77.4442 15.5469 73.1741L45.7 45.1279L29.8961 83.049Z"
-        android:fillColor="#C5E1A5" />
-    <path
-        android:pathData="M16.4977 74.1517C12.231 69.911 8.95103 64.7924 6.88875 59.1563L45.6995 45.1282L16.4977 74.1517Z"
-        android:fillColor="#A5D6A7" />
-    <path
-        android:pathData="M7.54558 60.8351C5.23527 55.2915 4.17593 49.3119 4.44219 43.3175L45.6995 45.1277L7.54558 60.8351Z"
-        android:fillColor="#80CBC4" />
-    <path
-        android:pathData="M4.40175 45.1277C4.40175 39.3457 5.63082 33.6291 8.00845 28.3521L45.6992 45.1277L4.40175 45.1277Z"
-        android:fillColor="#80DEEA" />
-    <path
-        android:pathData="M7.54533 29.4201C9.88677 23.8019 13.455 18.7709 17.992 14.691L45.6992 45.1276L7.54533 29.4201Z"
-        android:fillColor="#81D4FA" />
-    <path
-        android:pathData="M16.4972 16.104C20.7738 11.8536 25.9374 8.5886 31.6231 6.53981L45.699 45.1276L16.4972 16.104Z"
-        android:fillColor="#90CAF9" />
-    <path
-        android:pathData="M29.8956 7.20611C35.5358 4.88411 41.6238 3.83384 47.7214 4.13092L45.6995 45.1272L29.8956 7.20611Z"
-        android:fillColor="#9FA8DA" />
-    <path
-        android:pathData="M45.6997 4.08133C51.465 4.08133 57.1665 5.28113 62.4371 7.60349L45.6997 45.1268L45.6997 4.08133Z"
-        android:fillColor="#B39DDB" />
-    <path
-        android:pathData="M61.5036 7.20587C66.8144 9.39225 71.6074 12.6565 75.576 16.7898L45.6997 45.127L61.5036 7.20587Z"
-        android:fillColor="#CE93D8" />
-    <path
-        android:pathData="M74.9017 16.1034C78.982 20.1589 82.162 25.0192 84.2365 30.3711L45.7 45.127L74.9017 16.1034Z"
-        android:fillColor="#F48FB1" />
-    <path
-        android:pathData="M83.8541 29.4196C86.1054 34.8216 87.1695 40.6392 86.9751 46.4831L45.7002 45.1271L83.8541 29.4196Z"
-        android:fillColor="#EF9A9A" />
-    <path
-        android:pathData="M86.9979 45.1272C86.9979 50.5487 85.9172 55.9166 83.8183 60.9207L45.7004 45.1272L86.9979 45.1272Z"
-        android:fillColor="#FFAB91" />
-</vector>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/splash_icon.xml b/app/src/normal/res/drawable/splash_icon.xml
deleted file mode 100644
index f882d322..00000000
--- a/app/src/normal/res/drawable/splash_icon.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/rotate_progress_image"
-        android:height="198dp"
-        android:width="198dp"
-        android:gravity="fill"/>
-    <item
-        android:gravity="center"
-        android:height="52.75dp"
-        android:width="80dp"
-        >
-        <bitmap android:src="@drawable/logo"/>
-    </item>
-</layer-list>
\ No newline at end of file
-- 
cgit v1.2.3