diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
index b911dc9ba..247d8ccb2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
@@ -116,7 +116,7 @@ public class GB {
                 deviceCommunicationServiceIntent.setAction(DeviceService.ACTION_FETCH_RECORDED_DATA);
                 deviceCommunicationServiceIntent.putExtra(EXTRA_RECORDED_DATA_TYPES, ActivityKind.TYPE_ACTIVITY);
                 PendingIntent fetchPendingIntent = PendingIntent.getService(context, 1, deviceCommunicationServiceIntent, PendingIntent.FLAG_ONE_SHOT);
-                builder.addAction(R.drawable.ic_action_fetch_activity_data, context.getString(R.string.controlcenter_fetch_activity_data), fetchPendingIntent);
+                builder.addAction(R.drawable.ic_refresh, context.getString(R.string.controlcenter_fetch_activity_data), fetchPendingIntent);
             }
         } else if (device.getState().equals(GBDevice.State.WAITING_FOR_RECONNECT) || device.getState().equals(GBDevice.State.NOT_CONNECTED)) {
             deviceCommunicationServiceIntent.setAction(DeviceService.ACTION_CONNECT);
diff --git a/app/src/main/res/drawable/gadgetbridge_img.xml b/app/src/main/res/drawable/gadgetbridge_img.xml
index d066b98f8..757c33ef6 100644
--- a/app/src/main/res/drawable/gadgetbridge_img.xml
+++ b/app/src/main/res/drawable/gadgetbridge_img.xml
@@ -2,8 +2,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="200dp"
     android:height="300dp"
-    android:viewportWidth="950"
     android:tint="#A07E7E7E"
+    android:viewportWidth="950"
     android:viewportHeight="1400">
     <path
         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"
diff --git a/app/src/main/res/drawable/ic_access_alarms.xml b/app/src/main/res/drawable/ic_access_alarms.xml
new file mode 100644
index 000000000..a3b8e3bfe
--- /dev/null
+++ b/app/src/main/res/drawable/ic_access_alarms.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M15.87 15.25l-3.37-2V8.72c0-0.4-0.32-0.72-0.72-0.72h-0.06C11.32 8 11 8.32 11 8.72v4.72c0 0.35 0.18 0.68 0.49 0.86l3.65 2.19c0.34 0.2 0.78 0.1 0.98-0.24 0.21-0.35 0.1-0.8-0.25-1zm5.31-10.24L18.1 2.45c-0.42-0.35-1.05-0.3-1.41 0.13C16.34 3 16.4 3.63 16.82 3.99l3.07 2.56c0.42 0.35 1.05 0.3 1.41-0.13 0.36-0.42 0.3-1.05-0.12-1.41zM4.1 6.55l3.07-2.56C7.6 3.63 7.66 3 7.3 2.58 6.95 2.15 6.32 2.1 5.9 2.45L2.82 5.01C2.4 5.37 2.34 6 2.7 6.42 3.05 6.85 3.68 6.9 4.1 6.55zM12 4c-4.97 0-9 4.03-9 9s4.03 9 9 9 9-4.03 9-9-4.03-9-9-9zm0 16c-3.86 0-7-3.14-7-7s3.14-7 7-7 7 3.14 7 7-3.14 7-7 7z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_access_time.xml b/app/src/main/res/drawable/ic_access_time.xml
index ec835af0c..cfe3228e7 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="45sp"
-    android:height="45sp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="#7E7E7E"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         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" />
+        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 8zM11.78 7h-0.06C11.32 7 11 7.32 11 7.72v4.72c0 0.35 0.18 0.68 0.49 0.86l4.15 2.49c0.34 0.2 0.78 0.1 0.98-0.24 0.21-0.34 0.1-0.79-0.25-0.99l-3.87-2.3V7.72c0-0.4-0.32-0.72-0.72-0.72z" />
 </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
deleted file mode 100644
index 265a5f0dc..000000000
--- a/app/src/main/res/drawable/ic_action_fetch_activity_data.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
-    <path
-        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_add.xml b/app/src/main/res/drawable/ic_add.xml
index aa4154e27..70c233aa8 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40sp"
-    android:height="40sp"
-    android:viewportWidth="23"
-    android:viewportHeight="23">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+        android:fillColor="#000000"
+        android:pathData="M18 13h-5v5c0 0.55-0.45 1-1 1s-1-0.45-1-1v-5H6c-0.55 0-1-0.45-1-1s0.45-1 1-1h5V6c0-0.55 0.45-1 1-1s1 0.45 1 1v5h5c0.55 0 1 0.45 1 1s-0.45 1-1 1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_upward.xml b/app/src/main/res/drawable/ic_arrow_upward.xml
index 23a90b893..ed082cc04 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="45sp"
-    android:height="45sp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="#7E7E7E"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#000000"
-        android:pathData="M4 12l1.41 1.41L11 7.83V20h2V7.83l5.58 5.59L20 12l-8-8-8 8z" />
+        android:pathData="M13 19V7.83l4.88 4.88c0.39 0.39 1.03 0.39 1.42 0 0.39-0.39 0.39-1.02 0-1.41l-6.59-6.59c-0.39-0.39-1.02-0.39-1.41 0l-6.6 6.58c-0.39 0.39-0.39 1.02 0 1.41 0.39 0.39 1.02 0.39 1.41 0L11 7.83V19c0 0.55 0.45 1 1 1s1-0.45 1-1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_block_black.xml b/app/src/main/res/drawable/ic_block.xml
similarity index 73%
rename from app/src/main/res/drawable/ic_block_black.xml
rename to app/src/main/res/drawable/ic_block.xml
index ce9e6df8b..c0443c9c5 100644
--- a/app/src/main/res/drawable/ic_block_black.xml
+++ b/app/src/main/res/drawable/ic_block.xml
@@ -1,8 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40sp"
-    android:height="40sp"
-    android:viewportWidth="23"
-    android:viewportHeight="23">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         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" />
diff --git a/app/src/main/res/drawable/ic_brightness_2.xml b/app/src/main/res/drawable/ic_brightness_2.xml
index 24e69dbbf..cab8d9202 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="45sp"
-    android:height="45sp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="#7E7E7E"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
-        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" />
+        android:fillColor="#000000"
+        android:pathData="M12.43 2.3C10.05 1.71 7.75 2.03 5.8 2.94 5.45 3.1 5.39 3.58 5.7 3.8 8.3 5.6 10 8.6 10 12c0 3.4-1.7 6.4-4.3 8.2-0.32 0.22-0.26 0.7 0.09 0.86C7.07 21.66 8.5 22 10 22c6.05 0 10.85-5.38 9.87-11.6-0.61-3.92-3.59-7.16-7.44-8.1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_calculate.xml b/app/src/main/res/drawable/ic_calculate.xml
index 0ea041b2c..8be4fa2a2 100644
--- a/app/src/main/res/drawable/ic_calculate.xml
+++ b/app/src/main/res/drawable/ic_calculate.xml
@@ -1,12 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    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-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" />
+        android:fillColor="#000000"
+        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-2zm-5.44 3.53c0.29-0.29 0.77-0.29 1.06 0l0.88 0.88 0.88-0.88c0.29-0.29 0.77-0.29 1.06 0 0.29 0.29 0.29 0.77 0 1.06l-0.88 0.88 0.88 0.88c0.29 0.29 0.29 0.77 0 1.06-0.29 0.29-0.77 0.29-1.06 0L15.5 9.54l-0.88 0.88c-0.29 0.29-0.77 0.29-1.06 0-0.29-0.29-0.29-0.77 0-1.06l0.88-0.88-0.88-0.88c-0.3-0.3-0.3-0.78 0-1.07zM7 7.72h3.5c0.41 0 0.75 0.34 0.75 0.75s-0.34 0.75-0.75 0.75H7c-0.41 0-0.75-0.34-0.75-0.75S6.59 7.72 7 7.72zM10.75 16H9.5v1.25C9.5 17.66 9.16 18 8.75 18S8 17.66 8 17.25V16H6.75C6.34 16 6 15.66 6 15.25s0.34-0.75 0.75-0.75H8v-1.25c0-0.41 0.34-0.75 0.75-0.75s0.75 0.34 0.75 0.75v1.25h1.25c0.41 0 0.75 0.34 0.75 0.75S11.16 16 10.75 16zm6.5 1.25h-3.5c-0.41 0-0.75-0.34-0.75-0.75s0.34-0.75 0.75-0.75h3.5c0.41 0 0.75 0.34 0.75 0.75s-0.34 0.75-0.75 0.75zm0-2.5h-3.5C13.34 14.75 13 14.41 13 14s0.34-0.75 0.75-0.75h3.5c0.41 0 0.75 0.34 0.75 0.75s-0.34 0.75-0.75 0.75z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_calendar_sync.xml b/app/src/main/res/drawable/ic_calendar_sync.xml
index 757143cd9..f25dd4d8a 100644
--- a/app/src/main/res/drawable/ic_calendar_sync.xml
+++ b/app/src/main/res/drawable/ic_calendar_sync.xml
@@ -1,13 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="@color/secondarytext"
+        android:fillColor="#000000"
         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:fillColor="#000000"
         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" />
+        android:strokeWidth="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_calendar_today.xml b/app/src/main/res/drawable/ic_calendar_today.xml
index 7b9dcc34b..197339a90 100644
--- a/app/src/main/res/drawable/ic_calendar_today.xml
+++ b/app/src/main/res/drawable/ic_calendar_today.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <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" />
+        android:fillColor="#000000"
+        android:pathData="M20 3h-1V2c0-0.55-0.45-1-1-1s-1 0.45-1 1v1H7V2c0-0.55-0.45-1-1-1S5 1.45 5 2v1H4C2.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-2zm-1 18H5c-0.55 0-1-0.45-1-1V8h16v12c0 0.55-0.45 1-1 1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_create.xml b/app/src/main/res/drawable/ic_create.xml
new file mode 100644
index 000000000..9224b250c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_create.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M3 17.46v3.04C3 20.78 3.22 21 3.5 21h3.04c0.13 0 0.26-0.05 0.35-0.15L17.81 9.94l-3.75-3.75L3.15 17.1C3.05 17.2 3 17.32 3 17.46zM20.71 7.04c0.39-0.39 0.39-1.02 0-1.41l-2.34-2.34c-0.39-0.39-1.02-0.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_database_management.xml b/app/src/main/res/drawable/ic_database_management.xml
deleted file mode 100644
index 91f5419e1..000000000
--- a/app/src/main/res/drawable/ic_database_management.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="#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 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
deleted file mode 100644
index 8a78a7220..000000000
--- a/app/src/main/res/drawable/ic_debug.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40sp"
-    android:height="40sp"
-    android:viewportWidth="23"
-    android:viewportHeight="23">
-    <path
-        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.xml b/app/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 000000000..20ead7e53
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M6 19c0 1.1 0.9 2 2 2h8c1.1 0 2-0.9 2-2V9c0-1.1-0.9-2-2-2H8C6.9 7 6 7.9 6 9v10zM18 4h-2.5l-0.71-0.71C14.61 3.11 14.35 3 14.09 3H9.91c-0.26 0-0.52 0.11-0.7 0.29L8.5 4H6C5.45 4 5 4.45 5 5s0.45 1 1 1h12c0.55 0 1-0.45 1-1s-0.45-1-1-1z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_delete_cross.xml b/app/src/main/res/drawable/ic_delete_cross.xml
deleted file mode 100644
index e82e3680a..000000000
--- a/app/src/main/res/drawable/ic_delete_cross.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="#FFFFFFFF"
-        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_delete_forever.xml b/app/src/main/res/drawable/ic_delete_forever.xml
new file mode 100644
index 000000000..cfcbaa76d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete_forever.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M6 19c0 1.1 0.9 2 2 2h8c1.1 0 2-0.9 2-2V9c0-1.1-0.9-2-2-2H8C6.9 7 6 7.9 6 9v10zm3.17-7.83c0.39-0.39 1.02-0.39 1.41 0L12 12.59l1.42-1.42c0.39-0.39 1.02-0.39 1.41 0 0.39 0.39 0.39 1.02 0 1.41L13.41 14l1.42 1.42c0.39 0.39 0.39 1.02 0 1.41-0.39 0.39-1.02 0.39-1.41 0L12 15.41l-1.42 1.42c-0.39 0.39-1.02 0.39-1.41 0-0.39-0.39-0.39-1.02 0-1.41L10.59 14l-1.42-1.42c-0.39-0.38-0.39-1.02 0-1.41zM15.5 4l-0.71-0.71C14.61 3.11 14.35 3 14.09 3H9.91c-0.26 0-0.52 0.11-0.7 0.29L8.5 4H6C5.45 4 5 4.45 5 5s0.45 1 1 1h12c0.55 0 1-0.45 1-1s-0.45-1-1-1h-2.5z" />
+</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 098e7cf06..832edacd8 100644
--- a/app/src/main/res/drawable/ic_device_amazfit_bip.xml
+++ b/app/src/main/res/drawable/ic_device_amazfit_bip.xml
@@ -4,19 +4,23 @@
     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" />
+        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="#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" />
+        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.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: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="#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" />
+        android:fillColor="#ffffff"
+        android:pathData="M11.407 7.52c-0.814-0.016-0.908 0.156-0.885 0.967-0.72 0.126-1.342 1.159-1.325 2.124l0.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.15-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.22-0.24 0.085v-3.444c-0.087-0.903-0.473-1.51-1.295-1.838 0.007-0.945-0.06-0.991-0.806-0.98zm0.05 1.428L17.234 9c0.805 0.007 1.47 0.828 1.47 1.343l-0.028 7.942c-0.003 0.832-0.717 1.512-1.443 1.512h-5.925c-0.536 0-1.498-0.65-1.492-1.426l0.062-7.878c0.008-0.957 0.76-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" />
+        android:fillAlpha="0.731"
+        android:fillColor="#ffffff"
+        android:pathData="M11.457 8.948c-0.82-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.942C18.703 9.828 18.037 9.007 17.23 9zm-0.482 1.812h6.567v6.696h-6.568z"
+        android:strokeAlpha="0.731" />
 </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 43e36d861..84730f7a6 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
@@ -4,20 +4,23 @@
     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" />
+        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: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" />
+        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: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" />
+        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="#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" />
+        android:fillColor="#ffffff"
+        android:pathData="M11.342 7.48c-0.814-0.017-0.908 0.155-0.885 0.966-0.72 0.126-1.342 1.159-1.325 2.124l0.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.22 0.05 0.093 0.11 0.213 0.063 0.266-0.09l0.003-1.14c-0.055-0.114-0.1-0.213-0.25-0.117-0.078 0.049-0.11 0.22-0.24 0.085v-3.444c-0.087-0.903-0.473-1.51-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.512h-5.925c-0.536 0-1.498-0.65-1.492-1.426l0.062-7.878c0.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" />
+        android:fillAlpha="0.731"
+        android:fillColor="#ffffff"
+        android:pathData="M11.392 8.907c-0.819-0.007-1.572 0.59-1.58 1.547L9.75 18.33c-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.343zm-0.482 1.812h6.567v6.696H10.91z"
+        android:strokeAlpha="0.731" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_default.xml b/app/src/main/res/drawable/ic_device_default.xml
index e8f7c7207..f5aa60b2f 100644
--- a/app/src/main/res/drawable/ic_device_default.xml
+++ b/app/src/main/res/drawable/ic_device_default.xml
@@ -4,22 +4,21 @@
     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" />
+        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.57" />
     <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" />
+        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.57" />
     <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" />
+        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.57" />
     <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" />
+        android:pathData="M12 9.955h4.575a0.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.567v-7.836a0.507 0.567 0 0 1 0.507-0.567zm0.581 9.735h3.382v1.45h-3.382zM12.554 7.693h3.382v1.45h-3.382z" />
     <path
         android:fillColor="#2196f3"
-        android:pathData="M11.514 9.729h3.907v6.978h-3.907z"
-        android:strokeWidth="0.91048878" />
+        android:pathData="M12.363 10.948h3.907v6.978h-3.907z" />
 </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 295b92713..d1f118eb1 100644
--- a/app/src/main/res/drawable/ic_device_default_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_default_disabled.xml
@@ -4,23 +4,21 @@
     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" />
+        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.57" />
     <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" />
+        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.57" />
     <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" />
+        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.57" />
     <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" />
+        android:pathData="M12.15 9.904h4.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.567V10.47a0.507 0.567 0 0 1 0.507-0.567zm0.582 9.735h3.382v1.45h-3.382zM12.705 7.642h3.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" />
+        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
 </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
deleted file mode 100644
index f713c4dc1..000000000
--- a/app/src/main/res/drawable/ic_device_set_alarms.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="#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 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_devices_other.xml b/app/src/main/res/drawable/ic_devices_other.xml
new file mode 100644
index 000000000..46b697e4e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_devices_other.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M3 7c0-0.55 0.45-1 1-1h16c0.55 0 1-0.45 1-1s-0.45-1-1-1H3C1.9 4 1 4.9 1 6v12c0 1.1 0.9 2 2 2h3c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1-0.45-1-1V7zm9 5h-2c-0.55 0-1 0.45-1 1v0.78C8.39 14.33 8 15.11 8 16c0 0.89 0.39 1.67 1 2.22V19c0 0.55 0.45 1 1 1h2c0.55 0 1-0.45 1-1v-0.78c0.61-0.55 1-1.34 1-2.22s-0.39-1.67-1-2.22V13c0-0.55-0.45-1-1-1zm-1 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_do_not_disturb.xml b/app/src/main/res/drawable/ic_do_not_disturb.xml
deleted file mode 100644
index 8c19b3367..000000000
--- a/app/src/main/res/drawable/ic_do_not_disturb.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    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 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_drag_handle.xml b/app/src/main/res/drawable/ic_drag_handle.xml
new file mode 100644
index 000000000..1177cb38f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_drag_handle.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M19 9H5c-0.55 0-1 0.45-1 1s0.45 1 1 1h14c0.55 0 1-0.45 1-1s-0.45-1-1-1zM5 15h14c0.55 0 1-0.45 1-1s-0.45-1-1-1H5c-0.55 0-1 0.45-1 1s0.45 1 1 1z" />
+</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
deleted file mode 100644
index 1f23f1570..000000000
--- a/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="#FF000000"
-        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
deleted file mode 100644
index 6583ee016..000000000
--- a/app/src/main/res/drawable/ic_edit.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="@color/secondarytext"
-        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 e8428b97f..2839222ab 100644
--- a/app/src/main/res/drawable/ic_extension.xml
+++ b/app/src/main/res/drawable/ic_extension.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <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" />
+        android:fillColor="#000000"
+        android:pathData="M20.5 11H19V7c0-1.1-0.9-2-2-2h-4V3.5C13 2.12 11.88 1 10.5 1S8 2.12 8 3.5V5H4C2.9 5 2.01 5.9 2.01 7v3.8H3.5c1.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-1.5c0-1.49 1.21-2.7 2.7-2.7s2.7 1.21 2.7 2.7V22H17c1.1 0 2-0.9 2-2v-4h1.5c1.38 0 2.5-1.12 2.5-2.5S21.88 11 20.5 11z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml
deleted file mode 100644
index e66f184e2..000000000
--- a/app/src/main/res/drawable/ic_filter.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="@android:color/white"
-        android:pathData="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_filter_9_plus.xml b/app/src/main/res/drawable/ic_filter_9_plus.xml
new file mode 100644
index 000000000..7f6b1783f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_filter_9_plus.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M2 5C1.45 5 1 5.45 1 6v15c0 1.1 0.9 2 2 2h15c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1-0.45-1-1V6c0-0.55-0.45-1-1-1zm12 7V8c0-1.1-0.9-2-2-2h-1C9.9 6 9 6.9 9 8v1c0 1.1 0.9 2 2 2h1v1h-2c-0.55 0-1 0.45-1 1s0.45 1 1 1h2c1.1 0 2-0.9 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-2zm-1 16H8c-0.55 0-1-0.45-1-1V4c0-0.55 0.45-1 1-1h12c0.55 0 1 0.45 1 1v12c0 0.55-0.45 1-1 1zm1-7c0-0.55-0.45-1-1-1h-1V8c0-0.55-0.45-1-1-1s-1 0.45-1 1v1h-1c-0.55 0-1 0.45-1 1s0.45 1 1 1h1v1c0 0.55 0.45 1 1 1s1-0.45 1-1v-1h1c0.55 0 1-0.45 1-1z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_filter_alt.xml b/app/src/main/res/drawable/ic_filter_alt.xml
new file mode 100644
index 000000000..113833ab0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_filter_alt.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M4.25 5.61C6.57 8.59 10 13 10 13v5c0 1.1 0.9 2 2 2s2-0.9 2-2v-5s3.43-4.41 5.75-7.39C20.26 4.95 19.79 4 18.95 4H5.04c-0.83 0-1.3 0.95-0.79 1.61z" />
+</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
deleted file mode 100644
index f131683df..000000000
--- a/app/src/main/res/drawable/ic_find_lost_phone.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<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="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_font_download.xml b/app/src/main/res/drawable/ic_font_download.xml
index a8ad28e11..22b1354ec 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="45sp"
-    android:height="45sp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="#7E7E7E"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
-        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" />
+        android:fillColor="#000000"
+        android:pathData="M9.93 13.5h4.14L12 7.98 9.93 13.5zM20 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.29 15.88l-0.9-2.38H9.17l-0.89 2.37c-0.14 0.38-0.5 0.63-0.91 0.63-0.68 0-1.15-0.69-0.9-1.32l4.25-10.81C10.94 5.84 11.44 5.5 12 5.5s1.06 0.34 1.27 0.87l4.25 10.81c0.25 0.63-0.22 1.32-0.9 1.32-0.4 0-0.76-0.25-0.91-0.62z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
new file mode 100644
index 000000000..3f533c012
--- /dev/null
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M13.26 3C8.17 2.86 4 6.95 4 12H2.21c-0.45 0-0.67 0.54-0.35 0.85l2.79 2.8c0.2 0.2 0.51 0.2 0.71 0l2.79-2.8C8.46 12.54 8.24 12 7.79 12H6c0-3.9 3.18-7.05 7.1-7 3.72 0.05 6.85 3.18 6.9 6.9 0.05 3.91-3.1 7.1-7 7.1-1.61 0-3.1-0.55-4.28-1.48-0.4-0.31-0.96-0.28-1.32 0.08-0.42 0.42-0.39 1.13 0.08 1.49C9 20.29 10.91 21 13 21c5.05 0 9.14-4.17 9-9.26-0.13-4.69-4.05-8.61-8.74-8.74zm-0.51 5C12.34 8 12 8.34 12 8.75v3.68c0 0.35 0.19 0.68 0.49 0.86l3.12 1.85c0.36 0.21 0.82 0.09 1.03-0.26 0.21-0.36 0.09-0.82-0.26-1.03l-2.88-1.71v-3.4c0-0.4-0.34-0.74-0.75-0.74z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_history_black.xml b/app/src/main/res/drawable/ic_history_black.xml
deleted file mode 100644
index f7941d3b2..000000000
--- a/app/src/main/res/drawable/ic_history_black.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    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 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.xml b/app/src/main/res/drawable/ic_info.xml
new file mode 100644
index 000000000..7cc3a6a3a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        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 2zm0 15c-0.55 0-1-0.45-1-1v-4c0-0.55 0.45-1 1-1s1 0.45 1 1v4c0 0.55-0.45 1-1 1zm1-8h-2V7h2v2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_info_black.xml b/app/src/main/res/drawable/ic_info_black.xml
deleted file mode 100644
index 4fcb7bf6a..000000000
--- a/app/src/main/res/drawable/ic_info_black.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    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 8505c73a5..e9a732e61 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="45sp"
-    android:height="45sp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="#7E7E7E"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <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 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" />
+        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 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 2s0.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-2s0.07-1.35 0.16-2h4.68c0.09 0.65 0.16 1.32 0.16 2s-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-2s-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_lock_open.xml b/app/src/main/res/drawable/ic_lock_open.xml
index a3036eb4b..917091a2f 100644
--- a/app/src/main/res/drawable/ic_lock_open.xml
+++ b/app/src/main/res/drawable/ic_lock_open.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="#7E7E7E"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <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" />
+        android:fillColor="#000000"
+        android:pathData="M12 13c-1.1 0-2 0.9-2 2s0.9 2 2 2 2-0.9 2-2-0.9-2-2-2zm6-5h-1V6c0-2.76-2.24-5-5-5-2.28 0-4.27 1.54-4.84 3.75-0.14 0.54 0.18 1.08 0.72 1.22 0.53 0.14 1.08-0.18 1.22-0.72C9.44 3.93 10.63 3 12 3c1.65 0 3 1.35 3 3v2H6c-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 11c0 0.55-0.45 1-1 1H7c-0.55 0-1-0.45-1-1v-8c0-0.55 0.45-1 1-1h10c0.55 0 1 0.45 1 1v8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
index 2911b0719..66c96a6fb 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="45sp"
-    android:height="45sp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="#7E7E7E"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" />
+        android:fillColor="#000000"
+        android:pathData="M4 18h16c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1zm0-5h16c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1zM3 7c0 0.55 0.45 1 1 1h16c0.55 0 1-0.45 1-1s-0.45-1-1-1H4C3.45 6 3 6.45 3 7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_more_vert.xml b/app/src/main/res/drawable/ic_more_vert.xml
index a1d8763ca..d348540fd 100644
--- a/app/src/main/res/drawable/ic_more_vert.xml
+++ b/app/src/main/res/drawable/ic_more_vert.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#000000"
         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 2a4b4fc54..fdb1bfe6a 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="45sp"
-    android:height="45sp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <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" />
+        android:fillColor="#000000"
+        android:pathData="M11.1 12.08c-2-3.88-0.92-7.36 0.07-9.27 0.19-0.36-0.12-0.77-0.53-0.72-5.02 0.68-8.86 5.07-8.65 10.32 0.01 0 0.01 0 0.01 0.01C2.62 12.15 3.29 12 4 12c1.66 0 3.18 0.83 4.1 2.15C9.77 14.63 11 16.17 11 18c0 1.52-0.87 2.83-2.12 3.51 0.98 0.32 2.03 0.5 3.11 0.5 3.13 0 5.92-1.44 7.76-3.69 0.26-0.32 0.04-0.79-0.37-0.82-2.49-0.13-6.28-1.53-8.28-5.42z" />
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#000000"
         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 4e492c976..2d3efea22 100644
--- a/app/src/main/res/drawable/ic_no_watch.xml
+++ b/app/src/main/res/drawable/ic_no_watch.xml
@@ -1,15 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="@color/secondarytext"
+        android:fillColor="#000000"
         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" />
+        android:strokeColor="#000000" />
 </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
deleted file mode 100644
index 8112e1cdd..000000000
--- a/app/src/main/res/drawable/ic_outline_filter_9_plus.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    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_pageview.xml b/app/src/main/res/drawable/ic_pageview.xml
new file mode 100644
index 000000000..d0a505c8e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pageview.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        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.92 13.5l-2.2-2.2c-0.9 0.58-2.03 0.84-3.22 0.62-1.88-0.35-3.38-1.93-3.62-3.83-0.38-3.01 2.18-5.52 5.21-5.04 1.88 0.3 3.39 1.84 3.7 3.71 0.19 1.16-0.08 2.23-0.64 3.12l2.2 2.19c0.39 0.39 0.39 1.03 0 1.42-0.4 0.4-1.04 0.4-1.43 0.01z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_power_settings_new.xml b/app/src/main/res/drawable/ic_power_settings_new.xml
new file mode 100644
index 000000000..af6eb5e9c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_power_settings_new.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12 3c-0.55 0-1 0.45-1 1v8c0 0.55 0.45 1 1 1s1-0.45 1-1V4c0-0.55-0.45-1-1-1zm5.14 2.86c-0.39 0.39-0.38 1-0.01 1.39 1.13 1.2 1.83 2.8 1.87 4.57 0.09 3.83-3.08 7.13-6.91 7.17C8.18 19.05 5 15.9 5 12c0-1.84 0.71-3.51 1.87-4.76 0.37-0.39 0.37-1-0.01-1.38-0.4-0.4-1.05-0.39-1.43 0.02C3.98 7.42 3.07 9.47 3 11.74c-0.14 4.88 3.83 9.1 8.71 9.25 5.1 0.16 9.29-3.93 9.29-9 0-2.37-0.92-4.51-2.42-6.11-0.38-0.41-1.04-0.42-1.44-0.02z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_quit.xml b/app/src/main/res/drawable/ic_quit.xml
deleted file mode 100644
index bbc219767..000000000
--- a/app/src/main/res/drawable/ic_quit.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40sp"
-    android:height="40sp"
-    android:viewportWidth="23"
-    android:viewportHeight="23">
-    <path
-        android:fillColor="#FF000000"
-        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 bd0dc9cf2..228588f6c 100644
--- a/app/src/main/res/drawable/ic_radio.xml
+++ b/app/src/main/res/drawable/ic_radio.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    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-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" />
+        android:fillColor="#000000"
+        android:pathData="M3.24 6.15C2.51 6.43 2 7.17 2 8v12c0 1.1 0.9 2 2 2h16c1.11 0 2-0.9 2-2V8c0-1.1-0.9-2-2-2H8.3l7.43-3c0.46-0.19 0.68-0.71 0.49-1.17-0.19-0.46-0.71-0.68-1.17-0.49L3.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-1c0-0.55-0.45-1-1-1s-1 0.45-1 1v1H4V9c0-0.55 0.45-1 1-1h14c0.55 0 1 0.45 1 1v3z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
new file mode 100644
index 000000000..0a5320acb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M17.65 6.35c-1.63-1.63-3.94-2.57-6.48-2.31-3.67 0.37-6.69 3.35-7.1 7.02C3.52 15.91 7.27 20 12 20c3.19 0 5.93-1.87 7.21-4.56 0.32-0.67-0.16-1.44-0.9-1.44-0.37 0-0.72 0.2-0.88 0.53-1.13 2.43-3.84 3.97-6.8 3.31-2.22-0.49-4.01-2.3-4.48-4.52C5.31 9.44 8.26 6 12 6c1.66 0 3.14 0.69 4.22 1.78l-1.51 1.51C14.08 9.92 14.52 11 15.41 11H19c0.55 0 1-0.45 1-1V6.41c0-0.89-1.08-1.34-1.71-0.71l-0.64 0.65z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_remove_device.xml b/app/src/main/res/drawable/ic_remove_device.xml
deleted file mode 100644
index dd11ad06f..000000000
--- a/app/src/main/res/drawable/ic_remove_device.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="#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" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_reset.xml b/app/src/main/res/drawable/ic_reset.xml
deleted file mode 100644
index b3ac0c496..000000000
--- a/app/src/main/res/drawable/ic_reset.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<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 007266b97..f7104e06f 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="45sp"
-    android:height="45sp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="#7E7E7E"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <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 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" />
+        android:fillColor="#000000"
+        android:pathData="M6.56 7.98C6.1 7.52 5.31 7.6 5 8.17 4.72 8.68 4.5 9.2 4.33 9.75 4.14 10.38 4.64 11 5.29 11H5.3c0.43 0 0.82-0.28 0.94-0.7 0.12-0.4 0.28-0.79 0.48-1.17 0.22-0.37 0.15-0.84-0.16-1.15zM5.31 13H5.29c-0.65 0-1.15 0.62-0.96 1.25 0.16 0.54 0.38 1.07 0.66 1.58 0.31 0.57 1.11 0.66 1.57 0.2 0.3-0.31 0.38-0.77 0.17-1.15-0.2-0.37-0.36-0.76-0.48-1.16C6.13 13.28 5.74 13 5.31 13zm2.85 6.02c0.51 0.28 1.04 0.5 1.59 0.66 0.62 0.18 1.24-0.32 1.24-0.96v-0.03c0-0.43-0.28-0.82-0.7-0.94-0.4-0.12-0.78-0.28-1.15-0.48-0.38-0.21-0.86-0.14-1.16 0.17l-0.03 0.03c-0.45 0.45-0.36 1.24 0.21 1.55zM13 4.07V3.41c0-0.89-1.08-1.34-1.71-0.71L9.17 4.83c-0.4 0.4-0.4 1.04 0 1.43l2.13 2.08C11.93 8.96 13 8.51 13 7.62V6.09c2.84 0.48 5 2.94 5 5.91 0 2.73-1.82 5.02-4.32 5.75-0.41 0.12-0.68 0.51-0.68 0.94v0.02c0 0.65 0.61 1.14 1.23 0.96C17.57 18.71 20 15.64 20 12c0-4.08-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 614e6d9dd..d3b09022f 100644
--- a/app/src/main/res/drawable/ic_screenshot.xml
+++ b/app/src/main/res/drawable/ic_screenshot.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="#7E7E7E"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         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" />
diff --git a/app/src/main/res/drawable/ic_select_all.xml b/app/src/main/res/drawable/ic_select_all.xml
index 1822790d9..d9e5e2842 100644
--- a/app/src/main/res/drawable/ic_select_all.xml
+++ b/app/src/main/res/drawable/ic_select_all.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFFFF"
-        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" />
+        android:fillColor="#000000"
+        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-2v2zM8 17h8c0.55 0 1-0.45 1-1V8c0-0.55-0.45-1-1-1H8C7.45 7 7 7.45 7 8v8c0 0.55 0.45 1 1 1zm1-8h6v6H9V9z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 06c5623d0..3731428f7 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,8 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40sp"
-    android:height="40sp"
-    android:viewportWidth="23"
-    android:viewportHeight="23">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         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" />
diff --git a/app/src/main/res/drawable/ic_settings_remote.xml b/app/src/main/res/drawable/ic_settings_remote.xml
index b2c50df19..44587f808 100644
--- a/app/src/main/res/drawable/ic_settings_remote.xml
+++ b/app/src/main/res/drawable/ic_settings_remote.xml
@@ -1,12 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <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" />
+        android:fillColor="#000000"
+        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-3 6c-1.1 0-2-0.9-2-2s0.9-2 2-2 2 0.9 2 2-0.9 2-2 2zM7.82 6.82c0.35 0.35 0.9 0.38 1.3 0.1C9.93 6.34 10.93 6 12 6s2.07 0.34 2.88 0.91c0.4 0.28 0.95 0.26 1.3-0.09 0.43-0.43 0.39-1.14-0.09-1.5C14.94 4.49 13.53 4 12 4S9.06 4.49 7.91 5.32c-0.49 0.35-0.52 1.07-0.09 1.5zM12 0C9.36 0 6.94 0.93 5.05 2.47c-0.46 0.38-0.5 1.07-0.08 1.49 0.36 0.36 0.93 0.39 1.32 0.07C7.84 2.77 9.83 2 12 2s4.16 0.77 5.7 2.04c0.39 0.32 0.96 0.29 1.32-0.07 0.42-0.42 0.38-1.11-0.08-1.49C17.06 0.93 14.64 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 b8f981a23..7c8369abf 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        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" />
+        android:fillColor="#000000"
+        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.92s2.92-1.31 2.92-2.92-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
deleted file mode 100644
index a49d48387..000000000
--- a/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_0_bar.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<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:fillAlpha=".3"
-        android:fillColor="#000000"
-        android:pathData="M22 8V2L2 22h16V8z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M20 22h2v-2h-2v2zm0-12v8h2v-8h-2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_4_bar.xml b/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_4_bar.xml
new file mode 100644
index 000000000..ca121b7cb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_4_bar.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M21 18c0.55 0 1-0.45 1-1v-6c0-0.55-0.45-1-1-1s-1 0.45-1 1v6c0 0.55 0.45 1 1 1zm-1 4h2v-2h-2v2zM4.41 22H18V11c0-1.66 1.34-3 3-3h1V4.41c0-0.89-1.08-1.34-1.71-0.71L3.71 20.29C3.08 20.92 3.52 22 4.41 22z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_smart_button.xml b/app/src/main/res/drawable/ic_smart_button.xml
index 22ea0df32..6de309be2 100644
--- a/app/src/main/res/drawable/ic_smart_button.xml
+++ b/app/src/main/res/drawable/ic_smart_button.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <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" />
+        android:fillColor="#000000"
+        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.96 8.99c0.18 0.39 0.73 0.39 0.91 0l0.63-1.4 1.4-0.63c0.39-0.18 0.39-0.73 0-0.91l-1.4-0.63-0.63-1.4c-0.18-0.39-0.73-0.39-0.91 0l-0.63 1.4-1.4 0.63c-0.39 0.18-0.39 0.73 0 0.91l1.4 0.63 0.63 1.4zm2.7-4.56c0.1 0.22 0.42 0.22 0.52 0l0.36-0.8 0.8-0.36c0.22-0.1 0.22-0.42 0-0.52l-0.8-0.36-0.36-0.8c-0.1-0.22-0.42-0.22-0.52 0l-0.36 0.8-0.8 0.36c-0.22 0.1-0.22 0.42 0 0.52l0.8 0.36 0.36 0.8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_sunny.xml b/app/src/main/res/drawable/ic_sunny.xml
deleted file mode 100644
index ac71831ca..000000000
--- a/app/src/main/res/drawable/ic_sunny.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    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 901181350..095c9aaab 100644
--- a/app/src/main/res/drawable/ic_switch_left.xml
+++ b/app/src/main/res/drawable/ic_switch_left.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <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" />
+        android:fillColor="#000000"
+        android:pathData="M8.5 8.62v6.76L5.12 12 8.5 8.62m-4.79 2.67c-0.39 0.39-0.39 1.02 0 1.41l4.59 4.59c0.62 0.63 1.7 0.19 1.7-0.7V7.41c0-0.89-1.08-1.34-1.71-0.71l-4.58 4.59zM14 7.41v9.17c0 0.89 1.08 1.34 1.71 0.71l4.59-4.59c0.39-0.39 0.39-1.02 0-1.41L15.71 6.7C15.08 6.08 14 6.52 14 7.41z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_vibration.xml b/app/src/main/res/drawable/ic_vibration.xml
new file mode 100644
index 000000000..eab11f490
--- /dev/null
+++ b/app/src/main/res/drawable/ic_vibration.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M1 15c0.55 0 1-0.45 1-1v-4c0-0.55-0.45-1-1-1s-1 0.45-1 1v4c0 0.55 0.45 1 1 1zm3 2c0.55 0 1-0.45 1-1V8c0-0.55-0.45-1-1-1S3 7.45 3 8v8c0 0.55 0.45 1 1 1zm18-7v4c0 0.55 0.45 1 1 1s1-0.45 1-1v-4c0-0.55-0.45-1-1-1s-1 0.45-1 1zm-2 7c0.55 0 1-0.45 1-1V8c0-0.55-0.45-1-1-1s-1 0.45-1 1v8c0 0.55 0.45 1 1 1zM16.5 3h-9C6.67 3 6 3.67 6 4.5v15C6 20.33 6.67 21 7.5 21h9c0.83 0 1.5-0.67 1.5-1.5v-15C18 3.67 17.33 3 16.5 3zM16 19H8V5h8v14z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_vpn_key.xml b/app/src/main/res/drawable/ic_vpn_key.xml
index 8f50c18e6..6afa96cdd 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="45sp"
-    android:height="45sp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="#7E7E7E"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <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:fillColor="#000000"
+        android:pathData="M12.65 10C11.7 7.31 8.9 5.5 5.77 6.12 3.48 6.58 1.62 8.41 1.14 10.7 0.32 14.57 3.26 18 7 18c2.61 0 4.83-1.67 5.65-4H17v2c0 1.1 0.9 2 2 2s2-0.9 2-2v-2c1.1 0 2-0.9 2-2s-0.9-2-2-2h-8.35zM7 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_wb_sunny.xml b/app/src/main/res/drawable/ic_wb_sunny.xml
new file mode 100644
index 000000000..74e908546
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wb_sunny.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M6.05 4.14L5.66 3.75c-0.39-0.39-1.02-0.38-1.4 0L4.25 3.76c-0.39 0.39-0.39 1.02 0 1.4l0.39 0.39c0.39 0.39 1.01 0.39 1.4 0l0.01-0.01c0.39-0.38 0.39-1.02 0-1.4zM3.01 10.5H1.99C1.44 10.5 1 10.94 1 11.49v0.01c0 0.55 0.44 0.99 0.99 0.99H3c0.56 0.01 1-0.43 1-0.98V11.5c0-0.56-0.44-1-0.99-1zm9-9.95H12c-0.56 0-1 0.44-1 0.99V2.5c0 0.55 0.44 0.99 0.99 0.99H12c0.56 0.01 1-0.43 1-0.98V1.54c0-0.55-0.44-0.99-0.99-0.99zm7.74 3.21c-0.39-0.39-1.02-0.39-1.41-0.01l-0.39 0.39c-0.39 0.39-0.39 1.02 0 1.4l0.01 0.01c0.39 0.39 1.02 0.39 1.4 0l0.39-0.39c0.39-0.39 0.39-1.01 0-1.4zm-1.81 15.1l0.39 0.39c0.39 0.39 1.02 0.39 1.41 0 0.39-0.39 0.39-1.02 0-1.41l-0.39-0.39c-0.39-0.39-1.02-0.38-1.4 0-0.4 0.4-0.4 1.02-0.01 1.41zM20 11.49v0.01c0 0.55 0.44 0.99 0.99 0.99H22c0.55 0 0.99-0.44 0.99-0.99v-0.01c0-0.55-0.44-0.99-0.99-0.99h-1.01c-0.55 0-0.99 0.44-0.99 0.99zM12 5.5c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zm-0.01 16.95H12c0.55 0 0.99-0.44 0.99-0.99V20.5c0-0.55-0.44-0.99-0.99-0.99h-0.01c-0.55 0-0.99 0.44-0.99 0.99v0.96c0 0.55 0.44 0.99 0.99 0.99zm-7.74-3.21c0.39 0.39 1.02 0.39 1.41 0l0.39-0.39c0.39-0.39 0.38-1.02 0-1.4l-0.01-0.01c-0.39-0.39-1.02-0.39-1.41 0l-0.39 0.39c-0.38 0.4-0.38 1.02 0.01 1.41z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_widgets.xml b/app/src/main/res/drawable/ic_widgets.xml
index 5939cad64..de857d6eb 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="45sp"
-    android:height="45sp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="#7E7E7E"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M13 13v8h8v-8h-8zM3 21h8v-8H3v8zM3 3v8h8V3H3zm13.66-1.31L11 7.34 16.66 13l5.66-5.66-5.66-5.65z" />
+        android:fillColor="#000000"
+        android:pathData="M13 14v6c0 0.55 0.45 1 1 1h6c0.55 0 1-0.45 1-1v-6c0-0.55-0.45-1-1-1h-6c-0.55 0-1 0.45-1 1zm-9 7h6c0.55 0 1-0.45 1-1v-6c0-0.55-0.45-1-1-1H4c-0.55 0-1 0.45-1 1v6c0 0.55 0.45 1 1 1zM3 4v6c0 0.55 0.45 1 1 1h6c0.55 0 1-0.45 1-1V4c0-0.55-0.45-1-1-1H4C3.45 3 3 3.45 3 4zm12.95-1.6L11.7 6.64c-0.39 0.39-0.39 1.02 0 1.41l4.25 4.25c0.39 0.39 1.02 0.39 1.41 0l4.25-4.25c0.39-0.39 0.39-1.02 0-1.41L17.37 2.4c-0.39-0.39-1.03-0.39-1.42 0z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml
index 75721b465..56b6d99e1 100644
--- a/app/src/main/res/layout/activity_list.xml
+++ b/app/src/main/res/layout/activity_list.xml
@@ -39,7 +39,7 @@
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
         android:layout_gravity="bottom|end"
-        app:srcCompat="@drawable/ic_action_fetch_activity_data"
+        app:srcCompat="@drawable/ic_refresh"
         android:tint="@android:color/white"
         android:layout_margin="16dp" />
 
diff --git a/app/src/main/res/layout/activity_summary_details.xml b/app/src/main/res/layout/activity_summary_details.xml
index c5c5a7b18..82c008d1b 100644
--- a/app/src/main/res/layout/activity_summary_details.xml
+++ b/app/src/main/res/layout/activity_summary_details.xml
@@ -63,7 +63,7 @@
                     android:layout_gravity="right"
                     android:layout_weight="0.1"
                     android:scaleType="fitEnd"
-                    app:srcCompat="@drawable/ic_edit" />
+                    app:srcCompat="@drawable/ic_create" />
             </LinearLayout>
 
             <TextView
diff --git a/app/src/main/res/layout/device_itemv2.xml b/app/src/main/res/layout/device_itemv2.xml
index 3effe805a..d130565b9 100644
--- a/app/src/main/res/layout/device_itemv2.xml
+++ b/app/src/main/res/layout/device_itemv2.xml
@@ -52,7 +52,7 @@
                     android:contentDescription="@string/controlcenter_set_alias"
                     android:focusable="true"
                     android:tint="?attr/textColorTertiary"
-                    card_view:srcCompat="@drawable/ic_edit" />
+                    card_view:srcCompat="@drawable/ic_create" />
 
                 <ImageView
                     android:id="@+id/device_action_remove"
@@ -66,7 +66,7 @@
                     android:contentDescription="@string/controlcenter_delete_device"
                     android:focusable="true"
                     android:tint="?attr/textColorTertiary"
-                    card_view:srcCompat="@drawable/ic_remove_device" />
+                    card_view:srcCompat="@drawable/ic_delete" />
             </RelativeLayout>
 
             <ImageView
@@ -239,7 +239,7 @@
                     android:contentDescription="@string/controlcenter_fetch_activity_data"
                     android:scaleType="fitXY"
                     android:tint="@color/secondarytext"
-                    card_view:srcCompat="@drawable/ic_action_fetch_activity_data"
+                    card_view:srcCompat="@drawable/ic_refresh"
                     android:focusable="true" />
 
                 <ProgressBar
@@ -298,7 +298,7 @@
                 android:padding="4dp"
                 android:scaleType="fitXY"
                 android:tint="@color/secondarytext"
-                card_view:srcCompat="@drawable/ic_device_set_alarms"
+                card_view:srcCompat="@drawable/ic_access_alarms"
                 android:focusable="true" />
 
             <ImageView
diff --git a/app/src/main/res/layout/item_pebble_watchapp.xml b/app/src/main/res/layout/item_pebble_watchapp.xml
index 316fc03a6..27470c785 100644
--- a/app/src/main/res/layout/item_pebble_watchapp.xml
+++ b/app/src/main/res/layout/item_pebble_watchapp.xml
@@ -58,6 +58,6 @@
         android:layout_centerVertical="true"
         android:contentDescription="drag handle"
         android:tint="@color/secondarytext"
-        app:srcCompat="@drawable/ic_drag_handle_black_24dp" />
+        app:srcCompat="@drawable/ic_drag_handle" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml b/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml
index 897c277da..6c3ba2af3 100644
--- a/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml
+++ b/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml
@@ -9,20 +9,21 @@
             android:icon="@drawable/ic_settings" />
         <item android:id="@+id/action_debug"
             android:title="@string/action_debug"
-            android:icon="@drawable/ic_debug" />
+            android:icon="@drawable/ic_devices_other" />
         <item android:id="@+id/action_db_management"
             android:title="@string/action_db_management"
-            android:icon="@drawable/ic_database_management" />
+            android:icon="@drawable/ic_pageview" />
         <item android:id="@+id/action_blacklist"
             android:title="@string/title_activity_appblacklist"
-            android:icon="@drawable/ic_block_black" />
+            android:icon="@drawable/ic_block" />
         <item android:id="@+id/device_action_discover"
             android:title="@string/action_discover"
+            android:iconTint="#7E7E7E"
             android:icon="@drawable/ic_add" />
 
         <item android:id="@+id/action_quit"
             android:title="@string/action_quit"
-            android:icon="@drawable/ic_quit" />
+            android:icon="@drawable/ic_power_settings_new" />
     </group>
 
     <group
@@ -35,10 +36,10 @@
         <item
             android:id="@+id/external_changelog"
             android:title="@string/changelog_full_title"
-            android:icon="@drawable/ic_history_black" />
+            android:icon="@drawable/ic_history" />
         <item
             android:id="@+id/about"
-            android:icon="@drawable/ic_info_black"
+            android:icon="@drawable/ic_info"
             android:title="@string/about_title" />
 
     </group>
diff --git a/app/src/main/res/menu/activity_list_context_menu.xml b/app/src/main/res/menu/activity_list_context_menu.xml
index 17b30864a..170760f5c 100644
--- a/app/src/main/res/menu/activity_list_context_menu.xml
+++ b/app/src/main/res/menu/activity_list_context_menu.xml
@@ -17,7 +17,7 @@
 
     <item
         android:id="@+id/activity_action_delete"
-        android:icon="@drawable/ic_delete_cross"
+        android:icon="@drawable/ic_delete_forever"
         android:title="@string/Delete"
         app:showAsAction="always"/>
 
diff --git a/app/src/main/res/menu/activity_list_menu.xml b/app/src/main/res/menu/activity_list_menu.xml
index 5a959b948..dbefb0960 100644
--- a/app/src/main/res/menu/activity_list_menu.xml
+++ b/app/src/main/res/menu/activity_list_menu.xml
@@ -4,12 +4,12 @@
 
     <item
         android:id="@+id/activity_action_manage_timestamp"
-        android:icon="@drawable/ic_reset"
+        android:icon="@drawable/ic_history"
         android:title="@string/reset_index"
         app:showAsAction="never" />
     <item
         android:id="@+id/activity_action_filter"
-        android:icon="@drawable/ic_filter"
+        android:icon="@drawable/ic_filter_alt"
         android:title="@string/pref_header_filter"
         app:iconTint="@color/primarytext_dark"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/xml/devicesettings_device_actions.xml b/app/src/main/res/xml/devicesettings_device_actions.xml
index 5172a57ad..4f197f7ed 100644
--- a/app/src/main/res/xml/devicesettings_device_actions.xml
+++ b/app/src/main/res/xml/devicesettings_device_actions.xml
@@ -26,7 +26,7 @@
 
         <PreferenceCategory
             android:title="@string/prefs_events_forwarding_wokeup"
-            android:icon="@drawable/ic_sunny">
+            android:icon="@drawable/ic_wb_sunny">
 
             <ListPreference
                 android:entries="@array/device_action_options"
diff --git a/app/src/main/res/xml/devicesettings_disconnectnotification.xml b/app/src/main/res/xml/devicesettings_disconnectnotification.xml
index 4ac7855e6..8ec99b22b 100644
--- a/app/src/main/res/xml/devicesettings_disconnectnotification.xml
+++ b/app/src/main/res/xml/devicesettings_disconnectnotification.xml
@@ -3,7 +3,7 @@
 
     <PreferenceScreen
         android:key="screen_disconnect_nofifiction"
-        android:icon="@drawable/ic_signal_cellular_connected_no_internet_0_bar"
+        android:icon="@drawable/ic_signal_cellular_connected_no_internet_4_bar"
         android:persistent="false"
         android:title="@string/prefs_disconnect_notification">
 
diff --git a/app/src/main/res/xml/devicesettings_disconnectnotification_noshed.xml b/app/src/main/res/xml/devicesettings_disconnectnotification_noshed.xml
index c4d384e03..317b37252 100644
--- a/app/src/main/res/xml/devicesettings_disconnectnotification_noshed.xml
+++ b/app/src/main/res/xml/devicesettings_disconnectnotification_noshed.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreference
-        android:icon="@drawable/ic_signal_cellular_connected_no_internet_0_bar"
+        android:icon="@drawable/ic_signal_cellular_connected_no_internet_4_bar"
         android:defaultValue="false"
         android:key="disconnect_notification_noshed"
         android:title="@string/prefs_disconnect_notification" />
diff --git a/app/src/main/res/xml/devicesettings_donotdisturb_no_auto.xml b/app/src/main/res/xml/devicesettings_donotdisturb_no_auto.xml
index f30f0ec42..7043596b7 100644
--- a/app/src/main/res/xml/devicesettings_donotdisturb_no_auto.xml
+++ b/app/src/main/res/xml/devicesettings_donotdisturb_no_auto.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceScreen
-        android:icon="@drawable/ic_do_not_disturb"
+        android:icon="@drawable/ic_block"
         android:key="screen_do_not_disturb_no_auto"
         android:persistent="false"
         android:summary="@string/mi2_prefs_do_not_disturb_summary"
diff --git a/app/src/main/res/xml/devicesettings_donotdisturb_withauto.xml b/app/src/main/res/xml/devicesettings_donotdisturb_withauto.xml
index 13881caf7..f83e5eeba 100644
--- a/app/src/main/res/xml/devicesettings_donotdisturb_withauto.xml
+++ b/app/src/main/res/xml/devicesettings_donotdisturb_withauto.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceScreen
-        android:icon="@drawable/ic_do_not_disturb"
+        android:icon="@drawable/ic_block"
         android:key="screen_do_not_disturb"
         android:persistent="false"
         android:summary="@string/mi2_prefs_do_not_disturb_summary"
diff --git a/app/src/main/res/xml/devicesettings_find_phone.xml b/app/src/main/res/xml/devicesettings_find_phone.xml
index 5baec8c70..0e440e153 100644
--- a/app/src/main/res/xml/devicesettings_find_phone.xml
+++ b/app/src/main/res/xml/devicesettings_find_phone.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceScreen
-        android:icon="@drawable/ic_find_lost_phone"
+        android:icon="@drawable/ic_vibration"
         android:key="screen_prefs_find_phone"
         android:persistent="false"
         android:summary="@string/prefs_find_phone_summary"
diff --git a/app/src/main/res/xml/devicesettings_power_mode.xml b/app/src/main/res/xml/devicesettings_power_mode.xml
index 1dacde056..038cc3029 100644
--- a/app/src/main/res/xml/devicesettings_power_mode.xml
+++ b/app/src/main/res/xml/devicesettings_power_mode.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <ListPreference
-        android:icon="@drawable/ic_quit"
+        android:icon="@drawable/ic_power_settings_new"
         android:defaultValue="0"
         android:entries="@array/power_mode"
         android:entryValues="@array/power_mode_values"
diff --git a/app/src/main/res/xml/devicesettings_watchxplus.xml b/app/src/main/res/xml/devicesettings_watchxplus.xml
index 72ddca07c..733d6b8ba 100644
--- a/app/src/main/res/xml/devicesettings_watchxplus.xml
+++ b/app/src/main/res/xml/devicesettings_watchxplus.xml
@@ -2,7 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceScreen
-        android:icon="@drawable/ic_find_lost_phone"
+        android:icon="@drawable/ic_vibration"
         android:key="pref_category_notifications_and_calls"
         android:title="@string/pref_header_notifications_and_calls">
             <PreferenceCategory