diff --git a/app/src/main/java/com/github/libretube/SettingsActivity.kt b/app/src/main/java/com/github/libretube/SettingsActivity.kt
index a97a20ec3..ef81ffde2 100644
--- a/app/src/main/java/com/github/libretube/SettingsActivity.kt
+++ b/app/src/main/java/com/github/libretube/SettingsActivity.kt
@@ -24,6 +24,7 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.io.IOException
 import java.io.InputStream
 import java.util.zip.ZipEntry
@@ -268,7 +269,7 @@ class SettingsActivity :
                 } else {
                     Html.fromHtml(licenseString)
                 }
-                AlertDialog.Builder(view?.context!!)
+                MaterialAlertDialogBuilder(view?.context!!)
                     .setPositiveButton(getString(R.string.okay), DialogInterface.OnClickListener { _, _ -> })
                     .setMessage(licenseHtml)
                     .create()
diff --git a/app/src/main/res/drawable/ic_block.xml b/app/src/main/res/drawable/ic_block.xml
new file mode 100644
index 000000000..268f04edb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_block.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?attr/colorControlNormal">
+
+<path
+        android:fillColor="#FF000000"
+        android:pathData="M7,24Q7,27.05 8.1,29.875Q9.2,32.7 11.05,34.95L34.95,11.05Q32.65,9.1 29.85,8.05Q27.05,7 24,7Q16.9,7 11.95,11.95Q7,16.9 7,24ZM13.05,37Q15.3,38.95 18.125,39.975Q20.95,41 24,41Q31.1,41 36.05,36.05Q41,31.1 41,24Q41,20.95 39.95,18.15Q38.9,15.35 37,13.05ZM4,24Q4,19.85 5.575,16.2Q7.15,12.55 9.85,9.85Q12.55,7.15 16.2,5.575Q19.85,4 24,4Q28.15,4 31.8,5.575Q35.45,7.15 38.15,9.85Q40.85,12.55 42.425,16.2Q44,19.85 44,24Q44,28.15 42.425,31.8Q40.85,35.45 38.15,38.15Q35.45,40.85 31.8,42.425Q28.15,44 24,44Q19.85,44 16.2,42.425Q12.55,40.85 9.85,38.15Q7.15,35.45 5.575,31.8Q4,28.15 4,24Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_color.xml b/app/src/main/res/drawable/ic_color.xml
index 7faf883b6..cd24727ea 100644
--- a/app/src/main/res/drawable/ic_color.xml
+++ b/app/src/main/res/drawable/ic_color.xml
@@ -4,7 +4,8 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+
+<path
+      android:fillColor="#FF000000"
+      android:pathData="M12,22Q9.95,22 8.125,21.212Q6.3,20.425 4.938,19.062Q3.575,17.7 2.788,15.875Q2,14.05 2,12Q2,9.925 2.812,8.1Q3.625,6.275 5.013,4.925Q6.4,3.575 8.25,2.787Q10.1,2 12.2,2Q14.2,2 15.975,2.688Q17.75,3.375 19.087,4.588Q20.425,5.8 21.212,7.463Q22,9.125 22,11.05Q22,13.925 20.25,15.462Q18.5,17 16,17H14.15Q13.925,17 13.838,17.125Q13.75,17.25 13.75,17.4Q13.75,17.7 14.125,18.262Q14.5,18.825 14.5,19.55Q14.5,20.8 13.812,21.4Q13.125,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM6.5,13Q7.15,13 7.575,12.575Q8,12.15 8,11.5Q8,10.85 7.575,10.425Q7.15,10 6.5,10Q5.85,10 5.425,10.425Q5,10.85 5,11.5Q5,12.15 5.425,12.575Q5.85,13 6.5,13ZM9.5,9Q10.15,9 10.575,8.575Q11,8.15 11,7.5Q11,6.85 10.575,6.425Q10.15,6 9.5,6Q8.85,6 8.425,6.425Q8,6.85 8,7.5Q8,8.15 8.425,8.575Q8.85,9 9.5,9ZM14.5,9Q15.15,9 15.575,8.575Q16,8.15 16,7.5Q16,6.85 15.575,6.425Q15.15,6 14.5,6Q13.85,6 13.425,6.425Q13,6.85 13,7.5Q13,8.15 13.425,8.575Q13.85,9 14.5,9ZM17.5,13Q18.15,13 18.575,12.575Q19,12.15 19,11.5Q19,10.85 18.575,10.425Q18.15,10 17.5,10Q16.85,10 16.425,10.425Q16,10.85 16,11.5Q16,12.15 16.425,12.575Q16.85,13 17.5,13ZM12,20Q12.225,20 12.363,19.875Q12.5,19.75 12.5,19.55Q12.5,19.2 12.125,18.725Q11.75,18.25 11.75,17.3Q11.75,16.25 12.475,15.625Q13.2,15 14.25,15H16Q17.65,15 18.825,14.037Q20,13.075 20,11.05Q20,8.025 17.688,6.012Q15.375,4 12.2,4Q8.8,4 6.4,6.325Q4,8.65 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_column.xml b/app/src/main/res/drawable/ic_column.xml
deleted file mode 100644
index 7d8a64736..000000000
--- a/app/src/main/res/drawable/ic_column.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,18h5L15,5h-5v13zM4,18h5L9,5L4,5v13zM16,5v13h5L21,5h-5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 5fb767e44..65268d9c8 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -4,7 +4,8 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8,9h8v10L8,19L8,9zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
+
+<path
+      android:fillColor="#FF000000"
+      android:pathData="M7,21Q6.175,21 5.588,20.413Q5,19.825 5,19V6Q4.575,6 4.287,5.713Q4,5.425 4,5Q4,4.575 4.287,4.287Q4.575,4 5,4H9Q9,3.575 9.288,3.287Q9.575,3 10,3H14Q14.425,3 14.713,3.287Q15,3.575 15,4H19Q19.425,4 19.712,4.287Q20,4.575 20,5Q20,5.425 19.712,5.713Q19.425,6 19,6V19Q19,19.825 18.413,20.413Q17.825,21 17,21ZM7,6V19Q7,19 7,19Q7,19 7,19H17Q17,19 17,19Q17,19 17,19V6ZM7,6V19Q7,19 7,19Q7,19 7,19Q7,19 7,19Q7,19 7,19V6ZM12,13.9 L13.9,15.8Q14.2,16.075 14.613,16.075Q15.025,16.075 15.3,15.8Q15.6,15.5 15.6,15.087Q15.6,14.675 15.3,14.4L13.4,12.5L15.3,10.6Q15.6,10.3 15.6,9.887Q15.6,9.475 15.3,9.2Q15.025,8.9 14.613,8.9Q14.2,8.9 13.9,9.2L12,11.1L10.1,9.2Q9.825,8.9 9.413,8.9Q9,8.9 8.7,9.2Q8.425,9.475 8.425,9.887Q8.425,10.3 8.7,10.6L10.6,12.5L8.7,14.4Q8.425,14.675 8.425,15.087Q8.425,15.5 8.7,15.8Q9,16.075 9.413,16.075Q9.825,16.075 10.1,15.8Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_flag.xml b/app/src/main/res/drawable/ic_flag.xml
deleted file mode 100644
index 026653ce3..000000000
--- a/app/src/main/res/drawable/ic_flag.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_gnu.xml b/app/src/main/res/drawable/ic_gnu.xml
deleted file mode 100644
index 10e60abba..000000000
--- a/app/src/main/res/drawable/ic_gnu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5.072,13.932c-0.221,0.012 -0.419,0.141 -0.519,0.338 -0.115,0.211 -0.389,0.242 -0.517,0.201 -0.21,-0.07 -0.481,-0.119 -0.744,0.068s-0.546,0.045 -0.495,-0.297c0.049,-0.34 0.172,-0.645 0.499,-0.83 0.714,-0.41 0.217,-0.695 0.608,-1.109 0.394,-0.412 0.307,-0.537 0.293,-1.099 -1.326,-0.2 -2.078,-0.582 -2.916,-1.631C0.442,8.526 0.116,7.663 0.03,6.349 -0.058,5.032 0.019,4.18 0.587,3.088 1.155,2 1.755,1.475 2.789,0.93 3.824,0.382 4.84,0.253 5.778,0.269c0.939,0.015 1.564,0.083 2.094,0.387 0.531,0.303 1.016,0.684 1.324,0.685 0.24,0.015 0.477,-0.053 0.673,-0.192 0.04,1.02 -0.878,1.108 -1.698,1.13 -0.82,0.021 -1.324,-0.317 -2.08,-0.192 -0.754,0.128 -1.992,0.471 -2.595,1.52 -0.603,1.05 -0.624,1.42 -0.573,2.301 0.049,0.878 0.806,1.534 1.234,1.542 0.428,0.007 0.523,-0.117 0.898,-0.36 0.374,-0.246 2.284,-2.61 2.934,-3.14 0.653,-0.531 1.296,-0.696 1.99,-0.705 0.695,-0.008 0.871,0.015 1.433,0.246 0.56,0.229 0.904,0.652 1.356,0.91 0.23,-0.135 0.375,-0.339 0.584,-0.495 0.76,-0.552 1.152,-0.702 2.053,-0.615 0.518,0.052 1.169,0.347 1.56,0.686 0.693,0.604 1.266,1.441 1.728,2.079 0.36,0.497 0.785,1.091 1.392,1.277 0.659,0.201 1.157,-0.652 1.23,-1.129 0.043,-0.27 0.097,-0.506 0.097,-0.801 0,-0.297 -0.03,-0.655 -0.115,-0.965 -0.09,-0.307 -0.222,-0.599 -0.392,-0.869 -0.258,-0.416 -0.68,-0.85 -1.116,-1.072 -0.246,-0.125 -0.826,-0.353 -1.191,-0.361 -0.448,-0.01 -0.789,0.141 -1.202,0.169 -0.5,0.034 -1.396,0.146 -1.786,-0.24 -0.251,-0.246 -0.283,-0.411 -0.324,-0.731 0.109,0.092 0.264,0.15 0.401,0.163 0.313,0.026 0.605,-0.229 0.859,-0.378 0.21,-0.123 0.504,-0.34 0.778,-0.45 0.704,-0.285 1.568,-0.278 2.31,-0.2 0.595,0.06 1.368,0.324 1.89,0.621 0.526,0.296 1.031,0.797 1.4,1.268 0.466,0.594 0.721,1.104 0.889,1.844 0.216,0.945 0.277,2.365 0.015,3.299 -0.205,0.734 -0.887,1.861 -1.467,2.414 -0.573,0.547 -1.235,0.811 -1.986,0.955 0.03,0.149 0.033,0.291 0.071,0.416 0.056,0.178 0.163,0.375 0.38,0.313 0.086,-0.025 0.133,-0.047 0.246,0.053 0.115,0.1 0.056,0.485 -0.266,0.66 -0.164,0.086 -0.334,0.105 -0.595,0.112 -0.319,0.012 -0.639,-0.004 -0.953,-0.046 -0.283,-0.047 -0.451,-0.273 -0.765,-0.309 -0.485,-0.055 -0.855,-0.405 -1.245,-0.654 -0.162,-0.104 -0.218,-0.104 -0.311,-0.158 0.051,0.154 0.118,0.314 0.151,0.465 0.034,0.146 0.02,0.285 0.037,0.404 0.019,0.119 0.052,0.211 0.07,0.309 0.077,0.068 0.103,0.173 0.233,0.207 0.13,0.035 0.334,-0.018 0.468,-0.037 0.135,-0.018 0.224,-0.09 0.328,-0.07 0.105,0.02 0.204,0.096 0.292,0.166s0.164,0.08 0.234,0.254c0.07,0.178 0.135,0.537 0.146,0.777 0.009,0.24 -0.018,0.455 -0.089,0.648 -0.07,0.189 -0.135,0.273 -0.327,0.463s-0.506,0.465 -0.819,0.66c0.058,0.084 0.083,0.162 0.173,0.254 0.09,0.094 0.277,0.197 0.359,0.295 0.085,0.098 0.128,0.168 0.128,0.277 0.012,0.131 -0.021,0.262 -0.093,0.373 -0.223,0.299 -0.483,0.352 -0.803,0.492 0.054,0.334 0.098,0.572 0.02,0.906 -0.03,0.137 -0.102,0.445 -0.27,0.525 -0.169,0.08 -0.492,0.041 -0.698,0.074 -0.205,0.031 -0.319,0.063 -0.479,0.094 -0.098,0.141 -0.242,0.297 -0.291,0.422 -0.049,0.127 -0.034,0.172 0.006,0.299 0.042,0.129 0.185,0.316 0.225,0.469 0.039,0.15 0.049,0.311 0.011,0.463 -0.038,0.15 -0.117,0.287 -0.23,0.396 -0.129,0.135 -0.382,0.24 -0.509,0.346 -0.125,0.111 -0.252,0.123 -0.217,0.303 0.047,0.248 0.409,0.646 0.67,0.744 0.185,0.055 0.382,0.039 0.557,-0.041 -0.014,0.209 -0.195,0.354 -0.315,0.494 0.322,-0.094 0.636,-0.27 0.854,-0.504 -0.067,0.203 -0.3,0.529 -0.645,0.816s-0.343,0.229 -0.517,0.344c0.314,0.061 0.606,0.045 0.85,0.002 -0.197,0.111 -0.416,0.182 -0.641,0.207 -0.289,0.031 -0.468,0.008 -0.729,-0.055 -0.261,-0.063 -0.499,-0.301 -0.814,-0.465 0.03,0.119 0.053,0.26 0.185,0.381 0.136,0.119 0.335,0.182 0.549,0.283 -0.272,-0.029 -0.558,-0.037 -0.824,-0.096 -0.199,-0.047 -0.332,-0.092 -0.478,-0.164 -0.144,-0.07 -0.255,-0.176 -0.384,-0.264 0.061,0.117 0.079,0.256 0.184,0.352 0.104,0.098 0.275,0.135 0.412,0.199 -0.143,-0.004 -0.281,0.029 -0.43,-0.01 -0.16,-0.037 -0.312,-0.109 -0.443,-0.209 -0.16,-0.119 -0.311,-0.25 -0.445,-0.396 -0.132,-0.145 -0.296,-0.332 -0.345,-0.463 -0.048,-0.133 0.03,-0.225 0.044,-0.338 -0.09,0.061 -0.201,0.094 -0.272,0.18 -0.07,0.088 -0.132,0.166 -0.101,0.318 0.03,0.15 0.172,0.338 0.271,0.506 -0.296,-0.242 -0.461,-0.336 -0.531,-0.625 -0.064,-0.273 0.104,-0.52 0.233,-0.725 0.064,-0.104 0.162,-0.199 0.221,-0.299 -0.135,-0.129 -0.285,-0.24 -0.4,-0.389 -0.113,-0.15 -0.162,-0.352 -0.277,-0.492 -0.117,-0.143 -0.274,-0.232 -0.41,-0.348 0.119,0.256 0.317,0.572 0.359,0.771 0.044,0.199 -0.048,0.322 -0.119,0.43 -0.07,0.107 -0.184,0.133 -0.292,0.197 -0.11,0.068 -0.277,0.016 -0.342,0.113s-0.083,0.246 -0.021,0.344l0.256,0.398c-0.126,-0.072 -0.235,-0.168 -0.327,-0.281 -0.074,-0.096 -0.186,-0.188 -0.199,-0.316 -0.016,-0.131 -0.023,-0.246 0.063,-0.363 0.084,-0.117 0.318,-0.156 0.422,-0.246 0.105,-0.09 0.162,-0.148 0.156,-0.264 -0.006,-0.117 -0.119,-0.199 -0.217,-0.273 -0.299,-0.225 -0.68,-0.43 -0.934,-0.699 -0.109,-0.105 -0.191,-0.234 -0.239,-0.379 -0.03,-0.105 0.001,-0.188 0.071,-0.314 0.072,-0.131 0.315,-0.305 0.346,-0.443 0.029,-0.141 -0.095,-0.172 -0.205,-0.221 -0.111,-0.049 -0.322,0.025 -0.425,-0.061s0.03,-0.266 -0.086,-0.365 -0.381,-0.045 -0.519,-0.15c-0.121,-0.102 -0.205,-0.24 -0.24,-0.395 -0.046,-0.141 -0.053,-0.291 -0.021,-0.436 0.032,-0.113 0.128,-0.133 0.187,-0.191 0.059,-0.057 0.108,-0.104 0.03,-0.191 -0.074,-0.088 -0.33,0.004 -0.476,-0.105 -0.149,-0.113 -0.06,-0.381 -0.163,-0.494 -0.104,-0.109 -0.287,-0.066 -0.386,-0.104 -0.097,-0.035 -0.135,0.09 -0.194,-0.109 -0.061,-0.199 -0.063,-0.797 -0.143,-1.02s-0.238,-0.016 -0.311,-0.236c-0.075,-0.221 -0.004,-0.574 -0.037,-0.908l-0.15,-0.91c-0.521,0.352 -0.867,0.463 -1.428,0.561 -0.047,1.373 -0.176,2.182 0.291,3.705 0.465,1.521 1.408,2.42 2.68,3.707 -1.68,-1.256 -2.479,-2.279 -2.981,-3.588 -0.501,-1.311 -0.406,-2.407 -0.356,-3.666zM13.991,13.379c0.129,0.006 0.285,0.039 0.376,0.098 0.091,0.061 0.188,0.107 0.27,0.189 0.206,0.211 0.36,0.463 0.428,0.752 0.044,0.186 0.05,0.422 0.064,0.639 -0.062,-0.199 -0.103,-0.408 -0.192,-0.588 -0.139,-0.285 -0.376,-0.561 -0.672,-0.688 -0.066,-0.031 -0.141,-0.041 -0.214,-0.027 0.023,0.041 0.063,0.076 0.065,0.133 0,0.059 -0.012,0.174 -0.112,0.223 -0.16,0.078 -0.339,0.021 -0.464,-0.086 -0.127,-0.117 -0.166,-0.301 -0.102,-0.459 0.079,-0.194 0.375,-0.194 0.553,-0.186zM12.37,13.107c0.017,-0.332 0.135,-0.609 0.433,-0.771 0.187,-0.107 0.392,-0.18 0.604,-0.215 0.207,-0.026 0.713,-0.008 1.018,0.131 0.232,0.105 0.391,0.271 0.597,0.394 0.205,0.121 0.351,0.201 0.546,0.338 0.3,0.211 0.475,0.439 0.682,0.576 0.101,0.066 0.24,0.057 0.374,0.098 -0.104,0.029 -0.239,0.064 -0.35,0.029 -0.159,-0.064 -0.308,-0.152 -0.438,-0.264 -0.154,-0.137 -0.32,-0.258 -0.497,-0.359 -0.124,-0.072 -0.329,-0.158 -0.466,-0.246 -0.135,-0.09 -0.371,-0.283 -0.502,-0.349 -0.207,-0.086 -0.428,-0.129 -0.65,-0.125 -0.256,0.008 -0.626,0.05 -0.822,0.228 -0.197,0.18 -0.271,0.336 -0.227,0.566 0.073,-0.084 0.123,-0.191 0.195,-0.254 0.154,-0.133 0.329,-0.139 0.521,-0.113 0.215,0.027 0.322,0.15 0.393,0.354 -0.047,-0.033 -0.135,-0.109 -0.204,-0.135 -0.144,-0.055 -0.306,-0.039 -0.438,0.043 -0.179,0.098 -0.13,0.24 -0.154,0.396 -0.013,0.076 -0.041,0.133 -0.061,0.199 -0.067,-0.016 -0.129,-0.049 -0.18,-0.098 0.001,0.076 -0.01,0.141 0.006,0.223 0.014,0.084 0.055,0.184 0.084,0.273 -0.126,-0.125 -0.256,-0.24 -0.335,-0.402 -0.086,-0.157 -0.131,-0.337 -0.129,-0.517zM12.589,10.707c0.091,-0.136 0.119,-0.345 0.174,-0.517 -0.021,0.217 0.021,0.453 -0.083,0.609 -0.105,0.158 -0.292,0.129 -0.443,0.176 0.118,-0.09 0.258,-0.131 0.352,-0.268zM10.382,13.91c0.119,-0.096 0.438,-0.02 0.676,-0.002l-0.514,0.133c-0.017,0.059 -0.01,0.123 -0.048,0.174 -0.04,0.051 -0.114,0.068 -0.171,0.104 0.006,-0.155 -0.062,-0.313 0.057,-0.409zM12.065,7.258c0.143,0.075 0.321,0.178 0.449,0.18 0.124,0.004 0.158,-0.08 0.232,-0.131 0.115,0.38 0.25,0.797 0.448,1.142 0.083,0.146 0.136,0.079 0.2,0.224 0.063,0.145 0.09,0.439 0.15,0.626 0.059,0.187 0.137,0.321 0.207,0.483 -0.174,-0.25 -0.401,-0.566 -0.5,-0.773 -0.098,-0.207 -0.035,-0.225 -0.115,-0.421 -0.078,-0.198 -0.238,-0.504 -0.357,-0.756 -0.086,0.011 -0.19,0.026 -0.255,0.006 -0.065,-0.021 -0.054,-0.091 -0.112,-0.134 -0.059,-0.045 -0.158,-0.027 -0.24,-0.1 -0.081,-0.07 -0.1,-0.217 -0.107,-0.346zM11.298,9.133c0.135,-0.012 0.299,0.023 0.425,0.017s0.216,-0.039 0.325,-0.06c-0.021,-0.189 -0.002,-0.537 -0.176,-0.664 -0.115,-0.08 -0.578,-0.02 -0.701,0.006 -0.279,0.061 -0.604,0.227 -0.873,0.33 0.258,-0.18 0.481,-0.346 0.791,-0.439 0.188,-0.055 0.621,-0.129 0.813,-0.076 0.089,0.023 0.105,0.061 0.159,0.135 0.183,0.255 0.183,0.475 0.229,0.773 0.047,0.071 0.096,0.119 0.135,0.194 0.038,0.093 0.062,0.19 0.068,0.289 -0.048,-0.069 -0.018,-0.155 -0.149,-0.206 -0.135,-0.053 -0.337,-0.005 -0.517,0.014 0.131,0.096 0.195,0.186 0.201,0.384 0.006,0.233 -0.191,0.401 -0.398,0.417 -0.285,0.022 -0.434,-0.041 -0.549,-0.285 -0.051,-0.107 -0.016,-0.236 -0.018,-0.341 -0.346,0.024 -0.34,0.013 -0.592,0.222 0.139,0.201 0.224,0.315 0.451,0.436 0.125,0.066 0.27,0.133 0.425,0.16 0.157,0.027 0.415,0.053 0.581,0.027 0.145,-0.018 0.278,-0.082 0.379,-0.187 0.123,-0.112 0.135,-0.274 0.182,-0.403 -0.004,0.127 -0.027,0.252 -0.07,0.371 -0.14,0.27 -0.38,0.352 -0.668,0.352 -0.275,0 -0.616,-0.063 -0.873,-0.169 -0.205,-0.085 -0.545,-0.325 -0.625,-0.534 -0.056,-0.143 -0.012,-0.318 -0.018,-0.477 0.285,-0.189 0.354,-0.143 0.689,-0.198 0.141,-0.025 0.239,-0.076 0.374,-0.088zM9.643,7.854c0.007,-0.114 0.021,-0.111 0.03,-0.167 -0.259,-0.069 -0.361,0.099 -0.514,0.411 -0.057,0.115 0,0.186 -0.062,0.263 -0.059,0.076 -0.159,0.065 -0.257,0.139s-0.196,0.215 -0.289,0.292c-0.189,0.156 -0.447,0.251 -0.667,0.358 0.15,-0.111 0.443,-0.279 0.538,-0.439 0.05,-0.086 0.042,-0.247 0.12,-0.325 0.078,-0.075 0.105,-0.13 0.205,-0.149 0.1,-0.019 0.061,-0.136 0.093,-0.229 0.032,-0.091 0.097,-0.158 0.165,-0.251s0.156,-0.23 0.291,-0.282c0.135,-0.049 0.347,0.005 0.45,-0.023 0.102,-0.029 0.043,-0.105 0.118,-0.15s0.219,-0.023 0.32,-0.072c0.176,-0.084 0.26,-0.227 0.367,-0.377 0.015,0.326 0.01,0.561 -0.107,0.869 -0.131,0.346 -0.266,0.55 -0.641,0.763 -0.128,0.072 -0.257,0.098 -0.365,0.137 0.062,-0.086 0.152,-0.123 0.188,-0.256 0.034,-0.136 0.009,-0.4 0.017,-0.512zM15.702,9.446c-0.177,0.014 -0.219,-0.012 -0.363,0.091l0.232,0.36c-0.006,-0.237 0.018,-0.285 0.133,-0.451h-0.002zM15.237,9.274c0.246,-0.104 0.461,-0.189 0.73,-0.207 0.107,-0.008 0.274,0.009 0.383,0.016 0.094,-0.137 0.211,-0.244 0.256,-0.4 0.028,-0.104 0.015,-0.584 -0.038,-0.709 -0.146,-0.361 -0.29,-0.377 -0.495,-0.585 -0.146,-0.149 -0.152,-0.38 -0.197,-0.638 -0.015,-0.094 -0.062,-0.213 -0.084,-0.31 -0.283,-0.046 -0.57,-0.062 -0.857,-0.045 0.148,-0.143 0.291,-0.271 0.334,-0.486 0.045,-0.229 0.004,-0.466 -0.113,-0.667 -0.121,-0.191 -0.315,-0.36 -0.494,-0.517 -0.178,-0.155 -0.436,-0.284 -0.604,-0.412 0.221,-0.077 0.444,-0.194 0.66,-0.235 0.561,-0.108 1.043,0.057 1.584,0.384 0.315,0.19 0.573,0.37 0.902,0.716 0.329,0.344 0.735,0.975 1.054,1.348 0.317,0.375 0.575,0.67 0.853,0.893 0.276,0.226 0.528,0.289 0.792,0.431l0.412,0.438 0.335,-0.413 0.535,0.06 0.111,-0.601 0.49,-0.136 -0.079,-0.811 0.354,-0.252 -0.267,-0.504 0.27,-0.553 -0.352,-0.63 0.135,-0.607 -0.407,-0.348 -0.053,-0.646 -0.569,-0.217 -0.227,-0.561 -0.64,-0.007 -0.315,-0.417 -0.431,0.03 -0.479,-0.053 -0.27,-0.199 -0.396,0.26 -0.477,-0.248 -0.947,0.359 0.618,-0.537 0.64,-0.102 0.49,-0.126 0.663,0.218 0.582,-0.147 0.563,0.331 0.596,-0.031 0.293,0.525 0.591,0.067 0.32,0.581 0.372,0.205 0.1,0.746 0.333,0.315 -0.148,0.653 0.39,0.494 -0.363,0.529 0.39,0.332 -0.499,0.443 0.506,0.529 -0.613,0.2 0.398,0.566 -0.501,0.088 0.328,0.622 -0.563,-0.008 0.285,0.466 -0.621,-0.074 0.148,0.672 -0.468,-0.411 -0.159,0.814 -0.322,-0.585 -0.175,0.73 -0.397,-0.537 0.011,0.765 -0.439,-0.688c0.091,0.391 0.073,0.817 0.329,1.185 0.794,-0.107 1.312,-0.307 1.921,-0.892 0.552,-0.533 1.214,-1.644 1.394,-2.35 0.204,-0.802 0.21,-2.281 0.009,-3.101 -0.194,-0.787 -0.446,-1.163 -0.896,-1.807 -0.43,-0.455 -0.853,-0.939 -1.399,-1.264 -0.803,-0.48 -1.829,-0.608 -2.742,-0.596 -0.393,0.001 -0.781,0.074 -1.148,0.215 -0.527,0.191 -0.95,0.611 -1.487,0.818 -0.175,0.067 -0.315,0.068 -0.454,-0.004 0.135,0.27 0.281,0.391 0.619,0.489 0.244,0.071 0.825,0.026 1.227,-0.011 0.43,-0.039 0.654,-0.167 1.239,-0.16 0.57,0.01 1.024,0.225 1.272,0.368 0.511,0.292 0.877,0.614 1.196,1.129 0.175,0.282 0.298,0.601 0.383,0.925 0.086,0.324 0.124,0.688 0.13,1.006s-0.019,0.602 -0.097,0.888c-0.182,0.669 -0.583,1.35 -1.407,1.245 -0.504,-0.063 -1.263,-1.01 -1.518,-1.357 -0.515,-0.701 -1.043,-1.477 -1.688,-2.059 -0.407,-0.366 -0.92,-0.594 -1.463,-0.65 -0.992,-0.09 -1.287,0.098 -2.033,0.715 0.151,0.047 0.299,0.074 0.455,0.145 0.346,0.156 0.662,0.357 0.938,0.615 0.29,0.27 0.42,0.442 0.43,0.829 0.007,0.259 -0.204,0.465 -0.399,0.649 -0.118,0.114 -0.275,0.218 -0.372,0.307 -0.127,0.117 -0.285,0.246 -0.124,0.432 0.06,0.07 0.165,0.123 0.252,0.189 0.141,0.103 0.075,0.488 -0.108,0.592 -0.226,0.136 -0.513,0.111 -0.713,-0.061 0.246,-0.035 0.402,-0.068 0.395,-0.27 -0.002,-0.115 -0.149,-0.213 -0.297,-0.279 -0.35,-0.16 -0.614,-0.135 -0.963,-0.387 -0.353,-0.254 -0.359,-0.393 -0.455,-0.79 -0.17,0.017 -0.327,0.021 -0.555,0.097 -0.226,0.074 -0.478,0.254 -0.684,0.299 -0.52,0.111 -0.623,0.078 -0.907,0.006 -0.501,-0.132 -1.151,0.09 -1.8,0.299 -0.107,0.033 -0.543,0 -0.836,0.102 -0.528,0.209 -1.019,0.496 -1.457,0.853 -0.556,0.469 -1.286,1.869 -1.698,3.477 -0.045,0.49 0.095,0.818 -0.213,1.057 -0.308,0.24 -0.3,0.851 -0.405,1.023 -0.103,0.17 -0.225,0.094 -0.45,0.336 -0.223,0.24 -0.337,0.201 -0.332,0.654 0.195,-0.125 0.477,-0.273 0.725,-0.285 0.221,-0.006 0.222,0.283 0.785,-0.273 0.301,-0.299 0.881,-0.309 1.283,-0.439s1.125,-0.402 1.851,-1.212c0.724,-0.81 1.071,-1.664 1.212,-2.896 0.02,0.215 0.06,0.463 -0.033,1.065 -0.095,0.604 -0.296,1.28 0.129,2.094l0.265,0.504c-0.157,-0.215 -0.465,-0.566 -0.56,-0.816l-0.211,-0.578c-0.48,0.753 -0.59,0.887 -1.255,1.425 -0.026,0.334 -0.033,0.682 0.076,1.002 0.108,0.32 -0.064,0.688 0.02,0.9 0.082,0.209 0.273,0.09 0.336,0.303s-0.032,0.635 0.064,0.842c0.099,0.207 0.337,0.082 0.453,0.15 0.115,0.066 0.154,0.158 0.215,0.246 0.063,0.088 -0.023,0.297 0.103,0.365 0.126,0.066 0.32,0.01 0.453,0.074 0.13,0.066 0.149,0.223 0.119,0.361 -0.032,0.141 -0.172,0.205 -0.233,0.348 -0.062,0.119 -0.055,0.262 0.02,0.373 0.074,0.131 0.236,0.201 0.4,0.27 0.162,0.064 0.391,0.027 0.559,0.119 0.169,0.09 0.32,0.273 0.408,0.406 0.089,0.131 0.113,0.225 0.109,0.363 -0.014,0.154 -0.059,0.301 -0.137,0.434 -0.074,0.135 -0.236,0.299 0.02,0.555 0.254,0.254 0.246,0.145 0.393,0.313 -0.017,-0.289 -0.135,-0.521 -0.049,-0.738 0.088,-0.217 0.349,-0.256 0.484,-0.352 0.139,-0.1 0.219,-0.232 0.326,-0.348 0,0.148 0.015,0.309 -0.002,0.42 -0.033,0.227 -0.102,0.432 0.237,0.467 0.153,0.016 0.299,-0.082 0.459,-0.141 -0.084,0.148 -0.23,0.27 -0.253,0.451 -0.028,0.195 0.018,0.395 0.13,0.559 0.124,0.18 0.341,0.313 0.499,0.416 0.158,0.105 0.244,0.115 0.365,0.174 0.006,0.176 -0.03,0.363 -0.009,0.531 0.019,0.168 0.073,0.314 0.169,0.453 0.098,0.141 0.252,0.219 0.398,0.32 -0.08,-0.188 -0.242,-0.365 -0.24,-0.561s0.06,-0.334 0.252,-0.51c0.191,-0.174 0.639,-0.324 0.85,-0.494 0.156,-0.109 0.279,-0.26 0.355,-0.436 0.075,-0.164 0.055,-0.43 0.069,-0.576 0.069,0.205 0.079,0.27 0.103,0.486 0.021,0.217 -0.127,0.521 -0.189,0.68 0.228,-0.105 0.409,-0.293 0.51,-0.525 0.057,0.035 0.028,0.125 0.049,0.301 0.094,-0.092 0.199,-0.162 0.293,-0.25s0.195,-0.164 0.243,-0.287c0.046,-0.121 0.027,-0.252 -0.007,-0.393 -0.035,-0.143 -0.193,-0.307 -0.279,-0.463 -0.084,-0.152 0.016,-0.305 0.01,-0.492 -0.17,-0.029 -0.314,-0.117 -0.512,-0.088 -0.195,0.029 -0.42,0.248 -0.621,0.252 -0.199,0 -0.314,-0.188 -0.478,-0.238 -0.165,-0.053 -0.33,-0.045 -0.495,-0.07 0.209,-0.199 1.021,-0.295 1.576,-0.385 0.486,-0.082 0.978,-0.125 1.47,-0.133 0.221,-0.006 0.506,0.068 0.661,0.025 0.152,-0.045 0.119,-0.15 0.164,-0.264 0.129,-0.318 0.066,-0.604 -0.004,-0.924 -0.444,-0.053 -0.908,-0.115 -1.356,-0.082 -0.438,0.033 -0.956,0.242 -1.409,0.256 -0.392,0.014 -0.976,-0.074 -1.312,-0.281 -0.413,-0.25 -0.731,-0.789 -0.845,-0.965 -0.184,-0.281 -0.416,-0.836 -0.559,-1.088 -0.141,-0.254 -0.173,-0.324 -0.29,-0.43 -0.118,-0.105 -0.278,-0.113 -0.419,-0.17 0.161,0.014 0.336,-0.035 0.482,0.047 0.221,0.127 0.465,0.648 0.602,0.877 0.145,-0.486 0.111,-0.676 0.529,-0.951 -0.336,0.379 -0.346,0.666 -0.428,1.111 0.281,0.459 0.67,1.193 1.18,1.396 0.186,0.074 0.502,0.119 0.701,0.145 0.621,0.076 1.22,-0.119 1.828,-0.27 0.445,-0.111 0.897,-0.066 1.438,-0.035 0.183,0.012 0.616,-0.1 0.707,-0.283 0.052,-0.107 0.042,-0.232 -0.024,-0.33 -0.07,-0.105 -0.255,-0.158 -0.355,-0.254 -0.099,-0.098 -0.156,-0.211 -0.235,-0.314 -0.35,0.068 -0.704,0.105 -1.062,0.115 0.221,-0.09 0.433,-0.141 0.66,-0.23 0.237,-0.098 0.463,-0.219 0.676,-0.359 0.186,-0.123 0.303,-0.193 0.438,-0.334 0.134,-0.143 0.305,-0.289 0.404,-0.463 0.099,-0.174 0.114,-0.369 0.12,-0.584 0.004,-0.215 -0.005,-0.516 -0.088,-0.691 -0.084,-0.172 -0.243,-0.225 -0.372,-0.264 -0.127,-0.041 -0.216,0.063 -0.349,0.076 -0.134,0.014 -0.258,0.096 -0.452,0.006 -0.248,-0.129 -0.461,-0.318 -0.617,-0.549 -0.196,-0.274 -0.335,-0.723 -0.534,-1.068 -0.343,-0.596 -0.771,-1.149 -1.179,-1.702 -0.035,-0.135 -0.084,-0.324 -0.102,-0.508 -0.031,-0.322 -0.035,-0.656 0.065,-0.969 0.075,-0.24 0.188,-0.494 0.438,-0.592 0.1,-0.043 0.212,-0.051 0.317,-0.022 0.09,0.032 0.179,0.135 0.142,0.252 -0.039,0.129 -0.127,0.134 -0.188,0.198 -0.091,0.091 -0.153,0.205 -0.183,0.33 0.111,-0.004 0.262,-0.011 0.354,0.013 0.12,0.03 0.229,0.11 0.291,0.279 -0.143,-0.126 -0.213,-0.185 -0.39,-0.188 -0.083,-0.002 -0.182,0.026 -0.271,0.041 -0.034,0.108 -0.054,0.243 -0.101,0.329 -0.049,0.084 -0.141,0.063 -0.176,0.161 -0.033,0.128 -0.039,0.261 -0.02,0.391h0.004zM16.479,9.125c0.056,0.021 0.075,0.027 0.146,0.08 0.069,0.052 0.165,0.104 0.22,0.229 0.044,0.129 0.058,0.266 0.04,0.4 -0.048,-0.015 -0.113,-0.005 -0.163,-0.047 -0.05,-0.043 -0.079,-0.14 -0.143,-0.18 -0.065,-0.043 -0.117,-0.034 -0.188,-0.043 0.038,0.096 0.05,0.199 0.036,0.301 -0.036,0.203 -0.156,0.307 -0.352,0.33 -0.084,0.012 -0.219,-0.016 -0.292,-0.029 0.034,0.075 0.091,0.143 0.126,0.219 0.164,-0.023 0.285,-0.02 0.375,-0.061 0.088,-0.041 0.183,-0.135 0.296,-0.173 0.113,-0.039 0.214,-0.039 0.338,-0.059 -0.098,0.084 -0.162,0.167 -0.259,0.253l0.214,0.623c0.152,0.096 0.294,0.146 0.485,0.263 0.191,0.116 0.42,0.327 0.67,0.44 0.249,0.113 0.396,0.177 0.657,0.225 0.259,0.05 0.467,0.262 0.722,0.296 0.255,0.032 0.735,0.041 0.932,0.021 0.225,-0.021 0.516,-0.136 0.542,-0.382 -0.188,0.045 -0.475,0.005 -0.619,-0.349 -0.064,-0.157 -0.034,-0.447 -0.132,-0.631 -0.099,-0.187 -0.236,-0.246 -0.4,-0.475s-0.431,-0.589 -0.58,-0.895c-0.15,-0.308 -0.188,-0.654 -0.313,-0.929 -0.128,-0.274 -0.319,-0.495 -0.469,-0.708 -0.324,-0.463 -0.585,-0.777 -1.12,-1.011 -0.258,-0.112 -0.551,-0.143 -0.824,-0.213 -0.113,0.05 -0.268,0.104 -0.295,0.237 -0.021,0.15 0.021,0.305 0.12,0.421 0.159,0.165 0.395,0.342 0.487,0.603 0.061,0.168 0.076,0.73 0.025,0.883 -0.054,0.16 -0.178,0.257 -0.282,0.361zM16.531,10.456c-0.049,0.043 -0.087,0.087 -0.167,0.122 -0.08,0.036 -0.189,0.045 -0.295,0.071 0.148,0.231 0.305,0.466 0.447,0.709 0.143,0.242 0.266,0.51 0.401,0.765 -0.007,-0.147 0.002,-0.302 -0.019,-0.438 -0.021,-0.136 -0.083,-0.254 -0.145,-0.461 -0.06,-0.206 -0.135,-0.484 -0.222,-0.768zM12.532,5.369c-0.021,0.226 0.019,0.581 0.064,0.806 0.058,0.267 0.111,0.404 0.328,0.564 0.396,0.295 0.648,0.245 0.955,0.416 0.145,0.081 0.328,0.217 0.382,0.359 0.053,0.146 -0.036,0.301 -0.146,0.363 0.192,0.029 0.408,-0.189 0.318,-0.41 -0.045,-0.109 -0.255,-0.16 -0.32,-0.271 -0.059,-0.102 -0.07,-0.224 -0.033,-0.335 0.053,-0.202 0.454,-0.388 0.597,-0.546 0.218,-0.248 0.3,-0.453 0.177,-0.77 -0.172,-0.445 -0.842,-0.804 -1.242,-0.979 -0.183,-0.08 -0.287,-0.084 -0.429,-0.129 0.292,0.174 0.601,0.31 0.75,0.691 0.123,0.321 0.015,0.443 0.021,0.721 0.002,0.13 0.172,0.195 0.248,0.275 0.064,0.072 0.06,0.125 0.008,0.223 -0.004,-0.08 -0.045,-0.154 -0.111,-0.199 -0.112,-0.08 -0.234,-0.063 -0.294,-0.225 -0.09,-0.248 0.091,-0.484 -0.112,-0.762 -0.15,-0.208 -0.353,-0.441 -0.625,-0.447 -0.123,-0.001 -0.244,0.018 -0.36,0.058l-0.183,-0.22 -0.005,-0.003c-0.372,-0.339 -0.627,-0.619 -1.147,-0.852 -0.522,-0.234 -0.78,-0.27 -1.379,-0.256 -0.597,0.013 -1.19,0.063 -1.883,0.66 -0.694,0.6 -2.481,2.888 -2.915,3.177 -0.431,0.289 -0.527,0.389 -1.068,0.389s-1.387,-0.766 -1.42,-1.723c-0.032,-0.956 -0.045,-1.297 0.619,-2.449 0.666,-1.152 1.869,-1.506 2.764,-1.625 0.895,-0.121 1.432,0.194 2.092,0.195 0.66,0.002 1.314,-0.111 1.508,-0.637 -0.095,0.056 -0.221,0.12 -0.577,0.101 -0.355,-0.019 -0.849,-0.431 -1.402,-0.706C7.157,0.547 6.542,0.514 5.75,0.5c-0.79,-0.015 -1.777,0.045 -2.755,0.574 -0.978,0.525 -1.645,1.085 -2.213,2.12C0.214,4.227 0.13,5.069 0.222,6.321c0.09,1.25 0.477,2.181 1.219,3.098 0.744,0.914 1.486,1.363 2.824,1.529l0.283,-1.242 -0.504,0.721 0.014,-0.803 -0.455,0.565 -0.202,-0.767 -0.367,0.615 -0.183,-0.855 -0.536,0.432 0.17,-0.705 -0.707,0.078 0.324,-0.491 -0.644,0.006 0.375,-0.653 -0.57,-0.091 0.454,-0.596 -0.698,-0.206 0.578,-0.555 -0.573,-0.467 0.448,-0.348 -0.42,-0.559 0.448,-0.52 -0.167,-0.685 0.379,-0.329 0.113,-0.786 0.426,-0.214 0.366,-0.611 0.677,-0.072 0.334,-0.553 0.68,0.035 0.642,-0.348 0.666,0.154 0.756,-0.228 0.562,0.13 0.731,0.108 0.705,0.564 -1.081,-0.377 -0.544,0.26 -0.451,-0.273 -0.31,0.209 -0.55,0.057 -0.491,-0.03 -0.358,0.436 -0.732,0.007 -0.26,0.589 -0.65,0.228 -0.061,0.678 -0.467,0.366 0.155,0.637 -0.402,0.664 0.31,0.581 -0.305,0.529 0.404,0.264 -0.09,0.853 0.563,0.141 0.125,0.633 0.613,-0.063 0.381,0.434 0.47,-0.461c0.858,-0.428 1.212,-0.668 1.882,-1.391 0.759,-0.823 1.196,-1.584 2.208,-2.147 0.729,-0.405 1.321,-0.551 2.139,-0.408 0.766,0.132 1.024,0.593 1.59,1.077 0.061,-0.109 0.07,-0.139 0.169,-0.218 -0.03,0.142 -0.079,0.287 -0.093,0.423l-0.002,-0.001z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_grid.xml b/app/src/main/res/drawable/ic_grid.xml
new file mode 100644
index 000000000..6c7b4d242
--- /dev/null
+++ b/app/src/main/res/drawable/ic_grid.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+
+<path
+      android:fillColor="#FF000000"
+      android:pathData="M5,11Q4.175,11 3.587,10.412Q3,9.825 3,9V5Q3,4.175 3.587,3.587Q4.175,3 5,3H9Q9.825,3 10.413,3.587Q11,4.175 11,5V9Q11,9.825 10.413,10.412Q9.825,11 9,11ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V15Q3,14.175 3.587,13.587Q4.175,13 5,13H9Q9.825,13 10.413,13.587Q11,14.175 11,15V19Q11,19.825 10.413,20.413Q9.825,21 9,21ZM15,11Q14.175,11 13.588,10.412Q13,9.825 13,9V5Q13,4.175 13.588,3.587Q14.175,3 15,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V9Q21,9.825 20.413,10.412Q19.825,11 19,11ZM15,21Q14.175,21 13.588,20.413Q13,19.825 13,19V15Q13,14.175 13.588,13.587Q14.175,13 15,13H19Q19.825,13 20.413,13.587Q21,14.175 21,15V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM5,9H9V5H5ZM15,9H19V5H15ZM15,19H19V15H15ZM5,19H9V15H5ZM15,9ZM15,15ZM9,15ZM9,9Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_hd.xml b/app/src/main/res/drawable/ic_hd.xml
index 3305aaf85..88f881355 100644
--- a/app/src/main/res/drawable/ic_hd.xml
+++ b/app/src/main/res/drawable/ic_hd.xml
@@ -4,7 +4,8 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM11,15L9.5,15v-2h-2v2L6,15L6,9h1.5v2.5h2L9.5,9L11,9v6zM13,9h4c0.55,0 1,0.45 1,1v4c0,0.55 -0.45,1 -1,1h-4L13,9zM14.5,13.5h2v-3h-2v3z"/>
+
+<path
+      android:fillColor="#FF000000"
+      android:pathData="M6.75,15Q7.075,15 7.287,14.787Q7.5,14.575 7.5,14.25V13H9.5V14.25Q9.5,14.575 9.713,14.787Q9.925,15 10.25,15Q10.575,15 10.788,14.787Q11,14.575 11,14.25V9.75Q11,9.425 10.788,9.212Q10.575,9 10.25,9Q9.925,9 9.713,9.212Q9.5,9.425 9.5,9.75V11.5H7.5V9.75Q7.5,9.425 7.287,9.212Q7.075,9 6.75,9Q6.425,9 6.213,9.212Q6,9.425 6,9.75V14.25Q6,14.575 6.213,14.787Q6.425,15 6.75,15ZM13.5,15H17Q17.425,15 17.712,14.712Q18,14.425 18,14V10Q18,9.575 17.712,9.287Q17.425,9 17,9H13.5Q13.3,9 13.15,9.15Q13,9.3 13,9.5V14.5Q13,14.7 13.15,14.85Q13.3,15 13.5,15ZM14.5,13.5V10.5H16.5Q16.5,10.5 16.5,10.5Q16.5,10.5 16.5,10.5V13.5Q16.5,13.5 16.5,13.5Q16.5,13.5 16.5,13.5ZM4,20Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.175 2.588,4.588Q3.175,4 4,4H20Q20.825,4 21.413,4.588Q22,5.175 22,6V18Q22,18.825 21.413,19.413Q20.825,20 20,20ZM4,18Q4,18 4,18Q4,18 4,18V6Q4,6 4,6Q4,6 4,6Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18ZM4,18H20Q20,18 20,18Q20,18 20,18V6Q20,6 20,6Q20,6 20,6H4Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_home_outlined.xml b/app/src/main/res/drawable/ic_home_outlined.xml
new file mode 100644
index 000000000..99f7f8218
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_outlined.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48"
+    android:tint="?attr/colorControlNormal">
+
+<path
+        android:fillColor="#FF000000"
+        android:pathData="M11,39H18.5V26.5H29.5V39H37V19.5L24,9.75L11,19.5ZM11,42Q9.75,42 8.875,41.125Q8,40.25 8,39V19.5Q8,18.8 8.325,18.15Q8.65,17.5 9.2,17.1L22.2,7.35Q22.6,7.05 23.05,6.9Q23.5,6.75 24,6.75Q24.5,6.75 24.95,6.9Q25.4,7.05 25.8,7.35L38.8,17.1Q39.35,17.5 39.675,18.15Q40,18.8 40,19.5V39Q40,40.25 39.125,41.125Q38.25,42 37,42H26.5V29.5H21.5V42ZM24,24.35Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_import.xml b/app/src/main/res/drawable/ic_import.xml
deleted file mode 100644
index bc5c0ad68..000000000
--- a/app/src/main/res/drawable/ic_import.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
index 17255b7ae..8f9a9042a 100644
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -6,5 +6,5 @@
     android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+      android:pathData="M12,17Q12.425,17 12.713,16.712Q13,16.425 13,16V11.975Q13,11.55 12.713,11.275Q12.425,11 12,11Q11.575,11 11.288,11.287Q11,11.575 11,12V16.025Q11,16.45 11.288,16.725Q11.575,17 12,17ZM12,9Q12.425,9 12.713,8.712Q13,8.425 13,8Q13,7.575 12.713,7.287Q12.425,7 12,7Q11.575,7 11.288,7.287Q11,7.575 11,8Q11,8.425 11.288,8.712Q11.575,9 12,9ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM12,20Q15.325,20 17.663,17.663Q20,15.325 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml
index 0d9837d72..ce29cf2d2 100644
--- a/app/src/main/res/drawable/ic_login.xml
+++ b/app/src/main/res/drawable/ic_login.xml
@@ -4,7 +4,8 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11,7L9.6,8.4l2.6,2.6H2v2h10.2l-2.6,2.6L11,17l5,-5L11,7zM20,19h-8v2h8c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2h-8v2h8V19z"/>
+
+<path
+      android:fillColor="#FF000000"
+      android:pathData="M9.325,16.275Q9.05,15.95 9.05,15.537Q9.05,15.125 9.325,14.85L11.175,13H4Q3.575,13 3.288,12.712Q3,12.425 3,12Q3,11.575 3.288,11.287Q3.575,11 4,11H11.175L9.325,9.15Q9.025,8.85 9.025,8.438Q9.025,8.025 9.325,7.725Q9.6,7.425 10.013,7.425Q10.425,7.425 10.7,7.7L14.3,11.3Q14.45,11.45 14.513,11.625Q14.575,11.8 14.575,12Q14.575,12.2 14.513,12.375Q14.45,12.55 14.3,12.7L10.7,16.3Q10.4,16.6 10,16.575Q9.6,16.55 9.325,16.275ZM13,21Q12.575,21 12.288,20.712Q12,20.425 12,20Q12,19.575 12.288,19.288Q12.575,19 13,19H19Q19,19 19,19Q19,19 19,19V5Q19,5 19,5Q19,5 19,5H13Q12.575,5 12.288,4.712Q12,4.425 12,4Q12,3.575 12.288,3.287Q12.575,3 13,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_server.xml b/app/src/main/res/drawable/ic_server.xml
index 5bbe6bfde..67222c8b7 100644
--- a/app/src/main/res/drawable/ic_server.xml
+++ b/app/src/main/res/drawable/ic_server.xml
@@ -4,10 +4,8 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M14.17,13.71l1.4,-2.42c0.09,-0.15 0.05,-0.34 -0.08,-0.45l-1.48,-1.16c0.03,-0.22 0.05,-0.45 0.05,-0.68s-0.02,-0.46 -0.05,-0.69l1.48,-1.16c0.13,-0.11 0.17,-0.3 0.08,-0.45l-1.4,-2.42c-0.09,-0.15 -0.27,-0.21 -0.43,-0.15L12,4.83c-0.36,-0.28 -0.75,-0.51 -1.18,-0.69l-0.26,-1.85C10.53,2.13 10.38,2 10.21,2h-2.8C7.24,2 7.09,2.13 7.06,2.3L6.8,4.15C6.38,4.33 5.98,4.56 5.62,4.84l-1.74,-0.7c-0.16,-0.06 -0.34,0 -0.43,0.15l-1.4,2.42C1.96,6.86 2,7.05 2.13,7.16l1.48,1.16C3.58,8.54 3.56,8.77 3.56,9s0.02,0.46 0.05,0.69l-1.48,1.16C2,10.96 1.96,11.15 2.05,11.3l1.4,2.42c0.09,0.15 0.27,0.21 0.43,0.15l1.74,-0.7c0.36,0.28 0.75,0.51 1.18,0.69l0.26,1.85C7.09,15.87 7.24,16 7.41,16h2.8c0.17,0 0.32,-0.13 0.35,-0.3l0.26,-1.85c0.42,-0.18 0.82,-0.41 1.18,-0.69l1.74,0.7C13.9,13.92 14.08,13.86 14.17,13.71zM8.81,11c-1.1,0 -2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2C10.81,10.1 9.91,11 8.81,11z"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M21.92,18.67l-0.96,-0.74c0.02,-0.14 0.04,-0.29 0.04,-0.44c0,-0.15 -0.01,-0.3 -0.04,-0.44l0.95,-0.74c0.08,-0.07 0.11,-0.19 0.05,-0.29l-0.9,-1.55c-0.05,-0.1 -0.17,-0.13 -0.28,-0.1l-1.11,0.45c-0.23,-0.18 -0.48,-0.33 -0.76,-0.44l-0.17,-1.18C18.73,13.08 18.63,13 18.53,13h-1.79c-0.11,0 -0.21,0.08 -0.22,0.19l-0.17,1.18c-0.27,0.12 -0.53,0.26 -0.76,0.44l-1.11,-0.45c-0.1,-0.04 -0.22,0 -0.28,0.1l-0.9,1.55c-0.05,0.1 -0.04,0.22 0.05,0.29l0.95,0.74c-0.02,0.14 -0.03,0.29 -0.03,0.44c0,0.15 0.01,0.3 0.03,0.44l-0.95,0.74c-0.08,0.07 -0.11,0.19 -0.05,0.29l0.9,1.55c0.05,0.1 0.17,0.13 0.28,0.1l1.11,-0.45c0.23,0.18 0.48,0.33 0.76,0.44l0.17,1.18c0.02,0.11 0.11,0.19 0.22,0.19h1.79c0.11,0 0.21,-0.08 0.22,-0.19l0.17,-1.18c0.27,-0.12 0.53,-0.26 0.75,-0.44l1.12,0.45c0.1,0.04 0.22,0 0.28,-0.1l0.9,-1.55C22.03,18.86 22,18.74 21.92,18.67zM17.63,18.83c-0.74,0 -1.35,-0.6 -1.35,-1.35s0.6,-1.35 1.35,-1.35s1.35,0.6 1.35,1.35S18.37,18.83 17.63,18.83z"/>
+
+<path
+      android:fillColor="#FF000000"
+    android:pathData="M7.5,6Q6.875,6 6.438,6.438Q6,6.875 6,7.5Q6,8.125 6.438,8.562Q6.875,9 7.5,9Q8.125,9 8.562,8.562Q9,8.125 9,7.5Q9,6.875 8.562,6.438Q8.125,6 7.5,6ZM7.5,16Q6.875,16 6.438,16.438Q6,16.875 6,17.5Q6,18.125 6.438,18.562Q6.875,19 7.5,19Q8.125,19 8.562,18.562Q9,18.125 9,17.5Q9,16.875 8.562,16.438Q8.125,16 7.5,16ZM4,3H20Q20.425,3 20.712,3.287Q21,3.575 21,4V11Q21,11.425 20.712,11.712Q20.425,12 20,12H4Q3.575,12 3.288,11.712Q3,11.425 3,11V4Q3,3.575 3.288,3.287Q3.575,3 4,3ZM5,5V10H19V5ZM4,13H20Q20.425,13 20.712,13.287Q21,13.575 21,14V21Q21,21.425 20.712,21.712Q20.425,22 20,22H4Q3.575,22 3.288,21.712Q3,21.425 3,21V14Q3,13.575 3.288,13.287Q3.575,13 4,13ZM5,15V20H19V15ZM5,5V10ZM5,15V20Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 05d9bd36c..e13ec7f0c 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,6 +1,12 @@
-<vector android:height="24dp"    android:tint="?attr/colorControlNormal"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
 
-android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13.875,22H10.125Q9.75,22 9.475,21.75Q9.2,21.5 9.15,21.125L8.85,18.8Q8.525,18.675 8.238,18.5Q7.95,18.325 7.675,18.125L5.5,19.025Q5.15,19.15 4.8,19.05Q4.45,18.95 4.25,18.625L2.4,15.4Q2.2,15.075 2.275,14.7Q2.35,14.325 2.65,14.1L4.525,12.675Q4.5,12.5 4.5,12.337Q4.5,12.175 4.5,12Q4.5,11.825 4.5,11.662Q4.5,11.5 4.525,11.325L2.65,9.9Q2.35,9.675 2.275,9.3Q2.2,8.925 2.4,8.6L4.25,5.375Q4.425,5.025 4.787,4.937Q5.15,4.85 5.5,4.975L7.675,5.875Q7.95,5.675 8.25,5.5Q8.55,5.325 8.85,5.2L9.15,2.875Q9.2,2.5 9.475,2.25Q9.75,2 10.125,2H13.875Q14.25,2 14.525,2.25Q14.8,2.5 14.85,2.875L15.15,5.2Q15.475,5.325 15.763,5.5Q16.05,5.675 16.325,5.875L18.5,4.975Q18.85,4.85 19.2,4.95Q19.55,5.05 19.75,5.375L21.6,8.6Q21.8,8.925 21.725,9.3Q21.65,9.675 21.35,9.9L19.475,11.325Q19.5,11.5 19.5,11.662Q19.5,11.825 19.5,12Q19.5,12.175 19.5,12.337Q19.5,12.5 19.45,12.675L21.325,14.1Q21.625,14.325 21.7,14.7Q21.775,15.075 21.575,15.4L19.725,18.6Q19.525,18.925 19.163,19.038Q18.8,19.15 18.45,19.025L16.325,18.125Q16.05,18.325 15.75,18.5Q15.45,18.675 15.15,18.8L14.85,21.125Q14.8,21.5 14.525,21.75Q14.25,22 13.875,22ZM12.05,15.5Q13.5,15.5 14.525,14.475Q15.55,13.45 15.55,12Q15.55,10.55 14.525,9.525Q13.5,8.5 12.05,8.5Q10.575,8.5 9.562,9.525Q8.55,10.55 8.55,12Q8.55,13.45 9.562,14.475Q10.575,15.5 12.05,15.5Z" />
+    />
 </vector>
diff --git a/app/src/main/res/drawable/ic_theme.xml b/app/src/main/res/drawable/ic_theme.xml
index 7573d6c0b..bba2398d3 100644
--- a/app/src/main/res/drawable/ic_theme.xml
+++ b/app/src/main/res/drawable/ic_theme.xml
@@ -1,10 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
+    android:viewportWidth="48"
+    android:width="24dp"
+    android:viewportHeight="48"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20,15.31L23.31,12 20,8.69V4h-4.69L12,0.69 8.69,4H4v4.69L0.69,12 4,15.31V20h4.69L12,23.31 15.31,20H20v-4.69zM12,18c-3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6 6,2.69 6,6 -2.69,6 -6,6z"/>
+
+<path
+        android:fillColor="#FF000000"
+        android:pathData="M24,42Q16.5,42 11.25,36.75Q6,31.5 6,24Q6,17.25 9.975,12.55Q13.95,7.85 20.4,6.5Q22.45,6.1 23.2,7.2Q23.95,8.3 23.15,10.2Q22.7,11.35 22.45,12.55Q22.2,13.75 22.2,15Q22.2,19.5 25.35,22.65Q28.5,25.8 33,25.8Q34.25,25.8 35.425,25.575Q36.6,25.35 37.7,24.95Q39.85,24.15 40.9,25.025Q41.95,25.9 41.45,28Q40.1,34.05 35.4,38.025Q30.7,42 24,42ZM24,39Q29.45,39 33.5,35.625Q37.55,32.25 38.55,27.7Q37.3,28.25 35.875,28.525Q34.45,28.8 33,28.8Q27.25,28.8 23.225,24.775Q19.2,20.75 19.2,15Q19.2,13.8 19.45,12.425Q19.7,11.05 20.35,9.3Q15.45,10.65 12.225,14.775Q9,18.9 9,24Q9,30.25 13.375,34.625Q17.75,39 24,39ZM23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_translate.xml b/app/src/main/res/drawable/ic_translate.xml
new file mode 100644
index 000000000..94e6d4d98
--- /dev/null
+++ b/app/src/main/res/drawable/ic_translate.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+
+<path
+      android:fillColor="#FF000000"
+      android:pathData="M13.35,22Q12.75,22 12.488,21.613Q12.225,21.225 12.425,20.65L16.075,10.975Q16.225,10.575 16.638,10.287Q17.05,10 17.5,10Q17.925,10 18.35,10.287Q18.775,10.575 18.925,10.975L22.575,20.65Q22.775,21.225 22.513,21.613Q22.25,22 21.625,22Q21.35,22 21.125,21.825Q20.9,21.65 20.8,21.4L19.95,18.95H15.1L14.225,21.4Q14.125,21.65 13.875,21.825Q13.625,22 13.35,22ZM15.7,17.2H19.3L17.55,12.25H17.45ZM7.15,8.55Q7.55,9.275 8,9.887Q8.45,10.5 9.05,11.15Q10.15,9.95 10.875,8.688Q11.6,7.425 12.1,6H2Q1.575,6 1.288,5.713Q1,5.425 1,5Q1,4.575 1.288,4.287Q1.575,4 2,4H8V3Q8,2.575 8.288,2.287Q8.575,2 9,2Q9.425,2 9.713,2.287Q10,2.575 10,3V4H16Q16.425,4 16.712,4.287Q17,4.575 17,5Q17,5.425 16.712,5.713Q16.425,6 16,6H14.1Q13.575,7.775 12.675,9.45Q11.775,11.125 10.45,12.6L12.85,15.05L12.1,17.1L9,14L4.7,18.3Q4.425,18.575 4,18.575Q3.575,18.575 3.3,18.3Q3.025,18.025 3.025,17.6Q3.025,17.175 3.3,16.9L7.65,12.55Q6.975,11.775 6.4,10.987Q5.825,10.2 5.375,9.325Q5.1,8.8 5.35,8.4Q5.6,8 6.225,8Q6.475,8 6.75,8.162Q7.025,8.325 7.15,8.55Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_upload.xml b/app/src/main/res/drawable/ic_upload.xml
new file mode 100644
index 000000000..ac84d528c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_upload.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+
+<path
+      android:fillColor="#FF000000"
+      android:pathData="M12,16Q11.575,16 11.288,15.712Q11,15.425 11,15V7.85L9.125,9.725Q8.825,10.025 8.425,10.025Q8.025,10.025 7.7,9.7Q7.4,9.4 7.413,8.987Q7.425,8.575 7.7,8.3L11.3,4.7Q11.45,4.55 11.625,4.487Q11.8,4.425 12,4.425Q12.2,4.425 12.375,4.487Q12.55,4.55 12.7,4.7L16.3,8.3Q16.6,8.6 16.587,9.012Q16.575,9.425 16.3,9.7Q16,10 15.588,10.012Q15.175,10.025 14.875,9.725L13,7.85V15Q13,15.425 12.713,15.712Q12.425,16 12,16ZM6,20Q5.175,20 4.588,19.413Q4,18.825 4,18V16Q4,15.575 4.287,15.287Q4.575,15 5,15Q5.425,15 5.713,15.287Q6,15.575 6,16V18Q6,18 6,18Q6,18 6,18H18Q18,18 18,18Q18,18 18,18V16Q18,15.575 18.288,15.287Q18.575,15 19,15Q19.425,15 19.712,15.287Q20,15.575 20,16V18Q20,18.825 19.413,19.413Q18.825,20 18,20Z"/>
+</vector>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 2de3aec25..8c814939c 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -104,7 +104,12 @@
     </style>
 
     <style name="Theme.OLED" parent="Theme.Material3.Dark.NoActionBar">
+
         <item name="android:colorBackground">@color/black</item>
+        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 0b3557b52..e9b325751 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -21,7 +21,7 @@
         app:entryValues="@array/languagesValue"
         app:defaultValue="sys"
         app:useSimpleSummaryProvider="true"
-        android:icon="@drawable/ic_flag"
+        android:icon="@drawable/ic_translate"
         />
 
     </PreferenceCategory>
@@ -54,7 +54,7 @@
         app:key="import_from_yt"
         app:title="@string/import_from_yt"
         android:summary="@string/import_from_yt_summary"
-        android:icon="@drawable/ic_import"
+        android:icon="@drawable/ic_upload"
         />
 
     </PreferenceCategory>
@@ -84,7 +84,7 @@
         app:title="@string/sponsorblock"
         app:key="sponsorblock"
         app:summary="@string/sponsorblock_summary"
-        android:icon="@drawable/ic_sponsorblock"
+        android:icon="@drawable/ic_block"
         />
 
     <ListPreference
@@ -93,7 +93,7 @@
         app:entries="@array/tabs"
         app:entryValues="@array/tabsValue"
         app:defaultValue="home"
-        android:icon="@drawable/ic_home"
+        android:icon="@drawable/ic_home_outlined"
         />
 
     <ListPreference
@@ -112,7 +112,7 @@
         app:entries="@array/grid"
         app:entryValues="@array/grid"
         app:defaultValue="@integer/grid_items"
-        android:icon="@drawable/ic_column"
+        android:icon="@drawable/ic_grid"
         app:useSimpleSummaryProvider="true"
         />
 
@@ -129,7 +129,7 @@
         <Preference
             app:title="@string/clear_history"
             app:key="clear_history"
-            android:icon="@drawable/ic_trash" />
+            android:icon="@drawable/ic_delete" />
 
     </PreferenceCategory>
 
@@ -143,7 +143,7 @@
         <Preference
             app:title="@string/license"
             app:key="license"
-            android:icon="@drawable/ic_gnu" />
+            android:icon="@drawable/ic_info" />
 
     </PreferenceCategory>