diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
index d83f84a1e..fd76e0c00 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
@@ -27,24 +27,19 @@ import org.slf4j.LoggerFactory;
 import nodomain.freeyourgadget.gadgetbridge.R;
 
 
-
 public class AboutActivity extends AbstractGBActivity {
     private static final Logger LOG = LoggerFactory.getLogger(AboutActivity.class);
 
-
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
-        TextView link1 = (TextView) findViewById(R.id.links1);
+        TextView link1 = findViewById(R.id.links1);
         link1.setMovementMethod(LinkMovementMethod.getInstance());
-        TextView link2 = (TextView) findViewById(R.id.links2);
+        TextView link2 = findViewById(R.id.links2);
         link2.setMovementMethod(LinkMovementMethod.getInstance());
-        TextView link3 = (TextView) findViewById(R.id.links3);
+        TextView link3 = findViewById(R.id.links3);
         link3.setMovementMethod(LinkMovementMethod.getInstance());
 
     }
-
-
 }
diff --git a/app/src/main/res/drawable/gadgetbridge_img.xml b/app/src/main/res/drawable/gadgetbridge_img.xml
index 25dec7b26..d066b98f8 100644
--- a/app/src/main/res/drawable/gadgetbridge_img.xml
+++ b/app/src/main/res/drawable/gadgetbridge_img.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="233dp"
-    android:height="341dp"
+    android:width="200dp"
+    android:height="300dp"
     android:viewportWidth="950"
-    android:viewportHeight="1403">
+    android:tint="#A07E7E7E"
+    android:viewportHeight="1400">
     <path
-        android:strokeColor="#edededed"
+        android:pathData="M391.439 251.5c-16.53-0.137-32.726-5.052-49-7.576-31.323-4.857-62.605-10.178-94-14.554-11.34-1.581-22.657-3.315-34-4.87-3.544-0.486-9.985-0.271-11.683-4.148-2.661-6.074 3.215-15.79 5.989-20.852 9.17-16.735 19.424-32.9 29.64-49 26.59-41.901 56.624-85.123 95.054-117.08 25.306-21.043 54.596-33.544 87-20.467 13.073 5.276 24.874 14.036 34.155 24.548 7.445 8.431 14.372 18.176 17.816 29 4.549 14.293 11.03 39.431 4.977 53.999-5.502 13.241-20.4 23.207-29.662 34-15.78 18.385-28.437 38.888-40.147 60-5.488 9.893-15.517 24.17-14.96 35.981 0.352 7.455 22.806 13.067 28.82 16.328 21.17 11.476 40.696 28.364 50.689 50.691 18.396 41.106-0.666 100.512-34.69 128.535-10.353 8.529-23.217 13.179-35.998 16.72-35.687 9.887-74.001 0.29-110-1.255-1.397 17.704-4.591 36.596 0.774 54 9.793 31.77 49.168 55.388 82.226 47.402 32.92-7.953 54.022-37.177 77.089-59.294 4.322-4.143 10.976-4.135 15.068-8.032 5.05-4.808 6.756-15.863 10.027-22.076 5.03-9.552 12.956-18.21 19.237-27 38.268-53.553 71.679-110.568 103.719-168 8.826-15.82 17.512-31.797 25.613-48 2.81-5.62 4.46-16.206 8.76-20.486 4.169-4.15 13.16-3.887 18.487-6.306 37.106-16.857 75.799-10.058 105 18.796 6.41 6.338 13.31 12.628 17.1 20.996 16.27 36.011-0.86 79.314-13.68 113-22.504 59.17-57.511 114.154-93.395 166-5.988 8.652-6.82 20.868-12.868 28.725-3.998 5.193-12.115 6-16.718 11.29-10.773 12.382-20.651 27.824-34.44 37.135-26.993 18.228-73.226 17.881-101 2.538-26.892-14.858-32.244-45.823-33.624-73.688-0.5-10.078 3.588-22.7-1.375-32m12-379c17.823-3.679 32.752-13.717 51-16.56 38.387-5.984 78.04 16.747 92.547 52.56 7.349 18.142 5.142 37.032 10.453 55m21 344c8.3 11.537 3.86 33.142 7.746 47 11.464 40.89 48.099 57.862 88.254 49.331 56.57-12.018 97.41-63.857 127.67-109.33 6.99-10.508 12.44-24.387 20.96-33.61 2.88-3.113 10.21-7.579 14.05-4.03 5.94 5.48 3.32 26.012 3.32 33.64 0 32.984 0.29 66.192-2.83 99-5.99 62.92-7.24 134.76-42.22 190-11.86 18.727-29.51 34.486-45.95 49.165-32.43 28.959-66.94 55.856-103 80.164-15.844 10.68-34.304 20-48.891 32.28-5.808 4.89-4.11 13.58-4.11 20.39v54c0 5.29 2.608 20.69-2.317 23.97-4.938 3.3-16.896 1.03-22.682 1.03h-342c-6.208 0-19.404 2.49-24.682-1.03-5.401-3.6-2.318-23.03-2.318-28.97 0-21.69 5.279-56.45-8.804-74-71.457-89.076-142.18-180.028-199.62-279-24.185-41.671-53.67-88.059-58.406-137-9.294-96.034 42.012-191.579 91.777-270 12.162-19.166 25.178-38.033 39.064-56 4.758-6.156 9.917-16.188 17.004-19.821 11.35-5.818 31.627 1.813 43.985 1.821m576 99c44.15-9.108 86.54-30.774 128 0.375 7.04 5.292 12.9 11.496 18.08 18.625 6.29 8.669 10.42 17.756 13.34 28 3.2 11.222 6.24 23.209 5.49 35-1.67 26.166-15.3 46.19-24.44 70-3.25 8.446-3.75 18.156-5.47 27m-746-75c27.09 12.008 57.317 19.456 86 26.627 12.377 3.094 29.002 4.03 40 10.373m-16 622c-12.048 6.43-35.402 2-49 2-3.938 0-14.254-1.83-16.972 1.6-1.8 2.28-1.028 6.71-1.028 9.4v149c0 2.88-0.841 7.84 2.318 9.4 9.22 4.53 29.38 0.6 39.682 0.6h458c11.273 0 27.059 2.89 37.852-0.32 4.03-1.19 3.147-6.39 3.148-9.68v-149c0-2.69 0.772-7.12-1.028-9.4-3.055-3.85-16.446-1.6-20.972-1.6-17.678 0-41.071 4-58-1m-324 40.42c20.064-2.63 41.76-0.42 62-0.42h185c12.293 0 26.03-1.26 38 2.06 8.262 2.29 11.04 9.28 12.385 16.94 2.832 16.13 2.326 37.74 0.329 54-0.937 7.63-2.603 15.93-10.714 18.97-8.04 3.01-17.597 2.03-26 2.03h-251c-8.672 0-18.87 1.13-26.985-2.65-11.262-5.25-9.015-23.28-9.015-33.35 0-13.97-5.538-43.55 7.105-53.2 5.35-4.08 12.57-3.54 18.895-4.38m-63 131.58v127l1.028 10.4 20.972 1.6h343l20.397-1.6 1.603-10.4v-127"
         android:strokeWidth="15"
-        android:pathData="m 391.43859,251.50005 c -16.53,-0.137 -32.726,-5.052 -49,-7.576 -31.323,-4.857 -62.605,-10.178 -94,-14.554 -11.339,-1.581 -22.657,-3.315 -34,-4.87 -3.544,-0.486 -9.985,-0.271 -11.683,-4.148 -2.661,-6.074 3.215,-15.79 5.989,-20.852 9.17,-16.735 19.424,-32.9 29.641,-49 26.589,-41.901 56.623,-85.122998 95.053,-117.079498 25.306,-21.0432 54.596,-33.5442995 87,-20.4675 13.073,5.2758 24.874,14.0363 34.155,24.5477 7.445,8.4313 14.372,18.1763 17.816,28.9993 4.549,14.294 11.03,39.431998 4.977,53.999998 -5.502,13.241 -20.399,23.207 -29.662,34 -15.779,18.385 -28.437,38.888 -40.147,60 -5.488,9.893 -15.517,24.17 -14.96,35.981 0.352,7.455 22.806,13.067 28.821,16.328 21.17,11.476 40.695,28.364 50.688,50.691 18.396,41.106 -0.666,100.512 -34.689,128.535 -10.354,8.529 -23.218,13.179 -35.999,16.72 -35.687,9.887 -74.001,0.29 -110,-1.255 -1.397,17.704 -4.591,36.596 0.774,54 9.793,31.77 49.168,55.388 82.226,47.402 32.92,-7.953 54.022,-37.177 77.089,-59.294 4.322,-4.143 10.976,-4.135 15.068,-8.032 5.051,-4.808 6.756,-15.863 10.027,-22.076 5.03,-9.552 12.956,-18.21 19.237,-27 38.268,-53.553 71.679,-110.568 103.719,-168 8.826,-15.821 17.512,-31.797 25.613,-48 2.811,-5.621 4.461,-16.206 8.76,-20.486 4.169,-4.15 13.161,-3.887 18.487,-6.306 37.106,-16.857 75.799,-10.058 105,18.796 6.41,6.338 13.31,12.628 17.1,20.996 16.27,36.011 -0.86,79.314 -13.68,113 -22.504,59.169 -57.511,114.154 -93.395,166 -5.988,8.652 -6.819,20.868 -12.868,28.725 -3.998,5.193 -12.115,6 -16.718,11.29 -10.773,12.382 -20.651,27.824 -34.439,37.135 -26.994,18.228 -73.227,17.881 -101,2.538 -26.893,-14.858 -32.245,-45.823 -33.625,-73.688 -0.499,-10.078 3.588,-22.701 -1.375,-32 m 12,-379 c 17.823,-3.679 32.752,-13.717 51,-16.561 38.387,-5.982998 78.04,16.748 92.547,52.561 7.349,18.142 5.142,37.032 10.453,55 m 21,344 c 8.3,11.537 3.861,33.142 7.746,47 11.464,40.889 48.099,57.862 88.254,49.331 56.57,-12.018 97.41,-63.857 127.67,-109.331 6.99,-10.507 12.44,-24.386 20.96,-33.61 2.88,-3.112 10.21,-7.578 14.05,-4.029 5.94,5.48 3.32,26.012 3.32,33.639 0,32.985 0.29,66.193 -2.83,99 -5.99,62.921 -7.24,134.76 -42.22,190 -11.86,18.728 -29.51,34.487 -45.95,49.166 -32.43,28.959 -66.94,55.856 -103,80.164 -15.844,10.68 -34.304,20 -48.891,32.28 -5.808,4.89 -4.109,13.58 -4.109,20.38995 v 54 c 0,5.29 2.607,20.69 -2.318,23.97 -4.938,3.3 -16.896,1.03 -22.682,1.03 h -58 -221 -63 c -6.208,0 -19.404,2.49 -24.682,-1.03 -5.401,-3.6 -2.318,-23.03 -2.318,-28.97 0,-21.69 5.279,-56.44995 -8.804,-73.99995 -71.457,-89.076 -142.179,-180.028 -199.620003,-279 -24.185,-41.671 -53.67,-88.059 -58.406,-137 -9.29400002,-96.034 42.012,-191.579 91.777003,-270 12.162,-19.166 25.178,-38.033 39.064,-56 4.758,-6.156 9.917,-16.188 17.004,-19.821 11.35,-5.818 31.627,1.813 43.985,1.821 m 576,99 c 44.15,-9.108 86.54,-30.774 128,0.375 7.04,5.292 12.9,11.496 18.08,18.625 6.29,8.669 10.42,17.756 13.34,28 3.2,11.222 6.24,23.209 5.49,35 -1.67,26.166 -15.3,46.19 -24.44,70 -3.25,8.446 -3.75,18.156 -5.47,27 m -746,-75 c 27.091,12.008 57.317,19.456 86,26.627 12.377,3.094 29.002,4.03 40,10.373 m -16,621.99995 c -12.048,6.43 -35.402,2 -49,2 -3.938,0 -14.254,-1.83 -16.972,1.6 -1.8,2.28 -1.028,6.71 -1.028,9.4 v 25 96 28 c 0.001,2.88 -0.841,7.84 2.318,9.4 9.22,4.53 29.381,0.6 39.682,0.6 h 98 276 84 c 11.273,0 27.059,2.89 37.852,-0.32 4.03,-1.19 3.147,-6.39 3.148,-9.68 v -28 -96 -25 c 0,-2.69 0.772,-7.12 -1.028,-9.4 -3.055,-3.85 -16.446,-1.6 -20.972,-1.6 -17.678,0 -41.071,4 -58,-1 m -324,40.42 c 20.064,-2.63 41.761,-0.42 62,-0.42 h 121 64 c 12.293,0 26.031,-1.26 38,2.06 8.262,2.29 11.04,9.28 12.385,16.94 2.832,16.13 2.326,37.74 0.329,54 -0.937,7.63 -2.603,15.93 -10.714,18.97 -8.04,3.01 -17.597,2.03 -26,2.03 h -45 -155 -51 c -8.672,0 -18.869,1.13 -26.985,-2.65 -11.262,-5.25 -9.015,-23.28 -9.015,-33.35 0,-13.97 -5.538,-43.55 7.105,-53.2 5.351,-4.08 12.571,-3.54 18.895,-4.38 m -63,131.58 v 101 26 l 1.028,10.4 20.972,1.6 h 63 224 56 l 20.397,-1.6 1.603,-10.4 v -25 -102"
-        />
-</vector>
\ No newline at end of file
+        android:strokeColor="#FFFFFF" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_access_time.xml b/app/src/main/res/drawable/ic_access_time.xml
index e2de53bbd..ec835af0c 100644
--- a/app/src/main/res/drawable/ic_access_time.xml
+++ b/app/src/main/res/drawable/ic_access_time.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
+        android:fillColor="#000000"
+        android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm0.5-13H11v6l5.25 3.15 0.75-1.23-4.5-2.67z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_action_fetch_activity_data.xml b/app/src/main/res/drawable/ic_action_fetch_activity_data.xml
index 8229a9a64..265a5f0dc 100644
--- a/app/src/main/res/drawable/ic_action_fetch_activity_data.xml
+++ b/app/src/main/res/drawable/ic_action_fetch_activity_data.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+        android:fillColor="#000000"
+        android:pathData="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-0.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14 0.69 4.22 1.78L13 11h7V4l-2.35 2.35z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_action_find_lost_device.xml b/app/src/main/res/drawable/ic_action_find_lost_device.xml
index 84be5602b..8fdf6c723 100644
--- a/app/src/main/res/drawable/ic_action_find_lost_device.xml
+++ b/app/src/main/res/drawable/ic_action_find_lost_device.xml
@@ -1,10 +1,10 @@
-<!-- drawable/watch-vibrate.xml -->
+<!--drawable/watch-vibrate.xml-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#000"
-        android:pathData="M3,17V7H5V17H3M19,17V7H21V17H19M22,9H24V15H22V9M0,15V9H2V15H0M17.96,11.97C17.96,13.87 17.07,15.57 15.68,16.67L14.97,20.95H9L8.27,16.67C6.88,15.57 6,13.87 6,11.97C6,10.07 6.88,8.37 8.27,7.28L9,3H14.97L15.68,7.28C17.07,8.37 17.96,10.07 17.96,11.97M7.5,11.97C7.5,14.45 9.5,16.46 11.97,16.46A4.5,4.5 0 0,0 16.46,11.97C16.46,9.5 14.45,7.5 11.97,7.5A4.47,4.47 0 0,0 7.5,11.97Z" />
+        android:fillColor="#000000"
+        android:pathData="M3 17V7h2v10H3m16 0V7h2v10h-2m3-8h2v6h-2V9M0 15V9h2v6H0m17.96-3.03c0 1.9-0.89 3.6-2.28 4.7l-0.71 4.28H9l-0.73-4.28C6.88 15.57 6 13.87 6 11.97c0-1.9 0.88-3.6 2.27-4.69L9 3h5.97l0.71 4.28c1.39 1.09 2.28 2.79 2.28 4.69m-10.46 0c0 2.48 2 4.49 4.47 4.49a4.5 4.5 0 0 0 4.49-4.49c0-2.47-2.01-4.47-4.49-4.47a4.47 4.47 0 0 0-4.47 4.47z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_action_manage_apps.xml b/app/src/main/res/drawable/ic_action_manage_apps.xml
index 2fec90a11..37e9cdf8b 100644
--- a/app/src/main/res/drawable/ic_action_manage_apps.xml
+++ b/app/src/main/res/drawable/ic_action_manage_apps.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z" />
+        android:fillColor="#000000"
+        android:pathData="M4 8h4V4H4v4zm6 12h4v-4h-4v4zm-6 0h4v-4H4v4zm0-6h4v-4H4v4zm6 0h4v-4h-4v4zm6-10v4h4V4h-4zm-6 4h4V4h-4v4zm6 6h4v-4h-4v4zm0 6h4v-4h-4v4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_activity_bike_trainer.xml b/app/src/main/res/drawable/ic_activity_bike_trainer.xml
index f20019c9e..9af5caf54 100644
--- a/app/src/main/res/drawable/ic_activity_bike_trainer.xml
+++ b/app/src/main/res/drawable/ic_activity_bike_trainer.xml
@@ -1,49 +1,34 @@
 <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.7483,10.5117h4.2V8.7117h-3.2l-1.94,-3.27c-0.29,-0.5 -0.86,-0.83 -1.46,-0.83 -0.47,0 -0.9,0.19 -1.2,0.5l-3.7,3.69c-0.31,0.31 -0.5,0.71 -0.5,1.21 0,0.63 0.33,1.16 0.85,1.47l3.35,2.03 0.0815,2.923h1.8l-0.0815,-4.423 -2.25,-1.65 2.32,-2.35m2.93,-2.7c1,0 1.8,-0.8 1.8,-1.8 0,-1 -0.8,-1.8 -1.8,-1.8 -1,0 -1.8,0.8 -1.8,1.8 0,1 0.8,1.8 1.8,1.8z"
-      android:fillColor="@color/secondarytext"/>
-  <path
-      android:pathData="M1.8662,21.6967H21.6486l-6.4424,-10.0365 3.4466,-0.0643 1.6186,-1.9916"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="1"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/secondarytext"
-      android:fillType="evenOdd"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="M4.463,21.6967 L16.7036,14.0247"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="1"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/secondarytext"
-      android:fillType="evenOdd"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="M19.1497,17.8093m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
-      android:strokeAlpha="0.997028"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1"
-      android:fillColor="@color/secondarytext"
-      android:strokeColor="@color/secondarytext"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="m5.8325,11.9929 l2.7394,0.1061"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="1"
-      android:fillColor="@color/secondarytext"
-      android:strokeColor="@color/secondarytext"
-      android:fillType="evenOdd"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="M9.7782,18.2932m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-      android:strokeAlpha="0.997028"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1"
-      android:fillColor="@color/secondarytext"
-      android:strokeColor="@color/secondarytext"
-      android:strokeLineCap="square"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M13.748 10.512h4.2v-1.8h-3.2l-1.94-3.27c-0.29-0.5-0.86-0.83-1.46-0.83-0.47 0-0.9 0.19-1.2 0.5l-3.7 3.69c-0.31 0.31-0.5 0.71-0.5 1.21 0 0.63 0.33 1.16 0.85 1.47l3.35 2.03 0.082 2.923h1.8l-0.082-4.423-2.25-1.65 2.32-2.35m2.93-2.7c1 0 1.8-0.8 1.8-1.8s-0.8-1.8-1.8-1.8-1.8 0.8-1.8 1.8 0.8 1.8 1.8 1.8z" />
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M1.866 21.697H21.65L15.206 11.66l3.447-0.064 1.618-1.992M4.463 21.697l12.24-7.672"
+        android:strokeWidth="1"
+        android:strokeColor="@color/secondarytext" />
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M16.65 17.81a2.5 2.5 0 1 1 5 0 2.5 2.5 0 1 1-5 0"
+        android:strokeWidth="1"
+        android:strokeColor="@color/secondarytext"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="@color/secondarytext"
+        android:fillType="evenOdd"
+        android:pathData="M5.832 11.993l2.74 0.106"
+        android:strokeWidth="1"
+        android:strokeColor="@color/secondarytext" />
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M8.778 18.293a1 1 0 1 1 2 0 1 1 0 1 1-2 0"
+        android:strokeWidth="1"
+        android:strokeColor="@color/secondarytext"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_activity_biking.xml b/app/src/main/res/drawable/ic_activity_biking.xml
index a2ffce6a5..dc5b9a7fa 100644
--- a/app/src/main/res/drawable/ic_activity_biking.xml
+++ b/app/src/main/res/drawable/ic_activity_biking.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#000"
-        android:pathData="M5,20.5A3.5,3.5 0 0,1 1.5,17A3.5,3.5 0 0,1 5,13.5A3.5,3.5 0 0,1 8.5,17A3.5,3.5 0 0,1 5,20.5M5,12A5,5 0 0,0 0,17A5,5 0 0,0 5,22A5,5 0 0,0 10,17A5,5 0 0,0 5,12M14.8,10H19V8.2H15.8L13.86,4.93C13.57,4.43 13,4.1 12.4,4.1C11.93,4.1 11.5,4.29 11.2,4.6L7.5,8.29C7.19,8.6 7,9 7,9.5C7,10.13 7.33,10.66 7.85,10.97L11.2,13V18H13V11.5L10.75,9.85L13.07,7.5M19,20.5A3.5,3.5 0 0,1 15.5,17A3.5,3.5 0 0,1 19,13.5A3.5,3.5 0 0,1 22.5,17A3.5,3.5 0 0,1 19,20.5M19,12A5,5 0 0,0 14,17A5,5 0 0,0 19,22A5,5 0 0,0 24,17A5,5 0 0,0 19,12M16,4.8C17,4.8 17.8,4 17.8,3C17.8,2 17,1.2 16,1.2C15,1.2 14.2,2 14.2,3C14.2,4 15,4.8 16,4.8Z" />
-</vector>
\ No newline at end of file
+        android:fillColor="#000000"
+        android:pathData="M5 20.5A3.5 3.5 0 0 1 1.5 17 3.5 3.5 0 0 1 5 13.5 3.5 3.5 0 0 1 8.5 17 3.5 3.5 0 0 1 5 20.5M5 12a5 5 0 0 0-5 5 5 5 0 0 0 5 5 5 5 0 0 0 5-5 5 5 0 0 0-5-5m9.8-2H19V8.2h-3.2l-1.94-3.27C13.57 4.43 13 4.1 12.4 4.1c-0.47 0-0.9 0.19-1.2 0.5L7.5 8.29C7.19 8.6 7 9 7 9.5c0 0.63 0.33 1.16 0.85 1.47L11.2 13v5H13v-6.5l-2.25-1.65 2.32-2.35m5.93 13a3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5 3.5 3.5 0 0 1-3.5 3.5m0-8.5a5 5 0 0 0-5 5 5 5 0 0 0 5 5 5 5 0 0 0 5-5 5 5 0 0 0-5-5m-3-7.2c1 0 1.8-0.8 1.8-1.8S17 1.2 16 1.2 14.2 2 14.2 3 15 4.8 16 4.8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_activity_eliptical.xml b/app/src/main/res/drawable/ic_activity_eliptical.xml
index 8908568d1..d41fe3883 100644
--- a/app/src/main/res/drawable/ic_activity_eliptical.xml
+++ b/app/src/main/res/drawable/ic_activity_eliptical.xml
@@ -1,42 +1,20 @@
 <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="M12.5674,5.2119C13.5379,5.3831 14.4926,4.7068 14.6621,3.7452 14.838,2.748 14.1659,1.8216 13.1954,1.6505 12.2071,1.4762 11.2765,2.12 11.1007,3.1172 10.9311,4.0788 11.5791,5.0377 12.5674,5.2119M7.1741,17.0034 L8.7521,13.2606l1.5647,2.112 -0.942,5.3422 1.7807,0.314 1.1775,-6.6777 -1.5647,-2.112 1.0141,-2.5753c0.9131,1.5381 4.4258,0.3836 6.3602,-0.3904l-0.0021,-1.7019C16.3931,8.056 13.6417,9.5326 13.1434,8.1411L12.5011,6.5773C12.2423,5.9625 11.7677,5.53 11.1534,5.4216 10.8774,5.373 10.6956,5.4144 10.4196,5.3657 8.9321,5.7067 7.2727,11.6753 6.0342,14.6175l-3.0932,7.0775 1.9665,0.144z"
-      android:strokeWidth="0.999999"
-      android:fillColor="@color/secondarytext"/>
-  <path
-      android:pathData="M21.1593,22.8686 L17.3139,11.569 21.3323,6.8627"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="1"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/secondarytext"
-      android:fillType="evenOdd"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="M22.6042,23.1833 L15.8446,11.8252 19.32,5.7636"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="1"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/secondarytext"
-      android:fillType="evenOdd"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="M22.6042,23.1833 L7.173,20.1813"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="1"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/secondarytext"
-      android:fillType="evenOdd"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="M22.6042,23.1833 L2.6116,22.1185"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="1"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/secondarytext"
-      android:fillType="evenOdd"
-      android:strokeLineCap="butt"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M12.567 5.212c0.97 0.171 1.926-0.505 2.095-1.467 0.176-0.997-0.496-1.923-1.467-2.095-0.988-0.174-1.918 0.47-2.094 1.467-0.17 0.962 0.478 1.92 1.466 2.095M7.174 17.003l1.578-3.742 1.565 2.112-0.942 5.342 1.78 0.314 1.178-6.678-1.565-2.112 1.014-2.575c0.913 1.538 4.426 0.383 6.36-0.39L18.14 7.571c-1.747 0.484-4.498 1.96-4.997 0.57l-0.642-1.565c-0.259-0.614-0.733-1.047-1.348-1.155-0.276-0.049-0.457-0.008-0.733-0.056-1.488 0.34-3.147 6.31-4.386 9.252l-3.093 7.077 1.967 0.144z"
+        android:strokeWidth="0.999999" />
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M21.16 22.869l-3.846-11.3 4.018-4.706"
+        android:strokeWidth="1"
+        android:strokeColor="@color/secondarytext" />
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M22.604 23.183l-6.76-11.358 3.476-6.061m3.284 17.419L7.173 20.181m15.431 3.002L2.612 22.12"
+        android:strokeWidth="1"
+        android:strokeColor="@color/secondarytext" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_activity_exercise.xml b/app/src/main/res/drawable/ic_activity_exercise.xml
index 9b802f2da..aeeb811ce 100644
--- a/app/src/main/res/drawable/ic_activity_exercise.xml
+++ b/app/src/main/res/drawable/ic_activity_exercise.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2zM21,9h-6v13h-2v-6h-2v6L9,22L9,9L3,9L3,7h18v2z" />
+        android:fillColor="#000000"
+        android:pathData="M12 2c1.1 0 2 0.9 2 2s-0.9 2-2 2-2-0.9-2-2 0.9-2 2-2zm9 7h-6v13h-2v-6h-2v6H9V9H3V7h18v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_activity_graphs.xml b/app/src/main/res/drawable/ic_activity_graphs.xml
index 5048a587e..ffd8548a4 100644
--- a/app/src/main/res/drawable/ic_activity_graphs.xml
+++ b/app/src/main/res/drawable/ic_activity_graphs.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M10,20h4L14,4h-4v16zM4,20h4v-8L4,12v8zM16,9v11h4L20,9h-4z"/>
+        android:fillColor="#000000"
+        android:pathData="M10 20h4V4h-4v16zm-6 0h4v-8H4v8zM16 9v11h4V9h-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_activity_not_measured.xml b/app/src/main/res/drawable/ic_activity_not_measured.xml
index d42708d7e..165c8537c 100644
--- a/app/src/main/res/drawable/ic_activity_not_measured.xml
+++ b/app/src/main/res/drawable/ic_activity_not_measured.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#000"
-        android:pathData="M12,20A7,7 0 0,1 5,13C5,11.72 5.35,10.5 5.95,9.5L15.5,19.04C14.5,19.65 13.28,20 12,20M3,4L1.75,5.27L4.5,8.03C3.55,9.45 3,11.16 3,13A9,9 0 0,0 12,22C13.84,22 15.55,21.45 17,20.5L19.5,23L20.75,21.73L13.04,14L3,4M11,9.44L13,11.44V8H11M15,1H9V3H15M19.04,4.55L17.62,5.97C16.07,4.74 14.12,4 12,4C10.17,4 8.47,4.55 7.05,5.5L8.5,6.94C9.53,6.35 10.73,6 12,6A7,7 0 0,1 19,13C19,14.27 18.65,15.47 18.06,16.5L19.5,17.94C20.45,16.53 21,14.83 21,13C21,10.88 20.26,8.93 19.03,7.39L20.45,5.97L19.04,4.55Z" />
-</vector>
\ No newline at end of file
+        android:fillColor="#000000"
+        android:pathData="M12 20a7 7 0 0 1-7-7c0-1.28 0.35-2.5 0.95-3.5l9.55 9.54C14.5 19.65 13.28 20 12 20M3 4L1.75 5.27 4.5 8.03C3.55 9.45 3 11.16 3 13a9 9 0 0 0 9 9c1.84 0 3.55-0.55 5-1.5l2.5 2.5 1.25-1.27L13.04 14 3 4m8 5.44l2 2V8h-2m4-7H9v2h6m4.04 1.55l-1.42 1.42C16.07 4.74 14.12 4 12 4c-1.83 0-3.53 0.55-4.95 1.5L8.5 6.94C9.53 6.35 10.73 6 12 6a7 7 0 0 1 7 7c0 1.27-0.35 2.47-0.94 3.5l1.44 1.44C20.45 16.53 21 14.83 21 13c0-2.12-0.74-4.07-1.97-5.61l1.42-1.42-1.41-1.42z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_activity_rope_jump.xml b/app/src/main/res/drawable/ic_activity_rope_jump.xml
index 6bf421c9a..d1182c2ac 100644
--- a/app/src/main/res/drawable/ic_activity_rope_jump.xml
+++ b/app/src/main/res/drawable/ic_activity_rope_jump.xml
@@ -1,17 +1,14 @@
 <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="M18.985,12.4102 L19.7381,11.0487 16.9503,9.4439 14.1132,5.3277c-0.3,-0.5 -1.912,-0.4888 -2.5319,-0.501 -0.641,-0.0126 -1.5081,0.0073 -2.0092,0.501L7.4123,9.2552 4.1572,11.4915 5.1898,12.4741 8.7091,10.5465 9.5722,8.6454 9.5408,22.1057l1.7849,0.0132v-8.3181h0.9562l0.0555,5.4911h1.8l-0.0555,-5.4911 0.0314,-5.1554 1.3234,1.7364M11.6884,4.3955c1,0 1.8,-0.8 1.8,-1.8 0,-1 -0.8,-1.8 -1.8,-1.8 -1,0 -1.8,0.8 -1.8,1.8 0,1 0.8,1.8 1.8,1.8z"
-      android:fillColor="@color/secondarytext"/>
-  <path
-      android:pathData="m4.4844,12.5603c0,0 3.9069,7.9666 7.7302,8.3622 3.8234,0.3956 7.6367,-8.7793 7.6367,-8.7793"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="0.5"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/secondarytext"
-      android:fillType="evenOdd"
-      android:strokeLineCap="butt"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M18.985 12.41l0.753-1.361-2.788-1.605-2.837-4.116c-0.3-0.5-1.912-0.49-2.532-0.501-0.64-0.013-1.508 0.007-2.009 0.5l-2.16 3.928-3.255 2.236 1.033 0.983 3.52-1.928 0.862-1.9-0.031 13.46 1.785 0.013V13.8h0.956l0.055 5.49h1.8l-0.055-5.49 0.031-5.156 1.324 1.737m-3.749-5.986c1 0 1.8-0.8 1.8-1.8s-0.8-1.8-1.8-1.8-1.8 0.8-1.8 1.8 0.8 1.8 1.8 1.8z" />
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M4.484 12.56s3.907 7.967 7.73 8.362c3.824 0.396 7.637-8.779 7.637-8.779"
+        android:strokeWidth="0.5"
+        android:strokeColor="@color/secondarytext" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_activity_running.xml b/app/src/main/res/drawable/ic_activity_running.xml
index 78ce0c027..d97b24913 100644
--- a/app/src/main/res/drawable/ic_activity_running.xml
+++ b/app/src/main/res/drawable/ic_activity_running.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#000"
-        android:pathData="M13.5,5.5C14.59,5.5 15.5,4.58 15.5,3.5C15.5,2.38 14.59,1.5 13.5,1.5C12.39,1.5 11.5,2.38 11.5,3.5C11.5,4.58 12.39,5.5 13.5,5.5M9.89,19.38L10.89,15L13,17V23H15V15.5L12.89,13.5L13.5,10.5C14.79,12 16.79,13 19,13V11C17.09,11 15.5,10 14.69,8.58L13.69,7C13.29,6.38 12.69,6 12,6C11.69,6 11.5,6.08 11.19,6.08L6,8.28V13H8V9.58L9.79,8.88L8.19,17L3.29,16L2.89,18L9.89,19.38Z" />
-</vector>
\ No newline at end of file
+        android:fillColor="#000000"
+        android:pathData="M13.5 5.5c1.09 0 2-0.92 2-2 0-1.12-0.91-2-2-2-1.11 0-2 0.88-2 2 0 1.08 0.89 2 2 2M9.89 19.38l1-4.38L13 17v6h2v-7.5l-2.11-2 0.61-3C14.79 12 16.79 13 19 13v-2c-1.91 0-3.5-1-4.31-2.42l-1-1.58c-0.4-0.62-1-1-1.69-1-0.31 0-0.5 0.08-0.81 0.08L6 8.28V13h2V9.58l1.79-0.7L8.19 17l-4.9-1-0.4 2 7 1.38z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_activity_sleep.xml b/app/src/main/res/drawable/ic_activity_sleep.xml
index 6b13d8083..4f88c7967 100644
--- a/app/src/main/res/drawable/ic_activity_sleep.xml
+++ b/app/src/main/res/drawable/ic_activity_sleep.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
         android:fillColor="#000"
-        android:pathData="M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M15,16H9V14L12.39,10H9V8H15V10L11.62,14H15V16M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z" />
-</vector>
\ No newline at end of file
+        android:pathData="M23 12h-6v-2l3.39-4H17V4h6v2l-3.38 4H23v2m-8 4H9v-2l3.39-4H9V8h6v2l-3.38 4H15v2m-8 4H1v-2l3.39-4H1v-2h6v2l-3.38 4H7v2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_activity_swimming.xml b/app/src/main/res/drawable/ic_activity_swimming.xml
index 391cb99bd..7e136fe4e 100644
--- a/app/src/main/res/drawable/ic_activity_swimming.xml
+++ b/app/src/main/res/drawable/ic_activity_swimming.xml
@@ -1,13 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M22,21c-1.11,0 -1.73,-0.37 -2.18,-0.64 -0.37,-0.22 -0.6,-0.36 -1.15,-0.36 -0.56,0 -0.78,0.13 -1.15,0.36 -0.46,0.27 -1.07,0.64 -2.18,0.64s-1.73,-0.37 -2.18,-0.64c-0.37,-0.22 -0.6,-0.36 -1.15,-0.36 -0.56,0 -0.78,0.13 -1.15,0.36 -0.46,0.27 -1.08,0.64 -2.19,0.64 -1.11,0 -1.73,-0.37 -2.18,-0.64 -0.37,-0.23 -0.6,-0.36 -1.15,-0.36s-0.78,0.13 -1.15,0.36c-0.46,0.27 -1.08,0.64 -2.19,0.64v-2c0.56,0 0.78,-0.13 1.15,-0.36 0.46,-0.27 1.08,-0.64 2.19,-0.64s1.73,0.37 2.18,0.64c0.37,0.23 0.59,0.36 1.15,0.36 0.56,0 0.78,-0.13 1.15,-0.36 0.46,-0.27 1.08,-0.64 2.19,-0.64 1.11,0 1.73,0.37 2.18,0.64 0.37,0.22 0.6,0.36 1.15,0.36s0.78,-0.13 1.15,-0.36c0.45,-0.27 1.07,-0.64 2.18,-0.64s1.73,0.37 2.18,0.64c0.37,0.23 0.59,0.36 1.15,0.36v2zM22,16.5c-1.11,0 -1.73,-0.37 -2.18,-0.64 -0.37,-0.22 -0.6,-0.36 -1.15,-0.36 -0.56,0 -0.78,0.13 -1.15,0.36 -0.45,0.27 -1.07,0.64 -2.18,0.64s-1.73,-0.37 -2.18,-0.64c-0.37,-0.22 -0.6,-0.36 -1.15,-0.36 -0.56,0 -0.78,0.13 -1.15,0.36 -0.45,0.27 -1.07,0.64 -2.18,0.64s-1.73,-0.37 -2.18,-0.64c-0.37,-0.22 -0.6,-0.36 -1.15,-0.36s-0.78,0.13 -1.15,0.36c-0.47,0.27 -1.09,0.64 -2.2,0.64v-2c0.56,0 0.78,-0.13 1.15,-0.36 0.45,-0.27 1.07,-0.64 2.18,-0.64s1.73,0.37 2.18,0.64c0.37,0.22 0.6,0.36 1.15,0.36 0.56,0 0.78,-0.13 1.15,-0.36 0.45,-0.27 1.07,-0.64 2.18,-0.64s1.73,0.37 2.18,0.64c0.37,0.22 0.6,0.36 1.15,0.36s0.78,-0.13 1.15,-0.36c0.45,-0.27 1.07,-0.64 2.18,-0.64s1.73,0.37 2.18,0.64c0.37,0.22 0.6,0.36 1.15,0.36v2zM8.67,12c0.56,0 0.78,-0.13 1.15,-0.36 0.46,-0.27 1.08,-0.64 2.19,-0.64 1.11,0 1.73,0.37 2.18,0.64 0.37,0.22 0.6,0.36 1.15,0.36s0.78,-0.13 1.15,-0.36c0.12,-0.07 0.26,-0.15 0.41,-0.23L10.48,5C8.93,3.45 7.5,2.99 5,3v2.5c1.82,-0.01 2.89,0.39 4,1.5l1,1 -3.25,3.25c0.31,0.12 0.56,0.27 0.77,0.39 0.37,0.23 0.59,0.36 1.15,0.36z" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16.5,5.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0" />
+        android:fillColor="#000000"
+        android:pathData="M22 21c-1.11 0-1.73-0.37-2.18-0.64-0.37-0.22-0.6-0.36-1.15-0.36-0.56 0-0.78 0.13-1.15 0.36-0.46 0.27-1.07 0.64-2.18 0.64s-1.73-0.37-2.18-0.64c-0.37-0.22-0.6-0.36-1.15-0.36-0.56 0-0.78 0.13-1.15 0.36C10.4 20.63 9.78 21 8.67 21c-1.11 0-1.73-0.37-2.18-0.64C6.12 20.13 5.89 20 5.34 20s-0.78 0.13-1.15 0.36C3.73 20.63 3.11 21 2 21v-2c0.56 0 0.78-0.13 1.15-0.36C3.61 18.37 4.23 18 5.34 18s1.73 0.37 2.18 0.64C7.89 18.87 8.11 19 8.67 19c0.56 0 0.78-0.13 1.15-0.36 0.46-0.27 1.08-0.64 2.19-0.64 1.11 0 1.73 0.37 2.18 0.64 0.37 0.22 0.6 0.36 1.15 0.36s0.78-0.13 1.15-0.36c0.45-0.27 1.07-0.64 2.18-0.64s1.73 0.37 2.18 0.64C21.22 18.87 21.44 19 22 19v2zm0-4.5c-1.11 0-1.73-0.37-2.18-0.64-0.37-0.22-0.6-0.36-1.15-0.36-0.56 0-0.78 0.13-1.15 0.36-0.45 0.27-1.07 0.64-2.18 0.64s-1.73-0.37-2.18-0.64c-0.37-0.22-0.6-0.36-1.15-0.36-0.56 0-0.78 0.13-1.15 0.36-0.45 0.27-1.07 0.64-2.18 0.64s-1.73-0.37-2.18-0.64c-0.37-0.22-0.6-0.36-1.15-0.36s-0.78 0.13-1.15 0.36C3.73 16.13 3.11 16.5 2 16.5v-2c0.56 0 0.78-0.13 1.15-0.36 0.45-0.27 1.07-0.64 2.18-0.64s1.73 0.37 2.18 0.64c0.37 0.22 0.6 0.36 1.15 0.36 0.56 0 0.78-0.13 1.15-0.36 0.45-0.27 1.07-0.64 2.18-0.64s1.73 0.37 2.18 0.64c0.37 0.22 0.6 0.36 1.15 0.36s0.78-0.13 1.15-0.36c0.45-0.27 1.07-0.64 2.18-0.64s1.73 0.37 2.18 0.64c0.37 0.22 0.6 0.36 1.15 0.36v2zM8.67 12c0.56 0 0.78-0.13 1.15-0.36 0.46-0.27 1.08-0.64 2.19-0.64 1.11 0 1.73 0.37 2.18 0.64 0.37 0.22 0.6 0.36 1.15 0.36s0.78-0.13 1.15-0.36c0.12-0.07 0.26-0.15 0.41-0.23L10.48 5C8.93 3.45 7.5 2.99 5 3v2.5C6.82 5.49 7.89 5.89 9 7l1 1-3.25 3.25c0.31 0.12 0.56 0.27 0.77 0.39C7.89 11.87 8.11 12 8.67 12zM14 5.5a2.5 2.5 0 1 1 5 0 2.5 2.5 0 1 1-5 0" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_activity_threadmill.xml b/app/src/main/res/drawable/ic_activity_threadmill.xml
index 8ea66dd97..dfabc9de5 100644
--- a/app/src/main/res/drawable/ic_activity_threadmill.xml
+++ b/app/src/main/res/drawable/ic_activity_threadmill.xml
@@ -1,26 +1,20 @@
 <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="M12.6983,4.5632C13.6688,4.7343 14.6234,4.058 14.793,3.0964 14.9688,2.0992 14.2967,1.1728 13.3262,1.0017 12.3379,0.8275 11.4074,1.4713 11.2315,2.4685 11.062,3.4301 11.71,4.3889 12.6983,4.5632M7.305,16.3547l1.578,-3.7428 1.5647,2.112 -0.942,5.3422 1.7807,0.314 1.1775,-6.6777 -1.5647,-2.112 1.0141,-2.5753c0.9131,1.5381 4.4258,0.3836 6.3602,-0.3904L18.2714,6.9226C16.5239,7.4072 13.7725,8.8838 13.2742,7.4923L12.6319,5.9285C12.3731,5.3137 11.8986,4.8812 11.2842,4.7729 11.0082,4.7242 10.8265,4.7656 10.5505,4.7169L5.5841,5.8609 4.8431,10.0634 6.6238,10.3774 7.1607,7.3324 8.8644,6.9901 6.165,13.9687 1.9592,12.3091 1.2891,14.027Z"
-      android:strokeWidth="0.999999"
-      android:fillColor="@color/secondarytext"/>
-  <path
-      android:pathData="M0.4846,22.6421 L20.9058,19.7027 23.3837,23.4613H0.4846Z"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="1"
-      android:fillColor="@color/secondarytext"
-      android:strokeColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m22.6042,23.1833 l-6.2536,-9.471 3.4528,-1.3998"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="1"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/secondarytext"
-      android:fillType="evenOdd"
-      android:strokeLineCap="butt"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M12.698 4.563c0.97 0.171 1.925-0.505 2.095-1.467 0.176-0.997-0.496-1.923-1.467-2.094-0.988-0.174-1.919 0.47-2.095 1.467-0.169 0.961 0.479 1.92 1.467 2.094M7.305 16.355l1.578-3.743 1.565 2.112-0.942 5.342 1.78 0.314 1.178-6.678-1.565-2.112 1.014-2.575c0.913 1.538 4.426 0.384 6.36-0.39l-0.002-1.702c-1.747 0.484-4.498 1.96-4.997 0.57l-0.642-1.565c-0.259-0.614-0.733-1.047-1.348-1.155-0.276-0.049-0.458-0.007-0.734-0.056L5.584 5.86l-0.74 4.202 1.78 0.314 0.537-3.045L8.864 6.99l-2.699 6.98-4.206-1.66-0.67 1.718z"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="@color/secondarytext"
+        android:fillType="evenOdd"
+        android:pathData="M0.485 22.642l20.42-2.94 2.479 3.76h-22.9z"
+        android:strokeWidth="1" />
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M22.604 23.183l-6.253-9.47 3.452-1.4"
+        android:strokeWidth="1"
+        android:strokeColor="@color/secondarytext" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_activity_tracks.xml b/app/src/main/res/drawable/ic_activity_tracks.xml
index 14c06266a..b1c1e67f3 100644
--- a/app/src/main/res/drawable/ic_activity_tracks.xml
+++ b/app/src/main/res/drawable/ic_activity_tracks.xml
@@ -1,7 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M13.5,5.5C14.59,5.5 15.5,4.58 15.5,3.5C15.5,2.38 14.59,1.5 13.5,1.5C12.39,1.5 11.5,2.38 11.5,3.5C11.5,4.58 12.39,5.5 13.5,5.5M9.89,19.38L10.89,15L13,17V23H15V15.5L12.89,13.5L13.5,10.5C14.79,12 16.79,13 19,13V11C17.09,11 15.5,10 14.69,8.58L13.69,7C13.29,6.38 12.69,6 12,6C11.69,6 11.5,6.08 11.19,6.08L6,8.28V13H8V9.58L9.79,8.88L8.19,17L3.29,16L2.89,18L9.89,19.38Z" />
-</vector>
\ No newline at end of file
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M13.5 5.5c1.09 0 2-0.92 2-2 0-1.12-0.91-2-2-2-1.11 0-2 0.88-2 2 0 1.08 0.89 2 2 2M9.89 19.38l1-4.38L13 17v6h2v-7.5l-2.11-2 0.61-3C14.79 12 16.79 13 19 13v-2c-1.91 0-3.5-1-4.31-2.42l-1-1.58c-0.4-0.62-1-1-1.69-1-0.31 0-0.5 0.08-0.81 0.08L6 8.28V13h2V9.58l1.79-0.7L8.19 17l-4.9-1-0.4 2 7 1.38z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_activity_unknown.xml b/app/src/main/res/drawable/ic_activity_unknown.xml
index 6bde4c5f2..270c6911f 100644
--- a/app/src/main/res/drawable/ic_activity_unknown.xml
+++ b/app/src/main/res/drawable/ic_activity_unknown.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#000"
-        android:pathData="M12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6A6,6 0 0,1 18,12A6,6 0 0,1 12,18M20,15.31L23.31,12L20,8.69V4H15.31L12,0.69L8.69,4H4V8.69L0.69,12L4,15.31V20H8.69L12,23.31L15.31,20H20V15.31Z" />
-</vector>
\ No newline at end of file
+        android:fillColor="#000000"
+        android:pathData="M12 18a6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6 6 6 0 0 1-6 6m8-2.69L23.31 12 20 8.69V4h-4.69L12 0.69 8.69 4H4v4.69L0.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_activity_walking.xml b/app/src/main/res/drawable/ic_activity_walking.xml
index 97036cc9d..27934838e 100644
--- a/app/src/main/res/drawable/ic_activity_walking.xml
+++ b/app/src/main/res/drawable/ic_activity_walking.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#000"
-        android:pathData="M14.12,10H19V8.2H15.38L13.38,4.87C13.08,4.37 12.54,4.03 11.92,4.03C11.74,4.03 11.58,4.06 11.42,4.11L6,5.8V11H7.8V7.33L9.91,6.67L6,22H7.8L10.67,13.89L13,17V22H14.8V15.59L12.31,11.05L13.04,8.18M14,3.8C15,3.8 15.8,3 15.8,2C15.8,1 15,0.2 14,0.2C13,0.2 12.2,1 12.2,2C12.2,3 13,3.8 14,3.8Z" />
-</vector>
\ No newline at end of file
+        android:fillColor="#000000"
+        android:pathData="M14.12 10H19V8.2h-3.62l-2-3.33c-0.3-0.5-0.84-0.84-1.46-0.84-0.18 0-0.34 0.03-0.5 0.08L6 5.8V11h1.8V7.33l2.11-0.66L6 22h1.8l2.87-8.11L13 17v5h1.8v-6.41l-2.49-4.54 0.73-2.87M14 3.8c1 0 1.8-0.8 1.8-1.8S15 0.2 14 0.2 12.2 1 12.2 2 13 3.8 14 3.8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_activity_yoga.xml b/app/src/main/res/drawable/ic_activity_yoga.xml
index 413193c53..cc2bbcdf6 100644
--- a/app/src/main/res/drawable/ic_activity_yoga.xml
+++ b/app/src/main/res/drawable/ic_activity_yoga.xml
@@ -1,13 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
         android:fillColor="#000000"
-        android:pathData="M12,6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M21,16v-2c-2.24,0 -4.16,-0.96 -5.6,-2.68l-1.34,-1.6C13.68,9.26 13.12,9 12.53,9h-1.05c-0.59,0 -1.15,0.26 -1.53,0.72l-1.34,1.6C7.16,13.04 5.24,14 3,14v2c2.77,0 5.19,-1.17 7,-3.25V15l-3.88,1.55C5.45,16.82 5,17.48 5,18.21C5,19.2 5.8,20 6.79,20H9v-0.5c0,-1.38 1.12,-2.5 2.5,-2.5h3c0.28,0 0.5,0.22 0.5,0.5S14.78,18 14.5,18h-3c-0.83,0 -1.5,0.67 -1.5,1.5V20h7.21C18.2,20 19,19.2 19,18.21c0,-0.73 -0.45,-1.39 -1.12,-1.66L14,15v-2.25C15.81,14.83 18.23,16 21,16z" />
+        android:pathData="M10 6a2 2 0 1 1 4 0 2 2 0 1 1-4 0m11 10v-2c-2.24 0-4.16-0.96-5.6-2.68l-1.34-1.6C13.68 9.26 13.12 9 12.53 9h-1.05c-0.59 0-1.15 0.26-1.53 0.72l-1.34 1.6C7.16 13.04 5.24 14 3 14v2c2.77 0 5.19-1.17 7-3.25V15l-3.88 1.55C5.45 16.82 5 17.48 5 18.21 5 19.2 5.8 20 6.79 20H9v-0.5c0-1.38 1.12-2.5 2.5-2.5h3c0.28 0 0.5 0.22 0.5 0.5S14.78 18 14.5 18h-3c-0.83 0-1.5 0.67-1.5 1.5V20h7.21C18.2 20 19 19.2 19 18.21c0-0.73-0.45-1.39-1.12-1.66L14 15v-2.25c1.81 2.08 4.23 3.25 7 3.25z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_activitytracker.xml b/app/src/main/res/drawable/ic_activitytracker.xml
index 1a21f55a0..e07a19192 100644
--- a/app/src/main/res/drawable/ic_activitytracker.xml
+++ b/app/src/main/res/drawable/ic_activitytracker.xml
@@ -1,41 +1,34 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#1f7fdb"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#4dabf5"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M7.9108,8.7644h2.2539v12.1534h-2.2539z"
-        android:strokeWidth="3.46860933"
-        android:strokeColor="#00000000" />
+        android:pathData="M7.91 8.764h2.255v12.154H7.91z"
+        android:strokeWidth="3.46860933" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M11.2916,15.8796h2.2539v5.0381h-2.2539z"
-        android:strokeWidth="2.23327112"
-        android:strokeColor="#00000000" />
+        android:pathData="M11.292 15.88h2.254v5.038h-2.254z"
+        android:strokeWidth="2.23327112" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M14.783,11.7254h2.2539v9.1924h-2.2539z"
-        android:strokeWidth="3.01662064"
-        android:strokeColor="#00000000" />
+        android:pathData="M14.783 11.725h2.254v9.193h-2.254z"
+        android:strokeWidth="3.01662064" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M18.5395,7.8805h2.2539v13.0373h-2.2539z"
-        android:strokeWidth="3.59252691"
-        android:strokeColor="#00000000" />
+        android:pathData="M18.54 7.88h2.253v13.038H18.54z"
+        android:strokeWidth="3.59252691" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index d29480261..aa4154e27 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:width="40sp"
+    android:height="40sp"
+    android:viewportWidth="23"
+    android:viewportHeight="23">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+        android:fillColor="#FFFFFF"
+        android:pathData="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_upward.xml b/app/src/main/res/drawable/ic_arrow_upward.xml
index 631fb54b2..23a90b893 100644
--- a/app/src/main/res/drawable/ic_arrow_upward.xml
+++ b/app/src/main/res/drawable/ic_arrow_upward.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z" />
+        android:fillColor="#000000"
+        android:pathData="M4 12l1.41 1.41L11 7.83V20h2V7.83l5.58 5.59L20 12l-8-8-8 8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_battery_20.xml b/app/src/main/res/drawable/ic_battery_20.xml
index d9a1e6468..57aee1eb0 100644
--- a/app/src/main/res/drawable/ic_battery_20.xml
+++ b/app/src/main/res/drawable/ic_battery_20.xml
@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M7,17v3.67C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V17H7z"/>
+        android:fillColor="#000000"
+        android:pathData="M7 17v3.67C7 21.4 7.6 22 8.33 22h7.33C16.4 22 17 21.4 17 20.67V17H7z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M17,5.33C17,4.6 16.4,4 15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33V17h10V5.33z"
-        android:fillAlpha=".3"/>
+        android:fillAlpha=".3"
+        android:fillColor="#000000"
+        android:pathData="M17 5.33C17 4.6 16.4 4 15.67 4H14V2h-4v2H8.33C7.6 4 7 4.6 7 5.33V17h10V5.33z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_battery_50.xml b/app/src/main/res/drawable/ic_battery_50.xml
index 8236b239c..cc41ff33d 100644
--- a/app/src/main/res/drawable/ic_battery_50.xml
+++ b/app/src/main/res/drawable/ic_battery_50.xml
@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M17,5.33C17,4.6 16.4,4 15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33V13h10V5.33z"
-        android:fillAlpha=".3"/>
+        android:fillAlpha=".3"
+        android:fillColor="#000000"
+        android:pathData="M17 5.33C17 4.6 16.4 4 15.67 4H14V2h-4v2H8.33C7.6 4 7 4.6 7 5.33V13h10V5.33z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M7,13v7.67C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V13H7z"/>
+        android:fillColor="#000000"
+        android:pathData="M7 13v7.67C7 21.4 7.6 22 8.33 22h7.33C16.4 22 17 21.4 17 20.67V13H7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_battery_80.xml b/app/src/main/res/drawable/ic_battery_80.xml
index 600ad7784..7cba9a1c5 100644
--- a/app/src/main/res/drawable/ic_battery_80.xml
+++ b/app/src/main/res/drawable/ic_battery_80.xml
@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M17,5.33C17,4.6 16.4,4 15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33V9h10V5.33z"
-        android:fillAlpha=".3"/>
+        android:fillAlpha=".3"
+        android:fillColor="#000000"
+        android:pathData="M17 5.33C17 4.6 16.4 4 15.67 4H14V2h-4v2H8.33C7.6 4 7 4.6 7 5.33V9h10V5.33z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M7,9v11.67C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V9H7z"/>
+        android:fillColor="#000000"
+        android:pathData="M7 9v11.67C7 21.4 7.6 22 8.33 22h7.33C16.4 22 17 21.4 17 20.67V9H7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_battery_charging_20.xml b/app/src/main/res/drawable/ic_battery_charging_20.xml
index c3bf3b703..e15a88af2 100644
--- a/app/src/main/res/drawable/ic_battery_charging_20.xml
+++ b/app/src/main/res/drawable/ic_battery_charging_20.xml
@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M11,20v-3H7v3.67C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V17h-4.4L11,20z"/>
+        android:fillColor="#000000"
+        android:pathData="M11 20v-3H7v3.67C7 21.4 7.6 22 8.33 22h7.33C16.4 22 17 21.4 17 20.67V17h-4.4L11 20z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33V17h4v-2.5H9L13,7v5.5h2L12.6,17H17V5.33C17,4.6 16.4,4 15.67,4z"
-        android:fillAlpha=".3"/>
+        android:fillAlpha=".3"
+        android:fillColor="#000000"
+        android:pathData="M15.67 4H14V2h-4v2H8.33C7.6 4 7 4.6 7 5.33V17h4v-2.5H9L13 7v5.5h2L12.6 17H17V5.33C17 4.6 16.4 4 15.67 4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_battery_charging_50.xml b/app/src/main/res/drawable/ic_battery_charging_50.xml
index d794783a5..9972c40a1 100644
--- a/app/src/main/res/drawable/ic_battery_charging_50.xml
+++ b/app/src/main/res/drawable/ic_battery_charging_50.xml
@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M14.47,13.5L11,20v-5.5H9l0.53,-1H7v7.17C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V13.5h-2.53z"/>
+        android:fillColor="#000000"
+        android:pathData="M14.47 13.5L11 20v-5.5H9l0.53-1H7v7.17C7 21.4 7.6 22 8.33 22h7.33C16.4 22 17 21.4 17 20.67V13.5h-2.53z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33v8.17h2.53L13,7v5.5h2l-0.53,1H17V5.33C17,4.6 16.4,4 15.67,4z"
-        android:fillAlpha=".3"/>
+        android:fillAlpha=".3"
+        android:fillColor="#000000"
+        android:pathData="M15.67 4H14V2h-4v2H8.33C7.6 4 7 4.6 7 5.33v8.17h2.53L13 7v5.5h2l-0.53 1H17V5.33C17 4.6 16.4 4 15.67 4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_battery_charging_80.xml b/app/src/main/res/drawable/ic_battery_charging_80.xml
index e004a0a61..6156db800 100644
--- a/app/src/main/res/drawable/ic_battery_charging_80.xml
+++ b/app/src/main/res/drawable/ic_battery_charging_80.xml
@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33V9h4.93L13,7v2h4V5.33C17,4.6 16.4,4 15.67,4z"
-        android:fillAlpha=".3"/>
+        android:fillAlpha=".3"
+        android:fillColor="#000000"
+        android:pathData="M15.67 4H14V2h-4v2H8.33C7.6 4 7 4.6 7 5.33V9h4.93L13 7v2h4V5.33C17 4.6 16.4 4 15.67 4z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M13,12.5h2L11,20v-5.5H9L11.93,9H7v11.67C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V9h-4v3.5z"/>
+        android:fillColor="#000000"
+        android:pathData="M13 12.5h2L11 20v-5.5H9L11.93 9H7v11.67C7 21.4 7.6 22 8.33 22h7.33C16.4 22 17 21.4 17 20.67V9h-4v3.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_battery_charging_full.xml b/app/src/main/res/drawable/ic_battery_charging_full.xml
index 9389e7ce2..4a10b67fa 100644
--- a/app/src/main/res/drawable/ic_battery_charging_full.xml
+++ b/app/src/main/res/drawable/ic_battery_charging_full.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V5.33C17,4.6 16.4,4 15.67,4zM11,20v-5.5H9L13,7v5.5h2L11,20z"/>
+        android:fillColor="#000000"
+        android:pathData="M15.67 4H14V2h-4v2H8.33C7.6 4 7 4.6 7 5.33v15.33C7 21.4 7.6 22 8.33 22h7.33C16.4 22 17 21.4 17 20.67V5.33C17 4.6 16.4 4 15.67 4zM11 20v-5.5H9L13 7v5.5h2L11 20z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_battery_full.xml b/app/src/main/res/drawable/ic_battery_full.xml
index b0e57fe2c..b3c9a5644 100644
--- a/app/src/main/res/drawable/ic_battery_full.xml
+++ b/app/src/main/res/drawable/ic_battery_full.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V5.33C17,4.6 16.4,4 15.67,4z"/>
+        android:fillColor="#000000"
+        android:pathData="M15.67 4H14V2h-4v2H8.33C7.6 4 7 4.6 7 5.33v15.33C7 21.4 7.6 22 8.33 22h7.33C16.4 22 17 21.4 17 20.67V5.33C17 4.6 16.4 4 15.67 4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_block_black.xml b/app/src/main/res/drawable/ic_block_black.xml
index 4510bf5bb..ce9e6df8b 100644
--- a/app/src/main/res/drawable/ic_block_black.xml
+++ b/app/src/main/res/drawable/ic_block_black.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="40sp"
+    android:height="40sp"
+    android:viewportWidth="23"
+    android:viewportHeight="23">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
+        android:fillColor="#000000"
+        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zM4 12c0-4.42 3.58-8 8-8 1.85 0 3.55 0.63 4.9 1.69L5.69 16.9C4.63 15.55 4 13.85 4 12zm8 8c-1.85 0-3.55-0.63-4.9-1.69L18.31 7.1C19.37 8.45 20 10.15 20 12c0 4.42-3.58 8-8 8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_brightness_2.xml b/app/src/main/res/drawable/ic_brightness_2.xml
index 4b73de603..24e69dbbf 100644
--- a/app/src/main/res/drawable/ic_brightness_2.xml
+++ b/app/src/main/res/drawable/ic_brightness_2.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M10,2c-1.82,0 -3.53,0.5 -5,1.35C7.99,5.08 10,8.3 10,12s-2.01,6.92 -5,8.65C6.47,21.5 8.18,22 10,22c5.52,0 10,-4.48 10,-10S15.52,2 10,2z" />
+        android:pathData="M10 2C8.18 2 6.47 2.5 5 3.35 7.99 5.08 10 8.3 10 12s-2.01 6.92-5 8.65C6.47 21.5 8.18 22 10 22c5.52 0 10-4.48 10-10S15.52 2 10 2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_calculate.xml b/app/src/main/res/drawable/ic_calculate.xml
index dd8886e5a..0ea041b2c 100644
--- a/app/src/main/res/drawable/ic_calculate.xml
+++ b/app/src/main/res/drawable/ic_calculate.xml
@@ -1,24 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,19H5V5h14V19z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M6.25,7.72h5v1.5h-5z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M13,15.75h5v1.5h-5z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M13,13.25h5v1.5h-5z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M8,18l1.5,0l0,-2l2,0l0,-1.5l-2,0l0,-2l-1.5,0l0,2l-2,0l0,1.5l2,0z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M14.09,10.95l1.41,-1.41l1.41,1.41l1.06,-1.06l-1.41,-1.42l1.41,-1.41l-1.06,-1.06l-1.41,1.41l-1.41,-1.41l-1.06,1.06l1.41,1.41l-1.41,1.42z"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19 3H5C3.9 3 3 3.9 3 5v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm0 16H5V5h14v14z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6.25 7.72h5v1.5h-5zM13 15.75h5v1.5h-5zm0-2.5h5v1.5h-5zM8 18h1.5v-2h2v-1.5h-2v-2H8v2H6V16h2zm6.09-7.05l1.41-1.41 1.41 1.41 1.06-1.06-1.41-1.42 1.41-1.41L16.91 6 15.5 7.41 14.09 6l-1.06 1.06 1.41 1.41-1.41 1.42z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_calendar_sync.xml b/app/src/main/res/drawable/ic_calendar_sync.xml
index df634bb4e..757143cd9 100644
--- a/app/src/main/res/drawable/ic_calendar_sync.xml
+++ b/app/src/main/res/drawable/ic_calendar_sync.xml
@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@color/secondarytext"
-      android:pathData="m20.0187,3h-1L19.0187,1h-2L17.0187,3L7.0187,3L7.0187,1h-2v2h-1c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2L20.0187,23c1.1,0 2,-0.9 2,-2L22.0187,5c0,-1.1 -0.9,-2 -2,-2zM20.0187,21L4.0187,21L4.0187,10L20.0187,10ZM20.0187,8L4.0187,8L4.0187,5L20.0187,5Z"/>
-  <path
-      android:fillColor="@color/secondarytext"
-      android:pathData="m12.0187,11.6293v-1.4659l-1.9546,1.9546 1.9546,1.9546v-1.4659c1.6174,0 2.9319,1.3145 2.9319,2.9319 0,0.4935 -0.1222,0.9626 -0.3421,1.3682l0.7134,0.7134c0.3811,-0.601 0.6059,-1.3145 0.6059,-2.0816 0,-2.1598 -1.7494,-3.9092 -3.9092,-3.9092zM12.0187,18.4703c-1.6174,0 -2.9319,-1.3145 -2.9319,-2.9319 0,-0.4935 0.1222,-0.9626 0.3421,-1.3682L8.7154,13.4568c-0.3811,0.601 -0.6059,1.3145 -0.6059,2.0816 0,2.1598 1.7494,3.9092 3.9092,3.9092v1.4659l1.9546,-1.9546 -1.9546,-1.9546z"
-      android:strokeWidth="0.999998"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M20.019 3h-1V1h-2v2h-10V1h-2v2h-1c-1.1 0-2 0.9-2 2v16c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm0 18h-16V10h16zm0-13h-16V5h16z" />
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M12.019 11.63v-1.467l-1.955 1.955 1.955 1.955v-1.466c1.617 0 2.932 1.314 2.932 2.932 0 0.493-0.123 0.962-0.342 1.368l0.713 0.713c0.381-0.6 0.606-1.314 0.606-2.081 0-2.16-1.75-3.91-3.91-3.91zm0 6.84c-1.618 0-2.932-1.314-2.932-2.932 0-0.493 0.122-0.962 0.342-1.368l-0.714-0.713c-0.38 0.6-0.605 1.314-0.605 2.081 0 2.16 1.749 3.91 3.909 3.91v1.465l1.954-1.954-1.954-1.955z"
+        android:strokeWidth="0.999998" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_calendar_today.xml b/app/src/main/res/drawable/ic_calendar_today.xml
index 714f97c91..7b9dcc34b 100644
--- a/app/src/main/res/drawable/ic_calendar_today.xml
+++ b/app/src/main/res/drawable/ic_calendar_today.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@color/secondarytext"
-      android:pathData="M20,3h-1L19,1h-2v2L7,3L7,1L5,1v2L4,3c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,5c0,-1.1 -0.9,-2 -2,-2zM20,21L4,21L4,10h16v11zM20,8L4,8L4,5h16v3z"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M20 3h-1V1h-2v2H7V1H5v2H4C2.9 3 2 3.9 2 5v16c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm0 18H4V10h16v11zm0-13H4V5h16v3z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_database_management.xml b/app/src/main/res/drawable/ic_database_management.xml
index 6a990aff7..91f5419e1 100644
--- a/app/src/main/res/drawable/ic_database_management.xml
+++ b/app/src/main/res/drawable/ic_database_management.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M11.5,9C10.12,9 9,10.12 9,11.5s1.12,2.5 2.5,2.5 2.5,-1.12 2.5,-2.5S12.88,9 11.5,9zM20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM16.79,18.21l-2.91,-2.91c-0.69,0.44 -1.51,0.7 -2.39,0.7C9.01,16 7,13.99 7,11.5S9.01,7 11.5,7 16,9.01 16,11.5c0,0.88 -0.26,1.69 -0.7,2.39l2.91,2.9 -1.42,1.42z"/>
+        android:pathData="M11.5 9C10.12 9 9 10.12 9 11.5s1.12 2.5 2.5 2.5 2.5-1.12 2.5-2.5S12.88 9 11.5 9zM20 4H4C2.9 4 2 4.9 2 6v12c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V6c0-1.1-0.9-2-2-2zm-3.21 14.21l-2.91-2.91c-0.69 0.44-1.51 0.7-2.39 0.7C9.01 16 7 13.99 7 11.5S9.01 7 11.5 7 16 9.01 16 11.5c0 0.88-0.26 1.69-0.7 2.39l2.91 2.9-1.42 1.42z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_debug.xml b/app/src/main/res/drawable/ic_debug.xml
index c98c256a7..8a78a7220 100644
--- a/app/src/main/res/drawable/ic_debug.xml
+++ b/app/src/main/res/drawable/ic_debug.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="40sp"
+    android:height="40sp"
+    android:viewportWidth="23"
+    android:viewportHeight="23">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>
+        android:fillColor="#000000"
+        android:pathData="M3 6h18V4H3C1.9 4 1 4.9 1 6v12c0 1.1 0.9 2 2 2h4v-2H3V6zm10 6H9v1.78C8.39 14.33 8 15.11 8 16s0.39 1.67 1 2.22V20h4v-1.78c0.61-0.55 1-1.34 1-2.22s-0.39-1.67-1-2.22V12zm-2 5.5c-0.83 0-1.5-0.67-1.5-1.5s0.67-1.5 1.5-1.5 1.5 0.67 1.5 1.5-0.67 1.5-1.5 1.5zM22 8h-6c-0.5 0-1 0.5-1 1v10c0 0.5 0.5 1 1 1h6c0.5 0 1-0.5 1-1V9c0-0.5-0.5-1-1-1zm-1 10h-4v-8h4v8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete_cross.xml b/app/src/main/res/drawable/ic_delete_cross.xml
index ab38bb6d6..e82e3680a 100644
--- a/app/src/main/res/drawable/ic_delete_cross.xml
+++ b/app/src/main/res/drawable/ic_delete_cross.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
+        android:pathData="M6 19c0 1.1 0.9 2 2 2h8c1.1 0 2-0.9 2-2V7H6v12zm2.46-7.12l1.41-1.41L12 12.59l2.12-2.12 1.41 1.41L13.41 14l2.12 2.12-1.41 1.41L12 15.41l-2.12 2.12-1.41-1.41L10.59 14l-2.13-2.12zM15.5 4l-1-1h-5l-1 1H5v2h14V4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_amazfit_bip.xml b/app/src/main/res/drawable/ic_device_amazfit_bip.xml
index f8868dfb8..098e7cf06 100644
--- a/app/src/main/res/drawable/ic_device_amazfit_bip.xml
+++ b/app/src/main/res/drawable/ic_device_amazfit_bip.xml
@@ -1,8 +1,22 @@
-<vector android:height="26.9dp" android:viewportHeight="26.95"
-    android:viewportWidth="26.95" android:width="26.9dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#6cb8f7" android:pathData="m3.612,2.619h19.7a0.8541,0.8541 0,0 1,0.8541 0.8541v18.94a0.8541,0.8541 0,0 1,-0.8541 0.8541h-19.7a0.8541,0.8541 0,0 1,-0.8541 -0.8541v-18.94a0.8541,0.8541 0,0 1,0.8541 -0.8541z"/>
-    <path android:fillColor="#0c84e3" android:pathData="m3.611,3.393h19.7a0.8541,0.8541 0,0 1,0.8541 0.8541v18.94a0.8541,0.8541 0,0 1,-0.8541 0.8541h-19.7a0.8541,0.8541 0,0 1,-0.8541 -0.8541v-18.94a0.8541,0.8541 0,0 1,0.8541 -0.8541z"/>
-    <path android:fillColor="#2196f3" android:pathData="m3.61,3.024h19.7a0.8541,0.8541 0,0 1,0.8541 0.854v18.94a0.8541,0.8541 0,0 1,-0.8541 0.854h-19.7a0.8541,0.8541 0,0 1,-0.8541 -0.854v-18.94a0.8541,0.8541 0,0 1,0.8541 -0.854z"/>
-    <path android:fillColor="#fff" android:pathData="m10.38,6.588c-0.8142,-0.0172 -0.9082,0.1552 -0.8846,0.9659 -0.7213,0.1264 -1.342,1.159 -1.326,2.124l0.005,7.825c0.0937,0.8834 0.6257,1.487 1.321,1.867 -0.0007,0.813 0.0765,0.9907 0.8846,0.9907h5.81c0.8465,0 0.8262,-0.2367 0.8055,-0.9907 0.8715,-0.4163 1.209,-0.8924 1.295,-1.867 -0.0007,-0.7652 0.0013,-3.423 0.0013,-3.437 0.1229,-0.2049 0.1513,-0.0276 0.2187,0.0502 0.0945,0.1092 0.2143,0.0627 0.2676,-0.0896l0.0026,-1.14c-0.0551,-0.1149 -0.0998,-0.2132 -0.2505,-0.1176 -0.0771,0.0489 -0.1091,0.2215 -0.2397,0.0852v-3.444c-0.0865,-0.9028 -0.4723,-1.509 -1.295,-1.838 0.0077,-0.9455 -0.0592,-0.9913 -0.8055,-0.9801zM10.4315,8.015 L16.2065,8.0669c0.8048,0.0072 1.471,0.8282 1.469,1.343l-0.0276,7.942c-0.0029,0.8324 -0.7174,1.512 -1.443,1.512h-5.924c-0.5357,0 -1.498,-0.6497 -1.492,-1.426l0.0624,-7.877c0.0076,-0.9565 0.7608,-1.554 1.58,-1.546z"/>
-    <path android:fillAlpha="0.5345" android:fillColor="#fff" android:pathData="m10.43,8.015c-0.8188,-0.0074 -1.572,0.5903 -1.58,1.547l-0.0623,7.877c-0.0061,0.776 0.9564,1.425 1.492,1.425h5.924c0.7252,0 1.44,-0.6794 1.443,-1.512l0.0273,-7.942c0.002,-0.5152 -0.6638,-1.336 -1.469,-1.343zM9.9475,9.827h6.568v6.696h-6.568z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#6cb8f7"
+        android:pathData="M3.612 2.619h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854h-19.7a0.854 0.854 0 0 1-0.854-0.854V3.473A0.854 0.854 0 0 1 3.612 2.62z" />
+    <path
+        android:fillColor="#0c84e3"
+        android:pathData="M3.611 3.393h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.247A0.854 0.854 0 0 1 3.61 3.393z" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M3.61 3.024h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854H3.61a0.854 0.854 0 0 1-0.854-0.854V3.878A0.854 0.854 0 0 1 3.61 3.024z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M10.38 6.588C9.566 6.571 9.472 6.743 9.495 7.554 8.775 7.68 8.153 8.713 8.17 9.678l0.005 7.825c0.093 0.883 0.625 1.487 1.32 1.867 0 0.813 0.077 0.99 0.885 0.99h5.81c0.847 0 0.826-0.236 0.805-0.99 0.872-0.416 1.21-0.892 1.295-1.867l0.002-3.437c0.123-0.205 0.151-0.028 0.219 0.05 0.094 0.11 0.214 0.063 0.267-0.09l0.003-1.14c-0.055-0.114-0.1-0.213-0.25-0.117-0.078 0.049-0.11 0.221-0.24 0.085V9.41c-0.087-0.903-0.473-1.509-1.295-1.838 0.007-0.945-0.06-0.991-0.806-0.98zm0.051 1.427l5.775 0.052c0.805 0.007 1.471 0.828 1.47 1.343l-0.028 7.942c-0.003 0.832-0.717 1.512-1.443 1.512H10.28c-0.536 0-1.498-0.65-1.492-1.426L8.85 9.56c0.008-0.957 0.761-1.554 1.58-1.546z" />
+    <path
+        android:fillAlpha="0.5345"
+        android:fillColor="#fff"
+        android:pathData="M10.43 8.015c-0.819-0.007-1.572 0.59-1.58 1.547l-0.062 7.877c-0.006 0.776 0.956 1.425 1.492 1.425h5.924c0.725 0 1.44-0.68 1.443-1.512l0.027-7.942c0.002-0.515-0.664-1.336-1.469-1.343zM9.948 9.827h6.567v6.696H9.947z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml b/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml
index e97015794..43e36d861 100644
--- a/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml
@@ -1,8 +1,23 @@
-<vector android:height="26.9dp" android:viewportHeight="26.95"
-    android:viewportWidth="26.95" android:width="26.9dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#a1a1a1" android:pathData="m3.612,2.619h19.7a0.8541,0.8541 0,0 1,0.8541 0.8541v18.94a0.8541,0.8541 0,0 1,-0.8541 0.8541h-19.7a0.8541,0.8541 0,0 1,-0.8541 -0.8541v-18.94a0.8541,0.8541 0,0 1,0.8541 -0.8541z"/>
-    <path android:fillColor="#7d7d7d" android:pathData="m3.611,3.393h19.7a0.8541,0.8541 0,0 1,0.8541 0.8541v18.94a0.8541,0.8541 0,0 1,-0.8541 0.8541h-19.7a0.8541,0.8541 0,0 1,-0.8541 -0.8541v-18.94a0.8541,0.8541 0,0 1,0.8541 -0.8541z"/>
-    <path android:fillColor="#8a8a8a" android:fillAlpha="0.94" android:pathData="m3.61,3.024h19.7a0.8541,0.8541 0,0 1,0.8541 0.854v18.94a0.8541,0.8541 0,0 1,-0.8541 0.854h-19.7a0.8541,0.8541 0,0 1,-0.8541 -0.854v-18.94a0.8541,0.8541 0,0 1,0.8541 -0.854z"/>
-    <path android:fillColor="#fff" android:pathData="m10.38,6.588c-0.8142,-0.0172 -0.9082,0.1552 -0.8846,0.9659 -0.7213,0.1264 -1.342,1.159 -1.326,2.124l0.005,7.825c0.0937,0.8834 0.6257,1.487 1.321,1.867 -0.0007,0.813 0.0765,0.9907 0.8846,0.9907h5.81c0.8465,0 0.8262,-0.2367 0.8055,-0.9907 0.8715,-0.4163 1.209,-0.8924 1.295,-1.867 -0.0007,-0.7652 0.0013,-3.423 0.0013,-3.437 0.1229,-0.2049 0.1513,-0.0276 0.2187,0.0502 0.0945,0.1092 0.2143,0.0627 0.2676,-0.0896l0.0026,-1.14c-0.0551,-0.1149 -0.0998,-0.2132 -0.2505,-0.1176 -0.0771,0.0489 -0.1091,0.2215 -0.2397,0.0852v-3.444c-0.0865,-0.9028 -0.4723,-1.509 -1.295,-1.838 0.0077,-0.9455 -0.0592,-0.9913 -0.8055,-0.9801zM10.4315,8.015 L16.2065,8.0669c0.8048,0.0072 1.471,0.8282 1.469,1.343l-0.0276,7.942c-0.0029,0.8324 -0.7174,1.512 -1.443,1.512h-5.924c-0.5357,0 -1.498,-0.6497 -1.492,-1.426l0.0624,-7.877c0.0076,-0.9565 0.7608,-1.554 1.58,-1.546z"/>
-    <path android:fillAlpha="0.5345" android:fillColor="#fff" android:pathData="m10.43,8.015c-0.8188,-0.0074 -1.572,0.5903 -1.58,1.547l-0.0623,7.877c-0.0061,0.776 0.9564,1.425 1.492,1.425h5.924c0.7252,0 1.44,-0.6794 1.443,-1.512l0.0273,-7.942c0.002,-0.5152 -0.6638,-1.336 -1.469,-1.343zM9.9475,9.827h6.568v6.696h-6.568z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#a1a1a1"
+        android:pathData="M3.612 2.619h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854h-19.7a0.854 0.854 0 0 1-0.854-0.854V3.473A0.854 0.854 0 0 1 3.612 2.62z" />
+    <path
+        android:fillColor="#7d7d7d"
+        android:pathData="M3.611 3.393h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.247A0.854 0.854 0 0 1 3.61 3.393z" />
+    <path
+        android:fillAlpha="0.94"
+        android:fillColor="#8a8a8a"
+        android:pathData="M3.61 3.024h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854H3.61a0.854 0.854 0 0 1-0.854-0.854V3.878A0.854 0.854 0 0 1 3.61 3.024z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M10.38 6.588C9.566 6.571 9.472 6.743 9.495 7.554 8.775 7.68 8.153 8.713 8.17 9.678l0.005 7.825c0.093 0.883 0.625 1.487 1.32 1.867 0 0.813 0.077 0.99 0.885 0.99h5.81c0.847 0 0.826-0.236 0.805-0.99 0.872-0.416 1.21-0.892 1.295-1.867l0.002-3.437c0.123-0.205 0.151-0.028 0.219 0.05 0.094 0.11 0.214 0.063 0.267-0.09l0.003-1.14c-0.055-0.114-0.1-0.213-0.25-0.117-0.078 0.049-0.11 0.221-0.24 0.085V9.41c-0.087-0.903-0.473-1.509-1.295-1.838 0.007-0.945-0.06-0.991-0.806-0.98zm0.051 1.427l5.775 0.052c0.805 0.007 1.471 0.828 1.47 1.343l-0.028 7.942c-0.003 0.832-0.717 1.512-1.443 1.512H10.28c-0.536 0-1.498-0.65-1.492-1.426L8.85 9.56c0.008-0.957 0.761-1.554 1.58-1.546z" />
+    <path
+        android:fillAlpha="0.5345"
+        android:fillColor="#fff"
+        android:pathData="M10.43 8.015c-0.819-0.007-1.572 0.59-1.58 1.547l-0.062 7.877c-0.006 0.776 0.956 1.425 1.492 1.425h5.924c0.725 0 1.44-0.68 1.443-1.512l0.027-7.942c0.002-0.515-0.664-1.336-1.469-1.343zM9.948 9.827h6.567v6.696H9.947z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_default.xml b/app/src/main/res/drawable/ic_device_default.xml
index 6a019f7bd..e8f7c7207 100644
--- a/app/src/main/res/drawable/ic_device_default.xml
+++ b/app/src/main/res/drawable/ic_device_default.xml
@@ -1,38 +1,25 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26.947369dp"
-    android:height="26.947369dp"
-    android:viewportWidth="26.947369"
-    android:viewportHeight="26.947369">
-  <path
-      android:pathData="M3.6116,2.6188L23.3114,2.6188A0.8541,0.8541 0,0 1,24.1655 3.4729L24.1655,22.4136A0.8541,0.8541 0,0 1,23.3114 23.2677L3.6116,23.2677A0.8541,0.8541 0,0 1,2.7575 22.4136L2.7575,3.4729A0.8541,0.8541 0,0 1,3.6116 2.6188z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#6cb8f7"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M3.6108,3.3934L23.3107,3.3934A0.8541,0.8541 0,0 1,24.1648 4.2475L24.1648,23.1882A0.8541,0.8541 0,0 1,23.3107 24.0423L3.6108,24.0423A0.8541,0.8541 0,0 1,2.7567 23.1882L2.7567,4.2475A0.8541,0.8541 0,0 1,3.6108 3.3934z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#0c84e3"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M3.6099,3.0237L23.3097,3.0237A0.8541,0.8541 0,0 1,24.1638 3.8777L24.1638,22.8185A0.8541,0.8541 0,0 1,23.3097 23.6725L3.6099,23.6725A0.8541,0.8541 0,0 1,2.7558 22.8185L2.7558,3.8777A0.8541,0.8541 0,0 1,3.6099 3.0237z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#2196f3"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M11.1493,8.7358L15.7257,8.7358A0.5071,0.5669 0,0 1,16.2328 9.3027L16.2328,17.1386A0.5071,0.5669 0,0 1,15.7257 17.7055L11.1493,17.7055A0.5071,0.5669 0,0 1,10.6422 17.1386L10.6422,9.3027A0.5071,0.5669 0,0 1,11.1493 8.7358z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M11.7317,18.4714h3.3818v1.4494h-3.3818z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M11.7048,6.4739h3.3818v1.4494h-3.3818z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M11.5139,9.729h3.9069v6.9784h-3.9069z"
-      android:strokeWidth="0.91048878"
-      android:fillColor="#2196f3"
-      android:fillAlpha="1"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#6cb8f7"
+        android:pathData="M3.612 2.619h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.855 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V3.473a0.854 0.854 0 0 1 0.855-0.854z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#0c84e3"
+        android:pathData="M3.61 3.393h19.7a0.854 0.854 0 0 1 0.855 0.854v18.941a0.854 0.854 0 0 1-0.854 0.854H3.61a0.854 0.854 0 0 1-0.854-0.854V4.248A0.854 0.854 0 0 1 3.61 3.392z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M3.61 3.024h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854H3.61a0.854 0.854 0 0 1-0.854-0.854V3.878A0.854 0.854 0 0 1 3.61 3.024z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M11.15 8.736h4.576a0.507 0.567 0 0 1 0.507 0.567v7.836a0.507 0.567 0 0 1-0.507 0.567h-4.577a0.507 0.567 0 0 1-0.507-0.567V9.303a0.507 0.567 0 0 1 0.507-0.567zm0.582 9.735h3.382v1.45h-3.382zM11.705 6.474h3.382v1.45h-3.382z" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M11.514 9.729h3.907v6.978h-3.907z"
+        android:strokeWidth="0.91048878" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_default_disabled.xml b/app/src/main/res/drawable/ic_device_default_disabled.xml
index b3a75ef29..295b92713 100644
--- a/app/src/main/res/drawable/ic_device_default_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_default_disabled.xml
@@ -1,38 +1,26 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26.947369dp"
-    android:height="26.947369dp"
-    android:viewportWidth="26.947369"
-    android:viewportHeight="26.947369">
-  <path
-      android:pathData="M4.0362,2.923L23.736,2.923A0.8541,0.8541 0,0 1,24.5901 3.7771L24.5901,22.7178A0.8541,0.8541 0,0 1,23.736 23.5719L4.0362,23.5719A0.8541,0.8541 0,0 1,3.1821 22.7178L3.1821,3.7771A0.8541,0.8541 0,0 1,4.0362 2.923z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#a1a1a1"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M4.0354,3.6976L23.7353,3.6976A0.8541,0.8541 0,0 1,24.5894 4.5517L24.5894,23.4924A0.8541,0.8541 0,0 1,23.7353 24.3465L4.0354,24.3465A0.8541,0.8541 0,0 1,3.1813 23.4924L3.1813,4.5517A0.8541,0.8541 0,0 1,4.0354 3.6976z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#7d7d7d"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M4.0344,3.3278L23.7343,3.3278A0.8541,0.8541 0,0 1,24.5884 4.1819L24.5884,23.1226A0.8541,0.8541 0,0 1,23.7343 23.9767L4.0344,23.9767A0.8541,0.8541 0,0 1,3.1804 23.1226L3.1804,4.1819A0.8541,0.8541 0,0 1,4.0344 3.3278z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#8a8a8a"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M11.6209,9.1598L16.1973,9.1598A0.5071,0.5669 0,0 1,16.7044 9.7267L16.7044,17.5625A0.5071,0.5669 0,0 1,16.1973 18.1295L11.6209,18.1295A0.5071,0.5669 0,0 1,11.1138 17.5625L11.1138,9.7267A0.5071,0.5669 0,0 1,11.6209 9.1598z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M12.2033,18.8954h3.3818v1.4494h-3.3818z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M12.1764,6.8979h3.3818v1.4494h-3.3818z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M11.9855,10.1529h3.9069v6.9784h-3.9069z"
-      android:strokeWidth="0.91048878"
-      android:fillColor="#8a8a8a"
-      android:fillAlpha="0.94117647"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#a1a1a1"
+        android:pathData="M4.036 2.923h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V3.778a0.854 0.854 0 0 1 0.854-0.855z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#7d7d7d"
+        android:pathData="M4.035 3.698h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.552a0.854 0.854 0 0 1 0.854-0.854z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M4.034 3.328h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.182a0.854 0.854 0 0 1 0.854-0.854z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M11.62 9.16h4.577a0.507 0.567 0 0 1 0.507 0.567v7.835a0.507 0.567 0 0 1-0.507 0.567h-4.576a0.507 0.567 0 0 1-0.507-0.567V9.727A0.507 0.567 0 0 1 11.62 9.16zm0.583 9.735h3.382v1.45h-3.382zM12.176 6.898h3.382v1.45h-3.382z" />
+    <path
+        android:fillAlpha="0.94117647"
+        android:fillColor="#8a8a8a"
+        android:pathData="M11.986 10.153h3.906v6.978h-3.906z"
+        android:strokeWidth="0.91048878" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_h30_h10.xml b/app/src/main/res/drawable/ic_device_h30_h10.xml
index 7c7e79e28..18df6dc3a 100644
--- a/app/src/main/res/drawable/ic_device_h30_h10.xml
+++ b/app/src/main/res/drawable/ic_device_h30_h10.xml
@@ -1,39 +1,32 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26.947369dp"
-    android:height="26.947369dp"
-    android:viewportWidth="26.947369"
-    android:viewportHeight="26.947369">
-  <path
-      android:pathData="M3.6116,2.6188L23.3114,2.6188A0.8541,0.8541 0,0 1,24.1655 3.4729L24.1655,22.4136A0.8541,0.8541 0,0 1,23.3114 23.2677L3.6116,23.2677A0.8541,0.8541 0,0 1,2.7575 22.4136L2.7575,3.4729A0.8541,0.8541 0,0 1,3.6116 2.6188z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#6cb8f7"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M3.6108,3.3934L23.3107,3.3934A0.8541,0.8541 0,0 1,24.1648 4.2475L24.1648,23.1882A0.8541,0.8541 0,0 1,23.3107 24.0423L3.6108,24.0423A0.8541,0.8541 0,0 1,2.7567 23.1882L2.7567,4.2475A0.8541,0.8541 0,0 1,3.6108 3.3934z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#0c84e3"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M3.6099,3.0237L23.3097,3.0237A0.8541,0.8541 0,0 1,24.1638 3.8777L24.1638,22.8185A0.8541,0.8541 0,0 1,23.3097 23.6725L3.6099,23.6725A0.8541,0.8541 0,0 1,2.7558 22.8185L2.7558,3.8777A0.8541,0.8541 0,0 1,3.6099 3.0237z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#2196f3"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M6.5687,11.4794L20.4473,11.4794A0.6025,0.5534 0,0 1,21.0497 12.0329L21.0497,14.3731A0.6025,0.5534 0,0 1,20.4473 14.9266L6.5687,14.9266A0.6025,0.5534 0,0 1,5.9662 14.3731L5.9662,12.0329A0.6025,0.5534 0,0 1,6.5687 11.4794z"
-      android:strokeWidth="0.95660609"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M7.8393,10.0652L19.276,10.0652A0.5914,0.5534 0,0 1,19.8674 10.6186L19.8674,16.1409A0.5914,0.5534 0,0 1,19.276 16.6943L7.8393,16.6943A0.5914,0.5534 0,0 1,7.2478 16.1409L7.2478,10.6186A0.5914,0.5534 0,0 1,7.8393 10.0652z"
-      android:strokeWidth="0.98218656"
-      android:fillColor="#2196f3"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M8.5725,11.17L18.66,11.17A0.6131,0.5534 0,0 1,19.2731 11.7235L19.2731,14.7709A0.6131,0.5534 0,0 1,18.66 15.3243L8.5725,15.3243A0.6131,0.5534 0,0 1,7.9594 14.7709L7.9594,11.7235A0.6131,0.5534 0,0 1,8.5725 11.17z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M16.788,13.2494a0.7384,0.7513 0,1 0,1.4767 0a0.7384,0.7513 0,1 0,-1.4767 0z"
-      android:fillColor="#2196f3"
-      android:fillAlpha="1"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#6cb8f7"
+        android:pathData="M3.612 2.619h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.855 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V3.473a0.854 0.854 0 0 1 0.855-0.854z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#0c84e3"
+        android:pathData="M3.61 3.393h19.7a0.854 0.854 0 0 1 0.855 0.854v18.941a0.854 0.854 0 0 1-0.854 0.854H3.61a0.854 0.854 0 0 1-0.854-0.854V4.248A0.854 0.854 0 0 1 3.61 3.392z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M3.61 3.024h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854H3.61a0.854 0.854 0 0 1-0.854-0.854V3.878A0.854 0.854 0 0 1 3.61 3.024z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M6.569 11.48h13.878a0.603 0.553 0 0 1 0.603 0.553v2.34a0.603 0.553 0 0 1-0.603 0.554H6.57a0.603 0.553 0 0 1-0.603-0.554v-2.34a0.603 0.553 0 0 1 0.603-0.554z"
+        android:strokeWidth="0.95660609" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M7.84 10.065h11.436a0.591 0.553 0 0 1 0.591 0.554v5.522a0.591 0.553 0 0 1-0.591 0.553H7.839a0.591 0.553 0 0 1-0.591-0.553v-5.522a0.591 0.553 0 0 1 0.591-0.554z"
+        android:strokeWidth="0.98218656" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M8.572 11.17H18.66a0.613 0.553 0 0 1 0.613 0.553v3.048a0.613 0.553 0 0 1-0.613 0.553H8.572a0.613 0.553 0 0 1-0.613-0.553v-3.048a0.613 0.553 0 0 1 0.614-0.553z" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M16.788 13.25a0.738 0.751 0 1 0 1.477 0 0.738 0.751 0 1 0-1.477 0z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_h30_h10_disabled.xml b/app/src/main/res/drawable/ic_device_h30_h10_disabled.xml
index 0e2753a00..5e898b0ac 100644
--- a/app/src/main/res/drawable/ic_device_h30_h10_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_h30_h10_disabled.xml
@@ -1,39 +1,32 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26.947369dp"
-    android:height="26.947369dp"
-    android:viewportWidth="26.947369"
-    android:viewportHeight="26.947369">
-  <path
-      android:pathData="M4.0362,2.923L23.736,2.923A0.8541,0.8541 0,0 1,24.5901 3.7771L24.5901,22.7178A0.8541,0.8541 0,0 1,23.736 23.5719L4.0362,23.5719A0.8541,0.8541 0,0 1,3.1821 22.7178L3.1821,3.7771A0.8541,0.8541 0,0 1,4.0362 2.923z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#a1a1a1"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M4.0354,3.6976L23.7353,3.6976A0.8541,0.8541 0,0 1,24.5894 4.5517L24.5894,23.4924A0.8541,0.8541 0,0 1,23.7353 24.3465L4.0354,24.3465A0.8541,0.8541 0,0 1,3.1813 23.4924L3.1813,4.5517A0.8541,0.8541 0,0 1,4.0354 3.6976z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#7d7d7d"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M4.0344,3.3278L23.7343,3.3278A0.8541,0.8541 0,0 1,24.5884 4.1819L24.5884,23.1226A0.8541,0.8541 0,0 1,23.7343 23.9767L4.0344,23.9767A0.8541,0.8541 0,0 1,3.1804 23.1226L3.1804,4.1819A0.8541,0.8541 0,0 1,4.0344 3.3278z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#8a8a8a"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M7.3028,11.9896L21.2647,11.9896A0.6061,0.5534 0,0 1,21.8708 12.5431L21.8708,14.8833A0.6061,0.5534 0,0 1,21.2647 15.4368L7.3028,15.4368A0.6061,0.5534 0,0 1,6.6967 14.8833L6.6967,12.5431A0.6061,0.5534 0,0 1,7.3028 11.9896z"
-      android:strokeWidth="0.95947295"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M8.6603,10.5754L20.0971,10.5754A0.5914,0.5534 0,0 1,20.6885 11.1289L20.6885,16.6511A0.5914,0.5534 0,0 1,20.0971 17.2045L8.6603,17.2045A0.5914,0.5534 0,0 1,8.0689 16.6511L8.0689,11.1289A0.5914,0.5534 0,0 1,8.6603 10.5754z"
-      android:strokeWidth="0.98218656"
-      android:fillColor="#8a8a8a"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M9.3935,11.6803L19.4811,11.6803A0.6131,0.5534 0,0 1,20.0942 12.2337L20.0942,15.2811A0.6131,0.5534 0,0 1,19.4811 15.8345L9.3935,15.8345A0.6131,0.5534 0,0 1,8.7805 15.2811L8.7805,12.2337A0.6131,0.5534 0,0 1,9.3935 11.6803z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M17.609,13.7596a0.7384,0.7513 0,1 0,1.4767 0a0.7384,0.7513 0,1 0,-1.4767 0z"
-      android:fillColor="#8a8a8a"
-      android:fillAlpha="1"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#a1a1a1"
+        android:pathData="M4.036 2.923h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V3.778a0.854 0.854 0 0 1 0.854-0.855z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#7d7d7d"
+        android:pathData="M4.035 3.698h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.552a0.854 0.854 0 0 1 0.854-0.854z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M4.034 3.328h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.182a0.854 0.854 0 0 1 0.854-0.854z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M7.303 11.99h13.962a0.606 0.553 0 0 1 0.606 0.553v2.34a0.606 0.553 0 0 1-0.606 0.554H7.303a0.606 0.553 0 0 1-0.606-0.554v-2.34a0.606 0.553 0 0 1 0.606-0.553z"
+        android:strokeWidth="0.95947295" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M8.66 10.575h11.437a0.591 0.553 0 0 1 0.591 0.554v5.522a0.591 0.553 0 0 1-0.59 0.553H8.66a0.591 0.553 0 0 1-0.591-0.553V11.13a0.591 0.553 0 0 1 0.591-0.554z"
+        android:strokeWidth="0.98218656" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M9.393 11.68h10.088a0.613 0.553 0 0 1 0.613 0.554v3.047a0.613 0.553 0 0 1-0.613 0.553H9.393a0.613 0.553 0 0 1-0.613-0.553v-3.047a0.613 0.553 0 0 1 0.614-0.554z" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M17.609 13.76a0.738 0.751 0 1 0 1.477 0 0.738 0.751 0 1 0-1.477 0z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_hplus.xml b/app/src/main/res/drawable/ic_device_hplus.xml
index 8b1a81b18..e67599e6d 100644
--- a/app/src/main/res/drawable/ic_device_hplus.xml
+++ b/app/src/main/res/drawable/ic_device_hplus.xml
@@ -1,41 +1,34 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#1f7fdb"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#4dabf5"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M19.9316,9.3831L20.3293,9.3831A0.5303,0.5303 0,0 1,20.8597 9.9134L20.8597,10.4437A0.5303,0.5303 0,0 1,20.3293 10.9741L19.9316,10.9741A0.5303,0.5303 0,0 1,19.4012 10.4437L19.4012,9.9134A0.5303,0.5303 0,0 1,19.9316 9.3831z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M19.932 9.383h0.397a0.53 0.53 0 0 1 0.53 0.53v0.53a0.53 0.53 0 0 1-0.53 0.531h-0.397a0.53 0.53 0 0 1-0.53-0.53v-0.53a0.53 0.53 0 0 1 0.53-0.53z"
+        android:strokeWidth="3.5" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M9.8483,7.2176L18.8337,7.2176A1.142,1.142 0,0 1,19.9758 8.3596L19.9758,20.4828A1.142,1.142 0,0 1,18.8337 21.6249L9.8483,21.6249A1.142,1.142 0,0 1,8.7063 20.4828L8.7063,8.3596A1.142,1.142 0,0 1,9.8483 7.2176z"
-        android:strokeWidth="3.46226358"
-        android:strokeColor="#00000000" />
+        android:pathData="M9.848 7.218h8.986a1.142 1.142 0 0 1 1.142 1.142v12.123a1.142 1.142 0 0 1-1.142 1.142H9.848a1.142 1.142 0 0 1-1.142-1.142V8.36a1.142 1.142 0 0 1 1.142-1.142z"
+        android:strokeWidth="3.46226358" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M10.0763,9.2947h8.4411v10.0763h-8.4411z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M10.076 9.295h8.441V19.37h-8.44z"
+        android:strokeWidth="3.5" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M11.2253,10.6205h6.2756v7.513h-6.2756z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M11.225 10.62h6.276v7.514h-6.276z"
+        android:strokeWidth="3.5" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_hplus_disabled.xml b/app/src/main/res/drawable/ic_device_hplus_disabled.xml
index e41427442..15e6a0907 100644
--- a/app/src/main/res/drawable/ic_device_hplus_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_hplus_disabled.xml
@@ -1,42 +1,35 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#7a7a7a"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillAlpha="0.9411765"
         android:fillColor="#9f9f9f"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M19.9316,9.3831L20.3293,9.3831A0.5303,0.5303 0,0 1,20.8597 9.9134L20.8597,10.4437A0.5303,0.5303 0,0 1,20.3293 10.9741L19.9316,10.9741A0.5303,0.5303 0,0 1,19.4012 10.4437L19.4012,9.9134A0.5303,0.5303 0,0 1,19.9316 9.3831z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M19.932 9.383h0.397a0.53 0.53 0 0 1 0.53 0.53v0.53a0.53 0.53 0 0 1-0.53 0.531h-0.397a0.53 0.53 0 0 1-0.53-0.53v-0.53a0.53 0.53 0 0 1 0.53-0.53z"
+        android:strokeWidth="3.5" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M9.8483,7.2176L18.8337,7.2176A1.142,1.142 0,0 1,19.9758 8.3596L19.9758,20.4828A1.142,1.142 0,0 1,18.8337 21.6249L9.8483,21.6249A1.142,1.142 0,0 1,8.7063 20.4828L8.7063,8.3596A1.142,1.142 0,0 1,9.8483 7.2176z"
-        android:strokeWidth="3.46226358"
-        android:strokeColor="#00000000" />
+        android:pathData="M9.848 7.218h8.986a1.142 1.142 0 0 1 1.142 1.142v12.123a1.142 1.142 0 0 1-1.142 1.142H9.848a1.142 1.142 0 0 1-1.142-1.142V8.36a1.142 1.142 0 0 1 1.142-1.142z"
+        android:strokeWidth="3.46226358" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M10.0763,9.2947h8.4411v10.0763h-8.4411z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M10.076 9.295h8.441V19.37h-8.44z"
+        android:strokeWidth="3.5" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M11.1811,10.6205h6.2756v7.513h-6.2756z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M11.181 10.62h6.276v7.514H11.18z"
+        android:strokeWidth="3.5" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_itag.xml b/app/src/main/res/drawable/ic_device_itag.xml
index 95e1a19c7..1e92ae41a 100644
--- a/app/src/main/res/drawable/ic_device_itag.xml
+++ b/app/src/main/res/drawable/ic_device_itag.xml
@@ -1,53 +1,40 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26.947369dp"
-    android:height="26.947369dp"
-    android:viewportWidth="26.947369"
-    android:viewportHeight="26.947369">
-  <path
-      android:pathData="M3.6116,2.6188L23.3114,2.6188A0.8541,0.8541 0,0 1,24.1655 3.4729L24.1655,22.4136A0.8541,0.8541 0,0 1,23.3114 23.2677L3.6116,23.2677A0.8541,0.8541 0,0 1,2.7575 22.4136L2.7575,3.4729A0.8541,0.8541 0,0 1,3.6116 2.6188z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#6cb8f7"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M3.6108,3.3934L23.3107,3.3934A0.8541,0.8541 0,0 1,24.1648 4.2475L24.1648,23.1882A0.8541,0.8541 0,0 1,23.3107 24.0423L3.6108,24.0423A0.8541,0.8541 0,0 1,2.7567 23.1882L2.7567,4.2475A0.8541,0.8541 0,0 1,3.6108 3.3934z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#0c84e3"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M3.6099,3.0237L23.3097,3.0237A0.8541,0.8541 0,0 1,24.1638 3.8777L24.1638,22.8185A0.8541,0.8541 0,0 1,23.3097 23.6725L3.6099,23.6725A0.8541,0.8541 0,0 1,2.7558 22.8185L2.7558,3.8777A0.8541,0.8541 0,0 1,3.6099 3.0237z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#2196f3"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="m13.514,11.5177c0.7268,-0.0047 2.7305,-0.0312 3.0899,-0.6586 0.3594,-0.6274 -0.6417,-2.3511 -1.0091,-2.9738 -0.3674,-0.6227 -1.392,-2.3327 -2.1188,-2.328 -0.7268,0.0047 -1.7296,1.7278 -2.089,2.3552C11.0276,8.5399 10.0486,10.2764 10.416,10.8991 10.7834,11.5219 12.7872,11.5224 13.514,11.5177Z"
-      android:strokeWidth="0.75212771"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="m8.4011,13.429c0.8788,-0.0249 1.4878,1.1911 1.9465,2.0268 0.4587,0.8358 1.1528,1.9937 0.7328,2.8544 -0.42,0.8607 -1.6694,0.8404 -2.5482,0.8653 -0.8788,0.0249 -2.1256,0.1158 -2.5843,-0.7199 -0.4587,-0.8358 0.1816,-2.0315 0.6017,-2.8922 0.42,-0.8607 0.9728,-2.1095 1.8516,-2.1344z"
-      android:strokeWidth="0.64926457"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M13.4853,6.9897C13.223,6.9908 12.9187,7.0032 12.7868,6.8613 12.655,6.7194 12.8216,6.5589 12.952,6.4158 13.0825,6.2728 13.2185,6.1013 13.4808,6.1002 13.743,6.0991 13.8808,6.2693 14.0127,6.4112 14.1445,6.5532 14.3128,6.7122 14.1824,6.8553 14.052,6.9983 13.7476,6.9886 13.4853,6.9897Z"
-      android:fillColor="#2196f3"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M8.4311,14.7718C8.1939,14.7729 7.8517,14.7465 7.7325,14.6182 7.6132,14.4899 7.7448,14.2896 7.8627,14.1602 7.9807,14.0309 8.1892,13.8581 8.4264,13.857 8.6636,13.856 8.8739,14.027 8.9931,14.1553 9.1124,14.2836 9.246,14.4828 9.128,14.6121 9.0101,14.7415 8.6682,14.7708 8.4311,14.7718Z"
-      android:fillColor="#2196f3"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M5.7787,18.0041a2.7403,2.7842 0,1 0,5.4805 0a2.7403,2.7842 0,1 0,-5.4805 0z"
-      android:strokeWidth="1.24393165"
-      android:fillColor="#fefefe"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M16.2024,14.348L20.1069,14.348A0.8541,0.8541 0,0 1,20.961 15.2021L20.961,19.1065A0.8541,0.8541 0,0 1,20.1069 19.9606L16.2024,19.9606A0.8541,0.8541 0,0 1,15.3483 19.1065L15.3483,15.2021A0.8541,0.8541 0,0 1,16.2024 14.348z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M15.8657,15.3747a0.5535,0.5359 0,1 0,1.107 0a0.5535,0.5359 0,1 0,-1.107 0z"
-      android:strokeWidth="1.06593406"
-      android:fillColor="#2196f3"
-      android:fillAlpha="1"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#6cb8f7"
+        android:pathData="M3.612 2.619h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.855 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V3.473a0.854 0.854 0 0 1 0.855-0.854z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#0c84e3"
+        android:pathData="M3.61 3.393h19.7a0.854 0.854 0 0 1 0.855 0.854v18.941a0.854 0.854 0 0 1-0.854 0.854H3.61a0.854 0.854 0 0 1-0.854-0.854V4.248A0.854 0.854 0 0 1 3.61 3.392z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M3.61 3.024h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854H3.61a0.854 0.854 0 0 1-0.854-0.854V3.878A0.854 0.854 0 0 1 3.61 3.024z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M13.514 11.518c0.727-0.005 2.73-0.032 3.09-0.659 0.36-0.627-0.642-2.351-1.01-2.974-0.367-0.622-1.391-2.332-2.118-2.328-0.727 0.005-1.73 1.728-2.089 2.355-0.36 0.628-1.338 2.364-0.971 2.987 0.367 0.623 2.371 0.623 3.098 0.619z"
+        android:strokeWidth="0.75212771" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M8.401 13.429c0.879-0.025 1.488 1.191 1.947 2.027 0.458 0.836 1.152 1.994 0.732 2.854-0.42 0.86-1.669 0.84-2.548 0.866-0.879 0.024-2.125 0.115-2.584-0.72-0.459-0.836 0.181-2.032 0.602-2.893 0.42-0.86 0.972-2.11 1.851-2.134z"
+        android:strokeWidth="0.64926457" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M13.485 6.99c-0.262 0-0.566 0.013-0.698-0.129-0.132-0.142 0.035-0.302 0.165-0.445 0.13-0.143 0.267-0.315 0.529-0.316 0.262 0 0.4 0.17 0.532 0.311 0.132 0.142 0.3 0.301 0.17 0.444-0.131 0.143-0.435 0.134-0.698 0.135zm-5.054 7.782c-0.237 0-0.58-0.026-0.698-0.154-0.12-0.128 0.012-0.328 0.13-0.458 0.118-0.13 0.326-0.302 0.563-0.303 0.238-0.001 0.448 0.17 0.567 0.298 0.12 0.129 0.253 0.328 0.135 0.457-0.118 0.13-0.46 0.159-0.697 0.16z" />
+    <path
+        android:fillColor="#fefefe"
+        android:pathData="M5.779 18.004a2.74 2.784 0 1 0 5.48 0 2.74 2.784 0 1 0-5.48 0z"
+        android:strokeWidth="1.24393165" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16.202 14.348h3.905a0.854 0.854 0 0 1 0.854 0.854v3.905a0.854 0.854 0 0 1-0.854 0.854h-3.905a0.854 0.854 0 0 1-0.854-0.854v-3.905a0.854 0.854 0 0 1 0.854-0.854z" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M15.866 15.375a0.553 0.536 0 1 0 1.107 0 0.553 0.536 0 1 0-1.107 0z"
+        android:strokeWidth="1.06593406" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_itag_disabled.xml b/app/src/main/res/drawable/ic_device_itag_disabled.xml
index 1acdba6e2..c6072c708 100644
--- a/app/src/main/res/drawable/ic_device_itag_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_itag_disabled.xml
@@ -1,53 +1,40 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26.947369dp"
-    android:height="26.947369dp"
-    android:viewportWidth="26.947369"
-    android:viewportHeight="26.947369">
-  <path
-      android:pathData="M4.0362,2.923L23.736,2.923A0.8541,0.8541 0,0 1,24.5901 3.7771L24.5901,22.7178A0.8541,0.8541 0,0 1,23.736 23.5719L4.0362,23.5719A0.8541,0.8541 0,0 1,3.1821 22.7178L3.1821,3.7771A0.8541,0.8541 0,0 1,4.0362 2.923z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#a1a1a1"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M4.0354,3.6976L23.7353,3.6976A0.8541,0.8541 0,0 1,24.5894 4.5517L24.5894,23.4924A0.8541,0.8541 0,0 1,23.7353 24.3465L4.0354,24.3465A0.8541,0.8541 0,0 1,3.1813 23.4924L3.1813,4.5517A0.8541,0.8541 0,0 1,4.0354 3.6976z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#7d7d7d"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M4.0344,3.3278L23.7343,3.3278A0.8541,0.8541 0,0 1,24.5884 4.1819L24.5884,23.1226A0.8541,0.8541 0,0 1,23.7343 23.9767L4.0344,23.9767A0.8541,0.8541 0,0 1,3.1804 23.1226L3.1804,4.1819A0.8541,0.8541 0,0 1,4.0344 3.3278z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#8a8a8a"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="m13.9386,11.8219c0.7268,-0.0047 2.7305,-0.0312 3.0899,-0.6586 0.3594,-0.6274 -0.6417,-2.3511 -1.0091,-2.9738 -0.3674,-0.6227 -1.392,-2.3327 -2.1188,-2.328 -0.7268,0.0047 -1.7296,1.7278 -2.089,2.3552C11.4522,8.8441 10.4731,10.5805 10.8405,11.2033 11.2079,11.826 13.2118,11.8266 13.9386,11.8219Z"
-      android:strokeWidth="0.75212771"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="m8.8257,13.7332c0.8788,-0.0249 1.4878,1.1911 1.9465,2.0268 0.4587,0.8358 1.1528,1.9937 0.7328,2.8544 -0.42,0.8607 -1.6694,0.8404 -2.5482,0.8653 -0.8788,0.0249 -2.1256,0.1158 -2.5843,-0.7199 -0.4587,-0.8358 0.1816,-2.0315 0.6017,-2.8922 0.42,-0.8607 0.9728,-2.1095 1.8516,-2.1344z"
-      android:strokeWidth="0.64926457"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M13.9099,7.2939C13.6476,7.295 13.3433,7.3074 13.2114,7.1655 13.0795,7.0236 13.2462,6.8631 13.3766,6.72 13.507,6.577 13.6431,6.4055 13.9053,6.4044 14.1676,6.4032 14.3054,6.5735 14.4372,6.7154 14.5691,6.8573 14.7374,7.0164 14.607,7.1594 14.4766,7.3025 14.1721,7.2927 13.9099,7.2939Z"
-      android:fillColor="#8a8a8a"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M8.8556,15.076C8.6185,15.077 8.2763,15.0507 8.157,14.9223 8.0378,14.794 8.1694,14.5937 8.2873,14.4644 8.4052,14.335 8.6138,14.1622 8.851,14.1612 9.0881,14.1602 9.2985,14.3312 9.4177,14.4595 9.537,14.5878 9.6705,14.787 9.5526,14.9163 9.4347,15.0456 9.0928,15.075 8.8556,15.076Z"
-      android:fillColor="#8a8a8a"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M6.2033,18.3082a2.7403,2.7842 0,1 0,5.4805 0a2.7403,2.7842 0,1 0,-5.4805 0z"
-      android:strokeWidth="1.24393165"
-      android:fillColor="#fefefe"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M16.627,14.6521L20.5315,14.6521A0.8541,0.8541 0,0 1,21.3856 15.5062L21.3856,19.4107A0.8541,0.8541 0,0 1,20.5315 20.2648L16.627,20.2648A0.8541,0.8541 0,0 1,15.7729 19.4107L15.7729,15.5062A0.8541,0.8541 0,0 1,16.627 14.6521z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M16.2903,15.6788a0.5535,0.5359 0,1 0,1.107 0a0.5535,0.5359 0,1 0,-1.107 0z"
-      android:strokeWidth="1.06593406"
-      android:fillColor="#8a8a8a"
-      android:fillAlpha="1"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#a1a1a1"
+        android:pathData="M4.036 2.923h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V3.778a0.854 0.854 0 0 1 0.854-0.855z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#7d7d7d"
+        android:pathData="M4.035 3.698h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.552a0.854 0.854 0 0 1 0.854-0.854z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M4.034 3.328h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.182a0.854 0.854 0 0 1 0.854-0.854z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M13.939 11.822c0.726-0.005 2.73-0.031 3.09-0.659 0.359-0.627-0.642-2.35-1.01-2.974-0.367-0.622-1.392-2.332-2.118-2.328-0.727 0.005-1.73 1.728-2.09 2.356-0.359 0.627-1.338 2.364-0.97 2.986 0.367 0.623 2.37 0.624 3.098 0.619z"
+        android:strokeWidth="0.75212771" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M8.826 13.733c0.878-0.025 1.487 1.191 1.946 2.027 0.459 0.836 1.153 1.994 0.733 2.854-0.42 0.861-1.67 0.84-2.548 0.866-0.879 0.025-2.126 0.116-2.585-0.72-0.458-0.836 0.182-2.032 0.602-2.892 0.42-0.861 0.973-2.11 1.852-2.135z"
+        android:strokeWidth="0.64926457" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M13.91 7.294c-0.262 0.001-0.567 0.013-0.699-0.128-0.132-0.142 0.035-0.303 0.166-0.446 0.13-0.143 0.266-0.314 0.528-0.316 0.263 0 0.4 0.17 0.532 0.311 0.132 0.142 0.3 0.301 0.17 0.444-0.13 0.144-0.435 0.134-0.697 0.135zm-5.054 7.782c-0.238 0.001-0.58-0.025-0.699-0.154-0.12-0.128 0.012-0.328 0.13-0.458 0.118-0.129 0.327-0.302 0.564-0.303 0.237 0 0.447 0.17 0.567 0.299 0.119 0.128 0.253 0.327 0.135 0.456-0.118 0.13-0.46 0.159-0.697 0.16z" />
+    <path
+        android:fillColor="#fefefe"
+        android:pathData="M6.203 18.308a2.74 2.784 0 1 0 5.48 0 2.74 2.784 0 1 0-5.48 0z"
+        android:strokeWidth="1.24393165" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16.627 14.652h3.905a0.854 0.854 0 0 1 0.854 0.854v3.905a0.854 0.854 0 0 1-0.854 0.854h-3.905a0.854 0.854 0 0 1-0.854-0.854v-3.905a0.854 0.854 0 0 1 0.854-0.854z" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M16.29 15.679a0.553 0.536 0 1 0 1.107 0 0.553 0.536 0 1 0-1.107 0z"
+        android:strokeWidth="1.06593406" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_lovetoy.xml b/app/src/main/res/drawable/ic_device_lovetoy.xml
index f7e14fab4..b06520886 100644
--- a/app/src/main/res/drawable/ic_device_lovetoy.xml
+++ b/app/src/main/res/drawable/ic_device_lovetoy.xml
@@ -1,50 +1,35 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#1f7fdb"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#4dabf5"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M11.1875,11.8254m-4.0076,0a4.0076,4.0076 0,1 1,8.0152 0a4.0076,4.0076 0,1 1,-8.0152 0"
-        android:strokeWidth="3.69501472"
-        android:strokeColor="#00000000" />
+        android:pathData="M7.18 11.825a4.008 4.008 0 1 1 8.015 0 4.008 4.008 0 1 1-8.015 0"
+        android:strokeWidth="3.69501472" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M17.5009,11.8138m-4.0076,0a4.0076,4.0076 0,1 1,8.0152 0a4.0076,4.0076 0,1 1,-8.0152 0"
-        android:strokeWidth="3.69501472"
-        android:strokeColor="#00000000" />
+        android:pathData="M13.493 11.814a4.008 4.008 0 1 1 8.016 0 4.008 4.008 0 1 1-8.016 0"
+        android:strokeWidth="3.69501472" />
     <path
-        android:fillColor="#00000000"
-        android:pathData="m8.0018,13.3021c1.9553,3.307 6.759,7.1516 6.759,7.1516"
+        android:pathData="M8.002 13.302c1.955 3.307 6.759 7.152 6.759 7.152m6.035-7.436c-1.171 2.85-6.66 7.434-6.66 7.434"
         android:strokeWidth="1"
-        android:strokeColor="#ffffff"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="m20.796,13.0179c-1.1711,2.8505 -6.6604,7.4339 -6.6604,7.4339"
-        android:strokeWidth="1"
-        android:strokeColor="#ffffff"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" />
+        android:strokeColor="#ffffff" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="m14.0557,19.2122c-0.9315,-0.7976 -1.7959,-1.5949 -2.573,-2.3733 -0.6821,-0.6833 -1.0552,-1.0828 -0.9943,-1.0647 0.2312,0.0689 1.014,0.0724 1.3778,0.0061 0.6555,-0.1194 1.2366,-0.3744 1.7595,-0.772 0.1833,-0.1394 0.5293,-0.4703 0.6458,-0.6175l0.0665,-0.0841 0.318,0.3168c0.3624,0.361 0.6084,0.544 1.0141,0.7544 0.6469,0.3354 1.4088,0.4914 2.1202,0.4339 0.1574,-0.0127 0.3339,-0.032 0.3922,-0.0429 0.0583,-0.0109 0.1095,-0.0164 0.1136,-0.0122 0.0233,0.0233 -1.0555,1.1478 -1.6984,1.7704 -0.7315,0.7084 -1.7277,1.6225 -2.1444,1.9676 -0.0296,0.0245 -0.086,-0.0155 -0.3977,-0.2825z"
+        android:pathData="M14.056 19.212c-0.932-0.797-1.796-1.595-2.573-2.373-0.682-0.683-1.056-1.083-0.995-1.065 0.232 0.07 1.014 0.073 1.378 0.006 0.656-0.12 1.237-0.374 1.76-0.772 0.183-0.14 0.529-0.47 0.645-0.617l0.067-0.084 0.318 0.316c0.362 0.362 0.608 0.545 1.014 0.755 0.647 0.335 1.409 0.491 2.12 0.434 0.158-0.013 0.334-0.032 0.392-0.043 0.059-0.011 0.11-0.016 0.114-0.012 0.023 0.023-1.055 1.148-1.698 1.77-0.732 0.708-1.728 1.623-2.145 1.968-0.03 0.024-0.086-0.016-0.397-0.283z"
         android:strokeWidth="0.07733981"
         android:strokeColor="#ffffff" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_lovetoy_disabled.xml b/app/src/main/res/drawable/ic_device_lovetoy_disabled.xml
index 24dc22baf..207d62f36 100644
--- a/app/src/main/res/drawable/ic_device_lovetoy_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_lovetoy_disabled.xml
@@ -1,51 +1,36 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#7a7a7a"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillAlpha="0.9411765"
         android:fillColor="#9f9f9f"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M11.2862,12.1176m-4.0076,0a4.0076,4.0076 0,1 1,8.0152 0a4.0076,4.0076 0,1 1,-8.0152 0"
-        android:strokeWidth="3.69501472"
-        android:strokeColor="#00000000" />
+        android:pathData="M7.279 12.118a4.008 4.008 0 1 1 8.015 0 4.008 4.008 0 1 1-8.015 0"
+        android:strokeWidth="3.69501472" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M17.5996,12.106m-4.0076,0a4.0076,4.0076 0,1 1,8.0152 0a4.0076,4.0076 0,1 1,-8.0152 0"
-        android:strokeWidth="3.69501472"
-        android:strokeColor="#00000000" />
+        android:pathData="M13.592 12.106a4.008 4.008 0 1 1 8.015 0 4.008 4.008 0 1 1-8.015 0"
+        android:strokeWidth="3.69501472" />
     <path
-        android:fillColor="#00000000"
-        android:pathData="m8.1005,13.5943c1.9553,3.307 6.759,7.1516 6.759,7.1516"
+        android:pathData="M8.1 13.594c1.956 3.307 6.76 7.152 6.76 7.152m6.035-7.436c-1.171 2.85-6.66 7.434-6.66 7.434"
         android:strokeWidth="1"
-        android:strokeColor="#ffffff"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="m20.8947,13.3101c-1.1711,2.8505 -6.6604,7.4339 -6.6604,7.4339"
-        android:strokeWidth="1"
-        android:strokeColor="#ffffff"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" />
+        android:strokeColor="#ffffff" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="m14.1544,19.5044c-0.9315,-0.7976 -1.7959,-1.5949 -2.573,-2.3733 -0.6821,-0.6833 -1.0552,-1.0828 -0.9943,-1.0647 0.2312,0.0689 1.014,0.0724 1.3778,0.0061 0.6555,-0.1194 1.2366,-0.3744 1.7595,-0.772 0.1833,-0.1394 0.5293,-0.4703 0.6458,-0.6175l0.0665,-0.0841 0.318,0.3168c0.3624,0.361 0.6084,0.544 1.0141,0.7544 0.6469,0.3354 1.4088,0.4914 2.1202,0.4339 0.1574,-0.0127 0.3339,-0.032 0.3922,-0.0429 0.0583,-0.0109 0.1095,-0.0164 0.1136,-0.0122 0.0233,0.0233 -1.0555,1.1478 -1.6984,1.7704 -0.7315,0.7084 -1.7277,1.6225 -2.1444,1.9676 -0.0296,0.0245 -0.086,-0.0155 -0.3977,-0.2825z"
+        android:pathData="M14.154 19.504c-0.931-0.797-1.795-1.595-2.573-2.373-0.682-0.683-1.055-1.083-0.994-1.065 0.231 0.07 1.014 0.073 1.378 0.007 0.655-0.12 1.237-0.375 1.76-0.772 0.183-0.14 0.529-0.47 0.645-0.618l0.067-0.084 0.318 0.317c0.362 0.36 0.608 0.544 1.014 0.754 0.647 0.336 1.409 0.492 2.12 0.434 0.157-0.013 0.334-0.032 0.392-0.043 0.058-0.01 0.11-0.016 0.114-0.012 0.023 0.023-1.056 1.148-1.699 1.77-0.731 0.709-1.727 1.623-2.144 1.968-0.03 0.024-0.086-0.016-0.398-0.283z"
         android:strokeWidth="0.07733981"
         android:strokeColor="#ffffff" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_miband.xml b/app/src/main/res/drawable/ic_device_miband.xml
index 3f5368451..f5f68a21f 100644
--- a/app/src/main/res/drawable/ic_device_miband.xml
+++ b/app/src/main/res/drawable/ic_device_miband.xml
@@ -1,41 +1,27 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#1f7fdb"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#4dabf5"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M9.3882,13.2044L19.2293,13.2044A1.0938,1.0938 0,0 1,20.323 14.2982L20.323,14.5258A1.0938,1.0938 0,0 1,19.2293 15.6196L9.3882,15.6196A1.0938,1.0938 0,0 1,8.2945 14.5258L8.2945,14.2982A1.0938,1.0938 0,0 1,9.3882 13.2044z"
+        android:pathData="M9.388 13.204h9.841a1.094 1.094 0 0 1 1.094 1.094v0.228a1.094 1.094 0 0 1-1.094 1.094H9.39a1.094 1.094 0 0 1-1.095-1.094v-0.228a1.094 1.094 0 0 1 1.094-1.094z"
         android:strokeWidth="2.22514033"
         android:strokeColor="#ffffff" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M11.9261,14.3922m-0.4584,0a0.4584,0.4584 0,1 1,0.9167 0a0.4584,0.4584 0,1 1,-0.9167 0"
-        android:strokeWidth="1.34653521"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#2196f3"
-        android:pathData="M14.3631,14.3991m-0.4584,0a0.4584,0.4584 0,1 1,0.9167 0a0.4584,0.4584 0,1 1,-0.9167 0"
-        android:strokeWidth="1.34653521"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#2196f3"
-        android:pathData="M16.7481,14.3891m-0.4584,0a0.4584,0.4584 0,1 1,0.9167 0a0.4584,0.4584 0,1 1,-0.9167 0"
-        android:strokeWidth="1.34653521"
-        android:strokeColor="#00000000" />
+        android:pathData="M11.468 14.392a0.458 0.458 0 1 1 0.916 0 0.458 0.458 0 1 1-0.916 0m2.437 0.008a0.458 0.458 0 1 1 0.916 0 0.458 0.458 0 1 1-0.916 0m2.385-0.01a0.458 0.458 0 1 1 0.916 0 0.458 0.458 0 1 1-0.916 0"
+        android:strokeWidth="1.34653521" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_miband2.xml b/app/src/main/res/drawable/ic_device_miband2.xml
index a2a883c20..f2691e931 100644
--- a/app/src/main/res/drawable/ic_device_miband2.xml
+++ b/app/src/main/res/drawable/ic_device_miband2.xml
@@ -1,36 +1,31 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#1f7fdb"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#4dabf5"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M9.3882,13.2044L19.2293,13.2044A1.0938,1.0938 0,0 1,20.323 14.2982L20.323,14.5258A1.0938,1.0938 0,0 1,19.2293 15.6196L9.3882,15.6196A1.0938,1.0938 0,0 1,8.2945 14.5258L8.2945,14.2982A1.0938,1.0938 0,0 1,9.3882 13.2044z"
+        android:pathData="M9.388 13.204h9.841a1.094 1.094 0 0 1 1.094 1.094v0.228a1.094 1.094 0 0 1-1.094 1.094H9.39a1.094 1.094 0 0 1-1.095-1.094v-0.228a1.094 1.094 0 0 1 1.094-1.094z"
         android:strokeWidth="2.22514033"
         android:strokeColor="#ffffff" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M18.703,14.4052m-1.405,0a1.405,1.405 0,1 1,2.81 0a1.405,1.405 0,1 1,-2.81 0"
-        android:strokeWidth="3.82923341"
-        android:strokeColor="#00000000" />
+        android:pathData="M17.298 14.405a1.405 1.405 0 1 1 2.81 0 1.405 1.405 0 1 1-2.81 0"
+        android:strokeWidth="3.82923341" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M18.7052,14.4064m-1.0293,0a1.0293,1.0293 0,1 1,2.0587 0a1.0293,1.0293 0,1 1,-2.0587 0"
-        android:strokeWidth="2.80542302"
-        android:strokeColor="#00000000" />
+        android:pathData="M17.675 14.406a1.03 1.03 0 1 1 2.06 0 1.03 1.03 0 1 1-2.06 0"
+        android:strokeWidth="2.80542302" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_miband2_disabled.xml b/app/src/main/res/drawable/ic_device_miband2_disabled.xml
index 63b59f3b2..0044c1e15 100644
--- a/app/src/main/res/drawable/ic_device_miband2_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_miband2_disabled.xml
@@ -1,37 +1,32 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#7a7a7a"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillAlpha="0.9411765"
         android:fillColor="#9f9f9f"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M9.3882,13.2044L19.2293,13.2044A1.0938,1.0938 0,0 1,20.323 14.2982L20.323,14.5258A1.0938,1.0938 0,0 1,19.2293 15.6196L9.3882,15.6196A1.0938,1.0938 0,0 1,8.2945 14.5258L8.2945,14.2982A1.0938,1.0938 0,0 1,9.3882 13.2044z"
+        android:pathData="M9.388 13.204h9.841a1.094 1.094 0 0 1 1.094 1.094v0.228a1.094 1.094 0 0 1-1.094 1.094H9.39a1.094 1.094 0 0 1-1.095-1.094v-0.228a1.094 1.094 0 0 1 1.094-1.094z"
         android:strokeWidth="2.22514033"
         android:strokeColor="#ffffff" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M18.7175,14.4014m-1.405,0a1.405,1.405 0,1 1,2.81 0a1.405,1.405 0,1 1,-2.81 0"
-        android:strokeWidth="3.82923341"
-        android:strokeColor="#00000000" />
+        android:pathData="M17.313 14.401a1.405 1.405 0 1 1 2.81 0 1.405 1.405 0 1 1-2.81 0"
+        android:strokeWidth="3.82923341" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M18.7197,14.4026m-1.0293,0a1.0293,1.0293 0,1 1,2.0587 0a1.0293,1.0293 0,1 1,-2.0587 0"
-        android:strokeWidth="2.80542302"
-        android:strokeColor="#00000000" />
+        android:pathData="M17.69 14.403a1.03 1.03 0 1 1 2.06 0 1.03 1.03 0 1 1-2.06 0"
+        android:strokeWidth="2.80542302" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_miband_disabled.xml b/app/src/main/res/drawable/ic_device_miband_disabled.xml
index 40571ad3f..e1e6a1dbb 100644
--- a/app/src/main/res/drawable/ic_device_miband_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_miband_disabled.xml
@@ -1,42 +1,28 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#7a7a7a"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillAlpha="0.9411765"
         android:fillColor="#9f9f9f"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M9.3882,13.2044L19.2293,13.2044A1.0938,1.0938 0,0 1,20.323 14.2982L20.323,14.5258A1.0938,1.0938 0,0 1,19.2293 15.6196L9.3882,15.6196A1.0938,1.0938 0,0 1,8.2945 14.5258L8.2945,14.2982A1.0938,1.0938 0,0 1,9.3882 13.2044z"
+        android:pathData="M9.388 13.204h9.841a1.094 1.094 0 0 1 1.094 1.094v0.228a1.094 1.094 0 0 1-1.094 1.094H9.39a1.094 1.094 0 0 1-1.095-1.094v-0.228a1.094 1.094 0 0 1 1.094-1.094z"
         android:strokeWidth="2.22514033"
         android:strokeColor="#ffffff" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M11.9261,14.3922m-0.4584,0a0.4584,0.4584 0,1 1,0.9167 0a0.4584,0.4584 0,1 1,-0.9167 0"
-        android:strokeWidth="1.34653521"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M14.3631,14.3991m-0.4584,0a0.4584,0.4584 0,1 1,0.9167 0a0.4584,0.4584 0,1 1,-0.9167 0"
-        android:strokeWidth="1.34653521"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#8a8a8a"
-        android:pathData="M16.7481,14.3891m-0.4584,0a0.4584,0.4584 0,1 1,0.9167 0a0.4584,0.4584 0,1 1,-0.9167 0"
-        android:strokeWidth="1.34653521"
-        android:strokeColor="#00000000" />
+        android:pathData="M11.468 14.392a0.458 0.458 0 1 1 0.916 0 0.458 0.458 0 1 1-0.916 0m2.437 0.008a0.458 0.458 0 1 1 0.916 0 0.458 0.458 0 1 1-0.916 0m2.385-0.01a0.458 0.458 0 1 1 0.916 0 0.458 0.458 0 1 1-0.916 0"
+        android:strokeWidth="1.34653521" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_miscale2.xml b/app/src/main/res/drawable/ic_device_miscale2.xml
index 2eb436c25..15168995c 100644
--- a/app/src/main/res/drawable/ic_device_miscale2.xml
+++ b/app/src/main/res/drawable/ic_device_miscale2.xml
@@ -1,50 +1,41 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26.947369dp"
-    android:height="26.947369dp"
-    android:viewportWidth="26.947369"
-    android:viewportHeight="26.947369">
-  <path
-      android:pathData="M3.6116,2.6188L23.3114,2.6188A0.8541,0.8541 0,0 1,24.1655 3.4729L24.1655,22.4136A0.8541,0.8541 0,0 1,23.3114 23.2677L3.6116,23.2677A0.8541,0.8541 0,0 1,2.7575 22.4136L2.7575,3.4729A0.8541,0.8541 0,0 1,3.6116 2.6188z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#6cb8f7"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M3.6108,3.3934L23.3107,3.3934A0.8541,0.8541 0,0 1,24.1648 4.2475L24.1648,23.1882A0.8541,0.8541 0,0 1,23.3107 24.0423L3.6108,24.0423A0.8541,0.8541 0,0 1,2.7567 23.1882L2.7567,4.2475A0.8541,0.8541 0,0 1,3.6108 3.3934z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#0c84e3"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M3.6099,3.0237L23.3097,3.0237A0.8541,0.8541 0,0 1,24.1638 3.8777L24.1638,22.8185A0.8541,0.8541 0,0 1,23.3097 23.6725L3.6099,23.6725A0.8541,0.8541 0,0 1,2.7558 22.8185L2.7558,3.8777A0.8541,0.8541 0,0 1,3.6099 3.0237z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#2196f3"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M8.9063,7.8224L18,7.8224A0.6875,0.6875 0,0 1,18.6875 8.5099L18.6875,18.2599A0.6875,0.6875 0,0 1,18 18.9474L8.9063,18.9474A0.6875,0.6875 0,0 1,8.2188 18.2599L8.2188,8.5099A0.6875,0.6875 0,0 1,8.9063 7.8224z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="m10.8958,10.3231a3.6594,3.2653 92.1269,0 1,2.6306 -1.4692,3.6594 3.2653,92.1269 0,1 2.6058,1.4747l-2.6366,2.1842z"
-      android:strokeWidth="0.93131608"
-      android:fillColor="#2196f3"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="m11.6876,11.4717a2.9816,2.2646 90.8712,0 1,1.8242 -1.1972,2.9816 2.2646,90.8712 0,1 1.8071,1.2017l-1.8284,1.7798z"
-      android:strokeWidth="0.70008069"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M12.2903,9.7905L12.5444,10.1551A0.0895,0.0891 100.0071,0 1,12.5224 10.2797L12.5224,10.2797A0.0895,0.0891 100.0071,0 1,12.3983 10.2578L12.1442,9.8932A0.0895,0.0891 100.0071,0 1,12.1662 9.7686L12.1662,9.7686A0.0895,0.0891 100.0071,0 1,12.2903 9.7905z"
-      android:strokeWidth="0.8715741"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M16.1099,10.4527L15.2596,11.1627A0.0983,0.108 92.4563,0 1,15.107 11.1561L15.107,11.1561A0.0983,0.108 92.4563,0 1,15.113 11.0172L15.9633,10.3072A0.0983,0.108 92.4563,0 1,16.1159 10.3137L16.1159,10.3137A0.0983,0.108 92.4563,0 1,16.1099 10.4527z"
-      android:strokeWidth="0.43048036"
-      android:fillColor="#2196f3"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M11.0279,10.3108L11.8859,11.0024A0.1073,0.0972 81.0396,0 1,11.9095 11.1523L11.9095,11.1523A0.1073,0.0972 81.0396,0 1,11.7737 11.1737L10.9158,10.4821A0.1073,0.0972 81.0396,0 1,10.8921 10.3322L10.8921,10.3322A0.1073,0.0972 81.0396,0 1,11.0279 10.3108z"
-      android:strokeWidth="0.42741153"
-      android:fillColor="#2196f3"
-      android:fillAlpha="1"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#6cb8f7"
+        android:pathData="M3.612 2.619h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.855 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V3.473a0.854 0.854 0 0 1 0.855-0.854z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#0c84e3"
+        android:pathData="M3.61 3.393h19.7a0.854 0.854 0 0 1 0.855 0.854v18.941a0.854 0.854 0 0 1-0.854 0.854H3.61a0.854 0.854 0 0 1-0.854-0.854V4.248A0.854 0.854 0 0 1 3.61 3.392z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M3.61 3.024h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854H3.61a0.854 0.854 0 0 1-0.854-0.854V3.878A0.854 0.854 0 0 1 3.61 3.024z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M8.906 7.822H18a0.688 0.688 0 0 1 0.688 0.688v9.75A0.688 0.688 0 0 1 18 18.947H8.906A0.688 0.688 0 0 1 8.22 18.26V8.51a0.688 0.688 0 0 1 0.687-0.688z" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M10.896 10.323a3.66 3.265 92.127 0 1 2.63-1.47 3.66 3.265 92.127 0 1 2.606 1.476l-2.636 2.184z"
+        android:strokeWidth="0.93131608" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M11.688 11.472a2.982 2.265 90.871 0 1 1.824-1.197 2.982 2.265 90.871 0 1 1.807 1.201l-1.829 1.78z"
+        android:strokeWidth="0.70008069" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12.29 9.79l0.254 0.365a0.09 0.09 100.007 0 1-0.022 0.125 0.09 0.09 100.007 0 1-0.124-0.022l-0.254-0.365a0.09 0.09 100.007 0 1 0.022-0.124 0.09 0.09 100.007 0 1 0.124 0.021z"
+        android:strokeWidth="0.8715741" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M16.11 10.453l-0.85 0.71a0.098 0.108 92.456 0 1-0.153-0.007 0.098 0.108 92.456 0 1 0.006-0.139l0.85-0.71a0.098 0.108 92.456 0 1 0.153 0.007 0.098 0.108 92.456 0 1-0.006 0.139z"
+        android:strokeWidth="0.43048036" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M11.028 10.31l0.858 0.692a0.107 0.097 81.04 0 1 0.024 0.15 0.107 0.097 81.04 0 1-0.136 0.022l-0.858-0.692a0.107 0.097 81.04 0 1-0.024-0.15 0.107 0.097 81.04 0 1 0.136-0.021z"
+        android:strokeWidth="0.42741153" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_miscale2_disabled.xml b/app/src/main/res/drawable/ic_device_miscale2_disabled.xml
index a3e717402..5c56740e9 100644
--- a/app/src/main/res/drawable/ic_device_miscale2_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_miscale2_disabled.xml
@@ -1,50 +1,41 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26.947369dp"
-    android:height="26.947369dp"
-    android:viewportWidth="26.947369"
-    android:viewportHeight="26.947369">
-  <path
-      android:pathData="M4.0344,3.3278L23.7343,3.3278A0.8541,0.8541 0,0 1,24.5884 4.1819L24.5884,23.1226A0.8541,0.8541 0,0 1,23.7343 23.9767L4.0344,23.9767A0.8541,0.8541 0,0 1,3.1804 23.1226L3.1804,4.1819A0.8541,0.8541 0,0 1,4.0344 3.3278z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#8a8a8a"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M4.0354,3.6976L23.7353,3.6976A0.8541,0.8541 0,0 1,24.5894 4.5517L24.5894,23.4924A0.8541,0.8541 0,0 1,23.7353 24.3465L4.0354,24.3465A0.8541,0.8541 0,0 1,3.1813 23.4924L3.1813,4.5517A0.8541,0.8541 0,0 1,4.0354 3.6976z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#7d7d7d"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M4.0362,2.923L23.736,2.923A0.8541,0.8541 0,0 1,24.5901 3.7771L24.5901,22.7178A0.8541,0.8541 0,0 1,23.736 23.5719L4.0362,23.5719A0.8541,0.8541 0,0 1,3.1821 22.7178L3.1821,3.7771A0.8541,0.8541 0,0 1,4.0362 2.923z"
-      android:strokeWidth="0.99516809"
-      android:fillColor="#a1a1a1"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M9.1836,7.5521L18.2774,7.5521A0.6875,0.6875 0,0 1,18.9649 8.2396L18.9649,17.9896A0.6875,0.6875 0,0 1,18.2774 18.6771L9.1836,18.6771A0.6875,0.6875 0,0 1,8.4961 17.9896L8.4961,8.2396A0.6875,0.6875 0,0 1,9.1836 7.5521z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="m11.1732,10.0528a3.6594,3.2653 92.1269,0 1,2.6306 -1.4692,3.6594 3.2653,92.1269 0,1 2.6058,1.4747l-2.6366,2.1842z"
-      android:strokeWidth="0.93131608"
-      android:fillColor="#a1a1a1"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="m11.965,11.2014a2.9816,2.2646 90.8712,0 1,1.8242 -1.1972,2.9816 2.2646,90.8712 0,1 1.8071,1.2017l-1.8284,1.7798z"
-      android:strokeWidth="0.70008069"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M12.5677,9.5202L12.8218,9.8848A0.0895,0.0891 100.0071,0 1,12.7998 10.0094L12.7998,10.0094A0.0895,0.0891 100.0071,0 1,12.6757 9.9875L12.4216,9.623A0.0895,0.0891 100.0071,0 1,12.4436 9.4983L12.4436,9.4983A0.0895,0.0891 100.0071,0 1,12.5677 9.5202z"
-      android:strokeWidth="0.8715741"
-      android:fillColor="#ffffff"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M16.3873,10.1824L15.537,10.8924A0.0983,0.108 92.4563,0 1,15.3844 10.8859L15.3844,10.8859A0.0983,0.108 92.4563,0 1,15.3904 10.7469L16.2407,10.0369A0.0983,0.108 92.4563,0 1,16.3933 10.0435L16.3933,10.0435A0.0983,0.108 92.4563,0 1,16.3873 10.1824z"
-      android:strokeWidth="0.43048036"
-      android:fillColor="#a1a1a1"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M11.3053,10.0405L12.1633,10.7321A0.1073,0.0972 81.0396,0 1,12.1869 10.882L12.1869,10.882A0.1073,0.0972 81.0396,0 1,12.0511 10.9034L11.1932,10.2118A0.1073,0.0972 81.0396,0 1,11.1695 10.0619L11.1695,10.0619A0.1073,0.0972 81.0396,0 1,11.3053 10.0405z"
-      android:strokeWidth="0.42741153"
-      android:fillColor="#a1a1a1"
-      android:fillAlpha="1"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M4.034 3.328h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.182a0.854 0.854 0 0 1 0.854-0.854z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#7d7d7d"
+        android:pathData="M4.035 3.698h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.854h-19.7a0.854 0.854 0 0 1-0.854-0.854V4.552a0.854 0.854 0 0 1 0.854-0.854z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#a1a1a1"
+        android:pathData="M4.036 2.923h19.7a0.854 0.854 0 0 1 0.854 0.854v18.94a0.854 0.854 0 0 1-0.854 0.855h-19.7a0.854 0.854 0 0 1-0.854-0.854V3.778a0.854 0.854 0 0 1 0.854-0.855z"
+        android:strokeWidth="0.99516809" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M9.184 7.552h9.093a0.688 0.688 0 0 1 0.688 0.688v9.75a0.688 0.688 0 0 1-0.688 0.687H9.184a0.688 0.688 0 0 1-0.688-0.687V8.24a0.688 0.688 0 0 1 0.688-0.688z" />
+    <path
+        android:fillColor="#a1a1a1"
+        android:pathData="M11.173 10.053a3.66 3.265 92.127 0 1 2.63-1.47 3.66 3.265 92.127 0 1 2.607 1.475l-2.637 2.184z"
+        android:strokeWidth="0.93131608" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M11.965 11.201a2.982 2.265 90.871 0 1 1.824-1.197 2.982 2.265 90.871 0 1 1.807 1.202l-1.828 1.78z"
+        android:strokeWidth="0.70008069" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12.568 9.52l0.254 0.365a0.09 0.09 100.007 0 1-0.022 0.124 0.09 0.09 100.007 0 1-0.124-0.021l-0.254-0.365a0.09 0.09 100.007 0 1 0.022-0.125 0.09 0.09 100.007 0 1 0.124 0.022z"
+        android:strokeWidth="0.8715741" />
+    <path
+        android:fillColor="#a1a1a1"
+        android:pathData="M16.387 10.182l-0.85 0.71a0.098 0.108 92.456 0 1-0.153-0.006 0.098 0.108 92.456 0 1 0.006-0.14l0.85-0.71a0.098 0.108 92.456 0 1 0.153 0.008 0.098 0.108 92.456 0 1-0.006 0.138z"
+        android:strokeWidth="0.43048036" />
+    <path
+        android:fillColor="#a1a1a1"
+        android:pathData="M11.305 10.04l0.858 0.692a0.107 0.097 81.04 0 1 0.024 0.15 0.107 0.097 81.04 0 1-0.136 0.021l-0.858-0.691a0.107 0.097 81.04 0 1-0.024-0.15 0.107 0.097 81.04 0 1 0.136-0.021z"
+        android:strokeWidth="0.42741153" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_pebble.xml b/app/src/main/res/drawable/ic_device_pebble.xml
index 3d6190798..fcdd3de21 100644
--- a/app/src/main/res/drawable/ic_device_pebble.xml
+++ b/app/src/main/res/drawable/ic_device_pebble.xml
@@ -1,56 +1,42 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#1f7fdb"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#4dabf5"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M8.6563,8.6266h11.408v11.5327h-11.408z"
-        android:strokeWidth="3.49097753"
-        android:strokeColor="#00000000" />
+        android:pathData="M8.656 8.627h11.408v11.532H8.656z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M8.6563,7.1776h1.5851v14.4375h-1.5851z"
-        android:strokeWidth="3.39209962"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M18.4375,7.1776h1.6268v14.4688h-1.6268z"
-        android:strokeWidth="3.51330233"
-        android:strokeColor="#00000000" />
+        android:pathData="M8.656 7.178h1.585v14.437H8.656zm9.782 0h1.626v14.468h-1.627z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M10.231,10.1776h8.2065v8.5h-8.2065z"
-        android:strokeWidth="3.42758274"
-        android:strokeColor="#00000000" />
+        android:pathData="M10.231 10.178h8.207v8.5H10.23z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M11.3163,11.3468h6v6.125h-6z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M11.316 11.347h6v6.125h-6z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M13.9542,12.481h0.7813v2.2813h-0.7813z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M13.954 12.481h0.781v2.281h-0.78z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M13.9542,14.0435h2.1875v0.7188h-2.1875z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M13.954 14.043h2.188v0.72h-2.188z"
+        android:strokeWidth="3.4" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_pebble_disabled.xml b/app/src/main/res/drawable/ic_device_pebble_disabled.xml
index cdc33f920..c7bad5400 100644
--- a/app/src/main/res/drawable/ic_device_pebble_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_pebble_disabled.xml
@@ -1,57 +1,43 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#7a7a7a"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.4" />
     <path
         android:fillAlpha="0.9411765"
         android:fillColor="#9f9f9f"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M8.7228,8.5173h11.408v11.5327h-11.408z"
-        android:strokeWidth="3.49097753"
-        android:strokeColor="#00000000" />
+        android:pathData="M8.723 8.517H20.13V20.05H8.723z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M8.7228,7.0683h1.5851v14.4375h-1.5851z"
-        android:strokeWidth="3.39209962"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M18.504,7.0683h1.6268v14.4688h-1.6268z"
-        android:strokeWidth="3.51330233"
-        android:strokeColor="#00000000" />
+        android:pathData="M8.723 7.068h1.585v14.438H8.723zm9.781 0h1.627v14.47h-1.627z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M10.2975,10.0683h8.2065v8.5h-8.2065z"
-        android:strokeWidth="3.42758274"
-        android:strokeColor="#00000000" />
+        android:pathData="M10.297 10.068h8.207v8.5h-8.207z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M11.3828,11.2374h6v6.125h-6z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M11.383 11.237h6v6.125h-6z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M14.0208,12.3716h0.7813v2.2813h-0.7813z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M14.02 12.372h0.782v2.28h-0.781z"
+        android:strokeWidth="3.4" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M14.0208,13.9341h2.1875v0.7188h-2.1875z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M14.02 13.934h2.188v0.719h-2.187z"
+        android:strokeWidth="3.4" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_pinetime.xml b/app/src/main/res/drawable/ic_device_pinetime.xml
index 36a4b2818..f2e5b03a7 100644
--- a/app/src/main/res/drawable/ic_device_pinetime.xml
+++ b/app/src/main/res/drawable/ic_device_pinetime.xml
@@ -1,96 +1,66 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
-  <path
-      android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#1f7fdb"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#4dabf5"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#2196f3"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M12.2691,6.7079L16.8107,6.7079A0.425,0.425 0,0 1,17.2357 7.1329L17.2357,22.1721A0.425,0.425 0,0 1,16.8107 22.5971L12.2691,22.5971A0.425,0.425 0,0 1,11.844 22.1721L11.844,7.1329A0.425,0.425 0,0 1,12.2691 6.7079z"
-      android:strokeWidth="2.43489814"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M10.9153,9.6924L18.2086,9.6924A1.1042,1.1042 0,0 1,19.3129 10.7967L19.3129,18.09A1.1042,1.1042 0,0 1,18.2086 19.1942L10.9153,19.1942A1.1042,1.1042 0,0 1,9.8111 18.09L9.8111,10.7967A1.1042,1.1042 0,0 1,10.9153 9.6924z"
-      android:strokeWidth="3.5"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M9.8173,13.4853L10.2236,13.4853A0.2609,0.2609 0,0 1,10.4845 13.7462L10.4845,15.3015A0.2609,0.2609 0,0 1,10.2236 15.5624L9.8173,15.5624A0.2609,0.2609 0,0 1,9.5564 15.3015L9.5564,13.7462A0.2609,0.2609 0,0 1,9.8173 13.4853z"
-      android:strokeWidth="3.5"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M11.7155,10.731L17.4222,10.731A0.866,0.8376 90,0 1,18.2598 11.597L18.2598,16.6054A0.866,0.8376 90,0 1,17.4222 17.4713L11.7155,17.4713A0.866,0.8376 90,0 1,10.8779 16.6054L10.8779,11.597A0.866,0.8376 90,0 1,11.7155 10.731z"
-      android:strokeWidth="5.10916853"
-      android:fillColor="#2196f3"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M14.689,15.1735L15.8745,15.605A0.0973,0.2672 90,0 1,15.8745 15.7425L14.689,16.174A0.0973,0.2672 90,0 1,14.311 16.174L13.1255,15.7425A0.0973,0.2672 90,0 1,13.1255 15.605L14.311,15.1735A0.0973,0.2672 90,0 1,14.689 15.1735z"
-      android:strokeWidth="3.12518311"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M14.6811,13.9257L15.7183,14.3474A0.1041,0.2561 90,0 1,15.7183 14.4947L14.6811,14.9165A0.1041,0.2561 90,0 1,14.3189 14.9165L13.2817,14.4947A0.1041,0.2561 90,0 1,13.2817 14.3474L14.3189,13.9257A0.1041,0.2561 90,0 1,14.6811 13.9257z"
-      android:strokeWidth="2.83754849"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M14.6489,12.6994L15.6098,13.1338A0.0952,0.2106 90,0 1,15.6098 13.2685L14.6489,13.7029A0.0952,0.2106 90,0 1,14.3511 13.7029L13.3902,13.2685A0.0952,0.2106 90,0 1,13.3902 13.1338L14.3511,12.6994A0.0952,0.2106 90,0 1,14.6489 12.6994z"
-      android:strokeWidth="2.59477019"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M14.6794,11.5563L15.3255,11.9074A0.1379,0.2538 90,0 1,15.3255 12.1024L14.6794,12.4535A0.1379,0.2538 90,0 1,14.3206 12.4535L13.6745,12.1024A0.1379,0.2538 90,0 1,13.6745 11.9074L14.3206,11.5563A0.1379,0.2538 90,0 1,14.6794 11.5563z"
-      android:strokeWidth="2.1484313"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M14.3945,16.0233L14.6055,16.0233A0.0938,0.0938 0,0 1,14.6992 16.117L14.6992,16.493A0.0938,0.0938 0,0 1,14.6055 16.5867L14.3945,16.5867A0.0938,0.0938 0,0 1,14.3008 16.493L14.3008,16.117A0.0938,0.0938 0,0 1,14.3945 16.0233z"
-      android:strokeWidth="3.5"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m13.6299,13.4368c0.8811,0.4157 0.8692,0.3498 0.1189,0.6586 -0.7503,0.3088 -0.6702,0.3466 -0.801,-0.3779 -0.1308,-0.7245 -0.199,-0.6964 0.6821,-0.2807z"
-      android:strokeWidth="1.08117461"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m13.5499,14.6758c0.9831,0.4157 0.9698,0.3498 0.1326,0.6586 -0.8372,0.3088 -0.7478,0.3466 -0.8937,-0.3779 -0.1459,-0.7245 -0.222,-0.6964 0.7611,-0.2807z"
-      android:strokeWidth="1.08117461"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m15.4483,14.6788c-0.9831,0.4157 -0.9698,0.3498 -0.1326,0.6586 0.8372,0.3088 0.7478,0.3466 0.8937,-0.3779 0.1459,-0.7245 0.222,-0.6964 -0.7611,-0.2807z"
-      android:strokeWidth="1.08117461"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m15.3969,13.4375c-0.8811,0.4157 -0.8692,0.3498 -0.1189,0.6586 0.7503,0.3088 0.6702,0.3466 0.801,-0.3779 0.1308,-0.7245 0.199,-0.6964 -0.6821,-0.2807z"
-      android:strokeWidth="1.08117461"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m15.2751,12.2031c-0.7572,0.4305 -0.7482,0.3645 -0.0904,0.6605 0.6578,0.296 0.5889,0.3352 0.6884,-0.3914 0.0995,-0.7265 0.1593,-0.6996 -0.598,-0.2691z"
-      android:strokeWidth="1.08117461"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m13.7234,12.2005c0.7572,0.4305 0.7482,0.3645 0.0904,0.6605 -0.6578,0.296 -0.5889,0.3352 -0.6884,-0.3914 -0.0995,-0.7265 -0.1593,-0.6996 0.598,-0.2691z"
-      android:strokeWidth="1.08117461"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#1f7fdb"
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.6" />
+    <path
+        android:fillColor="#4dabf5"
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.6" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.6" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12.27 6.708h4.54a0.425 0.425 0 0 1 0.426 0.425v15.04a0.425 0.425 0 0 1-0.425 0.424h-4.542a0.425 0.425 0 0 1-0.425-0.425V7.132a0.425 0.425 0 0 1 0.425-0.424z"
+        android:strokeWidth="2.4" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M10.915 9.692h7.294a1.104 1.104 0 0 1 1.104 1.105v7.293a1.104 1.104 0 0 1-1.104 1.104h-7.294a1.104 1.104 0 0 1-1.104-1.104v-7.293a1.104 1.104 0 0 1 1.104-1.105z"
+        android:strokeWidth="3.5" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M9.817 13.485h0.407a0.26 0.26 0 0 1 0.26 0.261v1.556a0.26 0.26 0 0 1-0.26 0.26H9.817a0.26 0.26 0 0 1-0.26-0.26v-1.556a0.26 0.26 0 0 1 0.26-0.26z"
+        android:strokeWidth="3.5" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M11.716 10.731h5.706a0.866 0.838 90 0 1 0.838 0.866v5.008a0.866 0.838 90 0 1-0.838 0.866h-5.707a0.866 0.838 90 0 1-0.837-0.866v-5.008a0.866 0.838 90 0 1 0.838-0.866z"
+        android:strokeWidth="5.1" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.689 15.174l1.185 0.431a0.097 0.267 90 0 1 0 0.137l-1.185 0.432a0.097 0.267 90 0 1-0.378 0l-1.185-0.431a0.097 0.267 90 0 1 0-0.138l1.185-0.431a0.097 0.267 90 0 1 0.378 0z"
+        android:strokeWidth="3.1" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.681 13.926l1.037 0.421a0.104 0.256 90 0 1 0 0.148l-1.037 0.421a0.104 0.256 90 0 1-0.362 0l-1.037-0.421a0.104 0.256 90 0 1 0-0.148l1.037-0.421a0.104 0.256 90 0 1 0.362 0z"
+        android:strokeWidth="2.8" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.649 12.7l0.96 0.434a0.095 0.21 90 0 1 0 0.134l-0.96 0.435a0.095 0.21 90 0 1-0.298 0l-0.96-0.434a0.095 0.21 90 0 1 0-0.135l0.96-0.435a0.095 0.21 90 0 1 0.298 0z"
+        android:strokeWidth="2.6" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.68 11.556l0.646 0.351a0.138 0.254 90 0 1 0 0.195l-0.647 0.351a0.138 0.254 90 0 1-0.358 0l-0.646-0.35a0.138 0.254 90 0 1 0-0.196l0.646-0.35a0.138 0.254 90 0 1 0.358 0z"
+        android:strokeWidth="2" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.395 16.023h0.21a0.094 0.094 0 0 1 0.094 0.094v0.376a0.094 0.094 0 0 1-0.094 0.094h-0.21a0.094 0.094 0 0 1-0.094-0.094v-0.376a0.094 0.094 0 0 1 0.094-0.094z"
+        android:strokeWidth="3.5" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M13.63 13.437c0.881 0.416 0.87 0.35 0.119 0.658-0.75 0.31-0.67 0.347-0.801-0.378-0.131-0.724-0.2-0.696 0.682-0.28zm-0.08 1.239c0.983 0.416 0.97 0.35 0.132 0.658-0.837 0.31-0.747 0.347-0.893-0.377-0.146-0.725-0.222-0.697 0.76-0.281z"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M15.448 14.679c-0.983 0.416-0.97 0.35-0.132 0.658 0.837 0.31 0.747 0.347 0.893-0.377 0.146-0.725 0.222-0.697-0.76-0.281z"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M15.397 13.438c-0.881 0.415-0.87 0.35-0.119 0.658 0.75 0.309 0.67 0.347 0.801-0.378 0.13-0.724 0.199-0.696-0.682-0.28zm-0.122-1.235c-0.757 0.43-0.748 0.365-0.09 0.66 0.657 0.297 0.589 0.336 0.688-0.39 0.1-0.727 0.16-0.7-0.598-0.27zM13.723 12.2c0.758 0.431 0.749 0.365 0.09 0.661-0.657 0.296-0.588 0.335-0.688-0.391-0.1-0.727-0.159-0.7 0.598-0.27z"
+        android:strokeWidth="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_pinetime_disabled.xml b/app/src/main/res/drawable/ic_device_pinetime_disabled.xml
index 14556aac4..3bd626ff0 100644
--- a/app/src/main/res/drawable/ic_device_pinetime_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_pinetime_disabled.xml
@@ -1,97 +1,67 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
-  <path
-      android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#7a7a7a"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#9f9f9f"
-      android:strokeColor="#00000000"
-      android:fillAlpha="0.9411765"/>
-  <path
-      android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#8a8a8a"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M12.2783,6.3989L16.82,6.3989A0.425,0.425 0,0 1,17.245 6.824L17.245,21.8631A0.425,0.425 0,0 1,16.82 22.2882L12.2783,22.2882A0.425,0.425 0,0 1,11.8533 21.8631L11.8533,6.824A0.425,0.425 0,0 1,12.2783 6.3989z"
-      android:strokeWidth="2.43489814"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M10.9246,9.3835L18.2179,9.3835A1.1042,1.1042 0,0 1,19.3221 10.4877L19.3221,17.781A1.1042,1.1042 0,0 1,18.2179 18.8852L10.9246,18.8852A1.1042,1.1042 0,0 1,9.8204 17.781L9.8204,10.4877A1.1042,1.1042 0,0 1,10.9246 9.3835z"
-      android:strokeWidth="3.5"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M9.8266,13.1763L10.2329,13.1763A0.2609,0.2609 0,0 1,10.4938 13.4373L10.4938,14.9926A0.2609,0.2609 0,0 1,10.2329 15.2535L9.8266,15.2535A0.2609,0.2609 0,0 1,9.5657 14.9926L9.5657,13.4373A0.2609,0.2609 0,0 1,9.8266 13.1763z"
-      android:strokeWidth="3.5"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M11.7248,10.422L17.4314,10.422A0.866,0.8376 90,0 1,18.269 11.288L18.269,16.2964A0.866,0.8376 90,0 1,17.4314 17.1624L11.7248,17.1624A0.866,0.8376 90,0 1,10.8872 16.2964L10.8872,11.288A0.866,0.8376 90,0 1,11.7248 10.422z"
-      android:strokeWidth="5.10916853"
-      android:fillColor="#8a8a8a"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M14.7669,14.9324L15.9524,15.3639A0.0973,0.2672 90,0 1,15.9524 15.5015L14.7669,15.933A0.0973,0.2672 90,0 1,14.389 15.933L13.2035,15.5015A0.0973,0.2672 90,0 1,13.2035 15.3639L14.389,14.9324A0.0973,0.2672 90,0 1,14.7669 14.9324z"
-      android:strokeWidth="3.12518311"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M14.759,13.6846L15.7962,14.1064A0.1041,0.2561 90,0 1,15.7962 14.2537L14.759,14.6755A0.1041,0.2561 90,0 1,14.3968 14.6755L13.3596,14.2537A0.1041,0.2561 90,0 1,13.3596 14.1064L14.3968,13.6846A0.1041,0.2561 90,0 1,14.759 13.6846z"
-      android:strokeWidth="2.83754849"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M14.7268,12.4584L15.6877,12.8928A0.0952,0.2106 90,0 1,15.6877 13.0275L14.7268,13.4619A0.0952,0.2106 90,0 1,14.429 13.4619L13.4681,13.0275A0.0952,0.2106 90,0 1,13.4681 12.8928L14.429,12.4584A0.0952,0.2106 90,0 1,14.7268 12.4584z"
-      android:strokeWidth="2.59477019"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M14.7574,11.3152L15.4034,11.6663A0.1379,0.2538 90,0 1,15.4034 11.8614L14.7574,12.2124A0.1379,0.2538 90,0 1,14.3985 12.2124L13.7524,11.8614A0.1379,0.2538 90,0 1,13.7524 11.6663L14.3985,11.3152A0.1379,0.2538 90,0 1,14.7574 11.3152z"
-      android:strokeWidth="2.1484313"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M14.4724,15.7822L14.6834,15.7822A0.0938,0.0938 0,0 1,14.7771 15.876L14.7771,16.2519A0.0938,0.0938 0,0 1,14.6834 16.3457L14.4724,16.3457A0.0938,0.0938 0,0 1,14.3787 16.2519L14.3787,15.876A0.0938,0.0938 0,0 1,14.4724 15.7822z"
-      android:strokeWidth="3.5"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m13.7078,13.1958c0.8811,0.4157 0.8692,0.3498 0.1189,0.6586 -0.7503,0.3088 -0.6702,0.3466 -0.801,-0.3779 -0.1308,-0.7245 -0.199,-0.6964 0.6821,-0.2807z"
-      android:strokeWidth="1.08117461"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m13.6278,14.4347c0.9831,0.4157 0.9698,0.3498 0.1326,0.6586 -0.8372,0.3088 -0.7478,0.3466 -0.8937,-0.3779 -0.1459,-0.7245 -0.222,-0.6964 0.7611,-0.2807z"
-      android:strokeWidth="1.08117461"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m15.5262,14.4378c-0.9831,0.4157 -0.9698,0.3498 -0.1326,0.6586 0.8372,0.3088 0.7478,0.3466 0.8937,-0.3779 0.1459,-0.7245 0.222,-0.6964 -0.7611,-0.2807z"
-      android:strokeWidth="1.08117461"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m15.4748,13.1964c-0.8811,0.4157 -0.8692,0.3498 -0.1189,0.6586 0.7503,0.3088 0.6702,0.3466 0.801,-0.3779 0.1308,-0.7245 0.199,-0.6964 -0.6821,-0.2807z"
-      android:strokeWidth="1.08117461"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m15.353,11.9621c-0.7572,0.4305 -0.7482,0.3645 -0.0904,0.6605 0.6578,0.296 0.5889,0.3352 0.6884,-0.3914 0.0995,-0.7265 0.1593,-0.6996 -0.598,-0.2691z"
-      android:strokeWidth="1.08117461"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m13.8013,11.9595c0.7572,0.4305 0.7482,0.3645 0.0904,0.6605 -0.6578,0.296 -0.5889,0.3352 -0.6884,-0.3914 -0.0995,-0.7265 -0.1593,-0.6996 0.598,-0.2691z"
-      android:strokeWidth="1.08117461"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#7a7a7a"
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillAlpha="0.9411765"
+        android:fillColor="#9f9f9f"
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12.278 6.399h4.542a0.425 0.425 0 0 1 0.425 0.425v15.04a0.425 0.425 0 0 1-0.425 0.424h-4.542a0.425 0.425 0 0 1-0.425-0.425V6.824a0.425 0.425 0 0 1 0.425-0.425z"
+        android:strokeWidth="2.43489814" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M10.925 9.383h7.293a1.104 1.104 0 0 1 1.104 1.105v7.293a1.104 1.104 0 0 1-1.104 1.104h-7.293a1.104 1.104 0 0 1-1.105-1.104v-7.293a1.104 1.104 0 0 1 1.105-1.104z"
+        android:strokeWidth="3.5" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M9.827 13.176h0.406a0.26 0.26 0 0 1 0.26 0.261v1.556a0.26 0.26 0 0 1-0.26 0.26H9.827a0.26 0.26 0 0 1-0.261-0.26v-1.556a0.26 0.26 0 0 1 0.26-0.26z"
+        android:strokeWidth="3.5" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M11.725 10.422h5.706a0.866 0.838 90 0 1 0.838 0.866v5.008a0.866 0.838 90 0 1-0.838 0.866h-5.706a0.866 0.838 90 0 1-0.838-0.866v-5.008a0.866 0.838 90 0 1 0.838-0.866z"
+        android:strokeWidth="5.10916853" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.767 14.932l1.185 0.432a0.097 0.267 90 0 1 0 0.137l-1.185 0.432a0.097 0.267 90 0 1-0.378 0l-1.185-0.431a0.097 0.267 90 0 1 0-0.138l1.185-0.432a0.097 0.267 90 0 1 0.378 0z"
+        android:strokeWidth="3.12518311" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.759 13.685l1.037 0.421a0.104 0.256 90 0 1 0 0.148l-1.037 0.421a0.104 0.256 90 0 1-0.362 0l-1.037-0.421a0.104 0.256 90 0 1 0-0.148l1.037-0.421a0.104 0.256 90 0 1 0.362 0z"
+        android:strokeWidth="2.83754849" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.727 12.458l0.96 0.435a0.095 0.21 90 0 1 0 0.134l-0.96 0.435a0.095 0.21 90 0 1-0.298 0l-0.96-0.434a0.095 0.21 90 0 1 0-0.135l0.96-0.435a0.095 0.21 90 0 1 0.298 0z"
+        android:strokeWidth="2.59477019" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.757 11.315l0.646 0.351a0.138 0.254 90 0 1 0 0.195l-0.646 0.351a0.138 0.254 90 0 1-0.358 0l-0.647-0.35a0.138 0.254 90 0 1 0-0.196l0.646-0.35a0.138 0.254 90 0 1 0.36 0z"
+        android:strokeWidth="2.1484313" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.472 15.782h0.211a0.094 0.094 0 0 1 0.094 0.094v0.376a0.094 0.094 0 0 1-0.094 0.094h-0.21a0.094 0.094 0 0 1-0.094-0.094v-0.376a0.094 0.094 0 0 1 0.093-0.094z"
+        android:strokeWidth="3.5" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M13.708 13.196c0.88 0.416 0.869 0.35 0.119 0.658-0.75 0.31-0.67 0.347-0.801-0.377-0.131-0.725-0.2-0.697 0.682-0.281zm-0.08 1.239c0.983 0.415 0.97 0.35 0.132 0.658-0.837 0.31-0.747 0.347-0.893-0.378-0.146-0.724-0.222-0.696 0.76-0.28z"
+        android:strokeWidth="1.08117461" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M15.526 14.438c-0.983 0.415-0.97 0.35-0.132 0.658 0.837 0.31 0.747 0.347 0.893-0.378 0.146-0.724 0.222-0.696-0.76-0.28z"
+        android:strokeWidth="1.08117461" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M15.475 13.196c-0.881 0.416-0.87 0.35-0.12 0.659 0.751 0.309 0.671 0.347 0.802-0.378 0.13-0.724 0.199-0.696-0.682-0.28zm-0.122-1.234c-0.757 0.43-0.748 0.365-0.09 0.66 0.657 0.297 0.588 0.336 0.688-0.39 0.1-0.727 0.16-0.7-0.598-0.27zm-1.552-0.002c0.757 0.43 0.748 0.364 0.09 0.66-0.657 0.296-0.588 0.335-0.688-0.391-0.1-0.727-0.159-0.7 0.598-0.27z"
+        android:strokeWidth="1.08117461" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_roidmi.xml b/app/src/main/res/drawable/ic_device_roidmi.xml
index 204d95441..696ac8f24 100644
--- a/app/src/main/res/drawable/ic_device_roidmi.xml
+++ b/app/src/main/res/drawable/ic_device_roidmi.xml
@@ -1,46 +1,38 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
-  <path
-      android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#1f7fdb"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#4dabf5"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#2196f3"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M10.3284,7.7788L18.192,7.7788A0.6865,0.6865 0,0 1,18.8785 8.4652L18.8785,13.3881A0.6865,0.6865 0,0 1,18.192 14.0745L10.3284,14.0745A0.6865,0.6865 0,0 1,9.6419 13.3881L9.6419,8.4652A0.6865,0.6865 0,0 1,10.3284 7.7788z"
-      android:strokeWidth="3.28026915"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M11.3624,13.5047L17.1191,13.5047A0.6377,0.6377 0,0 1,17.7568 14.1424L17.7568,19.0352A0.6377,0.6377 0,0 1,17.1191 19.6729L11.3624,19.6729A0.6377,0.6377 0,0 1,10.7247 19.0352L10.7247,14.1424A0.6377,0.6377 0,0 1,11.3624 13.5047z"
-      android:strokeWidth="2.83302426"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M12.729,19.4188L15.771,19.4188A0.3417,0.3417 0,0 1,16.1127 19.7605L16.1127,21.6164A0.3417,0.3417 0,0 1,15.771 21.9581L12.729,21.9581A0.3417,0.3417 0,0 1,12.3873 21.6164L12.3873,19.7605A0.3417,0.3417 0,0 1,12.729 19.4188z"
-      android:strokeWidth="1.32303238"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M14.0634,21.518L14.4677,21.518A0.5491,0.5491 0,0 1,15.0169 22.0672L15.0169,22.2341A0.5491,0.5491 0,0 1,14.4677 22.7832L14.0634,22.7832A0.5491,0.5491 0,0 1,13.5143 22.2341L13.5143,22.0672A0.5491,0.5491 0,0 1,14.0634 21.518z"
-      android:strokeWidth="0.5930993"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M10.2618,7.56L18.2576,7.56A0.2136,0.2136 0,0 1,18.4712 7.7736L18.4712,12.8467A0.2136,0.2136 0,0 1,18.2576 13.0603L10.2618,13.0603A0.2136,0.2136 0,0 1,10.0482 12.8467L10.0482,7.7736A0.2136,0.2136 0,0 1,10.2618 7.56z"
-      android:strokeWidth="2.9279027"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#1f7fdb"
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#4dabf5"
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M10.328 7.779h7.864a0.686 0.686 0 0 1 0.686 0.686v4.923a0.686 0.686 0 0 1-0.686 0.687h-7.864a0.686 0.686 0 0 1-0.686-0.687V8.465a0.686 0.686 0 0 1 0.686-0.686z"
+        android:strokeWidth="3.28026915" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M11.362 13.505h5.757a0.638 0.638 0 0 1 0.638 0.637v4.893a0.638 0.638 0 0 1-0.638 0.638h-5.757a0.638 0.638 0 0 1-0.637-0.638v-4.893a0.638 0.638 0 0 1 0.637-0.637z"
+        android:strokeWidth="2.83302426" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12.729 19.419h3.042a0.342 0.342 0 0 1 0.342 0.341v1.856a0.342 0.342 0 0 1-0.342 0.342h-3.042a0.342 0.342 0 0 1-0.342-0.342v-1.855a0.342 0.342 0 0 1 0.342-0.342z"
+        android:strokeWidth="1.32303238" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.063 21.518h0.405a0.55 0.55 0 0 1 0.549 0.55v0.166a0.55 0.55 0 0 1-0.55 0.55h-0.404a0.55 0.55 0 0 1-0.549-0.55v-0.167a0.55 0.55 0 0 1 0.55-0.549z"
+        android:strokeWidth="0.5930993" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M10.262 7.56h7.996a0.214 0.214 0 0 1 0.213 0.214v5.073a0.214 0.214 0 0 1-0.213 0.213h-7.996a0.214 0.214 0 0 1-0.214-0.213V7.774a0.214 0.214 0 0 1 0.214-0.214z"
+        android:strokeWidth="2.9279027" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_roidmi_disabled.xml b/app/src/main/res/drawable/ic_device_roidmi_disabled.xml
index a202c1528..9c7155f21 100644
--- a/app/src/main/res/drawable/ic_device_roidmi_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_roidmi_disabled.xml
@@ -1,47 +1,39 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
-  <path
-      android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#7a7a7a"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#9f9f9f"
-      android:strokeColor="#00000000"
-      android:fillAlpha="0.9411765"/>
-  <path
-      android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#8a8a8a"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M10.4432,7.5348L18.3068,7.5348A0.6865,0.6865 0,0 1,18.9933 8.2213L18.9933,13.1441A0.6865,0.6865 0,0 1,18.3068 13.8306L10.4432,13.8306A0.6865,0.6865 0,0 1,9.7567 13.1441L9.7567,8.2213A0.6865,0.6865 0,0 1,10.4432 7.5348z"
-      android:strokeWidth="3.28026915"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M11.4771,13.2608L17.2339,13.2608A0.6377,0.6377 0,0 1,17.8716 13.8984L17.8716,18.7913A0.6377,0.6377 0,0 1,17.2339 19.4289L11.4771,19.4289A0.6377,0.6377 0,0 1,10.8395 18.7913L10.8395,13.8984A0.6377,0.6377 0,0 1,11.4771 13.2608z"
-      android:strokeWidth="2.83302426"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M12.8438,19.1748L15.8858,19.1748A0.3417,0.3417 0,0 1,16.2275 19.5165L16.2275,21.3724A0.3417,0.3417 0,0 1,15.8858 21.7141L12.8438,21.7141A0.3417,0.3417 0,0 1,12.5021 21.3724L12.5021,19.5165A0.3417,0.3417 0,0 1,12.8438 19.1748z"
-      android:strokeWidth="1.32303238"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M14.1782,21.274L14.5825,21.274A0.5491,0.5491 0,0 1,15.1317 21.8232L15.1317,21.9901A0.5491,0.5491 0,0 1,14.5825 22.5392L14.1782,22.5392A0.5491,0.5491 0,0 1,13.6291 21.9901L13.6291,21.8232A0.5491,0.5491 0,0 1,14.1782 21.274z"
-      android:strokeWidth="0.5930993"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M10.3766,7.316L18.3724,7.316A0.2136,0.2136 0,0 1,18.586 7.5297L18.586,12.6027A0.2136,0.2136 0,0 1,18.3724 12.8163L10.3766,12.8163A0.2136,0.2136 0,0 1,10.163 12.6027L10.163,7.5297A0.2136,0.2136 0,0 1,10.3766 7.316z"
-      android:strokeWidth="2.9279027"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#7a7a7a"
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillAlpha="0.9411765"
+        android:fillColor="#9f9f9f"
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M10.443 7.535h7.864a0.686 0.686 0 0 1 0.686 0.686v4.923a0.686 0.686 0 0 1-0.686 0.687h-7.864a0.686 0.686 0 0 1-0.686-0.687V8.221a0.686 0.686 0 0 1 0.686-0.686z"
+        android:strokeWidth="3.28026915" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M11.477 13.26h5.757a0.638 0.638 0 0 1 0.638 0.638v4.893a0.638 0.638 0 0 1-0.638 0.638h-5.757a0.638 0.638 0 0 1-0.638-0.638v-4.893a0.638 0.638 0 0 1 0.638-0.637z"
+        android:strokeWidth="2.83302426" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12.844 19.175h3.042a0.342 0.342 0 0 1 0.341 0.341v1.856a0.342 0.342 0 0 1-0.341 0.342h-3.042a0.342 0.342 0 0 1-0.342-0.342v-1.855a0.342 0.342 0 0 1 0.342-0.342z"
+        android:strokeWidth="1.32303238" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.178 21.274h0.404a0.55 0.55 0 0 1 0.55 0.55v0.166a0.55 0.55 0 0 1-0.55 0.55h-0.404a0.55 0.55 0 0 1-0.549-0.55v-0.167a0.55 0.55 0 0 1 0.55-0.549z"
+        android:strokeWidth="0.5930993" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M10.377 7.316h7.995a0.214 0.214 0 0 1 0.214 0.214v5.073a0.214 0.214 0 0 1-0.214 0.213h-7.995a0.214 0.214 0 0 1-0.214-0.213V7.53a0.214 0.214 0 0 1 0.214-0.214z"
+        android:strokeWidth="2.9279027" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_set_alarms.xml b/app/src/main/res/drawable/ic_device_set_alarms.xml
index 5f742d33a..f713c4dc1 100644
--- a/app/src/main/res/drawable/ic_device_set_alarms.xml
+++ b/app/src/main/res/drawable/ic_device_set_alarms.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M22,5.7l-4.6,-3.9 -1.3,1.5 4.6,3.9L22,5.7zM7.9,3.4L6.6,1.9 2,5.7l1.3,1.5 4.6,-3.8zM12.5,8L11,8v6l4.7,2.9 0.8,-1.2 -4,-2.4L12.5,8zM12,4c-5,0 -9,4 -9,9s4,9 9,9 9,-4 9,-9 -4,-9 -9,-9zM12,20c-3.9,0 -7,-3.1 -7,-7s3.1,-7 7,-7 7,3.1 7,7 -3.1,7 -7,7z"/>
+        android:pathData="M22 5.7l-4.6-3.9-1.3 1.5 4.6 3.9L22 5.7zM7.9 3.4L6.6 1.9 2 5.7l1.3 1.5 4.6-3.8zM12.5 8H11v6l4.7 2.9 0.8-1.2-4-2.4V8zM12 4c-5 0-9 4-9 9s4 9 9 9 9-4 9-9-4-9-9-9zm0 16c-3.9 0-7-3.1-7-7s3.1-7 7-7 7 3.1 7 7-3.1 7-7 7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_watchxplus.xml b/app/src/main/res/drawable/ic_device_watchxplus.xml
index 4a77da1f7..889fa3d0a 100644
--- a/app/src/main/res/drawable/ic_device_watchxplus.xml
+++ b/app/src/main/res/drawable/ic_device_watchxplus.xml
@@ -1,46 +1,38 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#1f7fdb"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#4dabf5"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M17.4781,6.6464L18.1153,6.6464A0.4989,0.4989 0,0 1,18.6142 7.1453L18.6142,21.5225A0.4989,0.4989 0,0 1,18.1153 22.0214L17.4781,22.0214A0.4989,0.4989 0,0 1,16.9792 21.5225L16.9792,7.1453A0.4989,0.4989 0,0 1,17.4781 6.6464z"
-        android:strokeWidth="3.87336898"
-        android:strokeColor="#00000000" />
+        android:pathData="M17.478 6.646h0.637a0.499 0.499 0 0 1 0.5 0.5v14.377a0.499 0.499 0 0 1-0.5 0.498h-0.637a0.499 0.499 0 0 1-0.499-0.498V7.145a0.499 0.499 0 0 1 0.5-0.499z"
+        android:strokeWidth="3.87336898" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M20.0016,13.0673L20.3628,13.0673A0.4989,0.4989 0,0 1,20.8617 13.5662L20.8617,15.0322A0.4989,0.4989 0,0 1,20.3628 15.5311L20.0016,15.5311A0.4989,0.4989 0,0 1,19.5027 15.0322L19.5027,13.5662A0.4989,0.4989 0,0 1,20.0016 13.0673z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M20.002 13.067h0.36a0.499 0.499 0 0 1 0.5 0.5v1.465a0.499 0.499 0 0 1-0.5 0.5h-0.36a0.499 0.499 0 0 1-0.5-0.5v-1.466a0.499 0.499 0 0 1 0.5-0.499z"
+        android:strokeWidth="3.5" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M10.5994,6.6776L11.2366,6.6776A0.4989,0.4989 0,0 1,11.7355 7.1765L11.7355,21.5537A0.4989,0.4989 0,0 1,11.2366 22.0526L10.5994,22.0526A0.4989,0.4989 0,0 1,10.1005 21.5537L10.1005,7.1765A0.4989,0.4989 0,0 1,10.5994 6.6776z"
-        android:strokeWidth="3.87336898"
-        android:strokeColor="#00000000" />
+        android:pathData="M10.6 6.678h0.637a0.499 0.499 0 0 1 0.498 0.498v14.378a0.499 0.499 0 0 1-0.498 0.499h-0.638a0.499 0.499 0 0 1-0.498-0.5V7.177a0.499 0.499 0 0 1 0.498-0.498z"
+        android:strokeWidth="3.87336898" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M8.3883,14.3344a5.9229,6.0988 0,1 0,11.8457 0a5.9229,6.0988 0,1 0,-11.8457 0z"
-        android:strokeWidth="9.28846169"
-        android:strokeColor="#00000000" />
+        android:pathData="M8.388 14.334a5.923 6.099 0 1 0 11.846 0 5.923 6.099 0 1 0-11.846 0z"
+        android:strokeWidth="9.28846169" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M9.8827,14.295a4.464,4.5966 0,1 0,8.928 0a4.464,4.5966 0,1 0,-8.928 0z"
-        android:strokeWidth="7.00060892"
-        android:strokeColor="#00000000" />
+        android:pathData="M9.883 14.295a4.464 4.597 0 1 0 8.928 0 4.464 4.597 0 1 0-8.928 0z"
+        android:strokeWidth="7.00060892" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_watchxplus_disabled.xml b/app/src/main/res/drawable/ic_device_watchxplus_disabled.xml
index f39919418..71bbfa55c 100644
--- a/app/src/main/res/drawable/ic_device_watchxplus_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_watchxplus_disabled.xml
@@ -1,47 +1,39 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#7a7a7a"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillAlpha="0.9411765"
         android:fillColor="#9f9f9f"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M17.3899,6.3964L18.0271,6.3964A0.4989,0.4989 0,0 1,18.526 6.8953L18.526,21.2725A0.4989,0.4989 0,0 1,18.0271 21.7714L17.3899,21.7714A0.4989,0.4989 0,0 1,16.891 21.2725L16.891,6.8953A0.4989,0.4989 0,0 1,17.3899 6.3964z"
-        android:strokeWidth="3.87336898"
-        android:strokeColor="#00000000" />
+        android:pathData="M17.39 6.396h0.637a0.499 0.499 0 0 1 0.499 0.5v14.377a0.499 0.499 0 0 1-0.499 0.498H17.39a0.499 0.499 0 0 1-0.499-0.498V6.895a0.499 0.499 0 0 1 0.499-0.499z"
+        android:strokeWidth="3.87336898" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M20.0697,12.786L20.4308,12.786A0.4989,0.4989 0,0 1,20.9297 13.2849L20.9297,14.751A0.4989,0.4989 0,0 1,20.4308 15.2499L20.0697,15.2499A0.4989,0.4989 0,0 1,19.5708 14.751L19.5708,13.2849A0.4989,0.4989 0,0 1,20.0697 12.786z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M20.07 12.786h0.36a0.499 0.499 0 0 1 0.5 0.499v1.466a0.499 0.499 0 0 1-0.5 0.499h-0.36a0.499 0.499 0 0 1-0.5-0.499v-1.466a0.499 0.499 0 0 1 0.5-0.499z"
+        android:strokeWidth="3.5" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M10.6674,6.3964L11.3047,6.3964A0.4989,0.4989 0,0 1,11.8035 6.8953L11.8035,21.2725A0.4989,0.4989 0,0 1,11.3047 21.7714L10.6674,21.7714A0.4989,0.4989 0,0 1,10.1685 21.2725L10.1685,6.8953A0.4989,0.4989 0,0 1,10.6674 6.3964z"
-        android:strokeWidth="3.87336898"
-        android:strokeColor="#00000000" />
+        android:pathData="M10.667 6.396h0.638a0.499 0.499 0 0 1 0.498 0.5v14.377a0.499 0.499 0 0 1-0.498 0.498h-0.638a0.499 0.499 0 0 1-0.498-0.498V6.895a0.499 0.499 0 0 1 0.498-0.499z"
+        android:strokeWidth="3.87336898" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M8.4563,14.0531a5.9229,6.0988 0,1 0,11.8457 0a5.9229,6.0988 0,1 0,-11.8457 0z"
-        android:strokeWidth="9.28846169"
-        android:strokeColor="#00000000" />
+        android:pathData="M8.456 14.053a5.923 6.099 0 1 0 11.846 0 5.923 6.099 0 1 0-11.846 0z"
+        android:strokeWidth="9.28846169" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M9.9508,14.0138a4.464,4.5966 0,1 0,8.928 0a4.464,4.5966 0,1 0,-8.928 0z"
-        android:strokeWidth="7.00060892"
-        android:strokeColor="#00000000" />
+        android:pathData="M9.95 14.014a4.464 4.597 0 1 0 8.929 0 4.464 4.597 0 1 0-8.928 0z"
+        android:strokeWidth="7.00060892" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_zetime.xml b/app/src/main/res/drawable/ic_device_zetime.xml
index 8bca61fcd..92efc213d 100644
--- a/app/src/main/res/drawable/ic_device_zetime.xml
+++ b/app/src/main/res/drawable/ic_device_zetime.xml
@@ -1,66 +1,50 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#1f7fdb"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#4dabf5"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M11.9825,5.9801L16.4969,5.9801A0.5491,0.5491 0,0 1,17.046 6.5293L17.046,21.4293A0.5491,0.5491 0,0 1,16.4969 21.9784L11.9825,21.9784A0.5491,0.5491 0,0 1,11.4333 21.4293L11.4333,6.5293A0.5491,0.5491 0,0 1,11.9825 5.9801z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M11.982 5.98h4.515a0.55 0.55 0 0 1 0.549 0.55v14.9a0.55 0.55 0 0 1-0.55 0.548h-4.513a0.55 0.55 0 0 1-0.55-0.549V6.53a0.55 0.55 0 0 1 0.55-0.549z"
+        android:strokeWidth="3.5" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="m14.2188,21.0516c-4.1214,-0.0602 -4.4129,-0.5287 -4.3747,-7.0322 0.0382,-6.5035 0.335,-6.9634 4.4565,-6.9032 4.1214,0.0602 4.4129,0.5287 4.3747,7.0322 -0.0382,6.5035 -0.335,6.9634 -4.4565,6.9032z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M14.219 21.052c-4.122-0.06-4.413-0.53-4.375-7.033 0.038-6.503 0.335-6.963 4.457-6.903 4.121 0.06 4.413 0.529 4.374 7.032-0.038 6.504-0.335 6.964-4.456 6.904z"
+        android:strokeWidth="3.5" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M14.2345,14.0994m-5.7032,0a5.7032,5.7032 0,1 1,11.4065 0a5.7032,5.7032 0,1 1,-11.4065 0"
-        android:strokeWidth="5.37907696"
-        android:strokeColor="#00000000" />
+        android:pathData="M8.531 14.1a5.703 5.703 0 1 1 11.407 0 5.703 5.703 0 1 1-11.407 0"
+        android:strokeWidth="5.37907696" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M19.1402,10.9058L19.1402,10.9058A0.4219,0.4219 118.059,0 1,19.6881 11.1419L20.1271,12.2452A0.4219,0.4219 106.1412,0 1,19.8911 12.7932L19.8911,12.7932A0.4219,0.4219 106.1412,0 1,19.3431 12.5571L18.9041,11.4538A0.4219,0.4219 118.059,0 1,19.1402 10.9058z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M19.14 10.906a0.422 0.422 118.059 0 1 0.548 0.236l0.44 1.103a0.422 0.422 106.141 0 1-0.237 0.548 0.422 0.422 106.141 0 1-0.548-0.236l-0.439-1.103a0.422 0.422 118.059 0 1 0.236-0.548zm0.826 4.371a0.422 0.422 93.114 0 1 0.22 0.555l-0.472 1.09a0.422 0.422 120.657 0 1-0.555 0.219 0.422 0.422 120.657 0 1-0.22-0.555l0.472-1.09a0.422 0.422 93.114 0 1 0.555-0.22z"
+        android:strokeWidth="3.5" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M19.9661,15.2769L19.9661,15.2769A0.4219,0.4219 93.1136,0 1,20.1856 15.8316L19.7137,16.9214A0.4219,0.4219 120.657,0 1,19.1589 17.1409L19.1589,17.1409A0.4219,0.4219 120.657,0 1,18.9394 16.5861L19.4113,15.4964A0.4219,0.4219 93.1136,0 1,19.9661 15.2769z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M19.5156,13.2089L20.1406,13.2089A0.4219,0.4219 0,0 1,20.5625 13.6308L20.5625,14.3183A0.4219,0.4219 0,0 1,20.1406 14.7401L19.5156,14.7401A0.4219,0.4219 0,0 1,19.0938 14.3183L19.0938,13.6308A0.4219,0.4219 0,0 1,19.5156 13.2089z"
-        android:strokeWidth="3.29593801"
-        android:strokeColor="#00000000" />
+        android:pathData="M19.516 13.209h0.625a0.422 0.422 0 0 1 0.422 0.422v0.687a0.422 0.422 0 0 1-0.422 0.422h-0.625a0.422 0.422 0 0 1-0.422-0.422v-0.687a0.422 0.422 0 0 1 0.422-0.422z"
+        android:strokeWidth="3.29593801" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M14.2499,14.0215m-4.3124,0a4.3124,4.3124 0,1 1,8.6247 0a4.3124,4.3124 0,1 1,-8.6247 0"
-        android:strokeWidth="9.89868832"
-        android:strokeColor="#00000000" />
+        android:pathData="M9.937 14.021a4.312 4.312 0 1 1 8.625 0 4.312 4.312 0 1 1-8.625 0"
+        android:strokeWidth="9.89868832" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M12.4372,11.7895L14.6469,13.9992A0.3438,0.3438 0,0 1,14.6469 14.4853L14.6469,14.4853A0.3438,0.3438 0,0 1,14.1608 14.4853L11.9511,12.2756A0.3438,0.3438 0,0 1,11.9511 11.7895L11.9511,11.7895A0.3438,0.3438 0,0 1,12.4372 11.7895z"
-        android:strokeWidth="2.75432277"
-        android:strokeColor="#00000000" />
+        android:pathData="M12.437 11.79l2.21 2.21a0.344 0.344 0 0 1 0 0.485 0.344 0.344 0 0 1-0.486 0l-2.21-2.21a0.344 0.344 0 0 1 0-0.486 0.344 0.344 0 0 1 0.486 0z"
+        android:strokeWidth="2.75432277" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M14.5156,13.9194L16.4219,13.9194A0.3438,0.3438 0,0 1,16.7656 14.2631L16.7656,14.2631A0.3438,0.3438 0,0 1,16.4219 14.6069L14.5156,14.6069A0.3438,0.3438 0,0 1,14.1719 14.2631L14.1719,14.2631A0.3438,0.3438 0,0 1,14.5156 13.9194z"
-        android:strokeWidth="2.27182031"
-        android:strokeColor="#00000000" />
+        android:pathData="M14.516 13.92h1.906a0.344 0.344 0 0 1 0.344 0.343 0.344 0.344 0 0 1-0.344 0.344h-1.906a0.344 0.344 0 0 1-0.344-0.344 0.344 0.344 0 0 1 0.344-0.344z"
+        android:strokeWidth="2.27182031" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_zetime_disabled.xml b/app/src/main/res/drawable/ic_device_zetime_disabled.xml
index 6f21239be..9c2589dd6 100644
--- a/app/src/main/res/drawable/ic_device_zetime_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_zetime_disabled.xml
@@ -1,67 +1,51 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#7a7a7a"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillAlpha="0.9411765"
         android:fillColor="#9f9f9f"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M11.8106,6.366L16.325,6.366A0.5491,0.5491 0,0 1,16.8741 6.9151L16.8741,21.8151A0.5491,0.5491 0,0 1,16.325 22.3643L11.8106,22.3643A0.5491,0.5491 0,0 1,11.2615 21.8151L11.2615,6.9151A0.5491,0.5491 0,0 1,11.8106 6.366z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M11.81 6.366h4.515a0.55 0.55 0 0 1 0.55 0.55v14.9a0.55 0.55 0 0 1-0.55 0.548h-4.514a0.55 0.55 0 0 1-0.55-0.549v-14.9a0.55 0.55 0 0 1 0.55-0.549z"
+        android:strokeWidth="3.5" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="m14.0469,21.4375c-4.1214,-0.0602 -4.4129,-0.5287 -4.3747,-7.0322 0.0382,-6.5035 0.335,-6.9634 4.4565,-6.9032 4.1214,0.0602 4.4129,0.5287 4.3747,7.0322 -0.0382,6.5035 -0.335,6.9634 -4.4565,6.9032z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M14.047 21.438c-4.122-0.06-4.413-0.53-4.375-7.033 0.038-6.503 0.335-6.963 4.457-6.903 4.121 0.06 4.413 0.529 4.374 7.032-0.038 6.504-0.335 6.964-4.456 6.903z"
+        android:strokeWidth="3.5" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M14.0626,14.4852m-5.7032,0a5.7032,5.7032 0,1 1,11.4065 0a5.7032,5.7032 0,1 1,-11.4065 0"
-        android:strokeWidth="5.37907696"
-        android:strokeColor="#00000000" />
+        android:pathData="M8.359 14.485a5.703 5.703 0 1 1 11.407 0 5.703 5.703 0 1 1-11.407 0"
+        android:strokeWidth="5.37907696" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M18.9683,11.2917L18.9683,11.2917A0.4219,0.4219 49.0492,0 1,19.5163 11.5277L19.9552,12.6311A0.4219,0.4219 106.1412,0 1,19.7192 13.179L19.7192,13.179A0.4219,0.4219 106.1412,0 1,19.1712 12.943L18.7323,11.8396A0.4219,0.4219 49.0492,0 1,18.9683 11.2917z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M18.968 11.292a0.422 0.422 49.05 0 1 0.548 0.236l0.44 1.103a0.422 0.422 106.141 0 1-0.237 0.548 0.422 0.422 106.141 0 1-0.548-0.236l-0.439-1.103a0.422 0.422 49.05 0 1 0.236-0.548zm0.826 4.371a0.422 0.422 68.194 0 1 0.22 0.555l-0.472 1.09a0.422 0.422 60.234 0 1-0.555 0.219 0.422 0.422 60.234 0 1-0.22-0.555l0.472-1.09a0.422 0.422 68.194 0 1 0.555-0.22z"
+        android:strokeWidth="3.5" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M19.7942,15.6627L19.7942,15.6627A0.4219,0.4219 68.1937,0 1,20.0137 16.2175L19.5418,17.3072A0.4219,0.4219 60.2338,0 1,18.9871 17.5267L18.9871,17.5267A0.4219,0.4219 60.2338,0 1,18.7676 16.972L19.2394,15.8822A0.4219,0.4219 68.1937,0 1,19.7942 15.6627z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M19.3438,13.5947L19.9688,13.5947A0.4219,0.4219 0,0 1,20.3906 14.0166L20.3906,14.7041A0.4219,0.4219 0,0 1,19.9688 15.126L19.3438,15.126A0.4219,0.4219 0,0 1,18.9219 14.7041L18.9219,14.0166A0.4219,0.4219 0,0 1,19.3438 13.5947z"
-        android:strokeWidth="3.29593801"
-        android:strokeColor="#00000000" />
+        android:pathData="M19.344 13.595h0.625a0.422 0.422 0 0 1 0.422 0.422v0.687a0.422 0.422 0 0 1-0.422 0.422h-0.625a0.422 0.422 0 0 1-0.422-0.422v-0.687a0.422 0.422 0 0 1 0.422-0.422z"
+        android:strokeWidth="3.29593801" />
     <path
         android:fillColor="#8a8a8a"
-        android:pathData="M14.078,14.4074m-4.3124,0a4.3124,4.3124 0,1 1,8.6247 0a4.3124,4.3124 0,1 1,-8.6247 0"
-        android:strokeWidth="9.89868832"
-        android:strokeColor="#00000000" />
+        android:pathData="M9.766 14.407a4.312 4.312 0 1 1 8.624 0 4.312 4.312 0 1 1-8.624 0"
+        android:strokeWidth="9.89868832" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M12.2654,12.1753L14.4751,14.385A0.3438,0.3438 0,0 1,14.4751 14.8712L14.4751,14.8712A0.3438,0.3438 0,0 1,13.9889 14.8712L11.7792,12.6615A0.3438,0.3438 109.5406,0 1,11.7792 12.1753L11.7792,12.1753A0.3438,0.3438 109.5406,0 1,12.2654 12.1753z"
-        android:strokeWidth="2.75432277"
-        android:strokeColor="#00000000" />
+        android:pathData="M12.265 12.175l2.21 2.21a0.344 0.344 0 0 1 0 0.486 0.344 0.344 0 0 1-0.486 0l-2.21-2.21a0.344 0.344 109.54 0 1 0-0.486 0.344 0.344 109.54 0 1 0.486 0z"
+        android:strokeWidth="2.75432277" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M14.3437,14.3052L16.25,14.3052A0.3438,0.3438 0,0 1,16.5937 14.649L16.5937,14.649A0.3438,0.3438 0,0 1,16.25 14.9927L14.3437,14.9927A0.3438,0.3438 0,0 1,14 14.649L14,14.649A0.3438,0.3438 0,0 1,14.3437 14.3052z"
-        android:strokeWidth="2.27182031"
-        android:strokeColor="#00000000" />
+        android:pathData="M14.344 14.305h1.906a0.344 0.344 0 0 1 0.344 0.344 0.344 0.344 0 0 1-0.344 0.344h-1.906A0.344 0.344 0 0 1 14 14.649a0.344 0.344 0 0 1 0.344-0.344z"
+        android:strokeWidth="2.27182031" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_do_not_disturb.xml b/app/src/main/res/drawable/ic_do_not_disturb.xml
index f00846d15..8c19b3367 100644
--- a/app/src/main/res/drawable/ic_do_not_disturb.xml
+++ b/app/src/main/res/drawable/ic_do_not_disturb.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:width="40sp"
+    android:height="40sp"
+    android:viewportWidth="23"
+    android:viewportHeight="23"
+    android:tint="#7E7E7E">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8 0,-1.85 0.63,-3.55 1.69,-4.9L16.9,18.31C15.55,19.37 13.85,20 12,20zM18.31,16.9L7.1,5.69C8.45,4.63 10.15,4 12,4c4.42,0 8,3.58 8,8 0,1.85 -0.63,3.55 -1.69,4.9z" />
+        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85 0.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-0.63 3.55-1.69 4.9z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_donate.xml b/app/src/main/res/drawable/ic_donate.xml
index 9dd09ab10..00f29ed4c 100644
--- a/app/src/main/res/drawable/ic_donate.xml
+++ b/app/src/main/res/drawable/ic_donate.xml
@@ -1,43 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-
-    <group android:scaleY="-1">
-        <group android:translateY="-48">
-            <path
-                android:fillColor="#000000"
-                android:strokeWidth="0.75"
-                android:strokeMiterLimit="79.8403193612775"
-                android:strokeLineCap="round"
-                android:pathData="M 17.266,14.156 C 17.266,16.557 18.748,18.614 20.847,19.466 L 20.749,19.461 C
-18.032,21.925 18.249,23.288 18.202,24.301 L 18.202,24.812 C 13.398,21.976
-8.006,18.283 6.316,19.973 L 5.892,20.99 C 11.546,24.893 17.202,28.796
-21.852,32.704 C 22.249,33.138 22.902,33.403 23.974,33.385 C 28.907,33.336
-33.583,32.949 38.07,32.451 L 43.588,34.829 L 43.417,27.782 C 38.887,23.557
-32.161,21.394 27.091,18.166 C 28.105,17.132 28.732,15.715 28.732,14.156 C
-28.732,10.992 26.164,8.423 22.998,8.423 C 19.835,8.423 17.266,10.992
-17.266,14.156 Z M 27.246,14.156 C 27.246,16.496 25.341,18.399 22.998,18.399 C
-20.655,18.399 18.752,16.496 18.752,14.156 C 18.752,11.813 20.655,9.911
-22.998,9.911 C 25.341,9.911 27.246,11.813 27.246,14.156 Z M 21.197,11.848 C
-20.842,12.223 20.608,12.689 20.497,13.249 L 19.885,13.249 L 20.018,13.888 L
-20.423,13.888 C 20.42,13.954 20.415,14.027 20.415,14.101 C 20.415,14.229
-20.42,14.338 20.426,14.434 L 19.885,14.434 L 20.018,15.075 L 20.509,15.075 C
-20.625,15.625 20.854,16.084 21.198,16.452 C 21.721,17.009 22.403,17.285
-23.253,17.285 C 23.716,17.285 24.118,17.202 24.458,17.036 L 24.216,15.889 C
-23.98,16.124 23.64,16.24 23.19,16.24 C 22.74,16.24 22.378,16.079 22.101,15.756 C
-21.943,15.576 21.832,15.347 21.766,15.075 L 24.04,15.075 L 23.905,14.434 L
-21.683,14.434 C 21.68,14.373 21.679,14.291 21.679,14.192 C 21.679,14.096
-21.68,13.994 21.686,13.888 L 23.791,13.888 L 23.659,13.249 L 21.772,13.249 C
-21.842,12.953 21.946,12.721 22.093,12.556 C 22.367,12.23 22.728,12.067
-23.166,12.067 C 23.694,12.067 24.117,12.23 24.431,12.556 L 24.431,11.29 C
-24.073,11.11 23.656,11.021 23.179,11.021 C 22.375,11.021 21.713,11.298
-21.197,11.848 Z M 29.494,23.708 C 30.203,25.42 30.088,27.919 24.739,26.679 C
-21.778,25.437 21.126,24.068 22.192,22.603 C 22.787,21.692 23.124,20.787
-23.329,19.878 C 23.931,19.843 24.507,19.716 25.047,19.508 C 26.476,21.08
-28.884,22.241 29.494,23.708 Z" />
-        </group>
-    </group>
-</vector>
\ No newline at end of file
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="45"
+    android:viewportHeight="45">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M17.266 33.844c0-2.401 1.482-4.458 3.581-5.31l-0.098 0.005c-2.717-2.464-2.5-3.827-2.547-4.84v-0.511c-4.804 2.836-10.196 6.529-11.886 4.839L5.892 27.01c5.654-3.903 11.31-7.806 15.96-11.714 0.397-0.434 1.05-0.699 2.122-0.681 4.933 0.049 9.609 0.436 14.096 0.934l5.518-2.378-0.171 7.047c-4.53 4.225-11.256 6.388-16.326 9.616 1.014 1.034 1.641 2.451 1.641 4.01 0 3.164-2.568 5.733-5.734 5.733-3.163 0-5.732-2.569-5.732-5.733zm9.98 0c0-2.34-1.905-4.243-4.248-4.243s-4.246 1.903-4.246 4.243c0 2.343 1.903 4.245 4.246 4.245 2.343 0 4.248-1.902 4.248-4.245zm-6.049 2.308c-0.355-0.375-0.589-0.841-0.7-1.401h-0.612l0.133-0.639h0.405c-0.003-0.066-0.008-0.139-0.008-0.213 0-0.128 0.005-0.237 0.011-0.333h-0.541l0.133-0.641h0.491c0.116-0.55 0.345-1.009 0.689-1.377 0.523-0.557 1.205-0.833 2.055-0.833 0.463 0 0.865 0.083 1.205 0.249l-0.242 1.147c-0.236-0.235-0.576-0.351-1.026-0.351-0.45 0-0.812 0.161-1.089 0.484-0.158 0.18-0.269 0.409-0.335 0.681h2.274l-0.135 0.641h-2.222c-0.003 0.061-0.004 0.143-0.004 0.242 0 0.096 0.001 0.198 0.007 0.304h2.105l-0.132 0.639h-1.887c0.07 0.296 0.174 0.528 0.321 0.693 0.274 0.326 0.635 0.489 1.073 0.489 0.528 0 0.951-0.163 1.265-0.489v1.266c-0.358 0.18-0.775 0.269-1.252 0.269-0.804 0-1.466-0.277-1.982-0.827zm8.297-11.86c0.709-1.712 0.594-4.211-4.755-2.971-2.961 1.242-3.613 2.611-2.547 4.076 0.595 0.911 0.932 1.816 1.137 2.725 0.602 0.035 1.178 0.162 1.718 0.37 1.429-1.572 3.837-2.733 4.447-4.2z"
+        android:strokeWidth="0.75"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="80" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml b/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml
index 8f7f335a3..1f23f1570 100644
--- a/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z" />
+        android:pathData="M20 9H4v2h16V9zM4 15h16v-2H4v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
index 47ea705d1..01f2119cb 100644
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M14.06,9.02l0.92,0.92L5.92,19L5,19v-0.92l9.06,-9.06M17.66,3c-0.25,0 -0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29zM14.06,6.19L3,17.25L3,21h3.75L17.81,9.94l-3.75,-3.75z"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M14.06 9.02l0.92 0.92L5.92 19H5v-0.92l9.06-9.06M17.66 3c-0.25 0-0.51 0.1-0.7 0.29l-1.83 1.83 3.75 3.75 1.83-1.83c0.39-0.39 0.39-1.02 0-1.41l-2.34-2.34C18.17 3.09 17.92 3 17.66 3zm-3.6 3.19L3 17.25V21h3.75L17.81 9.94l-3.75-3.75z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_extension.xml b/app/src/main/res/drawable/ic_extension.xml
index 95025044c..e8428b97f 100644
--- a/app/src/main/res/drawable/ic_extension.xml
+++ b/app/src/main/res/drawable/ic_extension.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@color/secondarytext"
-      android:pathData="M10.5,4.5c0.28,0 0.5,0.22 0.5,0.5v2h6v6h2c0.28,0 0.5,0.22 0.5,0.5s-0.22,0.5 -0.5,0.5h-2v6h-2.12c-0.68,-1.75 -2.39,-3 -4.38,-3s-3.7,1.25 -4.38,3H4v-2.12c1.75,-0.68 3,-2.39 3,-4.38 0,-1.99 -1.24,-3.7 -2.99,-4.38L4,7h6V5c0,-0.28 0.22,-0.5 0.5,-0.5m0,-2C9.12,2.5 8,3.62 8,5H4c-1.1,0 -1.99,0.9 -1.99,2v3.8h0.29c1.49,0 2.7,1.21 2.7,2.7s-1.21,2.7 -2.7,2.7H2V20c0,1.1 0.9,2 2,2h3.8v-0.3c0,-1.49 1.21,-2.7 2.7,-2.7s2.7,1.21 2.7,2.7v0.3H17c1.1,0 2,-0.9 2,-2v-4c1.38,0 2.5,-1.12 2.5,-2.5S20.38,11 19,11V7c0,-1.1 -0.9,-2 -2,-2h-4c0,-1.38 -1.12,-2.5 -2.5,-2.5z"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M10.5 4.5C10.78 4.5 11 4.72 11 5v2h6v6h2c0.28 0 0.5 0.22 0.5 0.5S19.28 14 19 14h-2v6h-2.12c-0.68-1.75-2.39-3-4.38-3s-3.7 1.25-4.38 3H4v-2.12c1.75-0.68 3-2.39 3-4.38 0-1.99-1.24-3.7-2.99-4.38L4 7h6V5c0-0.28 0.22-0.5 0.5-0.5m0-2C9.12 2.5 8 3.62 8 5H4C2.9 5 2.01 5.9 2.01 7v3.8H2.3c1.49 0 2.7 1.21 2.7 2.7s-1.21 2.7-2.7 2.7H2V20c0 1.1 0.9 2 2 2h3.8v-0.3c0-1.49 1.21-2.7 2.7-2.7s2.7 1.21 2.7 2.7V22H17c1.1 0 2-0.9 2-2v-4c1.38 0 2.5-1.12 2.5-2.5S20.38 11 19 11V7c0-1.1-0.9-2-2-2h-4c0-1.38-1.12-2.5-2.5-2.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml
index 454bd7deb..e66f184e2 100644
--- a/app/src/main/res/drawable/ic_filter.xml
+++ b/app/src/main/res/drawable/ic_filter.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_find_lost_phone.xml b/app/src/main/res/drawable/ic_find_lost_phone.xml
index 2740ef687..f131683df 100644
--- a/app/src/main/res/drawable/ic_find_lost_phone.xml
+++ b/app/src/main/res/drawable/ic_find_lost_phone.xml
@@ -1,28 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#7E7E7E">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M3,17V7H5V17H3m16,0V7h2v10h-2m3,-8h2v6H22V9M0,15V9h2v6H0"/>
-  <path
-      android:pathData="M6.84,3.615H17.16V20.385H6.84Z"
-      android:strokeAlpha="1"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:fillAlpha="1"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m12.75,18.467a0.75,0.75 0,0 1,-0.75 0.75,0.75 0.75,0 0,1 -0.75,-0.75 0.75,0.75 0,0 1,0.75 -0.75,0.75 0.75,0 0,1 0.75,0.75z"
-      android:strokeAlpha="1"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.5"
-      android:fillColor="#000000"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"
-      android:strokeLineCap="round"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3 17V7h2v10H3m16 0V7h2v10h-2m3-8h2v6h-2V9M0 15V9h2v6H0" />
+    <path
+        android:pathData="M6.84 3.615h10.32v16.77H6.84z"
+        android:strokeWidth="1.5"
+        android:strokeColor="#000000"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12.75 18.467a0.75 0.75 0 0 1-0.75 0.75 0.75 0.75 0 0 1-0.75-0.75 0.75 0.75 0 0 1 0.75-0.75 0.75 0.75 0 0 1 0.75 0.75z"
+        android:strokeWidth="1.5"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_firmware.xml b/app/src/main/res/drawable/ic_firmware.xml
index 85870ac96..a81445f04 100644
--- a/app/src/main/res/drawable/ic_firmware.xml
+++ b/app/src/main/res/drawable/ic_firmware.xml
@@ -1,96 +1,42 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#1f7fdb"
-        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#4dabf5"
-        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-        android:strokeWidth="3.57115173"
-        android:strokeColor="#00000000" />
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M9.8687,7.1734L18.8576,7.1734A1.3834,1.3834 0,0 1,20.2409 8.5567L20.2409,20.2415A1.3834,1.3834 0,0 1,18.8576 21.6249L9.8687,21.6249A1.3834,1.3834 0,0 1,8.4853 20.2415L8.4853,8.5567A1.3834,1.3834 0,0 1,9.8687 7.1734z"
-        android:strokeWidth="4.20063162"
-        android:strokeColor="#00000000" />
+        android:pathData="M9.869 7.173h8.989a1.383 1.383 0 0 1 1.383 1.384V20.24a1.383 1.383 0 0 1-1.383 1.384h-8.99a1.383 1.383 0 0 1-1.383-1.384V8.557A1.383 1.383 0 0 1 9.87 7.173z"
+        android:strokeWidth="4.20063162" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M12.2878,13.9378L16.4362,13.9378A0.8438,0.8438 0,0 1,17.2799 14.7815L17.2799,18.9169A0.8438,0.8438 0,0 1,16.4362 19.7607L12.2878,19.7607A0.8438,0.8438 0,0 1,11.4441 18.9169L11.4441,14.7815A0.8438,0.8438 0,0 1,12.2878 13.9378z"
-        android:strokeWidth="3.38216949"
-        android:strokeColor="#00000000" />
+        android:pathData="M12.288 13.938h4.148a0.844 0.844 0 0 1 0.844 0.843v4.136a0.844 0.844 0 0 1-0.844 0.844h-4.148a0.844 0.844 0 0 1-0.844-0.844V14.78a0.844 0.844 0 0 1 0.844-0.843z"
+        android:strokeWidth="3.38216949" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M12.2813,14.7556h4.1876v4.1876h-4.1876z"
-        android:strokeWidth="5.90702915"
-        android:strokeColor="#00000000" />
+        android:pathData="M12.281 14.756h4.188v4.187H12.28z"
+        android:strokeWidth="5.90702915" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M13.0625,15.5526h2.5912v2.7031h-2.5912z"
-        android:strokeWidth="3.58284044"
-        android:strokeColor="#00000000" />
+        android:pathData="M13.063 15.553h2.59v2.703h-2.59z"
+        android:strokeWidth="3.58284044" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M13.9453,16.4899h0.8139v0.844h-0.8139z"
-        android:strokeWidth="3.37599993"
-        android:strokeColor="#00000000" />
+        android:pathData="M13.945 16.49h0.814v0.844h-0.814z"
+        android:strokeWidth="3.37599993" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M10.7344,15.5683L11.4063,15.5683A0.1719,0.1719 0,0 1,11.5781 15.7401L11.5781,16.3651A0.1719,0.1719 0,0 1,11.4063 16.537L10.7344,16.537A0.1719,0.1719 0,0 1,10.5625 16.3651L10.5625,15.7401A0.1719,0.1719 0,0 1,10.7344 15.5683z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#2196f3"
-        android:pathData="M10.7344,17.287L11.4063,17.287A0.1719,0.1719 0,0 1,11.5781 17.4589L11.5781,18.0839A0.1719,0.1719 0,0 1,11.4063 18.2558L10.7344,18.2558A0.1719,0.1719 0,0 1,10.5625 18.0839L10.5625,17.4589A0.1719,0.1719 0,0 1,10.7344 17.287z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#2196f3"
-        android:pathData="M17.3125,17.287L17.9844,17.287A0.1719,0.1719 0,0 1,18.1563 17.4589L18.1563,18.0839A0.1719,0.1719 0,0 1,17.9844 18.2558L17.3125,18.2558A0.1719,0.1719 0,0 1,17.1406 18.0839L17.1406,17.4589A0.1719,0.1719 0,0 1,17.3125 17.287z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#2196f3"
-        android:pathData="M17.3125,15.5683L17.9844,15.5683A0.1719,0.1719 0,0 1,18.1563 15.7401L18.1563,16.3651A0.1719,0.1719 0,0 1,17.9844 16.537L17.3125,16.537A0.1719,0.1719 0,0 1,17.1406 16.3651L17.1406,15.7401A0.1719,0.1719 0,0 1,17.3125 15.5683z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#2196f3"
-        android:pathData="M14.8281,13.1151L15.5,13.1151A0.1719,0.1719 0,0 1,15.6719 13.287L15.6719,13.912A0.1719,0.1719 0,0 1,15.5 14.0839L14.8281,14.0839A0.1719,0.1719 0,0 1,14.6563 13.912L14.6563,13.287A0.1719,0.1719 0,0 1,14.8281 13.1151z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#2196f3"
-        android:pathData="M13.2266,13.1151L13.8984,13.1151A0.1719,0.1719 0,0 1,14.0703 13.287L14.0703,13.912A0.1719,0.1719 0,0 1,13.8984 14.0839L13.2266,14.0839A0.1719,0.1719 0,0 1,13.0547 13.912L13.0547,13.287A0.1719,0.1719 0,0 1,13.2266 13.1151z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#2196f3"
-        android:pathData="M13.2266,19.619L13.8984,19.619A0.1719,0.1719 0,0 1,14.0703 19.7909L14.0703,20.4159A0.1719,0.1719 0,0 1,13.8984 20.5878L13.2266,20.5878A0.1719,0.1719 0,0 1,13.0547 20.4159L13.0547,19.7909A0.1719,0.1719 0,0 1,13.2266 19.619z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#2196f3"
-        android:pathData="M14.8164,19.619L15.4883,19.619A0.1719,0.1719 0,0 1,15.6602 19.7909L15.6602,20.4159A0.1719,0.1719 0,0 1,15.4883 20.5878L14.8164,20.5878A0.1719,0.1719 0,0 1,14.6445 20.4159L14.6445,19.7909A0.1719,0.1719 0,0 1,14.8164 19.619z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#2196f3"
-        android:pathData="m20.2669,11.6898c0,0 0,0 0,0 -5.5432,-5.5523 0.9796,0.9809 -4.5638,-4.5711 0,0 0,0 0,0 5.5523,0.0026 -0.9809,-0.0002 4.5711,0.002 0,0 0,0 0,0 -0.0091,5.5497 0.0014,-0.9807 -0.0073,4.5691z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#2196f3"
-        android:pathData="m15.0798,8.1909c-0,-0 -0,-0 -0,-0 4.8985,4.9377 -0.8657,-0.8724 4.0331,4.0652 -0,-0 -0,-0 -0,-0 -4.8903,0.0145 0.864,-0.0028 -4.0261,0.0121 -0,-0 -0,-0 -0,-0 -0.0083,-4.9522 0.0017,0.8751 -0.007,-4.0773z"
-        android:strokeWidth="3.5"
-        android:strokeColor="#00000000" />
+        android:pathData="M10.734 15.568h0.672a0.172 0.172 0 0 1 0.172 0.172v0.625a0.172 0.172 0 0 1-0.172 0.172h-0.672a0.172 0.172 0 0 1-0.171-0.172V15.74a0.172 0.172 0 0 1 0.171-0.172zm0 1.719h0.672a0.172 0.172 0 0 1 0.172 0.172v0.625a0.172 0.172 0 0 1-0.172 0.172h-0.672a0.172 0.172 0 0 1-0.171-0.172v-0.625a0.172 0.172 0 0 1 0.171-0.172zm6.579 0h0.671a0.172 0.172 0 0 1 0.172 0.172v0.625a0.172 0.172 0 0 1-0.172 0.172h-0.672a0.172 0.172 0 0 1-0.171-0.172v-0.625a0.172 0.172 0 0 1 0.172-0.172zm0-1.719h0.671a0.172 0.172 0 0 1 0.172 0.172v0.625a0.172 0.172 0 0 1-0.172 0.172h-0.672a0.172 0.172 0 0 1-0.171-0.172V15.74a0.172 0.172 0 0 1 0.172-0.172zm-2.485-2.453H15.5a0.172 0.172 0 0 1 0.172 0.172v0.625a0.172 0.172 0 0 1-0.172 0.172h-0.672a0.172 0.172 0 0 1-0.172-0.172v-0.625a0.172 0.172 0 0 1 0.172-0.172zm-1.601 0h0.671a0.172 0.172 0 0 1 0.172 0.172v0.625a0.172 0.172 0 0 1-0.172 0.172h-0.671a0.172 0.172 0 0 1-0.172-0.172v-0.625a0.172 0.172 0 0 1 0.172-0.172zm0 6.504h0.671a0.172 0.172 0 0 1 0.172 0.172v0.625a0.172 0.172 0 0 1-0.172 0.172h-0.671a0.172 0.172 0 0 1-0.172-0.172V19.79a0.172 0.172 0 0 1 0.172-0.172zm1.589 0h0.672a0.172 0.172 0 0 1 0.172 0.172v0.625a0.172 0.172 0 0 1-0.172 0.172h-0.672a0.172 0.172 0 0 1-0.171-0.172V19.79a0.172 0.172 0 0 1 0.171-0.172zm5.451-7.929c-5.543-5.552 0.98 0.98-4.564-4.571l4.571 0.002-0.007 4.569zm-5.187-3.5l4.033 4.066-4.026 0.012-0.007-4.077z"
+        android:strokeWidth="3.5" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_font_download.xml b/app/src/main/res/drawable/ic_font_download.xml
index 03a9a260a..a8ad28e11 100644
--- a/app/src/main/res/drawable/ic_font_download.xml
+++ b/app/src/main/res/drawable/ic_font_download.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M9.93,13.5h4.14L12,7.98zM20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM15.95,18.5l-1.14,-3L9.17,15.5l-1.12,3L5.96,18.5l5.11,-13h1.86l5.11,13h-2.09z" />
+        android:pathData="M9.93 13.5h4.14L12 7.98zM20 2H4C2.9 2 2 2.9 2 4v16c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm-4.05 16.5l-1.14-3H9.17l-1.12 3H5.96l5.11-13h1.86l5.11 13h-2.09z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_history_black.xml b/app/src/main/res/drawable/ic_history_black.xml
index d9f75ea6d..f7941d3b2 100644
--- a/app/src/main/res/drawable/ic_history_black.xml
+++ b/app/src/main/res/drawable/ic_history_black.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:width="40sp"
+    android:height="40sp"
+    android:viewportWidth="23"
+    android:viewportHeight="23">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
+        android:pathData="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89 0.07 0.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-0.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13 21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.28 2.54 0.72-1.21-3.5-2.08V8H12z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_info_black.xml b/app/src/main/res/drawable/ic_info_black.xml
index b1a42e2f5..4fcb7bf6a 100644
--- a/app/src/main/res/drawable/ic_info_black.xml
+++ b/app/src/main/res/drawable/ic_info_black.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"
-      android:fillColor="#000000"/>
+    android:width="40sp"
+    android:height="40sp"
+    android:viewportWidth="23"
+    android:viewportHeight="23">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
index e5a15e1e8..8505c73a5 100644
--- a/app/src/main/res/drawable/ic_language.xml
+++ b/app/src/main/res/drawable/ic_language.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
+        android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm6.93 6h-2.95c-0.32-1.25-0.78-2.45-1.38-3.56 1.84 0.63 3.37 1.91 4.33 3.56zM12 4.04c0.83 1.2 1.48 2.53 1.91 3.96h-3.82c0.43-1.43 1.08-2.76 1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s0.1-1.36 0.26-2h3.38c-0.08 0.66-0.14 1.32-0.14 2 0 0.68 0.06 1.34 0.14 2H4.26zm0.82 2h2.95c0.32 1.25 0.78 2.45 1.38 3.56-1.84-0.63-3.37-1.9-4.33-3.56zm2.95-8H5.08c0.96-1.66 2.49-2.93 4.33-3.56C8.81 5.55 8.35 6.75 8.03 8zM12 19.96c-0.83-1.2-1.48-2.53-1.91-3.96h3.82c-0.43 1.43-1.08 2.76-1.91 3.96zM14.34 14H9.66c-0.09-0.66-0.16-1.32-0.16-2 0-0.68 0.07-1.35 0.16-2h4.68c0.09 0.65 0.16 1.32 0.16 2 0 0.68-0.07 1.34-0.16 2zm0.25 5.56c0.6-1.11 1.06-2.31 1.38-3.56h2.95c-0.96 1.65-2.49 2.93-4.33 3.56zM16.36 14c0.08-0.66 0.14-1.32 0.14-2 0-0.68-0.06-1.34-0.14-2h3.38C19.9 10.64 20 11.31 20 12s-0.1 1.36-0.26 2h-3.38z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 34ddd53d1..1688a2552 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,30 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportWidth="125"
-        android:viewportHeight="125">
-    <group android:translateX="12.5"
-            android:translateY="12.5">
-        <path
-            android:pathData="m59.62,75 l-0.43,-10.38c-0.15,-7.29 6,-13.48 7.64,-18.93 -1.74,1.66 -5.35,9.52 -9.1,8.86 -2.09,-0.7 -2.75,-1.69 -3.6,-3.47 -2.81,0.55 -5.04,-1.11 -5.85,-3.11l0.16,8.09 -3.66,-10.5c-2.86,-0.93 -5.48,-5.32 -2.85,-4.81l4.72,0.9c3.23,0.68 5.05,-3.69 2.16,-5.96 -0.62,-0.44 -6.79,-3.32 -7.95,-3.64 -1.04,-0.29 -2.28,0.12 -3.08,1.02l-4.81,8.93c-0.5,0.69 -0.5,1.41 -0.21,2.04l8.8,17.65c0.28,0.54 0.14,1.81 0.15,2.25l-1.05,11.07zM66.97,43.67c1.59,-1.81 -1.36,-6.84 -2.58,-5.38l-7.88,10.32c-2.31,2.87 1.17,5.71 3.65,3.94 0.22,-0.2 0.34,-0.31 0.5,-0.52zM63.12,35.84c-1.17,-1.22 -3.57,-2.98 -3.89,-2.86l-8.79,11.86c-2.37,2.31 0.3,5.07 2.88,4.8 0.36,-0.1 0.48,-0.17 0.7,-0.38l9.16,-11.84c0.4,-0.52 0.27,-1.16 -0.07,-1.58zM57.9,32.02c-0.09,-0.61 -3.96,-3.73 -4.26,-3.34l-4.46,5.77c5.64,6.14 -0.94,9.96 -4.85,7.73 0.49,1.57 3.42,3.2 4.33,2.01zM52.52,27.72c-0.85,-1.8 -4.22,-3.17 -5.74,-2.59l-4.83,5.95 6.06,2.51z"
-            android:fillAlpha="1"
-            android:strokeColor="#00000000"
-            android:fillColor="#ffffff"
-            android:strokeWidth="0.26458332"
-            android:strokeAlpha="0.5098038"/>
-        <path
-            android:pathData="M42.28,63.09L58.4,63.09A2.67,2.67 86.92,0 1,61.07 65.76L61.07,70.1A2.67,2.67 86.92,0 1,58.4 72.78L42.28,72.78A2.67,2.67 86.92,0 1,39.6 70.1L39.6,65.76A2.67,2.67 86.92,0 1,42.28 63.09z"
-            android:fillAlpha="1"
-            android:strokeColor="#00000000"
-            android:fillColor="#ff5000"
-            android:strokeWidth="16.03646088"
-            android:strokeAlpha="0.5098038"/>
-        <path
-            android:pathData="M46.45,64.98L54.22,64.98A1.63,1.63 0,0 1,55.85 66.61L55.85,69.26A1.63,1.63 0,0 1,54.22 70.89L46.45,70.89A1.63,1.63 0,0 1,44.82 69.26L44.82,66.61A1.63,1.63 0,0 1,46.45 64.98z"
-            android:fillAlpha="1"
-            android:strokeColor="#00000000"
-            android:fillColor="#1359ff"
-            android:strokeWidth="8.97837925"
-            android:strokeAlpha="0.5098038"/>
-    </group>
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="125"
+    android:viewportHeight="125">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M72.12 87.5l-0.43-10.38c-0.15-7.29 6-13.48 7.64-18.93-1.74 1.66-5.35 9.52-9.1 8.86-2.09-0.7-2.75-1.69-3.6-3.47-2.81 0.55-5.04-1.11-5.85-3.11l0.16 8.09-3.66-10.5c-2.86-0.93-5.48-5.32-2.85-4.81l4.72 0.9c3.23 0.68 5.05-3.69 2.16-5.96-0.62-0.44-6.79-3.32-7.95-3.64-1.04-0.29-2.28 0.12-3.08 1.02l-4.81 8.93c-0.5 0.69-0.5 1.41-0.21 2.04l8.8 17.65c0.28 0.54 0.14 1.81 0.15 2.25l-1.05 11.07zm7.35-31.33c1.59-1.81-1.36-6.84-2.58-5.38l-7.88 10.32c-2.31 2.87 1.17 5.71 3.65 3.94 0.22-0.2 0.34-0.31 0.5-0.52zm-3.85-7.83c-1.17-1.22-3.57-2.98-3.89-2.86l-8.79 11.86c-2.37 2.31 0.3 5.07 2.88 4.8 0.36-0.1 0.48-0.17 0.7-0.38l9.16-11.84c0.4-0.52 0.27-1.16-0.07-1.58zm-5.22-3.82c-0.09-0.61-3.96-3.73-4.26-3.34l-4.46 5.77c5.64 6.14-0.94 9.96-4.85 7.73 0.49 1.57 3.42 3.2 4.33 2.01zm-5.38-4.3c-0.85-1.8-4.22-3.17-5.74-2.59l-4.83 5.95 6.06 2.51z"
+        android:strokeWidth="0.26458332"
+        android:strokeAlpha="0.5098038" />
+    <path
+        android:fillColor="#ff5000"
+        android:pathData="M54.78 75.59H70.9a2.67 2.67 0 0 1 2.67 2.67v4.34a2.67 2.67 0 0 1-2.67 2.68H54.78a2.67 2.67 0 0 1-2.68-2.68v-4.34a2.67 2.67 0 0 1 2.68-2.67z"
+        android:strokeWidth="16.03646088"
+        android:strokeAlpha="0.5098038" />
+    <path
+        android:fillColor="#1359ff"
+        android:pathData="M58.95 77.48h7.77a1.63 1.63 0 0 1 1.63 1.63v2.65a1.63 1.63 0 0 1-1.63 1.63h-7.77a1.63 1.63 0 0 1-1.63-1.63v-2.65a1.63 1.63 0 0 1 1.63-1.63z"
+        android:strokeWidth="8.97837925"
+        android:strokeAlpha="0.5098038" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_led_color.xml b/app/src/main/res/drawable/ic_led_color.xml
index 8c0a801e2..bc61dcb93 100644
--- a/app/src/main/res/drawable/ic_led_color.xml
+++ b/app/src/main/res/drawable/ic_led_color.xml
@@ -4,7 +4,6 @@
     android:thicknessRatio="2"
     android:useLevel="false">
     <solid android:color="@android:color/transparent" />
-
     <stroke
         android:width="2dp"
         android:color="@color/secondarytext" />
diff --git a/app/src/main/res/drawable/ic_lock_open.xml b/app/src/main/res/drawable/ic_lock_open.xml
index dfe29b6e6..a3036eb4b 100644
--- a/app/src/main/res/drawable/ic_lock_open.xml
+++ b/app/src/main/res/drawable/ic_lock_open.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#7E7E7E"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="45sp"
+    android:height="45sp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12 17c1.1 0 2-0.9 2-2s-0.9-2-2-2-2 0.9-2 2 0.9 2 2 2zm6-9h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6h1.9c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2H6c-1.1 0-2 0.9-2 2v10c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2V10c0-1.1-0.9-2-2-2zm0 12H6V10h12v10z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
index 72d0a99ed..2911b0719 100644
--- a/app/src/main/res/drawable/ic_menu.xml
+++ b/app/src/main/res/drawable/ic_menu.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z" />
+        android:pathData="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_more_vert.xml b/app/src/main/res/drawable/ic_more_vert.xml
index 5176d8a4b..a1d8763ca 100644
--- a/app/src/main/res/drawable/ic_more_vert.xml
+++ b/app/src/main/res/drawable/ic_more_vert.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+        android:pathData="M12 8c1.1 0 2-0.9 2-2s-0.9-2-2-2-2 0.9-2 2 0.9 2 2 2zm0 2c-1.1 0-2 0.9-2 2s0.9 2 2 2 2-0.9 2-2-0.9-2-2-2zm0 6c-1.1 0-2 0.9-2 2s0.9 2 2 2 2-0.9 2-2-0.9-2-2-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_nights_stay.xml b/app/src/main/res/drawable/ic_nights_stay.xml
index 95650be95..2a4b4fc54 100644
--- a/app/src/main/res/drawable/ic_nights_stay.xml
+++ b/app/src/main/res/drawable/ic_nights_stay.xml
@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19.78,17.51c-2.47,0 -6.57,-1.33 -8.68,-5.43C8.77,7.57 10.6,3.6 11.63,2.01C6.27,2.2 1.98,6.59 1.98,12c0,0.14 0.02,0.28 0.02,0.42C2.61,12.16 3.28,12 3.98,12c0,0 0,0 0,0c0,-3.09 1.73,-5.77 4.3,-7.1C7.78,7.09 7.74,9.94 9.32,13c1.57,3.04 4.18,4.95 6.8,5.86c-1.23,0.74 -2.65,1.15 -4.13,1.15c-0.5,0 -1,-0.05 -1.48,-0.14c-0.37,0.7 -0.94,1.27 -1.64,1.64c0.98,0.32 2.03,0.5 3.11,0.5c3.5,0 6.58,-1.8 8.37,-4.52C20.18,17.5 19.98,17.51 19.78,17.51z"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M7,16l-0.18,0C6.4,14.84 5.3,14 4,14c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.62,0 2.49,0 3,0c1.1,0 2,-0.9 2,-2C9,16.9 8.1,16 7,16z"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.78 17.51c-2.47 0-6.57-1.33-8.68-5.43-2.33-4.51-0.5-8.48 0.53-10.07C6.27 2.2 1.98 6.59 1.98 12c0 0.14 0.02 0.28 0.02 0.42C2.61 12.16 3.28 12 3.98 12c0-3.09 1.73-5.77 4.3-7.1-0.5 2.19-0.54 5.04 1.04 8.1 1.57 3.04 4.18 4.95 6.8 5.86-1.23 0.74-2.65 1.15-4.13 1.15-0.5 0-1-0.05-1.48-0.14-0.37 0.7-0.94 1.27-1.64 1.64 0.98 0.32 2.03 0.5 3.11 0.5 3.5 0 6.58-1.8 8.37-4.52-0.17 0.01-0.37 0.02-0.57 0.02z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7 16H6.82C6.4 14.84 5.3 14 4 14c-1.66 0-3 1.34-3 3s1.34 3 3 3h3c1.1 0 2-0.9 2-2s-0.9-2-2-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_no_watch.xml b/app/src/main/res/drawable/ic_no_watch.xml
index 52ad589f9..4e492c976 100644
--- a/app/src/main/res/drawable/ic_no_watch.xml
+++ b/app/src/main/res/drawable/ic_no_watch.xml
@@ -1,17 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@color/secondarytext"
-      android:pathData="M8,0L7.0508,5.7305C6.8273,5.9059 6.6255,6.1054 6.4238,6.3047L8.1309,7.4375C8.5054,7.1202 8.9128,6.8404 9.3574,6.6211C10.156,6.2273 11.0506,6 12,6C13.1738,6 14.2659,6.3435 15.1914,6.9277C16.8759,7.991 18,9.8638 18,12C18,12.628 17.9022,13.2335 17.7227,13.8027L19.4316,14.9355C19.7924,14.0251 20,13.0375 20,12C20,10.1487 19.3619,8.4452 18.3027,7.0898C17.9087,6.5857 17.4625,6.1263 16.9609,5.7305L16,0L8,0zM9.6992,2L14.3105,2L14.7207,4.4805C13.8707,4.1705 12.96,4 12,4C11.05,4 10.1291,4.1707 9.2891,4.4707L9.6992,2zM5.3867,7.5254C4.515,8.7993 4,10.335 4,12C4,14.55 5.1908,16.8095 7.0508,18.2695L8,24L16,24L16.9609,18.2695C17.6269,17.7439 18.2038,17.1107 18.6738,16.4004L17.0117,15.291C15.9382,16.921 14.0947,18 12,18C8.69,18 6,15.31 6,12C6,10.7495 6.3916,9.5951 7.0488,8.6348L5.3867,7.5254zM14.7207,19.5195L14.3105,22L9.6992,22L9.2891,19.5293C10.1291,19.8293 11.05,20 12,20C12.96,20 13.8707,19.8295 14.7207,19.5195z"/>
-  <path
-      android:pathData="M2.0329,5.3033 L22.1855,18.9151"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="2"
-      android:fillColor="@color/secondarytext"
-      android:strokeColor="@color/secondarytext"
-      android:fillType="evenOdd"
-      android:strokeLineCap="butt"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M8 0L7.05 5.73C6.828 5.907 6.626 6.106 6.425 6.306L8.13 7.438C8.505 7.12 8.913 6.84 9.357 6.62 10.156 6.227 11.051 6 12 6c1.174 0 2.266 0.343 3.191 0.928C16.876 7.99 18 9.864 18 12c0 0.628-0.098 1.233-0.277 1.803l1.709 1.132C19.792 14.025 20 13.037 20 12c0-1.851-0.638-3.555-1.697-4.91-0.394-0.504-0.84-0.964-1.342-1.36L16 0H8zm1.7 2h4.61l0.41 2.48C13.87 4.17 12.96 4 12 4c-0.95 0-1.87 0.17-2.71 0.47L9.7 2zM5.386 7.525C4.515 8.8 4 10.335 4 12c0 2.55 1.19 4.81 3.05 6.27L8 24h8l0.96-5.73c0.667-0.526 1.244-1.16 1.714-1.87l-1.662-1.109C15.938 16.921 14.095 18 12 18c-3.31 0-6-2.69-6-6 0-1.25 0.392-2.405 1.049-3.365l-1.662-1.11zM14.72 19.52L14.31 22H9.698l-0.41-2.47C10.13 19.83 11.05 20 12 20c0.96 0 1.87-0.17 2.72-0.48z" />
+    <path
+        android:fillColor="@color/secondarytext"
+        android:fillType="evenOdd"
+        android:pathData="M2.033 5.303l20.152 13.612"
+        android:strokeWidth="2"
+        android:strokeColor="@color/secondarytext" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_filter_9_plus.xml b/app/src/main/res/drawable/ic_outline_filter_9_plus.xml
index 90a643aea..8112e1cdd 100644
--- a/app/src/main/res/drawable/ic_outline_filter_9_plus.xml
+++ b/app/src/main/res/drawable/ic_outline_filter_9_plus.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,5L1,5v16c0,1.1 0.9,2 2,2h16v-2L3,21L3,5zM14,12L14,8c0,-1.11 -0.9,-2 -2,-2h-1c-1.1,0 -2,0.89 -2,2v1c0,1.11 0.9,2 2,2h1v1L9,12v2h3c1.1,0 2,-0.89 2,-2zM11,9L11,8h1v1h-1zM21,1L7,1c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L23,3c0,-1.1 -0.9,-2 -2,-2zM21,9h-2L19,7h-2v2h-2v2h2v2h2v-2h2v6L7,17L7,3h14v6z"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3 5H1v16c0 1.1 0.9 2 2 2h16v-2H3V5zm11 7V8c0-1.11-0.9-2-2-2h-1C9.9 6 9 6.89 9 8v1c0 1.11 0.9 2 2 2h1v1H9v2h3c1.1 0 2-0.89 2-2zm-3-3V8h1v1h-1zm10-8H7C5.9 1 5 1.9 5 3v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V3c0-1.1-0.9-2-2-2zm0 8h-2V7h-2v2h-2v2h2v2h2v-2h2v6H7V3h14v6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_quit.xml b/app/src/main/res/drawable/ic_quit.xml
index 26272ab8d..bbc219767 100644
--- a/app/src/main/res/drawable/ic_quit.xml
+++ b/app/src/main/res/drawable/ic_quit.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="40sp"
+    android:height="40sp"
+    android:viewportWidth="23"
+    android:viewportHeight="23">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M13,3h-2v10h2L13,3zM17.83,5.17l-1.42,1.42C17.99,7.86 19,9.81 19,12c0,3.87 -3.13,7 -7,7s-7,-3.13 -7,-7c0,-2.19 1.01,-4.14 2.58,-5.42L6.17,5.17C4.23,6.82 3,9.26 3,12c0,4.97 4.03,9 9,9s9,-4.03 9,-9c0,-2.74 -1.23,-5.18 -3.17,-6.83z"/>
+        android:pathData="M13 3h-2v10h2V3zm4.83 2.17l-1.42 1.42C17.99 7.86 19 9.81 19 12c0 3.87-3.13 7-7 7s-7-3.13-7-7c0-2.19 1.01-4.14 2.58-5.42L6.17 5.17C4.23 6.82 3 9.26 3 12c0 4.97 4.03 9 9 9s9-4.03 9-9c0-2.74-1.23-5.18-3.17-6.83z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_radio.xml b/app/src/main/res/drawable/ic_radio.xml
index d14122596..bd0dc9cf2 100644
--- a/app/src/main/res/drawable/ic_radio.xml
+++ b/app/src/main/res/drawable/ic_radio.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M3.24,6.15C2.51,6.43 2,7.17 2,8v12c0,1.1 0.89,2 2,2h16c1.11,0 2,-0.9 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2L8.3,6l8.26,-3.34L15.88,1 3.24,6.15zM7,20c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM20,12h-2v-2h-2v2L4,12L4,8h16v4z"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3.24 6.15C2.51 6.43 2 7.17 2 8v12c0 1.1 0.89 2 2 2h16c1.11 0 2-0.9 2-2V8c0-1.11-0.89-2-2-2H8.3l8.26-3.34L15.88 1 3.24 6.15zM7 20c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zm13-8h-2v-2h-2v2H4V8h16v4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_remove_device.xml b/app/src/main/res/drawable/ic_remove_device.xml
index 39e64d698..dd11ad06f 100644
--- a/app/src/main/res/drawable/ic_remove_device.xml
+++ b/app/src/main/res/drawable/ic_remove_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+        android:pathData="M6 19c0 1.1 0.9 2 2 2h8c1.1 0 2-0.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_reset.xml b/app/src/main/res/drawable/ic_reset.xml
index de25eb445..b3ac0c496 100644
--- a/app/src/main/res/drawable/ic_reset.xml
+++ b/app/src/main/res/drawable/ic_reset.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40sp"
+    android:height="40sp"
+    android:viewportWidth="23"
+    android:viewportHeight="23"
+    android:tint="#FFFFFF">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89 0.07 0.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-0.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13 21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.28 2.54 0.72-1.21-3.5-2.08V8H12z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_rotate_left.xml b/app/src/main/res/drawable/ic_rotate_left.xml
index dccb97fb2..007266b97 100644
--- a/app/src/main/res/drawable/ic_rotate_left.xml
+++ b/app/src/main/res/drawable/ic_rotate_left.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M7.11,8.53L5.7,7.11C4.8,8.27 4.24,9.61 4.07,11h2.02c0.14,-0.87 0.49,-1.72 1.02,-2.47zM6.09,13L4.07,13c0.17,1.39 0.72,2.73 1.62,3.89l1.41,-1.42c-0.52,-0.75 -0.87,-1.59 -1.01,-2.47zM7.1,18.32c1.16,0.9 2.51,1.44 3.9,1.61L11,17.9c-0.87,-0.15 -1.71,-0.49 -2.46,-1.03L7.1,18.32zM13,4.07L13,1L8.45,5.55 13,10L13,6.09c2.84,0.48 5,2.94 5,5.91s-2.16,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93s-3.05,-7.44 -7,-7.93z" />
+        android:pathData="M7.11 8.53L5.7 7.11C4.8 8.27 4.24 9.61 4.07 11h2.02c0.14-0.87 0.49-1.72 1.02-2.47zM6.09 13H4.07c0.17 1.39 0.72 2.73 1.62 3.89l1.41-1.42C6.58 14.72 6.23 13.88 6.09 13zm1.01 5.32c1.16 0.9 2.51 1.44 3.9 1.61V17.9c-0.87-0.15-1.71-0.49-2.46-1.03L7.1 18.32zM13 4.07V1L8.45 5.55 13 10V6.09c2.84 0.48 5 2.94 5 5.91s-2.16 5.43-5 5.91v2.02c3.95-0.49 7-3.85 7-7.93s-3.05-7.44-7-7.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_screenshot.xml b/app/src/main/res/drawable/ic_screenshot.xml
index 9e2340bd2..614e6d9dd 100644
--- a/app/src/main/res/drawable/ic_screenshot.xml
+++ b/app/src/main/res/drawable/ic_screenshot.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,4h7L11,2L4,2c-1.1,0 -2,0.9 -2,2v7h2L4,4zM10,13l-4,5h12l-3,-4 -2.03,2.71L10,13zM17,8.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S14,7.67 14,8.5s0.67,1.5 1.5,1.5S17,9.33 17,8.5zM20,2h-7v2h7v7h2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,20h-7v2h7c1.1,0 2,-0.9 2,-2v-7h-2v7zM4,13L2,13v7c0,1.1 0.9,2 2,2h7v-2L4,20v-7z"/>
+        android:fillColor="#000000"
+        android:pathData="M4 4h7V2H4C2.9 2 2 2.9 2 4v7h2V4zm6 9l-4 5h12l-3-4-2.03 2.71L10 13zm7-4.5C17 7.67 16.33 7 15.5 7S14 7.67 14 8.5s0.67 1.5 1.5 1.5S17 9.33 17 8.5zM20 2h-7v2h7v7h2V4c0-1.1-0.9-2-2-2zm0 18h-7v2h7c1.1 0 2-0.9 2-2v-7h-2v7zM4 13H2v7c0 1.1 0.9 2 2 2h7v-2H4v-7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_select_all.xml b/app/src/main/res/drawable/ic_select_all.xml
index 0fc49c923..1822790d9 100644
--- a/app/src/main/res/drawable/ic_select_all.xml
+++ b/app/src/main/res/drawable/ic_select_all.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
+        android:pathData="M3 5h2V3C3.9 3 3 3.9 3 5zm0 8h2v-2H3v2zm4 8h2v-2H7v2zM3 9h2V7H3v2zm10-6h-2v2h2V3zm6 0v2h2c0-1.1-0.9-2-2-2zM5 21v-2H3c0 1.1 0.9 2 2 2zm-2-4h2v-2H3v2zM9 3H7v2h2V3zm2 18h2v-2h-2v2zm8-8h2v-2h-2v2zm0 8c1.1 0 2-0.9 2-2h-2v2zm0-12h2V7h-2v2zm0 8h2v-2h-2v2zm-4 4h2v-2h-2v2zm0-16h2V3h-2v2zM7 17h10V7H7v10zm2-8h6v6H9V9z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index ace746c40..06c5623d0 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="40sp"
+    android:height="40sp"
+    android:viewportWidth="23"
+    android:viewportHeight="23">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+        android:fillColor="#000000"
+        android:pathData="M19.43 12.98c0.04-0.32 0.07-0.64 0.07-0.98s-0.03-0.66-0.07-0.98l2.11-1.65c0.19-0.15 0.24-0.42 0.12-0.64l-2-3.46c-0.12-0.22-0.39-0.3-0.61-0.22l-2.49 1c-0.52-0.4-1.08-0.73-1.69-0.98l-0.38-2.65C14.46 2.18 14.25 2 14 2h-4C9.75 2 9.54 2.18 9.51 2.42L9.13 5.07C8.52 5.32 7.96 5.66 7.44 6.05l-2.49-1c-0.23-0.09-0.49 0-0.61 0.22l-2 3.46C2.21 8.95 2.27 9.22 2.46 9.37l2.11 1.65C4.53 11.34 4.5 11.67 4.5 12s0.03 0.66 0.07 0.98l-2.11 1.65c-0.19 0.15-0.24 0.42-0.12 0.64l2 3.46c0.12 0.22 0.39 0.3 0.61 0.22l2.49-1c0.52 0.4 1.08 0.73 1.69 0.98l0.38 2.65C9.54 21.82 9.75 22 10 22h4c0.25 0 0.46-0.18 0.49-0.42l0.38-2.65c0.61-0.25 1.17-0.59 1.69-0.98l2.49 1c0.23 0.09 0.49 0 0.61-0.22l2-3.46c0.12-0.22 0.07-0.49-0.12-0.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings_remote.xml b/app/src/main/res/drawable/ic_settings_remote.xml
index 31311b28e..b2c50df19 100644
--- a/app/src/main/res/drawable/ic_settings_remote.xml
+++ b/app/src/main/res/drawable/ic_settings_remote.xml
@@ -1,15 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@color/secondarytext"
-      android:pathData="M15,9L9,9c-0.55,0 -1,0.45 -1,1v12c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L16,10c0,-0.55 -0.45,-1 -1,-1zM14,21h-4L10,11h4v10z"/>
-  <path
-      android:fillColor="@color/secondarytext"
-      android:pathData="M12,13m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"/>
-  <path
-      android:fillColor="@color/secondarytext"
-      android:pathData="M7.05,6.05l1.41,1.41C9.37,6.56 10.62,6 12,6s2.63,0.56 3.54,1.46l1.41,-1.41C15.68,4.78 13.93,4 12,4s-3.68,0.78 -4.95,2.05zM12,0C8.96,0 6.21,1.23 4.22,3.22l1.41,1.41C7.26,3.01 9.51,2 12,2s4.74,1.01 6.36,2.64l1.41,-1.41C17.79,1.23 15.04,0 12,0z"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M15 9H9c-0.55 0-1 0.45-1 1v12c0 0.55 0.45 1 1 1h6c0.55 0 1-0.45 1-1V10c0-0.55-0.45-1-1-1zm-1 12h-4V11h4v10z" />
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M11 13a1 1 0 1 1 2 0 1 1 0 1 1-2 0M7.05 6.05l1.41 1.41C9.37 6.56 10.62 6 12 6s2.63 0.56 3.54 1.46l1.41-1.41C15.68 4.78 13.93 4 12 4S8.32 4.78 7.05 6.05zM12 0C8.96 0 6.21 1.23 4.22 3.22l1.41 1.41C7.26 3.01 9.51 2 12 2s4.74 1.01 6.36 2.64l1.41-1.41C17.79 1.23 15.04 0 12 0z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index 904066636..b8f981a23 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+        android:fillColor="#FFFFFF"
+        android:pathData="M18 16.08c-0.76 0-1.44 0.3-1.96 0.77L8.91 12.7C8.96 12.47 9 12.24 9 12s-0.04-0.47-0.09-0.7l7.05-4.11C16.5 7.69 17.21 8 18 8c1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 0.24 0.04 0.47 0.09 0.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c0.79 0 1.5-0.31 2.04-0.81l7.12 4.16c-0.05 0.21-0.08 0.43-0.08 0.65 0 1.61 1.31 2.92 2.92 2.92 1.61 0 2.92-1.31 2.92-2.92s-1.31-2.92-2.92-2.92z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_0_bar.xml b/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_0_bar.xml
index a6650dc31..a49d48387 100644
--- a/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_0_bar.xml
+++ b/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_0_bar.xml
@@ -1,14 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillAlpha=".3"
-        android:fillColor="#FF000000"
-        android:pathData="M22,8V2L2,22h16V8z" />
+        android:fillColor="#000000"
+        android:pathData="M22 8V2L2 22h16V8z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,22h2v-2h-2v2zM20,10v8h2v-8h-2z" />
+        android:fillColor="#000000"
+        android:pathData="M20 22h2v-2h-2v2zm0-12v8h2v-8h-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_smart_button.xml b/app/src/main/res/drawable/ic_smart_button.xml
index 714ac4b7d..22ea0df32 100644
--- a/app/src/main/res/drawable/ic_smart_button.xml
+++ b/app/src/main/res/drawable/ic_smart_button.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@color/secondarytext"
-      android:pathData="M22,9v6c0,1.1 -0.9,2 -2,2h-1l0,-2h1V9H4v6h6v2H4c-1.1,0 -2,-0.9 -2,-2V9c0,-1.1 0.9,-2 2,-2h16C21.1,7 22,7.9 22,9zM14.5,19l1.09,-2.41L18,15.5l-2.41,-1.09L14.5,12l-1.09,2.41L11,15.5l2.41,1.09L14.5,19zM17,14l0.62,-1.38L19,12l-1.38,-0.62L17,10l-0.62,1.38L15,12l1.38,0.62L17,14zM14.5,19l1.09,-2.41L18,15.5l-2.41,-1.09L14.5,12l-1.09,2.41L11,15.5l2.41,1.09L14.5,19zM17,14l0.62,-1.38L19,12l-1.38,-0.62L17,10l-0.62,1.38L15,12l1.38,0.62L17,14z"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M22 9v6c0 1.1-0.9 2-2 2h-1v-2h1V9H4v6h6v2H4c-1.1 0-2-0.9-2-2V9c0-1.1 0.9-2 2-2h16c1.1 0 2 0.9 2 2zm-7.5 10l1.09-2.41L18 15.5l-2.41-1.09L14.5 12l-1.09 2.41L11 15.5l2.41 1.09L14.5 19zm2.5-5l0.62-1.38L19 12l-1.38-0.62L17 10l-0.62 1.38L15 12l1.38 0.62L17 14zm-2.5 5l1.09-2.41L18 15.5l-2.41-1.09L14.5 12l-1.09 2.41L11 15.5l2.41 1.09L14.5 19zm2.5-5l0.62-1.38L19 12l-1.38-0.62L17 10l-0.62 1.38L15 12l1.38 0.62L17 14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_sunny.xml b/app/src/main/res/drawable/ic_sunny.xml
index 8bac9e686..ac71831ca 100644
--- a/app/src/main/res/drawable/ic_sunny.xml
+++ b/app/src/main/res/drawable/ic_sunny.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6.76,4.84l-1.8,-1.79 -1.41,1.41 1.79,1.79zM1,10.5h3v2L1,12.5zM11,0.55h2L13,3.5h-2zM19.04,3.045l1.408,1.407 -1.79,1.79 -1.407,-1.408zM17.24,18.16l1.79,1.8 1.41,-1.41 -1.8,-1.79zM20,10.5h3v2h-3zM12,5.5c-3.31,0 -6,2.69 -6,6s2.69,6 6,6 6,-2.69 6,-6 -2.69,-6 -6,-6zM12,15.5c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4 4,1.79 4,4 -1.79,4 -4,4zM11,19.5h2v2.95h-2zM3.55,18.54l1.41,1.41 1.79,-1.8 -1.41,-1.41z"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6.76 4.84l-1.8-1.79-1.41 1.41 1.79 1.79zM1 10.5h3v2H1zm10-9.95h2V3.5h-2zm8.04 2.495l1.408 1.407-1.79 1.79-1.407-1.408zm-1.8 15.115l1.79 1.8 1.41-1.41-1.8-1.79zM20 10.5h3v2h-3zm-8-5c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zm0 10c-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4-1.79 4-4 4zm-1 4h2v2.95h-2zm-7.45-0.96l1.41 1.41 1.79-1.8-1.41-1.41z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_switch_left.xml b/app/src/main/res/drawable/ic_switch_left.xml
index 087110caf..901181350 100644
--- a/app/src/main/res/drawable/ic_switch_left.xml
+++ b/app/src/main/res/drawable/ic_switch_left.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@color/secondarytext"
-      android:pathData="M8.5,8.62v6.76L5.12,12L8.5,8.62M10,5l-7,7l7,7V5L10,5zM14,5v14l7,-7L14,5z"/>
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="@color/secondarytext"
+        android:pathData="M8.5 8.62v6.76L5.12 12 8.5 8.62M10 5l-7 7 7 7V5zm4 0v14l7-7-7-7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_vpn_key.xml b/app/src/main/res/drawable/ic_vpn_key.xml
index 88053a611..8f50c18e6 100644
--- a/app/src/main/res/drawable/ic_vpn_key.xml
+++ b/app/src/main/res/drawable/ic_vpn_key.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
+        android:pathData="M12.65 10C11.83 7.67 9.61 6 7 6c-3.31 0-6 2.69-6 6s2.69 6 6 6c2.61 0 4.83-1.67 5.65-4H17v4h4v-4h2v-4H12.65zM7 14c-1.1 0-2-0.9-2-2s0.9-2 2-2 2 0.9 2 2-0.9 2-2 2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_widgets.xml b/app/src/main/res/drawable/ic_widgets.xml
index 638ce0000..5939cad64 100644
--- a/app/src/main/res/drawable/ic_widgets.xml
+++ b/app/src/main/res/drawable/ic_widgets.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="45sp"
+    android:height="45sp"
     android:tint="#7E7E7E"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M13,13v8h8v-8h-8zM3,21h8v-8L3,13v8zM3,3v8h8L11,3L3,3zM16.66,1.69L11,7.34 16.66,13l5.66,-5.66 -5.66,-5.65z" />
+        android:pathData="M13 13v8h8v-8h-8zM3 21h8v-8H3v8zM3 3v8h8V3H3zm13.66-1.31L11 7.34 16.66 13l5.66-5.66-5.66-5.65z" />
 </vector>
diff --git a/app/src/main/res/drawable/level_list_battery.xml b/app/src/main/res/drawable/level_list_battery.xml
index 0a2d643d1..8448f117d 100644
--- a/app/src/main/res/drawable/level_list_battery.xml
+++ b/app/src/main/res/drawable/level_list_battery.xml
@@ -1,11 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="20" android:drawable="@drawable/ic_battery_20" />
-    <item android:maxLevel="50" android:drawable="@drawable/ic_battery_50" />
-    <item android:maxLevel="80" android:drawable="@drawable/ic_battery_80" />
-    <item android:maxLevel="100" android:drawable="@drawable/ic_battery_full" />
-    <item android:maxLevel="120" android:drawable="@drawable/ic_battery_charging_20" />
-    <item android:maxLevel="150" android:drawable="@drawable/ic_battery_charging_50" />
-    <item android:maxLevel="180" android:drawable="@drawable/ic_battery_charging_80" />
-    <item android:maxLevel="200" android:drawable="@drawable/ic_battery_charging_full" />
-</level-list>
\ No newline at end of file
+    <item
+        android:drawable="@drawable/ic_battery_20"
+        android:maxLevel="20" />
+    <item
+        android:drawable="@drawable/ic_battery_50"
+        android:maxLevel="50" />
+    <item
+        android:drawable="@drawable/ic_battery_80"
+        android:maxLevel="80" />
+    <item
+        android:drawable="@drawable/ic_battery_full"
+        android:maxLevel="100" />
+    <item
+        android:drawable="@drawable/ic_battery_charging_20"
+        android:maxLevel="120" />
+    <item
+        android:drawable="@drawable/ic_battery_charging_50"
+        android:maxLevel="150" />
+    <item
+        android:drawable="@drawable/ic_battery_charging_80"
+        android:maxLevel="180" />
+    <item
+        android:drawable="@drawable/ic_battery_charging_full"
+        android:maxLevel="200" />
+</level-list>
diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml
index 22942cd4a..a695cc9a0 100644
--- a/app/src/main/res/drawable/side_nav_bar.xml
+++ b/app/src/main/res/drawable/side_nav_bar.xml
@@ -3,7 +3,7 @@
     <gradient
         android:angle="135"
         android:centerColor="@color/primary_light"
-        android:startColor="@color/primary_light"
         android:endColor="@color/primary_dark"
+        android:startColor="@color/primary_light"
         android:type="linear" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/splash.xml b/app/src/main/res/drawable/splash.xml
index b0916a7f0..a003d8f7e 100644
--- a/app/src/main/res/drawable/splash.xml
+++ b/app/src/main/res/drawable/splash.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:drawable="@color/primary_dark"/>
-
+    <item android:drawable="@color/primary_dark" />
 </layer-list>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 6b425571b..0b9883be6 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,5 +1,4 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"