From 35cc9bce42dc761eaa6a6fbf7fb079c726743cc3 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 13 Apr 2021 10:32:20 +0200
Subject: [PATCH] reformat all layout/ui XML with Android Studio Ctrl-Alt-L

---
 app/src/main/res/color/bottom_nav_items.xml   |   6 +-
 .../drawable-anydpi-v21/ic_file_install.xml   |  15 ++-
 .../res/drawable-v23/seekbar_background.xml   |   4 +-
 .../res/drawable/app_list_item_divider.xml    |   5 +-
 .../app_version_item_status_incompatible.xml  |   7 +-
 .../app_version_item_status_installed.xml     |   7 +-
 .../drawable/app_version_item_status_new.xml  |   7 +-
 .../app_version_item_status_suggested.xml     |   7 +-
 ...egory_preview_app_card_background_dark.xml |   1 +
 ...gory_preview_app_card_background_light.xml |   1 +
 .../res/drawable/donation_option_bitcoin.xml  |  26 ++--
 .../drawable/donation_option_liberapay.xml    |   4 +-
 .../res/drawable/donation_option_litecoin.xml |  28 ++--
 .../donation_option_opencollective.xml        |  58 ++++----
 app/src/main/res/drawable/ic_access_time.xml  |  22 ++--
 app/src/main/res/drawable/ic_add.xml          |   6 +-
 .../main/res/drawable/ic_antifeature_ads.xml  |  15 ++-
 .../ic_antifeature_disabledalgorithm.xml      |  23 +++-
 .../res/drawable/ic_antifeature_knownvuln.xml |  15 ++-
 .../drawable/ic_antifeature_nonfreeadd.xml    |  23 +++-
 .../drawable/ic_antifeature_nonfreeassets.xml |  23 +++-
 .../drawable/ic_antifeature_nonfreedep.xml    |  27 +++-
 .../drawable/ic_antifeature_nonfreenet.xml    |  47 +++++--
 .../drawable/ic_antifeature_nosourcesince.xml |  19 ++-
 .../res/drawable/ic_antifeature_tracking.xml  |  27 +++-
 .../ic_antifeature_upstreamnonfree.xml        |  23 +++-
 app/src/main/res/drawable/ic_cancel.xml       |   6 +-
 app/src/main/res/drawable/ic_categories.xml   |  13 +-
 app/src/main/res/drawable/ic_changelog.xml    |   6 +-
 app/src/main/res/drawable/ic_clear.xml        |   6 +-
 app/src/main/res/drawable/ic_delete.xml       |   6 +-
 app/src/main/res/drawable/ic_donate.xml       |  10 +-
 app/src/main/res/drawable/ic_download.xml     |  16 +--
 .../res/drawable/ic_download_progress.xml     | 124 ++++++++++++++----
 .../res/drawable/ic_download_progress_0.xml   |  14 +-
 .../res/drawable/ic_download_progress_105.xml |  16 +--
 .../res/drawable/ic_download_progress_120.xml |  16 +--
 .../res/drawable/ic_download_progress_135.xml |  16 +--
 .../res/drawable/ic_download_progress_15.xml  |  16 +--
 .../res/drawable/ic_download_progress_150.xml |  16 +--
 .../res/drawable/ic_download_progress_165.xml |  16 +--
 .../res/drawable/ic_download_progress_180.xml |  16 +--
 .../res/drawable/ic_download_progress_195.xml |  16 +--
 .../res/drawable/ic_download_progress_210.xml |  16 +--
 .../res/drawable/ic_download_progress_225.xml |  16 +--
 .../res/drawable/ic_download_progress_240.xml |  45 +++++--
 .../res/drawable/ic_download_progress_255.xml |  16 +--
 .../res/drawable/ic_download_progress_270.xml |  16 +--
 .../res/drawable/ic_download_progress_285.xml |  16 +--
 .../res/drawable/ic_download_progress_30.xml  |  16 +--
 .../res/drawable/ic_download_progress_300.xml |  16 +--
 .../res/drawable/ic_download_progress_315.xml |  16 +--
 .../res/drawable/ic_download_progress_330.xml |  16 +--
 .../res/drawable/ic_download_progress_345.xml |  16 +--
 .../res/drawable/ic_download_progress_360.xml |  16 +--
 .../res/drawable/ic_download_progress_45.xml  |  16 +--
 .../res/drawable/ic_download_progress_60.xml  |  16 +--
 .../res/drawable/ic_download_progress_75.xml  |  16 +--
 .../res/drawable/ic_download_progress_90.xml  |  16 +--
 app/src/main/res/drawable/ic_email.xml        |   6 +-
 app/src/main/res/drawable/ic_error.xml        |   6 +-
 app/src/main/res/drawable/ic_expand_less.xml  |   3 +-
 app/src/main/res/drawable/ic_expand_more.xml  |   6 +-
 .../main/res/drawable/ic_file_download.xml    |   6 +-
 .../res/drawable/ic_known_vuln_overlay.xml    |  51 +++++--
 app/src/main/res/drawable/ic_latest.xml       |  19 ++-
 app/src/main/res/drawable/ic_lock.xml         |  10 +-
 app/src/main/res/drawable/ic_nearby.xml       |  38 ++++--
 app/src/main/res/drawable/ic_nearby_share.xml |  37 ++++--
 app/src/main/res/drawable/ic_nfc.xml          |   6 +-
 app/src/main/res/drawable/ic_notification.xml |  18 ++-
 .../res/drawable/ic_notification_download.xml |  34 +++--
 .../res/drawable/ic_notifications_off.xml     |   6 +-
 .../res/drawable/ic_notifications_paused.xml  |   6 +-
 .../main/res/drawable/ic_perm_device_info.xml |   2 +-
 app/src/main/res/drawable/ic_share.xml        |   6 +-
 app/src/main/res/drawable/ic_sort.xml         |  16 +--
 app/src/main/res/drawable/ic_video.xml        |   4 +-
 app/src/main/res/drawable/ic_warning.xml      |   6 +-
 app/src/main/res/drawable/ic_website.xml      |   6 +-
 app/src/main/res/drawable/no_updates_bg.xml   |  15 ++-
 .../res/drawable/screenshot_placeholder.xml   |  40 ++++--
 .../res/layout-v11/app_permission_item.xml    |   1 +
 .../main/res/layout-v11/install_confirm.xml   |   1 +
 .../layout-v17/app_permission_item_money.xml  |  10 +-
 app/src/main/res/layout-v21/app_details2.xml  |  89 +++++++------
 .../res/layout-v21/app_details2_header.xml    |  25 ++--
 app/src/main/res/layout/addrepo.xml           |   6 +-
 .../main/res/layout/app_card_horizontal.xml   |   3 +-
 app/src/main/res/layout/app_card_large.xml    |   3 +-
 .../main/res/layout/app_card_list_item.xml    |   3 +-
 .../res/layout/app_details2_link_item.xml     |   3 +-
 .../main/res/layout/app_details2_links.xml    |   6 +-
 app/src/main/res/layout/app_list_item.xml     |   3 +-
 app/src/main/res/layout/app_perms_summary.xml |   4 +-
 .../main/res/layout/crash_report_dialog.xml   |  18 +--
 app/src/main/res/layout/donate_generic.xml    |   3 +-
 .../main/res/layout/install_app_details.xml   |   8 +-
 app/src/main/res/layout/install_confirm.xml   |   4 +-
 app/src/main/res/layout/install_start.xml     |   4 +-
 .../res/layout/installed_app_list_item.xml    |  19 ++-
 .../layout/listitem_antifeaturelisting.xml    |  21 ++-
 app/src/main/res/layout/login.xml             |   2 +-
 app/src/main/res/layout/main_tab_settings.xml |   3 +-
 app/src/main/res/layout/permissions_list.xml  |   4 +-
 app/src/main/res/layout/share_item.xml        |   3 +-
 .../res/layout/updateable_app_list_item.xml   |   3 +-
 app/src/main/res/layout/updates_header.xml    |   3 +-
 app/src/main/res/menu/details2.xml            |   8 +-
 app/src/main/res/menu/install_history.xml     |  24 ++--
 app/src/main/res/menu/installed_apps.xml      |  11 +-
 app/src/main/res/menu/manage_repos.xml        |   4 +-
 .../main/res/menu/repo_details_activity.xml   |   2 +-
 app/src/main/res/values-night/themes.xml      |   1 +
 .../values-sw360dp-v13/values-preference.xml  |   8 +-
 app/src/main/res/values-tt/strings.xml        |   2 +-
 app/src/main/res/values-v16/styles.xml        |   3 +-
 app/src/main/res/values-v17/styles.xml        |   4 +-
 app/src/main/res/values-v17/styles_detail.xml |   1 +
 app/src/main/res/values-v21/styles_detail.xml |   1 +
 app/src/main/res/values/themes.xml            |   4 +-
 app/src/main/res/xml/backup_rules.xml         |   6 +-
 .../main/res/xml/installer_file_provider.xml  |   8 +-
 .../main/res/xml/network_security_config.xml  |   2 +-
 app/src/main/res/xml/preferences.xml          |  20 +--
 app/src/main/res/xml/searchable.xml           |   3 +-
 126 files changed, 1074 insertions(+), 697 deletions(-)

diff --git a/app/src/main/res/color/bottom_nav_items.xml b/app/src/main/res/color/bottom_nav_items.xml
index ce3b9b1d1..e785610df 100644
--- a/app/src/main/res/color/bottom_nav_items.xml
+++ b/app/src/main/res/color/bottom_nav_items.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/white" android:state_checked="true"/>
-    <item android:color="@android:color/white" android:state_pressed="true"/>
-    <item android:color="#B8D4F0"/>
+    <item android:color="@android:color/white" android:state_checked="true" />
+    <item android:color="@android:color/white" android:state_pressed="true" />
+    <item android:color="#B8D4F0" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi-v21/ic_file_install.xml b/app/src/main/res/drawable-anydpi-v21/ic_file_install.xml
index 644cb6070..11af9550a 100644
--- a/app/src/main/res/drawable-anydpi-v21/ic_file_install.xml
+++ b/app/src/main/res/drawable-anydpi-v21/ic_file_install.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="32dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="32dp">
-    <group android:pivotX="12" android:pivotY="12" android:rotation="-90">
-        <path android:fillColor="#30000000" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="32dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="32dp">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:rotation="-90">
+        <path
+            android:fillColor="#30000000"
+            android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" />
     </group>
 </vector>
diff --git a/app/src/main/res/drawable-v23/seekbar_background.xml b/app/src/main/res/drawable-v23/seekbar_background.xml
index 87855cb5b..24c882cd6 100644
--- a/app/src/main/res/drawable-v23/seekbar_background.xml
+++ b/app/src/main/res/drawable-v23/seekbar_background.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:height="3dp" android:gravity="center_vertical">
+    <item
+        android:height="3dp"
+        android:gravity="center_vertical">
         <shape android:shape="rectangle">
             <solid android:color="#818181" />
         </shape>
diff --git a/app/src/main/res/drawable/app_list_item_divider.xml b/app/src/main/res/drawable/app_list_item_divider.xml
index 43e49bab5..4b2c94fe0 100644
--- a/app/src/main/res/drawable/app_list_item_divider.xml
+++ b/app/src/main/res/drawable/app_list_item_divider.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
   Used to separate two separate R.layout.app_list_item views in a list.
   As these are not cards, they don't have their own drop shadow or other features that help
   separate different list items.
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:width="1dp" android:height="1dp" />
+    <size
+        android:width="1dp"
+        android:height="1dp" />
     <solid android:color="#50999999" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/app_version_item_status_incompatible.xml b/app/src/main/res/drawable/app_version_item_status_incompatible.xml
index 57383ccb9..5277498b3 100644
--- a/app/src/main/res/drawable/app_version_item_status_incompatible.xml
+++ b/app/src/main/res/drawable/app_version_item_status_incompatible.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <stroke android:width="1dp" android:color="#d86758" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#d86758" />
     <corners android:radius="2dp" />
 </shape>
diff --git a/app/src/main/res/drawable/app_version_item_status_installed.xml b/app/src/main/res/drawable/app_version_item_status_installed.xml
index 7a41f1043..3d4ff6756 100644
--- a/app/src/main/res/drawable/app_version_item_status_installed.xml
+++ b/app/src/main/res/drawable/app_version_item_status_installed.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <stroke android:width="1dp" android:color="#19c878" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#19c878" />
     <corners android:radius="2dp" />
 </shape>
diff --git a/app/src/main/res/drawable/app_version_item_status_new.xml b/app/src/main/res/drawable/app_version_item_status_new.xml
index 95ed5d276..393c74738 100644
--- a/app/src/main/res/drawable/app_version_item_status_new.xml
+++ b/app/src/main/res/drawable/app_version_item_status_new.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <stroke android:width="1dp" android:color="#429fff" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#429fff" />
     <corners android:radius="2dp" />
 </shape>
diff --git a/app/src/main/res/drawable/app_version_item_status_suggested.xml b/app/src/main/res/drawable/app_version_item_status_suggested.xml
index 6f6f0410f..08cd4615a 100644
--- a/app/src/main/res/drawable/app_version_item_status_suggested.xml
+++ b/app/src/main/res/drawable/app_version_item_status_suggested.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <stroke android:width="1dp" android:color="#777777" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#777777" />
     <corners android:radius="2dp" />
 </shape>
diff --git a/app/src/main/res/drawable/category_preview_app_card_background_dark.xml b/app/src/main/res/drawable/category_preview_app_card_background_dark.xml
index fef43a2c1..e8fd2a618 100644
--- a/app/src/main/res/drawable/category_preview_app_card_background_dark.xml
+++ b/app/src/main/res/drawable/category_preview_app_card_background_dark.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
   Visually different from other app cards because it doesn't have a drop shadow, and has a larger
   corner radius.
diff --git a/app/src/main/res/drawable/category_preview_app_card_background_light.xml b/app/src/main/res/drawable/category_preview_app_card_background_light.xml
index 5bb971142..750797697 100644
--- a/app/src/main/res/drawable/category_preview_app_card_background_light.xml
+++ b/app/src/main/res/drawable/category_preview_app_card_background_light.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
   Visually different from other app cards because it doesn't have a drop shadow, and has a larger
   corner radius.
diff --git a/app/src/main/res/drawable/donation_option_bitcoin.xml b/app/src/main/res/drawable/donation_option_bitcoin.xml
index a4a1aa5ff..22d82a53a 100644
--- a/app/src/main/res/drawable/donation_option_bitcoin.xml
+++ b/app/src/main/res/drawable/donation_option_bitcoin.xml
@@ -1,33 +1,33 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="306dp"
-        android:height="64dp"
-        android:viewportWidth="306.5"
-        android:viewportHeight="64.001">
+    android:width="306dp"
+    android:height="64dp"
+    android:viewportWidth="306.5"
+    android:viewportHeight="64.001">
     <path
         android:pathData="m63.03,39.75c-4.27,17.14 -21.64,27.58 -38.78,23.3 -17.14,-4.27 -27.57,-21.64 -23.3,-38.78 4.27,-17.15 21.64,-27.58 38.78,-23.31 17.14,4.27 27.58,21.64 23.3,38.78z"
-        android:fillColor="#f7931a"/>
+        android:fillColor="#f7931a" />
     <path
         android:pathData="m46.1,27.45c0.64,-4.26 -2.61,-6.55 -7.04,-8.07l1.44,-5.77 -3.51,-0.88 -1.4,5.62c-0.92,-0.23 -1.87,-0.45 -2.81,-0.66l1.41,-5.65 -3.51,-0.88 -1.44,5.77c-0.76,-0.17 -1.51,-0.35 -2.24,-0.53l0,-0.02 -4.84,-1.21 -0.93,3.75s2.61,0.6 2.55,0.63c1.42,0.35 1.68,1.3 1.64,2.04l-1.64,6.57c0.1,0.03 0.22,0.06 0.37,0.12 -0.12,-0.03 -0.24,-0.06 -0.37,-0.09l-2.3,9.2c-0.17,0.43 -0.62,1.08 -1.61,0.83 0.04,0.05 -2.55,-0.64 -2.55,-0.64l-1.74,4.02 4.57,1.14c0.85,0.21 1.68,0.44 2.5,0.65l-1.45,5.83 3.51,0.88 1.44,-5.77c0.96,0.26 1.89,0.5 2.8,0.73l-1.43,5.74 3.51,0.88 1.45,-5.82c5.99,1.13 10.49,0.68 12.38,-4.74 1.53,-4.36 -0.08,-6.88 -3.23,-8.52 2.29,-0.53 4.02,-2.04 4.48,-5.16zM38.08,38.69c-1.09,4.36 -8.43,2 -10.81,1.41l1.93,-7.73c2.38,0.59 10.01,1.77 8.88,6.32zM39.17,27.38c-0.99,3.97 -7.1,1.95 -9.08,1.46l1.75,-7.01c1.98,0.49 8.36,1.42 7.33,5.55z"
-        android:fillColor="#FFF"/>
+        android:fillColor="#FFF" />
     <path
         android:pathData="m93.77,19.37c2.6,0 4.84,0.47 6.72,1.38 1.89,0.92 3.45,2.16 4.71,3.73 1.24,1.57 2.16,3.4 2.75,5.51 0.59,2.11 0.89,4.38 0.89,6.8 0,3.73 -0.68,7.25 -2.06,10.57 -1.38,3.33 -3.25,6.21 -5.63,8.67 -2.38,2.46 -5.19,4.39 -8.42,5.82 -3.23,1.43 -6.75,2.15 -10.52,2.15 -0.49,0 -1.35,-0.01 -2.56,-0.04s-2.61,-0.15 -4.16,-0.36c-1.57,-0.22 -3.23,-0.54 -4.98,-0.98 -1.75,-0.43 -3.42,-1.02 -4.98,-1.78l14.01,-58.88 12.55,-1.95 -5.02,20.89c1.07,-0.48 2.16,-0.86 3.24,-1.13 1.08,-0.27 2.24,-0.41 3.48,-0.41zM83.25,54.04c1.89,0 3.67,-0.47 5.34,-1.38 1.68,-0.91 3.13,-2.15 4.34,-3.68 1.21,-1.54 2.17,-3.28 2.87,-5.23s1.05,-3.97 1.05,-6.08c0,-2.59 -0.43,-4.61 -1.3,-6.07 -0.86,-1.46 -2.46,-2.19 -4.78,-2.19 -0.76,0 -1.74,0.14 -2.95,0.4 -1.22,0.28 -2.31,0.85 -3.29,1.71l-5.34,22.19c0.32,0.06 0.61,0.11 0.85,0.16 0.24,0.05 0.5,0.09 0.76,0.12 0.28,0.03 0.59,0.05 0.98,0.05s0.86,0 1.46,0z"
-        android:fillColor="#4d4d4d"/>
+        android:fillColor="#4d4d4d" />
     <path
         android:pathData="m121.85,62.87h-11.99l10.12,-42.6h12.07l-10.2,42.6zM127.69,15.08c-1.67,0 -3.19,-0.5 -4.54,-1.5 -1.36,-0.99 -2.03,-2.52 -2.03,-4.58 0,-1.13 0.23,-2.19 0.69,-3.2 0.46,-1 1.07,-1.86 1.83,-2.59 0.76,-0.73 1.63,-1.31 2.63,-1.74 1,-0.43 2.07,-0.64 3.2,-0.64 1.67,0 3.18,0.5 4.53,1.5 1.35,1 2.02,2.53 2.02,4.58 0,1.14 -0.23,2.2 -0.69,3.2 -0.46,1 -1.06,1.86 -1.82,2.59 -0.75,0.73 -1.64,1.3 -2.63,1.74 -1,0.44 -2.07,0.64 -3.2,0.64z"
-        android:fillColor="#4d4d4d"/>
+        android:fillColor="#4d4d4d" />
     <path
         android:pathData="m142.56,9.66 l12.56,-1.95 -3.08,12.56h13.45l-2.43,9.88h-13.36l-3.56,14.9c-0.33,1.24 -0.51,2.4 -0.57,3.48 -0.06,1.08 0.08,2.01 0.4,2.8 0.32,0.79 0.9,1.39 1.74,1.82 0.84,0.44 2.03,0.65 3.6,0.65 1.29,0 2.55,-0.12 3.77,-0.37 1.21,-0.24 2.44,-0.57 3.68,-1.01l0.89,9.24c-1.62,0.59 -3.37,1.11 -5.26,1.53 -1.89,0.44 -4.13,0.65 -6.72,0.65 -3.72,0 -6.61,-0.55 -8.67,-1.65 -2.05,-1.11 -3.51,-2.62 -4.38,-4.54 -0.86,-1.91 -1.24,-4.11 -1.13,-6.6 0.11,-2.49 0.49,-5.1 1.13,-7.86l7.94,-33.53z"
-        android:fillColor="#4d4d4d"/>
+        android:fillColor="#4d4d4d" />
     <path
         android:pathData="m164.95,45.86c0,-3.67 0.59,-7.13 1.78,-10.37 1.18,-3.24 2.89,-6.08 5.11,-8.51 2.21,-2.42 4.9,-4.34 8.06,-5.75 3.15,-1.4 6.68,-2.11 10.56,-2.11 2.43,0 4.61,0.23 6.52,0.69 1.92,0.47 3.66,1.07 5.23,1.82l-4.13,9.4c-1.08,-0.44 -2.2,-0.82 -3.36,-1.17 -1.16,-0.36 -2.58,-0.53 -4.25,-0.53 -4,0 -7.16,1.38 -9.52,4.13 -2.35,2.75 -3.53,6.45 -3.53,11.1 0,2.75 0.59,4.98 1.79,6.68 1.19,1.7 3.38,2.55 6.56,2.55 1.57,0 3.09,-0.16 4.54,-0.48 1.46,-0.32 2.75,-0.73 3.89,-1.21l0.89,9.64c-1.52,0.59 -3.19,1.12 -5.02,1.58 -1.84,0.45 -4.03,0.68 -6.56,0.68 -3.35,0 -6.18,-0.49 -8.5,-1.46 -2.32,-0.98 -4.24,-2.28 -5.75,-3.93 -1.52,-1.65 -2.61,-3.58 -3.28,-5.8 -0.67,-2.21 -1.02,-4.54 -1.02,-6.96z"
-        android:fillColor="#4d4d4d"/>
+        android:fillColor="#4d4d4d" />
     <path
         android:pathData="m218.2,64c-2.86,0 -5.35,-0.44 -7.45,-1.3 -2.1,-0.86 -3.84,-2.07 -5.22,-3.64 -1.38,-1.56 -2.41,-3.41 -3.12,-5.55 -0.71,-2.13 -1.05,-4.49 -1.05,-7.08 0,-3.24 0.52,-6.49 1.57,-9.72 1.05,-3.24 2.6,-6.16 4.66,-8.74 2.04,-2.59 4.56,-4.71 7.53,-6.37 2.96,-1.64 6.37,-2.47 10.2,-2.47 2.81,0 5.28,0.44 7.42,1.3 2.13,0.86 3.88,2.08 5.26,3.64 1.37,1.57 2.41,3.41 3.11,5.55 0.7,2.13 1.05,4.49 1.05,7.08 0,3.23 -0.51,6.48 -1.53,9.72 -1.02,3.23 -2.54,6.15 -4.54,8.74 -2,2.59 -4.49,4.71 -7.49,6.35 -2.99,1.65 -6.47,2.47 -10.41,2.47zM224.19,29.33c-1.78,0 -3.35,0.52 -4.69,1.53 -1.35,1.03 -2.48,2.33 -3.4,3.89 -0.92,1.57 -1.61,3.28 -2.07,5.14 -0.46,1.87 -0.68,3.63 -0.68,5.3 0,2.7 0.44,4.81 1.29,6.32 0.87,1.51 2.43,2.27 4.7,2.27 1.78,0 3.35,-0.51 4.7,-1.54 1.34,-1.02 2.48,-2.32 3.4,-3.89 0.92,-1.56 1.61,-3.28 2.07,-5.14 0.45,-1.86 0.68,-3.63 0.68,-5.3 0,-2.7 -0.43,-4.81 -1.3,-6.32 -0.86,-1.51 -2.43,-2.27 -4.7,-2.27z"
-        android:fillColor="#4d4d4d"/>
+        android:fillColor="#4d4d4d" />
     <path
         android:pathData="m255.23,62.87h-12l10.12,-42.6h12.07l-10.2,42.6zM261.06,15.08c-1.67,0 -3.19,-0.5 -4.53,-1.5 -1.35,-0.99 -2.03,-2.52 -2.03,-4.58 0,-1.13 0.23,-2.19 0.69,-3.2 0.46,-1 1.07,-1.86 1.82,-2.59 0.75,-0.73 1.64,-1.31 2.63,-1.74 1,-0.43 2.06,-0.64 3.19,-0.64 1.68,0 3.19,0.5 4.54,1.5 1.35,1 2.03,2.53 2.03,4.58 0,1.14 -0.24,2.2 -0.69,3.2s-1.06,1.86 -1.82,2.59c-0.76,0.73 -1.63,1.3 -2.63,1.74 -1,0.44 -2.07,0.64 -3.21,0.64z"
-        android:fillColor="#4d4d4d"/>
+        android:fillColor="#4d4d4d" />
     <path
         android:pathData="m274.07,22.21c0.91,-0.27 1.93,-0.59 3.03,-0.93 1.11,-0.35 2.35,-0.67 3.73,-0.96 1.37,-0.3 2.91,-0.55 4.61,-0.73 1.7,-0.19 3.63,-0.29 5.79,-0.29 6.32,0 10.68,1.84 13.09,5.51 2.4,3.67 2.82,8.69 1.26,15.06l-5.51,23h-12.07l5.34,-22.52c0.33,-1.41 0.58,-2.77 0.77,-4.09 0.19,-1.32 0.18,-2.48 -0.04,-3.48 -0.21,-0.99 -0.71,-1.8 -1.49,-2.43 -0.79,-0.62 -1.99,-0.93 -3.61,-0.93 -1.56,0 -3.15,0.17 -4.78,0.49l-7.86,32.96h-12.07l9.81,-40.65z"
-        android:fillColor="#4d4d4d"/>
+        android:fillColor="#4d4d4d" />
 </vector>
diff --git a/app/src/main/res/drawable/donation_option_liberapay.xml b/app/src/main/res/drawable/donation_option_liberapay.xml
index d9a8bccd9..ebd0a454c 100644
--- a/app/src/main/res/drawable/donation_option_liberapay.xml
+++ b/app/src/main/res/drawable/donation_option_liberapay.xml
@@ -69,8 +69,8 @@ L68.2511,15.436 C68.3771,14.386,68.8671,13.812,69.7351,13.812
 C70.5751,13.812,71.1631,14.358,71.2611,15.436 Z" />
     <path
         android:pathData="M11.18,19.11a4.25,4.25 0,0 1,-1.68 -0.28,1.85 1.85,0 0,1 -0.88,-0.76 2.22,2.22 0,0 1,-0.25 -1.11,6 6,0 0,1 0.17,-1.34l1.92,-8 2.34,-0.36 -2.1,8.69a3.32,3.32 0,0 0,-0.07 0.5,0.87 0.87,0 0,0 0.08,0.4 0.71,0.71 0,0 0,0.31 0.28,1.79 1.79,0 0,0 0.61,0.13l-0.45,1.86"
-        android:fillColor="#1a171b"/>
+        android:fillColor="#1a171b" />
     <path
         android:pathData="M19.63,14.12a5.44,5.44 0,0 1,-0.36 2,5 5,0 0,1 -1,1.58 4.58,4.58 0,0 1,-1.54 1,5 5,0 0,1 -2,0.37 5.86,5.86 0,0 1,-1 -0.09l-0.68,2.73L10.84,21.71l2.5,-10.44a11.85,11.85 0,0 1,1.38 -0.32,8.9 8.9,0 0,1 1.68,-0.15 3.77,3.77 0,0 1,1.46 0.26,2.61 2.61,0 0,1 1,0.7 2.8,2.8 0,0 1,0.58 1,4.09 4.09,0 0,1 0.19,1.28m-5.47,3.09a2.8,2.8 0,0 0,0.63 0.06,2.5 2.5,0 0,0 1.07,-0.22 2.38,2.38 0,0 0,0.82 -0.61,2.87 2.87,0 0,0 0.53,-0.94 3.63,3.63 0,0 0,0.19 -1.22,2 2,0 0,0 -0.29,-1.1 1.08,1.08 0,0 0,-1 -0.45,4.39 4.39,0 0,0 -0.91,0.09l-1.05,4.39"
-        android:fillColor="#1a171b"/>
+        android:fillColor="#1a171b" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/donation_option_litecoin.xml b/app/src/main/res/drawable/donation_option_litecoin.xml
index 57deb2328..81f0c4434 100644
--- a/app/src/main/res/drawable/donation_option_litecoin.xml
+++ b/app/src/main/res/drawable/donation_option_litecoin.xml
@@ -11,7 +11,7 @@
         android:fillColor="#666666"
         android:strokeWidth="1.87500012"
         android:strokeLineJoin="round"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M37.78,2.13L362.22,2.13A34.87,34.87 0,0 1,397.1 37L397.1,92.34A34.87,34.87 0,0 1,362.22 127.22L37.78,127.22A34.87,34.87 0,0 1,2.9 92.34L2.9,37A34.87,34.87 0,0 1,37.78 2.13z"
         android:strokeLineCap="round"
@@ -20,7 +20,7 @@
         android:fillColor="#f2f2f2"
         android:strokeWidth="1.87500012"
         android:strokeLineJoin="round"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M69.18,64.67m-46.16,0a46.16,46.16 0,1 1,92.32 0a46.16,46.16 0,1 1,-92.32 0"
         android:strokeLineCap="round"
@@ -29,7 +29,7 @@
         android:fillColor="#b3b3b3"
         android:strokeWidth="1.87500012"
         android:strokeLineJoin="round"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m44.58,93.88 l5.01,-19.04 -7.11,2.67 2.02,-7.61 7.08,-2.62 8.39,-31.8 18.23,-0.01 -6.38,24.31 8.19,-3.09 -2,7.62 -8.18,3.04 -4.06,15.38h30.12l-2.94,11.16z"
         android:strokeLineCap="butt"
@@ -37,60 +37,60 @@
         android:fillColor="#ffffff"
         android:strokeWidth="0.93750006"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m266.13,54.09 l-3.15,8.46c-1.8,-0.84 -3.42,-1.47 -4.86,-1.89 -1.44,-0.42 -2.91,-0.63 -4.41,-0.63 -3.96,0 -7.35,1.35 -10.17,4.05 -2.64,2.76 -3.96,6.18 -3.96,10.26 0,4.08 1.3,7.44 3.91,10.07 2.61,2.64 5.95,3.96 10.03,3.96 2.88,0 6,-0.99 9.36,-2.97l3.51,7.83 -2.97,1.62c-3.42,1.62 -7.2,2.43 -11.34,2.43 -6.48,0 -11.89,-2.17 -16.24,-6.52 -4.35,-4.35 -6.52,-9.79 -6.52,-16.33 0,-6.66 2.26,-12.22 6.79,-16.69 4.53,-4.47 10.18,-6.7 16.96,-6.7 4.56,0 8.91,1.02 13.04,3.06z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#666666"
-        android:strokeWidth="0.23809522"/>
+        android:strokeWidth="0.23809522" />
     <path
         android:pathData="m268.73,74.15c0,-6.6 2.26,-12.1 6.79,-16.51 4.53,-4.41 10.15,-6.61 16.87,-6.61 6.72,0 12.34,2.17 16.87,6.52 4.53,4.35 6.79,9.88 6.79,16.6 0,6.6 -2.25,12.1 -6.75,16.51 -4.5,4.41 -10.14,6.61 -16.91,6.61 -6.9,0 -12.56,-2.17 -17,-6.52 -4.44,-4.35 -6.66,-9.88 -6.66,-16.6zM292.39,59.66c-3.96,0 -7.27,1.38 -9.94,4.14 -2.67,2.76 -4,6.21 -4,10.35 0,2.16 0.3,4.05 0.9,5.67 0.6,1.62 1.62,3.18 3.06,4.68 2.64,2.7 5.97,4.05 9.99,4.05 3.96,0 7.27,-1.36 9.94,-4.09 2.67,-2.73 4,-6.16 4,-10.3 0,-2.16 -0.3,-4.05 -0.9,-5.67 -0.6,-1.62 -1.62,-3.18 -3.06,-4.68 -2.64,-2.76 -5.97,-4.14 -9.99,-4.14z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#666666"
-        android:strokeWidth="0.23809522"/>
+        android:strokeWidth="0.23809522" />
     <path
         android:pathData="m321.56,96.94v-43.72h9.99v43.72z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#666666"
-        android:strokeWidth="0.23809522"/>
+        android:strokeWidth="0.23809522" />
     <path
         android:pathData="m320.21,43.05c0,-1.62 0.6,-3.03 1.8,-4.23 1.32,-1.14 2.82,-1.71 4.5,-1.71 1.86,0 3.4,0.55 4.63,1.66 1.23,1.11 1.84,2.53 1.84,4.27 0,1.56 -0.63,2.97 -1.89,4.23 -1.32,1.14 -2.85,1.71 -4.59,1.71 -1.68,0 -3.15,-0.55 -4.41,-1.66 -1.26,-1.11 -1.89,-2.53 -1.89,-4.27z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#666666"
-        android:strokeWidth="0.23809522"/>
+        android:strokeWidth="0.23809522" />
     <path
         android:pathData="m338.84,96.94v-43.72h9.99v6.75c3.24,-5.4 7.92,-8.1 14.03,-8.1 5.82,0 10.07,2.25 12.77,6.75 1.32,2.28 1.98,5.82 1.98,10.61v27.71h-9.99v-25.19l-0.27,-4.5c-0.24,-1.98 -1.2,-3.57 -2.88,-4.77 -1.56,-1.26 -3.39,-1.89 -5.49,-1.89 -3,0 -5.49,1.11 -7.47,3.33 -1.8,2.16 -2.7,5.22 -2.7,9.18v23.84z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#666666"
-        android:strokeWidth="0.23809522"/>
+        android:strokeWidth="0.23809522" />
     <path
         android:pathData="m127.32,96.94l0,-64.86l5.13,0l0,64.86z"
         android:strokeColor="#00000000"
         android:fillAlpha="1"
-        android:fillColor="#808080"/>
+        android:fillColor="#808080" />
     <path
         android:pathData="m142.99,96.94l0,-43.72l5.22,0l0,43.72z"
         android:strokeColor="#00000000"
         android:fillAlpha="1"
-        android:fillColor="#808080"/>
+        android:fillColor="#808080" />
     <path
         android:pathData="m154.95,57.06l0,-4.5l5.94,0l0,-12.24l5.22,0l0,12.24l12.14,0l0,4.5l-12.14,0l0,25.82c0,2.28 0.06,3.63 0.18,4.05 0.36,3.84 2.61,5.76 6.75,5.76 1.68,0 3.27,-0.33 4.77,-0.99l1.26,4.59c-2.64,0.66 -4.92,0.99 -6.84,0.99 -3.96,0 -7.02,-1.38 -9.18,-4.14 -0.84,-1.14 -1.44,-2.34 -1.8,-3.6 -0.12,-0.78 -0.21,-1.62 -0.27,-2.52 -0.06,-0.9 -0.09,-2.34 -0.09,-4.32l0,-25.64z"
         android:strokeColor="#00000000"
         android:fillAlpha="1"
-        android:fillColor="#808080"/>
+        android:fillColor="#808080" />
     <path
         android:pathData="m223.69,75.95l-37.96,0c0,2.52 0.42,4.78 1.26,6.79 0.84,2.01 2.1,3.85 3.78,5.53 3.12,3 7.02,4.5 11.7,4.5 7.2,0 12.42,-3.51 15.65,-10.53l4.77,2.43c-4.14,8.4 -10.92,12.6 -20.33,12.6 -6.66,0 -12.04,-2.1 -16.15,-6.3 -4.11,-4.2 -6.16,-9.72 -6.16,-16.56 0,-6.84 2.08,-12.47 6.25,-16.91 4.17,-4.44 9.49,-6.66 15.97,-6.66 6.06,0 11.13,2.08 15.2,6.25 4.08,4.17 6.12,9.43 6.12,15.79l0,1.26zM202.37,55.35c-4.56,0 -8.26,1.38 -11.11,4.14 -2.85,2.76 -4.72,6.75 -5.62,11.96l32.48,0c0,-4.8 -1.48,-8.68 -4.45,-11.65 -2.97,-2.97 -6.73,-4.45 -11.29,-4.45z"
         android:strokeColor="#00000000"
         android:fillAlpha="1"
-        android:fillColor="#808080"/>
+        android:fillColor="#808080" />
     <path
         android:pathData="m139.47,43.05c0,-1.62 0.6,-3.03 1.8,-4.23 1.32,-1.14 2.82,-1.71 4.5,-1.71 1.86,0 3.4,0.55 4.63,1.66 1.23,1.11 1.84,2.53 1.84,4.27 0,1.56 -0.63,2.97 -1.89,4.23 -1.32,1.14 -2.85,1.71 -4.59,1.71 -1.68,0 -3.15,-0.55 -4.41,-1.66 -1.26,-1.11 -1.89,-2.53 -1.89,-4.27z"
         android:strokeColor="#00000000"
         android:fillAlpha="1"
-        android:fillColor="#808080"/>
+        android:fillColor="#808080" />
 </vector>
diff --git a/app/src/main/res/drawable/donation_option_opencollective.xml b/app/src/main/res/drawable/donation_option_opencollective.xml
index 78253aef3..10487f097 100644
--- a/app/src/main/res/drawable/donation_option_opencollective.xml
+++ b/app/src/main/res/drawable/donation_option_opencollective.xml
@@ -4,31 +4,35 @@
     android:height="50dp"
     android:viewportWidth="300"
     android:viewportHeight="50">
-  <path
-      android:pathData="M25.806,0.226L275.806,0.226A24,24 0,0 1,299.806 24.226L299.806,24.226A24,24 0,0 1,275.806 48.226L25.806,48.226A24,24 0,0 1,1.806 24.226L1.806,24.226A24,24 0,0 1,25.806 0.226z"
-      android:fillType="evenOdd">
-    <aapt:attr name="android:fillColor">
-      <gradient 
-          android:startY="2.1030872"
-          android:startX="150.80646"
-          android:endY="48.225807"
-          android:endX="150.80646"
-          android:type="linear">
-        <item android:offset="0" android:color="#FF7ACFFF"/>
-        <item android:offset="1" android:color="#FF4CBEFF"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:pathData="M275.806,24.226m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M287.316,16.252C288.886,18.516 289.806,21.262 289.806,24.226c0,2.963 -0.92,5.71 -2.49,7.974L283.688,28.573C284.401,27.283 284.806,25.803 284.806,24.226 284.806,22.649 284.401,21.168 283.688,19.879l3.627,-3.627zM283.78,12.717 L280.153,16.345C278.863,15.631 277.383,15.226 275.806,15.226c-4.97,0 -9,4.03 -9,9 0,4.97 4.03,9 9,9 1.577,0 3.058,-0.405 4.347,-1.118l3.627,3.627C281.516,37.306 278.77,38.226 275.806,38.226 268.074,38.226 261.806,31.958 261.806,24.226 261.806,16.494 268.074,10.226 275.806,10.226c2.963,0 5.71,0.92 7.974,2.49z"
-      android:fillColor="#3faff0"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M287.316,16.252C288.886,18.516 289.806,21.262 289.806,24.226c0,2.963 -0.92,5.71 -2.49,7.974L283.688,28.573C284.401,27.283 284.806,25.803 284.806,24.226 284.806,22.649 284.401,21.168 283.688,19.879l3.627,-3.627z"
-      android:fillColor="#b8d5e6"
-      android:fillType="evenOdd"/>
+    <path
+        android:pathData="M25.806,0.226L275.806,0.226A24,24 0,0 1,299.806 24.226L299.806,24.226A24,24 0,0 1,275.806 48.226L25.806,48.226A24,24 0,0 1,1.806 24.226L1.806,24.226A24,24 0,0 1,25.806 0.226z"
+        android:fillType="evenOdd">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startY="2.1030872"
+                android:startX="150.80646"
+                android:endY="48.225807"
+                android:endX="150.80646"
+                android:type="linear">
+                <item
+                    android:offset="0"
+                    android:color="#FF7ACFFF" />
+                <item
+                    android:offset="1"
+                    android:color="#FF4CBEFF" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M275.806,24.226m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd" />
+    <path
+        android:pathData="M287.316,16.252C288.886,18.516 289.806,21.262 289.806,24.226c0,2.963 -0.92,5.71 -2.49,7.974L283.688,28.573C284.401,27.283 284.806,25.803 284.806,24.226 284.806,22.649 284.401,21.168 283.688,19.879l3.627,-3.627zM283.78,12.717 L280.153,16.345C278.863,15.631 277.383,15.226 275.806,15.226c-4.97,0 -9,4.03 -9,9 0,4.97 4.03,9 9,9 1.577,0 3.058,-0.405 4.347,-1.118l3.627,3.627C281.516,37.306 278.77,38.226 275.806,38.226 268.074,38.226 261.806,31.958 261.806,24.226 261.806,16.494 268.074,10.226 275.806,10.226c2.963,0 5.71,0.92 7.974,2.49z"
+        android:fillColor="#3faff0"
+        android:fillType="evenOdd" />
+    <path
+        android:pathData="M287.316,16.252C288.886,18.516 289.806,21.262 289.806,24.226c0,2.963 -0.92,5.71 -2.49,7.974L283.688,28.573C284.401,27.283 284.806,25.803 284.806,24.226 284.806,22.649 284.401,21.168 283.688,19.879l3.627,-3.627z"
+        android:fillColor="#b8d5e6"
+        android:fillType="evenOdd" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_access_time.xml b/app/src/main/res/drawable/ic_access_time.xml
index 9cd21dd87..92991c239 100644
--- a/app/src/main/res/drawable/ic_access_time.xml
+++ b/app/src/main/res/drawable/ic_access_time.xml
@@ -1,15 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:width="36dp"
-        android:height="36dp"
-        android:tint="?attr/colorControlNormal"
-        android:viewportWidth="24"
-        android:viewportHeight="24"
-        tools:ignore="VectorRaster">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="36dp"
+    android:height="36dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    tools:ignore="VectorRaster">
     <path
-            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,8z"
-            android:fillColor="#FFFFFF" />
+        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,8z"
+        android:fillColor="#FFFFFF" />
     <path
-            android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"
-            android:fillColor="#FFFFFF" />
+        android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"
+        android:fillColor="#FFFFFF" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index b38b4e6c6..472ec42ff 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FFFFFF"
-      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"/>
+    <path
+        android:fillColor="#FFFFFF"
+        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_antifeature_ads.xml b/app/src/main/res/drawable/ic_antifeature_ads.xml
index b43689753..99eb6f5e3 100644
--- a/app/src/main/res/drawable/ic_antifeature_ads.xml
+++ b/app/src/main/res/drawable/ic_antifeature_ads.xml
@@ -1,8 +1,15 @@
 <vector xmlns:tools="http://schemas.android.com/tools"
-    android:height="24dp" android:viewportHeight="48"
+    android:height="24dp"
+    android:viewportHeight="48"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="48"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     tools:ignore="VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M32.56,11.19a3,3 0,0 0,-3.07 0.44h0a44.91,44.91 0,0 1,-13.55 8.07,2.67 2.67,0 0,0 -2.51,-2.08H8.76a2.84,2.84 0,0 0,-2.64 3.06v6A3.08,3.08 0,0 0,7.66 29.5c0.28,7 2.5,11.65 4.05,12.8a2.65,2.65 0,0 0,1.61 0.47,7.75 7.75,0 0,0 3.17,-0.89c1.55,-0.79 2.33,-1.67 2.32,-2.64A6.52,6.52 0,0 0,18 36.92,25 25,0 0,1 16.5,33a14.59,14.59 0,0 1,-0.44 -4.38,1.28 1.28,0 0,0 0,-0.37c2.13,0.41 7,1.91 13.44,7.49a3.13,3.13 0,0 0,2 0.73,2.63 2.63,0 0,0 1.1,-0.24c0.62,-0.28 1.66,-1.08 1.66,-3.19V14.34A3.13,3.13 0,0 0,32.56 11.19ZM8.71,20.69a0.78,0.78 0,0 1,0.13 -0.47h4.5a0.78,0.78 0,0 1,0.13 0.47v6a0.78,0.78 0,0 1,-0.13 0.47H8.85a0.78,0.78 0,0 1,-0.13 -0.47ZM16.13,39.1a5.6,5.6 0,0 1,-2.92 1.09c-0.63,-0.58 -2.62,-4.2 -2.94,-10.41h3.18A17.66,17.66 0,0 0,14 33.62,27.5 27.5,0 0,0 15.65,38C15.82,38.36 16,38.8 16.13,39.1ZM31.63,33a1.67,1.67 0,0 1,-0.14 0.83,0.47 0.47,0 0,1 -0.31,-0.09C24,27.52 18.51,26 16.07,25.6V22.37c2.44,-0.64 8.75,-3.41 15.09,-8.75h0a0.42,0.42 0,0 1,0.3 -0.07s0.16,0.24 0.16,0.8Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M40.86,13.17 L44,6.11a1.3,1.3 0,0 0,-2.37 -1l-4.72,10.7h5.27l-3.62,7A1.3,1.3 0,1 0,40.83 24l5.56,-10.82Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M32.56,11.19a3,3 0,0 0,-3.07 0.44h0a44.91,44.91 0,0 1,-13.55 8.07,2.67 2.67,0 0,0 -2.51,-2.08H8.76a2.84,2.84 0,0 0,-2.64 3.06v6A3.08,3.08 0,0 0,7.66 29.5c0.28,7 2.5,11.65 4.05,12.8a2.65,2.65 0,0 0,1.61 0.47,7.75 7.75,0 0,0 3.17,-0.89c1.55,-0.79 2.33,-1.67 2.32,-2.64A6.52,6.52 0,0 0,18 36.92,25 25,0 0,1 16.5,33a14.59,14.59 0,0 1,-0.44 -4.38,1.28 1.28,0 0,0 0,-0.37c2.13,0.41 7,1.91 13.44,7.49a3.13,3.13 0,0 0,2 0.73,2.63 2.63,0 0,0 1.1,-0.24c0.62,-0.28 1.66,-1.08 1.66,-3.19V14.34A3.13,3.13 0,0 0,32.56 11.19ZM8.71,20.69a0.78,0.78 0,0 1,0.13 -0.47h4.5a0.78,0.78 0,0 1,0.13 0.47v6a0.78,0.78 0,0 1,-0.13 0.47H8.85a0.78,0.78 0,0 1,-0.13 -0.47ZM16.13,39.1a5.6,5.6 0,0 1,-2.92 1.09c-0.63,-0.58 -2.62,-4.2 -2.94,-10.41h3.18A17.66,17.66 0,0 0,14 33.62,27.5 27.5,0 0,0 15.65,38C15.82,38.36 16,38.8 16.13,39.1ZM31.63,33a1.67,1.67 0,0 1,-0.14 0.83,0.47 0.47,0 0,1 -0.31,-0.09C24,27.52 18.51,26 16.07,25.6V22.37c2.44,-0.64 8.75,-3.41 15.09,-8.75h0a0.42,0.42 0,0 1,0.3 -0.07s0.16,0.24 0.16,0.8Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M40.86,13.17 L44,6.11a1.3,1.3 0,0 0,-2.37 -1l-4.72,10.7h5.27l-3.62,7A1.3,1.3 0,1 0,40.83 24l5.56,-10.82Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml b/app/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml
index 134bfb20c..0b231666d 100644
--- a/app/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml
+++ b/app/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml
@@ -1,10 +1,21 @@
 <vector xmlns:tools="http://schemas.android.com/tools"
-    android:height="24dp" android:viewportHeight="48"
+    android:height="24dp"
+    android:viewportHeight="48"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="48"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     tools:ignore="VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M36.24,30.79l-2.18,-2.33A10,10 0,0 0,30.4 26a9.64,9.64 0,0 0,-1.28 -2.77A1.3,1.3 0,1 0,27 24.63a7.38,7.38 0,0 1,0.42 0.73,6.59 6.59,0 0,0 -4.63,1.71 6.51,6.51 0,0 0,-2 4.22,7.7 7.7,0 0,1 -1.48,-1.21l-2.18,-2.33A7.76,7.76 0,0 1,16 26.16,6.37 6.37,0 0,0 22.36,20a7.38,7.38 0,0 1,0.69 0.46,1.3 1.3,0 1,0 1.59,-2.05A9.65,9.65 0,0 0,22 16.92a10,10 0,0 0,-2.25 -3.83l-2.18,-2.33C14.26,7.24 9.18,6.62 6.23,9.37a6.74,6.74 0,0 0,-2 5.53,9.63 9.63,0 0,0 2.64,5.84L9,23.07a9.94,9.94 0,0 0,3.91 2.59,10.05 10.05,0 0,0 2.26,3.84l2.18,2.33A10,10 0,0 0,21 34.34a10,10 0,0 0,2.33 4.1l2.18,2.33a9.4,9.4 0,0 0,6.75 3.11,6.58 6.58,0 0,0 4.55,-1.72 6.74,6.74 0,0 0,2 -5.53A9.63,9.63 0,0 0,36.24 30.79ZM19.77,19.11a4.2,4.2 0,0 1,-1.22 3.46,4.18 4.18,0 0,1 -3.42,1s0,0 0,-0.06A4.2,4.2 0,0 1,16.35 20a4.2,4.2 0,0 1,3.41 -1S19.77,19.09 19.77,19.11ZM8.73,19a7,7 0,0 1,-2 -4.25A4.2,4.2 0,0 1,8 11.26a4,4 0,0 1,2.8 -1,6.84 6.84,0 0,1 4.85,2.3l2.18,2.33a7.7,7.7 0,0 1,1.11 1.57,6.4 6.4,0 0,0 -6.39,6.19 7.69,7.69 0,0 1,-1.63 -1.31ZM24.52,29a4.23,4.23 0,0 1,3.59 -1,3.94 3.94,0 0,1 -4.81,4.31A4.17,4.17 0,0 1,24.52 29ZM35.07,40.3C33.17,42 29.74,41.48 27.43,39l-2.18,-2.33a7.68,7.68 0,0 1,-1.2 -1.73h0.06A6.39,6.39 0,0 0,30.68 29a7.7,7.7 0,0 1,1.49 1.22l2.18,2.33a7,7 0,0 1,2 4.25A4.2,4.2 0,0 1,35.07 40.26Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M41.09,19.1a1.59,1.59 0,0 0,-1.87 -1.21l-4.57,1a1.54,1.54 0,0 0,-0.57 0.24h0a1.58,1.58 0,0 0,1.27 2.83l4.57,-1A1.55,1.55 0,0 0,41.09 19.1Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M33.93,16.3l0.06,-0.05 3.48,-3.1a1.58,1.58 0,0 0,-2 -2.41l-0.06,0.05 -3.48,3.1a1.58,1.58 0,0 0,2 2.41Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M27.14,14.49A1.54,1.54 0,0 0,29 13.34h0l1,-4.56a1.59,1.59 0,0 0,-1.15 -1.91,1.55 1.55,0 0,0 -1.49,0.4h0A1.54,1.54 0,0 0,27 8l-1,4.56A1.59,1.59 0,0 0,27.14 14.49Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M36.24,30.79l-2.18,-2.33A10,10 0,0 0,30.4 26a9.64,9.64 0,0 0,-1.28 -2.77A1.3,1.3 0,1 0,27 24.63a7.38,7.38 0,0 1,0.42 0.73,6.59 6.59,0 0,0 -4.63,1.71 6.51,6.51 0,0 0,-2 4.22,7.7 7.7,0 0,1 -1.48,-1.21l-2.18,-2.33A7.76,7.76 0,0 1,16 26.16,6.37 6.37,0 0,0 22.36,20a7.38,7.38 0,0 1,0.69 0.46,1.3 1.3,0 1,0 1.59,-2.05A9.65,9.65 0,0 0,22 16.92a10,10 0,0 0,-2.25 -3.83l-2.18,-2.33C14.26,7.24 9.18,6.62 6.23,9.37a6.74,6.74 0,0 0,-2 5.53,9.63 9.63,0 0,0 2.64,5.84L9,23.07a9.94,9.94 0,0 0,3.91 2.59,10.05 10.05,0 0,0 2.26,3.84l2.18,2.33A10,10 0,0 0,21 34.34a10,10 0,0 0,2.33 4.1l2.18,2.33a9.4,9.4 0,0 0,6.75 3.11,6.58 6.58,0 0,0 4.55,-1.72 6.74,6.74 0,0 0,2 -5.53A9.63,9.63 0,0 0,36.24 30.79ZM19.77,19.11a4.2,4.2 0,0 1,-1.22 3.46,4.18 4.18,0 0,1 -3.42,1s0,0 0,-0.06A4.2,4.2 0,0 1,16.35 20a4.2,4.2 0,0 1,3.41 -1S19.77,19.09 19.77,19.11ZM8.73,19a7,7 0,0 1,-2 -4.25A4.2,4.2 0,0 1,8 11.26a4,4 0,0 1,2.8 -1,6.84 6.84,0 0,1 4.85,2.3l2.18,2.33a7.7,7.7 0,0 1,1.11 1.57,6.4 6.4,0 0,0 -6.39,6.19 7.69,7.69 0,0 1,-1.63 -1.31ZM24.52,29a4.23,4.23 0,0 1,3.59 -1,3.94 3.94,0 0,1 -4.81,4.31A4.17,4.17 0,0 1,24.52 29ZM35.07,40.3C33.17,42 29.74,41.48 27.43,39l-2.18,-2.33a7.68,7.68 0,0 1,-1.2 -1.73h0.06A6.39,6.39 0,0 0,30.68 29a7.7,7.7 0,0 1,1.49 1.22l2.18,2.33a7,7 0,0 1,2 4.25A4.2,4.2 0,0 1,35.07 40.26Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M41.09,19.1a1.59,1.59 0,0 0,-1.87 -1.21l-4.57,1a1.54,1.54 0,0 0,-0.57 0.24h0a1.58,1.58 0,0 0,1.27 2.83l4.57,-1A1.55,1.55 0,0 0,41.09 19.1Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M33.93,16.3l0.06,-0.05 3.48,-3.1a1.58,1.58 0,0 0,-2 -2.41l-0.06,0.05 -3.48,3.1a1.58,1.58 0,0 0,2 2.41Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M27.14,14.49A1.54,1.54 0,0 0,29 13.34h0l1,-4.56a1.59,1.59 0,0 0,-1.15 -1.91,1.55 1.55,0 0,0 -1.49,0.4h0A1.54,1.54 0,0 0,27 8l-1,4.56A1.59,1.59 0,0 0,27.14 14.49Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_antifeature_knownvuln.xml b/app/src/main/res/drawable/ic_antifeature_knownvuln.xml
index 61138cc8d..cfa81345a 100644
--- a/app/src/main/res/drawable/ic_antifeature_knownvuln.xml
+++ b/app/src/main/res/drawable/ic_antifeature_knownvuln.xml
@@ -1,8 +1,15 @@
 <vector xmlns:tools="http://schemas.android.com/tools"
-    android:height="24dp" android:viewportHeight="48"
+    android:height="24dp"
+    android:viewportHeight="48"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="48"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     tools:ignore="VectorRaster">
-    <path android:fillColor="#FF000000" android:pathData="M37.55,32.13a1.27,1.27 0,0 0,-0.43 0v-1.5h7.94a1.3,1.3 0,0 0,0 -2.59L37.12,28.04L37.12,26.71a1.24,1.24 0,0 0,0.18 0l0.25,0c3.44,-0.67 7.38,-5 8.61,-9.4a1.3,1.3 0,1 0,-2.5 -0.7c-1,3.7 -4.35,7.06 -6.55,7.53L37.11,20.58a1.3,1.3 0,0 0,-1.3 -1.3L33.54,19.28c0,-1.14 0,-3.88 0,-5a9.24,9.24 0,0 0,-18.47 0,1.3 1.3,0 1,0 2.59,0 6.64,6.64 0,0 1,13.29 0c0,1.08 0,3.81 0,5L13.14,19.28a1.3,1.3 0,0 0,-1.3 1.3v3.57c-2.2,-0.49 -5.51,-3.84 -6.53,-7.53a1.3,1.3 0,1 0,-2.5 0.7C4,21.75 8,26.06 11.43,26.72l0.25,0a1.24,1.24 0,0 0,0.17 0L11.85,28L3.65,28a1.3,1.3 0,1 0,0 2.59h8.2v1.5a1.26,1.26 0,0 0,-0.42 0c-3.44,0.67 -7.38,5 -8.61,9.4a1.3,1.3 0,1 0,2.5 0.7c1,-3.69 4.33,-7 6.53,-7.53v2.84a1.3,1.3 0,0 0,1.3 1.3L35.82,38.8a1.3,1.3 0,0 0,1.3 -1.3L37.12,34.69c2.2,0.48 5.52,3.83 6.55,7.53a1.3,1.3 0,1 0,2.5 -0.7C44.93,37.1 41,32.79 37.55,32.13ZM34.55,36.24L14.44,36.24L14.44,21.88L34.52,21.88Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M24.5,28.82m-2.44,0a2.44,2.44 0,1 1,4.88 0a2.44,2.44 0,1 1,-4.88 0"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M37.55,32.13a1.27,1.27 0,0 0,-0.43 0v-1.5h7.94a1.3,1.3 0,0 0,0 -2.59L37.12,28.04L37.12,26.71a1.24,1.24 0,0 0,0.18 0l0.25,0c3.44,-0.67 7.38,-5 8.61,-9.4a1.3,1.3 0,1 0,-2.5 -0.7c-1,3.7 -4.35,7.06 -6.55,7.53L37.11,20.58a1.3,1.3 0,0 0,-1.3 -1.3L33.54,19.28c0,-1.14 0,-3.88 0,-5a9.24,9.24 0,0 0,-18.47 0,1.3 1.3,0 1,0 2.59,0 6.64,6.64 0,0 1,13.29 0c0,1.08 0,3.81 0,5L13.14,19.28a1.3,1.3 0,0 0,-1.3 1.3v3.57c-2.2,-0.49 -5.51,-3.84 -6.53,-7.53a1.3,1.3 0,1 0,-2.5 0.7C4,21.75 8,26.06 11.43,26.72l0.25,0a1.24,1.24 0,0 0,0.17 0L11.85,28L3.65,28a1.3,1.3 0,1 0,0 2.59h8.2v1.5a1.26,1.26 0,0 0,-0.42 0c-3.44,0.67 -7.38,5 -8.61,9.4a1.3,1.3 0,1 0,2.5 0.7c1,-3.69 4.33,-7 6.53,-7.53v2.84a1.3,1.3 0,0 0,1.3 1.3L35.82,38.8a1.3,1.3 0,0 0,1.3 -1.3L37.12,34.69c2.2,0.48 5.52,3.83 6.55,7.53a1.3,1.3 0,1 0,2.5 -0.7C44.93,37.1 41,32.79 37.55,32.13ZM34.55,36.24L14.44,36.24L14.44,21.88L34.52,21.88Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M24.5,28.82m-2.44,0a2.44,2.44 0,1 1,4.88 0a2.44,2.44 0,1 1,-4.88 0" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreeadd.xml b/app/src/main/res/drawable/ic_antifeature_nonfreeadd.xml
index e61ab095b..adca82ca4 100644
--- a/app/src/main/res/drawable/ic_antifeature_nonfreeadd.xml
+++ b/app/src/main/res/drawable/ic_antifeature_nonfreeadd.xml
@@ -1,8 +1,19 @@
-<vector android:height="24dp" android:viewportHeight="48"
+<vector android:height="24dp"
+    android:viewportHeight="48"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M32.83,26.35H29.65a2.68,2.68 0,0 0,-3 -2.27h-0.18c-2.4,0 -3.35,1.82 -3.43,4.5s1.54,4.54 3.43,4.5a2.73,2.73 0,0 0,3 -2.44h3.56c-0.59,3.34 -3,5.29 -6.53,5.3 -3.94,0 -6.8,-3.29 -6.8,-7.36 0,-4.34 2.85,-7.36 6.8,-7.36H27c2.46,0 5.81,1.77 5.81,5.13Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M16.28,23.15h0A1.87,1.87 0,0 1,18.14 25h0a1.87,1.87 0,0 1,-1.86 1.87h0A1.87,1.87 0,0 1,14.42 25h0A1.87,1.87 0,0 1,16.28 23.15Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M16.28,29.7h0a1.87,1.87 0,0 1,1.86 1.87h0a1.87,1.87 0,0 1,-1.86 1.87h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,16.28 29.7Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M11,41.81a1.5,1.5 0,0 1,-1.5 -1.5L9.5,16.24a1.5,1.5 0,0 1,1.5 -1.5h8.71l0,-0.82A4.54,4.54 0,0 1,17.9 10.6,3.62 3.62,0 0,1 19,8a7,7 0,0 1,5.08 -1.81c5.65,0 6.35,3.1 6.38,4.42A4.61,4.61 0,0 1,28.76 14v0.79h8.19a1.5,1.5 0,0 1,1.5 1.49l0,7.6a1.3,1.3 0,0 1,-1.29 1.3h0a1.3,1.3 0,0 1,-1.3 -1.29l0,-6.51h-8.4a1.3,1.3 0,0 1,-1.3 -1.3v-2.7a1.3,1.3 0,0 1,0.55 -1.06c0.49,-0.35 1.17,-1.1 1.15,-1.59 0,-1.25 -1.32,-1.89 -3.8,-1.9a4.62,4.62 0,0 0,-3.22 1,1.08 1.08,0 0,0 -0.36,0.73c0,0.88 1.09,1.55 1.1,1.55a1.3,1.3 0,0 1,0.65 1.05L22.4,16a1.3,1.3 0,0 1,-1.29 1.37h-9L12.11,39.21l23.74,0c0,-0.33 0,-0.74 0,-1.21 0,-1.43 0,-3.4 0,-5.17a1.3,1.3 0,0 1,1.29 -1.3h0a1.3,1.3 0,0 1,1.3 1.29c0,1.79 0,3.77 0,5.21 0,0.72 0,1.3 0,1.67 0,0.07 0,0.32 0,0.55 -0.11,1.45 -1.09,1.56 -1.39,1.56l-26,0ZM11,39.22h0ZM37,39.22h0Z"/>
+    android:viewportWidth="48"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M32.83,26.35H29.65a2.68,2.68 0,0 0,-3 -2.27h-0.18c-2.4,0 -3.35,1.82 -3.43,4.5s1.54,4.54 3.43,4.5a2.73,2.73 0,0 0,3 -2.44h3.56c-0.59,3.34 -3,5.29 -6.53,5.3 -3.94,0 -6.8,-3.29 -6.8,-7.36 0,-4.34 2.85,-7.36 6.8,-7.36H27c2.46,0 5.81,1.77 5.81,5.13Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.28,23.15h0A1.87,1.87 0,0 1,18.14 25h0a1.87,1.87 0,0 1,-1.86 1.87h0A1.87,1.87 0,0 1,14.42 25h0A1.87,1.87 0,0 1,16.28 23.15Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.28,29.7h0a1.87,1.87 0,0 1,1.86 1.87h0a1.87,1.87 0,0 1,-1.86 1.87h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,16.28 29.7Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,41.81a1.5,1.5 0,0 1,-1.5 -1.5L9.5,16.24a1.5,1.5 0,0 1,1.5 -1.5h8.71l0,-0.82A4.54,4.54 0,0 1,17.9 10.6,3.62 3.62,0 0,1 19,8a7,7 0,0 1,5.08 -1.81c5.65,0 6.35,3.1 6.38,4.42A4.61,4.61 0,0 1,28.76 14v0.79h8.19a1.5,1.5 0,0 1,1.5 1.49l0,7.6a1.3,1.3 0,0 1,-1.29 1.3h0a1.3,1.3 0,0 1,-1.3 -1.29l0,-6.51h-8.4a1.3,1.3 0,0 1,-1.3 -1.3v-2.7a1.3,1.3 0,0 1,0.55 -1.06c0.49,-0.35 1.17,-1.1 1.15,-1.59 0,-1.25 -1.32,-1.89 -3.8,-1.9a4.62,4.62 0,0 0,-3.22 1,1.08 1.08,0 0,0 -0.36,0.73c0,0.88 1.09,1.55 1.1,1.55a1.3,1.3 0,0 1,0.65 1.05L22.4,16a1.3,1.3 0,0 1,-1.29 1.37h-9L12.11,39.21l23.74,0c0,-0.33 0,-0.74 0,-1.21 0,-1.43 0,-3.4 0,-5.17a1.3,1.3 0,0 1,1.29 -1.3h0a1.3,1.3 0,0 1,1.3 1.29c0,1.79 0,3.77 0,5.21 0,0.72 0,1.3 0,1.67 0,0.07 0,0.32 0,0.55 -0.11,1.45 -1.09,1.56 -1.39,1.56l-26,0ZM11,39.22h0ZM37,39.22h0Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreeassets.xml b/app/src/main/res/drawable/ic_antifeature_nonfreeassets.xml
index bee58b812..20619b4ee 100644
--- a/app/src/main/res/drawable/ic_antifeature_nonfreeassets.xml
+++ b/app/src/main/res/drawable/ic_antifeature_nonfreeassets.xml
@@ -1,8 +1,19 @@
-<vector android:height="24dp" android:viewportHeight="48"
+<vector android:height="24dp"
+    android:viewportHeight="48"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M17.08,18.06h0a1.87,1.87 0,0 1,1.86 1.87h0a1.87,1.87 0,0 1,-1.86 1.87h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,17.08 18.06Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M17.08,26.28h0a1.87,1.87 0,0 1,1.86 1.87h0A1.87,1.87 0,0 1,17.08 30h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,17.08 26.28Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M33.18,22H30a2.68,2.68 0,0 0,-3 -2.27h-0.18c-2.4,0 -3.35,1.82 -3.43,4.5s1.54,4.54 3.43,4.5a2.73,2.73 0,0 0,3 -2.44h3.56c-0.59,3.34 -3,5.29 -6.53,5.3 -3.94,0 -6.8,-3.29 -6.8,-7.36 0,-4.34 2.85,-7.36 6.8,-7.36h0.43c2.46,0 5.81,1.77 5.81,5.13Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M39.29,7.11h-30A3.85,3.85 0,0 0,6.44 8.37h0v0a3.59,3.59 0,0 0,-0.9 2.37L5.54,37.63a3.75,3.75 0,0 0,3.8 3.68h30a3.75,3.75 0,0 0,3.8 -3.68L43.14,10.79A3.75,3.75 0,0 0,39.29 7.11ZM39.48,9.71a1.86,1.86 0,1 1,-1.85 1.86A1.85,1.85 0,0 1,39.48 9.71ZM39.48,17.93a1.86,1.86 0,1 1,-1.85 1.86A1.85,1.85 0,0 1,39.48 17.94ZM9.06,38.34h0a1.87,1.87 0,0 1,0 -3.75h0a1.87,1.87 0,0 1,0 3.75ZM9.06,30.05h0a1.87,1.87 0,0 1,0 -3.75h0a1.87,1.87 0,0 1,0 3.75ZM9.06,21.76h0a1.87,1.87 0,0 1,0 -3.75h0a1.87,1.87 0,0 1,0 3.75ZM9.06,13.47h0a1.87,1.87 0,0 1,0 -3.75h0a1.87,1.87 0,0 1,0 3.75ZM36,38.71L12.23,38.71L12.23,9.7L36,9.7ZM39.51,38.33a1.87,1.87 0,1 1,1.86 -1.87A1.87,1.87 0,0 1,39.48 38.34ZM39.51,30.04a1.87,1.87 0,1 1,1.86 -1.87A1.87,1.87 0,0 1,39.48 30Z"/>
+    android:viewportWidth="48"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.08,18.06h0a1.87,1.87 0,0 1,1.86 1.87h0a1.87,1.87 0,0 1,-1.86 1.87h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,17.08 18.06Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.08,26.28h0a1.87,1.87 0,0 1,1.86 1.87h0A1.87,1.87 0,0 1,17.08 30h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,17.08 26.28Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M33.18,22H30a2.68,2.68 0,0 0,-3 -2.27h-0.18c-2.4,0 -3.35,1.82 -3.43,4.5s1.54,4.54 3.43,4.5a2.73,2.73 0,0 0,3 -2.44h3.56c-0.59,3.34 -3,5.29 -6.53,5.3 -3.94,0 -6.8,-3.29 -6.8,-7.36 0,-4.34 2.85,-7.36 6.8,-7.36h0.43c2.46,0 5.81,1.77 5.81,5.13Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M39.29,7.11h-30A3.85,3.85 0,0 0,6.44 8.37h0v0a3.59,3.59 0,0 0,-0.9 2.37L5.54,37.63a3.75,3.75 0,0 0,3.8 3.68h30a3.75,3.75 0,0 0,3.8 -3.68L43.14,10.79A3.75,3.75 0,0 0,39.29 7.11ZM39.48,9.71a1.86,1.86 0,1 1,-1.85 1.86A1.85,1.85 0,0 1,39.48 9.71ZM39.48,17.93a1.86,1.86 0,1 1,-1.85 1.86A1.85,1.85 0,0 1,39.48 17.94ZM9.06,38.34h0a1.87,1.87 0,0 1,0 -3.75h0a1.87,1.87 0,0 1,0 3.75ZM9.06,30.05h0a1.87,1.87 0,0 1,0 -3.75h0a1.87,1.87 0,0 1,0 3.75ZM9.06,21.76h0a1.87,1.87 0,0 1,0 -3.75h0a1.87,1.87 0,0 1,0 3.75ZM9.06,13.47h0a1.87,1.87 0,0 1,0 -3.75h0a1.87,1.87 0,0 1,0 3.75ZM36,38.71L12.23,38.71L12.23,9.7L36,9.7ZM39.51,38.33a1.87,1.87 0,1 1,1.86 -1.87A1.87,1.87 0,0 1,39.48 38.34ZM39.51,30.04a1.87,1.87 0,1 1,1.86 -1.87A1.87,1.87 0,0 1,39.48 30Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreedep.xml b/app/src/main/res/drawable/ic_antifeature_nonfreedep.xml
index f2498d171..2b37b8d8d 100644
--- a/app/src/main/res/drawable/ic_antifeature_nonfreedep.xml
+++ b/app/src/main/res/drawable/ic_antifeature_nonfreedep.xml
@@ -1,9 +1,22 @@
-<vector android:height="24dp" android:viewportHeight="48"
+<vector android:height="24dp"
+    android:viewportHeight="48"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M9.38,17.97a1.49,1.46 0,1 0,2.98 0a1.49,1.46 0,1 0,-2.98 0z"/>
-    <path android:fillColor="#FF000000" android:pathData="M34.73,9.72a1.3,1.3 0,0 0,-1.3 1.3V33.07l-7.19,-5.52a12,12 0,1 0,-1.67 2l8.29,6.37a1.27,1.27 0,0 0,0.56 0.23v6.4a1.3,1.3 0,1 0,2.59 0V11A1.3,1.3 0,0 0,34.73 9.72ZM16.33,30.27a9.33,9.33 0,1 1,9.33 -9.33A9.34,9.34 0,0 1,16.33 30.27Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M41.67,9.72a1.3,1.3 0,0 0,-1.3 1.3V42.54a1.3,1.3 0,1 0,2.59 0V11A1.3,1.3 0,0 0,41.67 9.72Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M9.38,23.81a1.49,1.46 0,1 0,2.98 0a1.49,1.46 0,1 0,-2.98 0z"/>
-    <path android:fillColor="#FF000000" android:pathData="M20.08,22.43A1.74,1.74 0,0 1,18.13 24h0a1.93,1.93 0,0 1,-1.38 -0.59,3.12 3.12,0 0,1 -0.78,-2.32c0.06,-1.94 0.8,-2.92 2.2,-2.92h0.18a1.68,1.68 0,0 1,1.83 1.44v0.07h2.28v-0.09c0,-2.34 -2.36,-3.48 -4,-3.5h-0.28c-2.72,0 -4.62,2.05 -4.62,5A5.23,5.23 0,0 0,15 24.77a4.41,4.41 0,0 0,3.14 1.29h0a4.19,4.19 0,0 0,4.43 -3.6l0,-0.1H20.09Z"/>
+    android:viewportWidth="48"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9.38,17.97a1.49,1.46 0,1 0,2.98 0a1.49,1.46 0,1 0,-2.98 0z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M34.73,9.72a1.3,1.3 0,0 0,-1.3 1.3V33.07l-7.19,-5.52a12,12 0,1 0,-1.67 2l8.29,6.37a1.27,1.27 0,0 0,0.56 0.23v6.4a1.3,1.3 0,1 0,2.59 0V11A1.3,1.3 0,0 0,34.73 9.72ZM16.33,30.27a9.33,9.33 0,1 1,9.33 -9.33A9.34,9.34 0,0 1,16.33 30.27Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M41.67,9.72a1.3,1.3 0,0 0,-1.3 1.3V42.54a1.3,1.3 0,1 0,2.59 0V11A1.3,1.3 0,0 0,41.67 9.72Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9.38,23.81a1.49,1.46 0,1 0,2.98 0a1.49,1.46 0,1 0,-2.98 0z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.08,22.43A1.74,1.74 0,0 1,18.13 24h0a1.93,1.93 0,0 1,-1.38 -0.59,3.12 3.12,0 0,1 -0.78,-2.32c0.06,-1.94 0.8,-2.92 2.2,-2.92h0.18a1.68,1.68 0,0 1,1.83 1.44v0.07h2.28v-0.09c0,-2.34 -2.36,-3.48 -4,-3.5h-0.28c-2.72,0 -4.62,2.05 -4.62,5A5.23,5.23 0,0 0,15 24.77a4.41,4.41 0,0 0,3.14 1.29h0a4.19,4.19 0,0 0,4.43 -3.6l0,-0.1H20.09Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreenet.xml b/app/src/main/res/drawable/ic_antifeature_nonfreenet.xml
index a208ae22c..4d726f091 100644
--- a/app/src/main/res/drawable/ic_antifeature_nonfreenet.xml
+++ b/app/src/main/res/drawable/ic_antifeature_nonfreenet.xml
@@ -1,14 +1,37 @@
-<vector android:height="24dp" android:viewportHeight="48"
+<vector android:height="24dp"
+    android:viewportHeight="48"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M13.65,31.74L13,31.74a10.63,10.63 0,0 1,0 -21.25C15.18,7.25 19.22,4.1 23.66,3.9h0c6.23,-0.23 11.08,3.49 13.09,10a8.91,8.91 0,0 1,0 17.82L13.65,31.72ZM13.21,13.06A8,8 0,0 0,13 29.14L36.69,29.14a6.32,6.32 0,0 0,-0.23 -12.64l-0.54,0 -1.11,0.11 -0.27,-1.08c-0.72,-2.82 -3.19,-9.35 -10.76,-9.07h0c-3.23,0.14 -7,2.61 -9.06,6l-0.42,0.67 -0.78,-0.06Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M15.33,14.71h0a1.87,1.87 0,0 1,1.86 1.87h0a1.87,1.87 0,0 1,-1.86 1.87h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,15.33 14.71Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M15.33,20.77h0a1.87,1.87 0,0 1,1.86 1.87h0a1.87,1.87 0,0 1,-1.86 1.87h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,15.33 20.77Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M36.27,39.92a1.3,1.3 0,0 1,-1.1 -2l2.28,-3.68a1.3,1.3 0,1 1,2.2 1.37l-2.28,3.68A1.3,1.3 0,0 1,36.27 39.92Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M27.92,43.41a1.3,1.3 0,0 1,-1.1 -2l2.28,-3.68a1.3,1.3 0,1 1,2.2 1.37L29,42.79A1.3,1.3 0,0 1,27.92 43.41Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M22.17,39.92a1.3,1.3 0,0 1,-1.1 -2l2.28,-3.68a1.3,1.3 0,1 1,2.2 1.37l-2.28,3.68A1.3,1.3 0,0 1,22.17 39.92Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M13.83,43.41a1.3,1.3 0,0 1,-1.1 -2L15,37.75a1.3,1.3 0,1 1,2.2 1.37l-2.28,3.68A1.3,1.3 0,0 1,13.83 43.41Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M8.64,39.84a1.3,1.3 0,0 1,-1.1 -2l2.28,-3.68A1.3,1.3 0,0 1,12 35.55L9.74,39.23A1.3,1.3 0,0 1,8.64 39.84Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M30.28,17.37H27.56A2.3,2.3 0,0 0,25 15.43h-0.15c-2.06,0 -2.87,1.56 -2.94,3.85s1.32,3.89 2.94,3.85A2.34,2.34 0,0 0,27.48 21h3.05a5.28,5.28 0,0 1,-5.59 4.54c-3.38,0 -5.82,-2.82 -5.82,-6.3 0,-3.72 2.44,-6.3 5.82,-6.3h0.37C27.42,13 30.28,14.5 30.28,17.37Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M24.93,25.63a5.61,5.61 0,0 1,-4 -1.64,6.56 6.56,0 0,1 -1.86,-4.7 6.65,6.65 0,0 1,1.65 -4.57,5.67 5.67,0 0,1 4.21,-1.77h0.37c2,0 5,1.47 5,4.44v0H27.52v0a2.23,2.23 0,0 0,-2.42 -1.91h-0.23c-1.85,0 -2.82,1.28 -2.9,3.81a4.07,4.07 0,0 0,1 3,2.55 2.55,0 0,0 1.87,0.78A2.3,2.3 0,0 0,27.44 21v0h3.14v0.05a5.32,5.32 0,0 1,-5.64 4.57ZM25.14,13h-0.2c-3.4,0 -5.78,2.57 -5.78,6.26A6.48,6.48 0,0 0,21 23.93a5.53,5.53 0,0 0,3.93 1.62h0a5.24,5.24 0,0 0,5.54 -4.45h-3a2.39,2.39 0,0 1,-2.64 2.09h-0.05a2.63,2.63 0,0 1,-1.88 -0.8,4.15 4.15,0 0,1 -1.05,-3.1c0.08,-2.59 1.08,-3.9 3,-3.9h0.22a2.34,2.34 0,0 1,2.5 1.94h2.65c0,-2.88 -3,-4.27 -4.94,-4.31h-0.16Z"/>
+    android:viewportWidth="48"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13.65,31.74L13,31.74a10.63,10.63 0,0 1,0 -21.25C15.18,7.25 19.22,4.1 23.66,3.9h0c6.23,-0.23 11.08,3.49 13.09,10a8.91,8.91 0,0 1,0 17.82L13.65,31.72ZM13.21,13.06A8,8 0,0 0,13 29.14L36.69,29.14a6.32,6.32 0,0 0,-0.23 -12.64l-0.54,0 -1.11,0.11 -0.27,-1.08c-0.72,-2.82 -3.19,-9.35 -10.76,-9.07h0c-3.23,0.14 -7,2.61 -9.06,6l-0.42,0.67 -0.78,-0.06Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.33,14.71h0a1.87,1.87 0,0 1,1.86 1.87h0a1.87,1.87 0,0 1,-1.86 1.87h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,15.33 14.71Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.33,20.77h0a1.87,1.87 0,0 1,1.86 1.87h0a1.87,1.87 0,0 1,-1.86 1.87h0a1.87,1.87 0,0 1,-1.86 -1.87h0A1.87,1.87 0,0 1,15.33 20.77Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M36.27,39.92a1.3,1.3 0,0 1,-1.1 -2l2.28,-3.68a1.3,1.3 0,1 1,2.2 1.37l-2.28,3.68A1.3,1.3 0,0 1,36.27 39.92Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M27.92,43.41a1.3,1.3 0,0 1,-1.1 -2l2.28,-3.68a1.3,1.3 0,1 1,2.2 1.37L29,42.79A1.3,1.3 0,0 1,27.92 43.41Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M22.17,39.92a1.3,1.3 0,0 1,-1.1 -2l2.28,-3.68a1.3,1.3 0,1 1,2.2 1.37l-2.28,3.68A1.3,1.3 0,0 1,22.17 39.92Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13.83,43.41a1.3,1.3 0,0 1,-1.1 -2L15,37.75a1.3,1.3 0,1 1,2.2 1.37l-2.28,3.68A1.3,1.3 0,0 1,13.83 43.41Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8.64,39.84a1.3,1.3 0,0 1,-1.1 -2l2.28,-3.68A1.3,1.3 0,0 1,12 35.55L9.74,39.23A1.3,1.3 0,0 1,8.64 39.84Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M30.28,17.37H27.56A2.3,2.3 0,0 0,25 15.43h-0.15c-2.06,0 -2.87,1.56 -2.94,3.85s1.32,3.89 2.94,3.85A2.34,2.34 0,0 0,27.48 21h3.05a5.28,5.28 0,0 1,-5.59 4.54c-3.38,0 -5.82,-2.82 -5.82,-6.3 0,-3.72 2.44,-6.3 5.82,-6.3h0.37C27.42,13 30.28,14.5 30.28,17.37Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M24.93,25.63a5.61,5.61 0,0 1,-4 -1.64,6.56 6.56,0 0,1 -1.86,-4.7 6.65,6.65 0,0 1,1.65 -4.57,5.67 5.67,0 0,1 4.21,-1.77h0.37c2,0 5,1.47 5,4.44v0H27.52v0a2.23,2.23 0,0 0,-2.42 -1.91h-0.23c-1.85,0 -2.82,1.28 -2.9,3.81a4.07,4.07 0,0 0,1 3,2.55 2.55,0 0,0 1.87,0.78A2.3,2.3 0,0 0,27.44 21v0h3.14v0.05a5.32,5.32 0,0 1,-5.64 4.57ZM25.14,13h-0.2c-3.4,0 -5.78,2.57 -5.78,6.26A6.48,6.48 0,0 0,21 23.93a5.53,5.53 0,0 0,3.93 1.62h0a5.24,5.24 0,0 0,5.54 -4.45h-3a2.39,2.39 0,0 1,-2.64 2.09h-0.05a2.63,2.63 0,0 1,-1.88 -0.8,4.15 4.15,0 0,1 -1.05,-3.1c0.08,-2.59 1.08,-3.9 3,-3.9h0.22a2.34,2.34 0,0 1,2.5 1.94h2.65c0,-2.88 -3,-4.27 -4.94,-4.31h-0.16Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_antifeature_nosourcesince.xml b/app/src/main/res/drawable/ic_antifeature_nosourcesince.xml
index 684e971e0..b524fc424 100644
--- a/app/src/main/res/drawable/ic_antifeature_nosourcesince.xml
+++ b/app/src/main/res/drawable/ic_antifeature_nosourcesince.xml
@@ -1,7 +1,16 @@
-<vector android:height="24dp" android:viewportHeight="48"
+<vector android:height="24dp"
+    android:viewportHeight="48"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M42,31.65L40.6,31.65L40.6,21.46a1.24,1.24 0,0 0,0 -0.26,16.08 16.08,0 0,0 -32.16,0.05 1.31,1.31 0,0 0,0 0.21v10.2L6.9,31.66a1.3,1.3 0,0 0,-1.3 1.3v7.36a1.3,1.3 0,0 0,1.3 1.3L42,41.62a1.3,1.3 0,0 0,1.3 -1.3L43.3,32.95A1.3,1.3 0,0 0,42 31.65ZM11,21.65a1.3,1.3 0,0 0,0 -0.18,13.49 13.49,0 0,1 27,0 1.24,1.24 0,0 0,0 0.24v10L11,31.71ZM40.74,39L8.2,39L8.2,34.25L40.74,34.25Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M28.27,16.23a1.3,1.3 0,0 0,-1.82 1.85l3.9,3.82 -3.9,3.82a1.3,1.3 0,0 0,1.82 1.85l4.84,-4.75a1.3,1.3 0,0 0,0 -1.85Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M22.52,16.25a1.3,1.3 0,0 0,-1.83 0L15.84,21a1.3,1.3 0,0 0,0 1.85l4.84,4.75a1.3,1.3 0,0 0,1.82 -1.85L18.6,21.9l3.9,-3.82A1.3,1.3 0,0 0,22.52 16.25Z"/>
+    android:viewportWidth="48"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M42,31.65L40.6,31.65L40.6,21.46a1.24,1.24 0,0 0,0 -0.26,16.08 16.08,0 0,0 -32.16,0.05 1.31,1.31 0,0 0,0 0.21v10.2L6.9,31.66a1.3,1.3 0,0 0,-1.3 1.3v7.36a1.3,1.3 0,0 0,1.3 1.3L42,41.62a1.3,1.3 0,0 0,1.3 -1.3L43.3,32.95A1.3,1.3 0,0 0,42 31.65ZM11,21.65a1.3,1.3 0,0 0,0 -0.18,13.49 13.49,0 0,1 27,0 1.24,1.24 0,0 0,0 0.24v10L11,31.71ZM40.74,39L8.2,39L8.2,34.25L40.74,34.25Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M28.27,16.23a1.3,1.3 0,0 0,-1.82 1.85l3.9,3.82 -3.9,3.82a1.3,1.3 0,0 0,1.82 1.85l4.84,-4.75a1.3,1.3 0,0 0,0 -1.85Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M22.52,16.25a1.3,1.3 0,0 0,-1.83 0L15.84,21a1.3,1.3 0,0 0,0 1.85l4.84,4.75a1.3,1.3 0,0 0,1.82 -1.85L18.6,21.9l3.9,-3.82A1.3,1.3 0,0 0,22.52 16.25Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_antifeature_tracking.xml b/app/src/main/res/drawable/ic_antifeature_tracking.xml
index c78bdfd1d..984fe20c6 100644
--- a/app/src/main/res/drawable/ic_antifeature_tracking.xml
+++ b/app/src/main/res/drawable/ic_antifeature_tracking.xml
@@ -1,9 +1,22 @@
-<vector android:height="24dp" android:viewportHeight="48"
+<vector android:height="24dp"
+    android:viewportHeight="48"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M6.32,34.68a2.83,2.83 0,0 1,-2.54 -1.4,3.12 3.12,0 0,1 0.12,-3.16L9.68,20.3l0.25,-0.45c0.72,-1.31 1.25,-1.49 2.82,-1.5h0l20.2,-0.06h0c1.48,0 2,0.2 2.73,1.43l0.29,0.49L42.12,30a3.07,3.07 0,0 1,0.17 3.14,2.88 2.88,0 0,1 -2.58,1.44l-33.38,0.06ZM12.32,20.96 L12.24,21.11 11.95,21.62L6.13,31.44A0.62,0.62 0,0 0,6 32c0,0.08 0.24,0.09 0.29,0.09h0L39.71,32c0.08,0 0.26,0 0.31,-0.11a0.57,0.57 0,0 0,-0.1 -0.52l-6.11,-9.82c-0.14,-0.22 -0.25,-0.41 -0.34,-0.57l-0.07,-0.12L33,20.86l-20.2,0.06Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M22.94,18.19a8,8 0,0 0,-8.2 7.89A8,8 0,0 0,22.94 34a8,8 0,0 0,8.2 -7.89A8,8 0,0 0,22.94 18.19ZM22.94,31.12a5,5 0,1 1,5.26 -5A5.16,5.16 0,0 1,22.94 31.12Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M22.94,24h0a2.1,2.1 0,0 1,2.14 2.05h0a2.1,2.1 0,0 1,-2.14 2.05h0a2.1,2.1 0,0 1,-2.14 -2.05h0A2.1,2.1 0,0 1,22.94 24Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M42.91,29.16a6.72,6.72 0,0 1,-3.12 -1c-0.71,-0.39 -4.24,-2.45 -4.23,-4.5s3.48,-4 4.18,-4.42c2.92,-1.6 3.94,-0.94 4.28,-0.73 1.24,0.79 1.48,3.31 1.47,5.28 0,2.77 -0.51,4.49 -1.49,5.1A1.89,1.89 0,0 1,42.91 29.16ZM42.47,26.8ZM38.21,23.62a10.84,10.84 0,0 0,4.39 2.91,13.3 13.3,0 0,0 0,-5.75A10.64,10.64 0,0 0,38.21 23.62ZM38.13,23.77ZM38.13,23.47ZM42.87,20.75h0ZM42.47,20.52Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M42.82,42.72H3.15A1.3,1.3 0,0 1,2 40.79l3.49,-6.2a2.72,2.72 0,0 1,-1.74 -1.3,3.12 3.12,0 0,1 0.12,-3.16L9.68,20.3l0.25,-0.45c0.72,-1.31 1.25,-1.49 2.82,-1.5h1.91L21.51,6.17a1.3,1.3 0,0 1,1.12 -0.66,1.28 1.28,0 0,1 1.13,0.64L30.85,18.3h2.1c1.52,0 2.06,0.18 2.77,1.43 0.08,0.14 0.17,0.3 0.29,0.49L42.12,30a3.07,3.07 0,0 1,0.17 3.14,2.8 2.8,0 0,1 -2,1.38l3.62,6.2a1.3,1.3 0,0 1,-1.12 1.95ZM5.37,40.13H40.56L37,34A1.3,1.3 0,0 1,38.1 32h1.61c0.08,0 0.26,0 0.31,-0.11a0.57,0.57 0,0 0,-0.1 -0.52l-6.11,-9.82c-0.14,-0.23 -0.25,-0.41 -0.34,-0.57l-0.07,-0.12h-3.3A1.31,1.31 0,0 1,29 20.26L22.66,9.42 16.54,20.28a1.3,1.3 0,0 1,-1.13 0.66H12.29l-0.08,0.15 -0.29,0.51L6.13,31.44A0.62,0.62 0,0 0,6 32c0,0.08 0.24,0.09 0.29,0.09H7.68A1.3,1.3 0,0 1,8.81 34Z"/>
+    android:viewportWidth="48"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6.32,34.68a2.83,2.83 0,0 1,-2.54 -1.4,3.12 3.12,0 0,1 0.12,-3.16L9.68,20.3l0.25,-0.45c0.72,-1.31 1.25,-1.49 2.82,-1.5h0l20.2,-0.06h0c1.48,0 2,0.2 2.73,1.43l0.29,0.49L42.12,30a3.07,3.07 0,0 1,0.17 3.14,2.88 2.88,0 0,1 -2.58,1.44l-33.38,0.06ZM12.32,20.96 L12.24,21.11 11.95,21.62L6.13,31.44A0.62,0.62 0,0 0,6 32c0,0.08 0.24,0.09 0.29,0.09h0L39.71,32c0.08,0 0.26,0 0.31,-0.11a0.57,0.57 0,0 0,-0.1 -0.52l-6.11,-9.82c-0.14,-0.22 -0.25,-0.41 -0.34,-0.57l-0.07,-0.12L33,20.86l-20.2,0.06Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M22.94,18.19a8,8 0,0 0,-8.2 7.89A8,8 0,0 0,22.94 34a8,8 0,0 0,8.2 -7.89A8,8 0,0 0,22.94 18.19ZM22.94,31.12a5,5 0,1 1,5.26 -5A5.16,5.16 0,0 1,22.94 31.12Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M22.94,24h0a2.1,2.1 0,0 1,2.14 2.05h0a2.1,2.1 0,0 1,-2.14 2.05h0a2.1,2.1 0,0 1,-2.14 -2.05h0A2.1,2.1 0,0 1,22.94 24Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M42.91,29.16a6.72,6.72 0,0 1,-3.12 -1c-0.71,-0.39 -4.24,-2.45 -4.23,-4.5s3.48,-4 4.18,-4.42c2.92,-1.6 3.94,-0.94 4.28,-0.73 1.24,0.79 1.48,3.31 1.47,5.28 0,2.77 -0.51,4.49 -1.49,5.1A1.89,1.89 0,0 1,42.91 29.16ZM42.47,26.8ZM38.21,23.62a10.84,10.84 0,0 0,4.39 2.91,13.3 13.3,0 0,0 0,-5.75A10.64,10.64 0,0 0,38.21 23.62ZM38.13,23.77ZM38.13,23.47ZM42.87,20.75h0ZM42.47,20.52Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M42.82,42.72H3.15A1.3,1.3 0,0 1,2 40.79l3.49,-6.2a2.72,2.72 0,0 1,-1.74 -1.3,3.12 3.12,0 0,1 0.12,-3.16L9.68,20.3l0.25,-0.45c0.72,-1.31 1.25,-1.49 2.82,-1.5h1.91L21.51,6.17a1.3,1.3 0,0 1,1.12 -0.66,1.28 1.28,0 0,1 1.13,0.64L30.85,18.3h2.1c1.52,0 2.06,0.18 2.77,1.43 0.08,0.14 0.17,0.3 0.29,0.49L42.12,30a3.07,3.07 0,0 1,0.17 3.14,2.8 2.8,0 0,1 -2,1.38l3.62,6.2a1.3,1.3 0,0 1,-1.12 1.95ZM5.37,40.13H40.56L37,34A1.3,1.3 0,0 1,38.1 32h1.61c0.08,0 0.26,0 0.31,-0.11a0.57,0.57 0,0 0,-0.1 -0.52l-6.11,-9.82c-0.14,-0.23 -0.25,-0.41 -0.34,-0.57l-0.07,-0.12h-3.3A1.31,1.31 0,0 1,29 20.26L22.66,9.42 16.54,20.28a1.3,1.3 0,0 1,-1.13 0.66H12.29l-0.08,0.15 -0.29,0.51L6.13,31.44A0.62,0.62 0,0 0,6 32c0,0.08 0.24,0.09 0.29,0.09H7.68A1.3,1.3 0,0 1,8.81 34Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_antifeature_upstreamnonfree.xml b/app/src/main/res/drawable/ic_antifeature_upstreamnonfree.xml
index fb7aae5d9..f3598e677 100644
--- a/app/src/main/res/drawable/ic_antifeature_upstreamnonfree.xml
+++ b/app/src/main/res/drawable/ic_antifeature_upstreamnonfree.xml
@@ -1,8 +1,19 @@
-<vector android:height="24dp" android:viewportHeight="48"
+<vector android:height="24dp"
+    android:viewportHeight="48"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M15.72,22.64a1.86,1.87 0,1 0,3.72 0a1.86,1.87 0,1 0,-3.72 0z"/>
-    <path android:fillColor="#FF000000" android:pathData="M15.72,29.24a1.86,1.87 0,1 0,3.72 0a1.86,1.87 0,1 0,-3.72 0z"/>
-    <path android:fillColor="#FF000000" android:pathData="M20.28,26.12c0,4.06 2.85,7.37 6.8,7.36 3.49,0 5.94,-2 6.53,-5.3H30a2.73,2.73 0,0 1,-3 2.44c-1.89,0 -3.51,-1.7 -3.43,-4.5s1,-4.5 3.43,-4.5h0.18a2.68,2.68 0,0 1,3 2.27h3.18c0,-3.36 -3.35,-5.08 -5.81,-5.13h-0.43C23.13,18.76 20.28,21.78 20.28,26.12Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M24.375,8.9277A1.3,1.3 0,0 0,23.7793 9.0801L5.4492,18.8008A1.3,1.3 0,0 0,6.6699 21.0898L10.1992,19.2109L10.1992,36.6699A3.07,3.07 0,0 0,13.3594 39.6699L35.6406,39.6699A3.07,3.07 0,0 0,38.8008 36.6699L38.8008,19.4609L42.3301,21.3594A1.3,1.3 0,0 0,43.5605 19.0801L43.5605,19.0703L25,9.0801A1.3,1.3 0,0 0,24.375 8.9277zM24.3691,11.6992L36.2207,18.0703L36.2109,36.6699C36.2109,36.8399 35.9706,37.0293 35.6406,37.0293L13.3594,37.0293C13.0394,37.0293 12.7891,36.8399 12.7891,36.6699L12.7891,17.9492L12.7891,17.8496L24.3691,11.6992z"/>
+    android:viewportWidth="48"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.72,22.64a1.86,1.87 0,1 0,3.72 0a1.86,1.87 0,1 0,-3.72 0z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.72,29.24a1.86,1.87 0,1 0,3.72 0a1.86,1.87 0,1 0,-3.72 0z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.28,26.12c0,4.06 2.85,7.37 6.8,7.36 3.49,0 5.94,-2 6.53,-5.3H30a2.73,2.73 0,0 1,-3 2.44c-1.89,0 -3.51,-1.7 -3.43,-4.5s1,-4.5 3.43,-4.5h0.18a2.68,2.68 0,0 1,3 2.27h3.18c0,-3.36 -3.35,-5.08 -5.81,-5.13h-0.43C23.13,18.76 20.28,21.78 20.28,26.12Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M24.375,8.9277A1.3,1.3 0,0 0,23.7793 9.0801L5.4492,18.8008A1.3,1.3 0,0 0,6.6699 21.0898L10.1992,19.2109L10.1992,36.6699A3.07,3.07 0,0 0,13.3594 39.6699L35.6406,39.6699A3.07,3.07 0,0 0,38.8008 36.6699L38.8008,19.4609L42.3301,21.3594A1.3,1.3 0,0 0,43.5605 19.0801L43.5605,19.0703L25,9.0801A1.3,1.3 0,0 0,24.375 8.9277zM24.3691,11.6992L36.2207,18.0703L36.2109,36.6699C36.2109,36.8399 35.9706,37.0293 35.6406,37.0293L13.3594,37.0293C13.0394,37.0293 12.7891,36.8399 12.7891,36.6699L12.7891,17.9492L12.7891,17.8496L24.3691,11.6992z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_cancel.xml b/app/src/main/res/drawable/ic_cancel.xml
index a18d5d4bc..9c6a8b137 100644
--- a/app/src/main/res/drawable/ic_cancel.xml
+++ b/app/src/main/res/drawable/ic_cancel.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_categories.xml b/app/src/main/res/drawable/ic_categories.xml
index 74b639b7c..339ee37df 100644
--- a/app/src/main/res/drawable/ic_categories.xml
+++ b/app/src/main/res/drawable/ic_categories.xml
@@ -1,7 +1,12 @@
-<vector android:height="24dp" android:viewportHeight="42.0"
+<vector android:height="24dp"
+    android:viewportHeight="42.0"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="42.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff"
+    android:viewportWidth="42.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#ffffff"
         android:pathData="M38,3H4C2.9,3 2,3.9 2,5v12c0,1.1 0.9,2 2,2h34c1.1,0 2,-0.9 2,-2V5C40,3.9 39.1,3 38,3m0,20H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h34c1.1,0 2,-0.9 2,-2V25c0,-1.1 -0.9,-2 -2,-2"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_changelog.xml b/app/src/main/res/drawable/ic_changelog.xml
index 83174bdc8..0c1626858 100644
--- a/app/src/main/res/drawable/ic_changelog.xml
+++ b/app/src/main/res/drawable/ic_changelog.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M12,7.77L18.39,18H5.61L12,7.77m-0.85,-2.41l-8.2,13.11c-0.41,0.67 0.07,1.53 0.85,1.53h16.4c0.79,0 1.26,-0.86 0.85,-1.53l-8.2,-13.11c-0.39,-0.63 -1.31,-0.63 -1.7,0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,7.77L18.39,18H5.61L12,7.77m-0.85,-2.41l-8.2,13.11c-0.41,0.67 0.07,1.53 0.85,1.53h16.4c0.79,0 1.26,-0.86 0.85,-1.53l-8.2,-13.11c-0.39,-0.63 -1.31,-0.63 -1.7,0z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_clear.xml b/app/src/main/res/drawable/ic_clear.xml
index 05c3fe06a..f231ceb1f 100644
--- a/app/src/main/res/drawable/ic_clear.xml
+++ b/app/src/main/res/drawable/ic_clear.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M18.3,5.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L12,10.59 7.11,5.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41L10.59,12 5.7,16.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L12,13.41l4.89,4.89c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M18.3,5.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L12,10.59 7.11,5.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41L10.59,12 5.7,16.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L12,13.41l4.89,4.89c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index d53f9f0db..6148249dc 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V9c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v10zM18,4h-2.5l-0.71,-0.71c-0.18,-0.18 -0.44,-0.29 -0.7,-0.29H9.91c-0.26,0 -0.52,0.11 -0.7,0.29L8.5,4H6c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V9c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v10zM18,4h-2.5l-0.71,-0.71c-0.18,-0.18 -0.44,-0.29 -0.7,-0.29H9.91c-0.26,0 -0.52,0.11 -0.7,0.29L8.5,4H6c-0.55,0 -1,0.45 -1,1s0.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_donate.xml b/app/src/main/res/drawable/ic_donate.xml
index 3e6940a42..3a2af1e51 100644
--- a/app/src/main/res/drawable/ic_donate.xml
+++ b/app/src/main/res/drawable/ic_donate.xml
@@ -1,6 +1,10 @@
 <vector android:height="24dp"
     android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13.41,18.09L13.41,20h-2.67v-1.93c-1.71,-0.36 -3.16,-1.46 -3.27,-3.4h1.96c0.1,1.05 0.82,1.87 2.65,1.87 1.96,0 2.4,-0.98 2.4,-1.59 0,-0.83 -0.44,-1.61 -2.67,-2.14 -2.48,-0.6 -4.18,-1.62 -4.18,-3.67 0,-1.72 1.39,-2.84 3.11,-3.21L10.74,4h2.67v1.95c1.86,0.45 2.79,1.86 2.85,3.39L14.3,9.34c-0.05,-1.11 -0.64,-1.87 -2.22,-1.87 -1.5,0 -2.4,0.68 -2.4,1.64 0,0.84 0.65,1.39 2.67,1.91s4.18,1.39 4.18,3.91c-0.01,1.83 -1.38,2.83 -3.12,3.16z"/>
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13.41,18.09L13.41,20h-2.67v-1.93c-1.71,-0.36 -3.16,-1.46 -3.27,-3.4h1.96c0.1,1.05 0.82,1.87 2.65,1.87 1.96,0 2.4,-0.98 2.4,-1.59 0,-0.83 -0.44,-1.61 -2.67,-2.14 -2.48,-0.6 -4.18,-1.62 -4.18,-3.67 0,-1.72 1.39,-2.84 3.11,-3.21L10.74,4h2.67v1.95c1.86,0.45 2.79,1.86 2.85,3.39L14.3,9.34c-0.05,-1.11 -0.64,-1.87 -2.22,-1.87 -1.5,0 -2.4,0.68 -2.4,1.64 0,0.84 0.65,1.39 2.67,1.91s4.18,1.39 4.18,3.91c-0.01,1.83 -1.38,2.83 -3.12,3.16z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
index f13f91b85..c18145d25 100644
--- a/app/src/main/res/drawable/ic_download.xml
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="m45,9.73c19.49,0 35.27,15.78 35.27,35.27 0,19.49 -15.78,35.27 -35.27,35.27 -19.49,0 -35.27,-15.78 -35.27,-35.27 0,-19.49 15.78,-35.27 35.27,-35.27z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#ffffff"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27zM45,9.73c19.49,0 35.27,15.78 35.27,35.27 0,19.49 -15.78,35.27 -35.27,35.27 -19.49,0 -35.27,-15.78 -35.27,-35.27 0,-19.49 15.78,-35.27 35.27,-35.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#0066cc"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#0066cc"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress.xml b/app/src/main/res/drawable/ic_download_progress.xml
index acc98f429..488427521 100644
--- a/app/src/main/res/drawable/ic_download_progress.xml
+++ b/app/src/main/res/drawable/ic_download_progress.xml
@@ -1,28 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_download_progress_0" android:minLevel="0" android:maxLevel="14" />
-    <item android:drawable="@drawable/ic_download_progress_15" android:minLevel="15" android:maxLevel="29" />
-    <item android:drawable="@drawable/ic_download_progress_30" android:minLevel="30" android:maxLevel="44" />
-    <item android:drawable="@drawable/ic_download_progress_45" android:minLevel="45" android:maxLevel="59" />
-    <item android:drawable="@drawable/ic_download_progress_60" android:minLevel="60" android:maxLevel="74" />
-    <item android:drawable="@drawable/ic_download_progress_75" android:minLevel="75" android:maxLevel="89" />
-    <item android:drawable="@drawable/ic_download_progress_90" android:minLevel="90" android:maxLevel="104" />
-    <item android:drawable="@drawable/ic_download_progress_105" android:minLevel="105" android:maxLevel="119" />
-    <item android:drawable="@drawable/ic_download_progress_120" android:minLevel="120" android:maxLevel="134" />
-    <item android:drawable="@drawable/ic_download_progress_135" android:minLevel="135" android:maxLevel="149" />
-    <item android:drawable="@drawable/ic_download_progress_150" android:minLevel="150" android:maxLevel="164" />
-    <item android:drawable="@drawable/ic_download_progress_165" android:minLevel="165" android:maxLevel="179" />
-    <item android:drawable="@drawable/ic_download_progress_180" android:minLevel="180" android:maxLevel="194" />
-    <item android:drawable="@drawable/ic_download_progress_195" android:minLevel="195" android:maxLevel="209" />
-    <item android:drawable="@drawable/ic_download_progress_210" android:minLevel="210" android:maxLevel="224" />
-    <item android:drawable="@drawable/ic_download_progress_225" android:minLevel="225" android:maxLevel="239" />
-    <item android:drawable="@drawable/ic_download_progress_240" android:minLevel="240" android:maxLevel="254" />
-    <item android:drawable="@drawable/ic_download_progress_255" android:minLevel="255" android:maxLevel="269" />
-    <item android:drawable="@drawable/ic_download_progress_270" android:minLevel="270" android:maxLevel="284" />
-    <item android:drawable="@drawable/ic_download_progress_285" android:minLevel="285" android:maxLevel="299" />
-    <item android:drawable="@drawable/ic_download_progress_300" android:minLevel="300" android:maxLevel="314" />
-    <item android:drawable="@drawable/ic_download_progress_315" android:minLevel="315" android:maxLevel="329" />
-    <item android:drawable="@drawable/ic_download_progress_330" android:minLevel="330" android:maxLevel="344" />
-    <item android:drawable="@drawable/ic_download_progress_345" android:minLevel="345" android:maxLevel="359" />
-    <item android:drawable="@drawable/ic_download_progress_360" android:minLevel="360" />
+    <item
+        android:drawable="@drawable/ic_download_progress_0"
+        android:minLevel="0"
+        android:maxLevel="14" />
+    <item
+        android:drawable="@drawable/ic_download_progress_15"
+        android:minLevel="15"
+        android:maxLevel="29" />
+    <item
+        android:drawable="@drawable/ic_download_progress_30"
+        android:minLevel="30"
+        android:maxLevel="44" />
+    <item
+        android:drawable="@drawable/ic_download_progress_45"
+        android:minLevel="45"
+        android:maxLevel="59" />
+    <item
+        android:drawable="@drawable/ic_download_progress_60"
+        android:minLevel="60"
+        android:maxLevel="74" />
+    <item
+        android:drawable="@drawable/ic_download_progress_75"
+        android:minLevel="75"
+        android:maxLevel="89" />
+    <item
+        android:drawable="@drawable/ic_download_progress_90"
+        android:minLevel="90"
+        android:maxLevel="104" />
+    <item
+        android:drawable="@drawable/ic_download_progress_105"
+        android:minLevel="105"
+        android:maxLevel="119" />
+    <item
+        android:drawable="@drawable/ic_download_progress_120"
+        android:minLevel="120"
+        android:maxLevel="134" />
+    <item
+        android:drawable="@drawable/ic_download_progress_135"
+        android:minLevel="135"
+        android:maxLevel="149" />
+    <item
+        android:drawable="@drawable/ic_download_progress_150"
+        android:minLevel="150"
+        android:maxLevel="164" />
+    <item
+        android:drawable="@drawable/ic_download_progress_165"
+        android:minLevel="165"
+        android:maxLevel="179" />
+    <item
+        android:drawable="@drawable/ic_download_progress_180"
+        android:minLevel="180"
+        android:maxLevel="194" />
+    <item
+        android:drawable="@drawable/ic_download_progress_195"
+        android:minLevel="195"
+        android:maxLevel="209" />
+    <item
+        android:drawable="@drawable/ic_download_progress_210"
+        android:minLevel="210"
+        android:maxLevel="224" />
+    <item
+        android:drawable="@drawable/ic_download_progress_225"
+        android:minLevel="225"
+        android:maxLevel="239" />
+    <item
+        android:drawable="@drawable/ic_download_progress_240"
+        android:minLevel="240"
+        android:maxLevel="254" />
+    <item
+        android:drawable="@drawable/ic_download_progress_255"
+        android:minLevel="255"
+        android:maxLevel="269" />
+    <item
+        android:drawable="@drawable/ic_download_progress_270"
+        android:minLevel="270"
+        android:maxLevel="284" />
+    <item
+        android:drawable="@drawable/ic_download_progress_285"
+        android:minLevel="285"
+        android:maxLevel="299" />
+    <item
+        android:drawable="@drawable/ic_download_progress_300"
+        android:minLevel="300"
+        android:maxLevel="314" />
+    <item
+        android:drawable="@drawable/ic_download_progress_315"
+        android:minLevel="315"
+        android:maxLevel="329" />
+    <item
+        android:drawable="@drawable/ic_download_progress_330"
+        android:minLevel="330"
+        android:maxLevel="344" />
+    <item
+        android:drawable="@drawable/ic_download_progress_345"
+        android:minLevel="345"
+        android:maxLevel="359" />
+    <item
+        android:drawable="@drawable/ic_download_progress_360"
+        android:minLevel="360" />
 </level-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_download_progress_0.xml b/app/src/main/res/drawable/ic_download_progress_0.xml
index a5da70a1a..6048b19d4 100644
--- a/app/src/main/res/drawable/ic_download_progress_0.xml
+++ b/app/src/main/res/drawable/ic_download_progress_0.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -11,19 +11,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_105.xml b/app/src/main/res/drawable/ic_download_progress_105.xml
index 321e2a54d..d98fbf74d 100644
--- a/app/src/main/res/drawable/ic_download_progress_105.xml
+++ b/app/src/main/res/drawable/ic_download_progress_105.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L45,45L45,45L45.02,45L46.51,45L45.02,45L45,45L88.08,56.56C89.07,52.88 89.61,49 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.41,44.29z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_120.xml b/app/src/main/res/drawable/ic_download_progress_120.xml
index 1c7a3cbf8..831ef5074 100644
--- a/app/src/main/res/drawable/ic_download_progress_120.xml
+++ b/app/src/main/res/drawable/ic_download_progress_120.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L45.01,45L83.62,67.32C85.53,64.02 87.05,60.42 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_135.xml b/app/src/main/res/drawable/ic_download_progress_135.xml
index 898e77257..85a58b13c 100644
--- a/app/src/main/res/drawable/ic_download_progress_135.xml
+++ b/app/src/main/res/drawable/ic_download_progress_135.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L45.01,45L83.62,67.32C85.53,64.02 87.05,60.42 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27C82.27,24.43 65.57,7.73 45,7.73Z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_15.xml b/app/src/main/res/drawable/ic_download_progress_15.xml
index 9cadfe39c..8522fa6b7 100644
--- a/app/src/main/res/drawable/ic_download_progress_15.xml
+++ b/app/src/main/res/drawable/ic_download_progress_15.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="m45,0.39c-0.03,0 -0.06,0 -0.1,0l0.1,44.59 0,0.02 11.56,-43.09c-3.69,-0.99 -7.56,-1.53 -11.56,-1.53z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_150.xml b/app/src/main/res/drawable/ic_download_progress_150.xml
index 70c2b1a58..df1ed1ee6 100644
--- a/app/src/main/res/drawable/ic_download_progress_150.xml
+++ b/app/src/main/res/drawable/ic_download_progress_150.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L45,45L45,45L45.01,45L46.26,45.72L45.02,45.01L45,45L76.53,76.56C79.23,73.86 81.63,70.77 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27C82.27,24.43 65.57,7.73 45,7.73Z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_165.xml b/app/src/main/res/drawable/ic_download_progress_165.xml
index 06c153384..5797d39ce 100644
--- a/app/src/main/res/drawable/ic_download_progress_165.xml
+++ b/app/src/main/res/drawable/ic_download_progress_165.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L45,45L67.29,83.64C70.59,81.73 73.7,79.38 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45zM45,45L45.01,45L46.26,45.72L45.02,45.01L45,45z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27C82.27,24.43 65.57,7.73 45,7.73Z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_180.xml b/app/src/main/res/drawable/ic_download_progress_180.xml
index 24e201adb..6189bfaae 100644
--- a/app/src/main/res/drawable/ic_download_progress_180.xml
+++ b/app/src/main/res/drawable/ic_download_progress_180.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L45,45L45,45.02L44.99,89.61C48.8,89.61 52.68,89.12 56.54,88.09C56.58,88.08 56.61,88.07 56.64,88.06L56.64,88.06C60.28,87.07 63.86,85.62 67.29,83.64C67.29,83.64 67.3,83.63 67.3,83.63C67.3,83.63 67.31,83.63 67.31,83.63C70.6,81.72 73.71,79.37 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45zM45,45L45.01,45L45.01,45L46.26,45.72L45.02,45.01L45,45z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_195.xml b/app/src/main/res/drawable/ic_download_progress_195.xml
index c5763fdc5..c9e478e72 100644
--- a/app/src/main/res/drawable/ic_download_progress_195.xml
+++ b/app/src/main/res/drawable/ic_download_progress_195.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,44.99L44.99,45L45,45L45,45L45,45L45,45.02L45,47.25L45,45.02L45,45L33.43,88.08C37.12,89.07 41,89.61 45,89.61L45,89.61C45.03,89.61 45.07,89.61 45.1,89.61L45.1,89.6C48.88,89.59 52.72,89.11 56.54,88.09C56.58,88.08 56.61,88.07 56.64,88.06L56.64,88.06C60.28,87.07 63.86,85.62 67.29,83.64C67.29,83.64 67.3,83.63 67.3,83.63C67.3,83.63 67.31,83.63 67.31,83.63C70.6,81.72 73.71,79.37 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.01,44.98L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45zM45,45L45.01,45L46.26,45.72L45.02,45.01L45,45z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_210.xml b/app/src/main/res/drawable/ic_download_progress_210.xml
index 76a3d518b..f73a78d82 100644
--- a/app/src/main/res/drawable/ic_download_progress_210.xml
+++ b/app/src/main/res/drawable/ic_download_progress_210.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,44.99L44.99,45L45,45L45,45L45,45L45,45.02L45,47.25L45,45.02L45,45L44.99,45.03L22.68,83.62C25.98,85.53 29.58,87.05 33.43,88.08L33.43,88.08C37.12,89.07 41,89.61 45,89.61L45,89.61C45.03,89.61 45.07,89.61 45.1,89.61L45.1,89.6C48.88,89.59 52.72,89.11 56.54,88.09C56.58,88.08 56.61,88.07 56.64,88.06L56.64,88.06C60.28,87.07 63.86,85.62 67.29,83.64C67.29,83.64 67.3,83.63 67.3,83.63C67.3,83.63 67.31,83.63 67.31,83.63C70.6,81.72 73.71,79.37 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.01,44.98L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45zM45,45L45.01,45L46.26,45.72L45.02,45.01L45,45z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_225.xml b/app/src/main/res/drawable/ic_download_progress_225.xml
index d9dd70ef4..3d05bff61 100644
--- a/app/src/main/res/drawable/ic_download_progress_225.xml
+++ b/app/src/main/res/drawable/ic_download_progress_225.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L45,45L45,45.02L45,47.25L45,45.02L45,45L45,45L44.99,45L13.44,76.53C16.14,79.23 19.23,81.63 22.7,83.63C22.72,83.65 22.75,83.66 22.78,83.68L22.78,83.67C26.06,85.55 29.62,87.06 33.43,88.08L33.43,88.08C37.12,89.07 41,89.61 45,89.61L45,89.61C45.03,89.61 45.07,89.61 45.1,89.61L45.1,89.6C48.88,89.59 52.72,89.11 56.54,88.09C56.58,88.08 56.61,88.07 56.64,88.06L56.64,88.06C60.28,87.07 63.86,85.62 67.29,83.64C67.29,83.64 67.3,83.63 67.3,83.63C67.3,83.63 67.31,83.63 67.31,83.63C70.6,81.72 73.71,79.37 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45zM45,45L45.01,45L45.01,45L46.26,45.72L45.02,45.01L45,45zM45,45.01L44.99,45.03L44.04,46.68L44.99,45.02L45,45.01z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_240.xml b/app/src/main/res/drawable/ic_download_progress_240.xml
index 36cfb98be..c24f07dc2 100644
--- a/app/src/main/res/drawable/ic_download_progress_240.xml
+++ b/app/src/main/res/drawable/ic_download_progress_240.xml
@@ -1,17 +1,38 @@
-<vector android:height="24dp" android:viewportHeight="90.0"
-    android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#8ab000"
+<vector android:height="24dp"
+    android:viewportHeight="90.0"
+    android:viewportWidth="90.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#8ab000"
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L44.99,45L44.99,45L6.36,67.29C8.27,70.59 10.62,73.7 13.44,76.53C13.45,76.53 13.45,76.53 13.45,76.54C13.45,76.54 13.45,76.54 13.46,76.54C16.15,79.24 19.24,81.63 22.7,83.63C22.72,83.65 22.75,83.66 22.78,83.68L22.78,83.67C26.06,85.55 29.62,87.06 33.43,88.08L33.43,88.08C37.12,89.07 41,89.61 45,89.61L45,89.61C45.03,89.61 45.07,89.61 45.1,89.61L45.1,89.6C48.88,89.59 52.72,89.11 56.54,88.09C56.58,88.08 56.61,88.07 56.64,88.06L56.64,88.06C60.28,87.07 63.86,85.62 67.29,83.64C67.29,83.64 67.3,83.63 67.3,83.63C67.3,83.63 67.31,83.63 67.31,83.63C70.6,81.72 73.71,79.37 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45zM45,45L45.01,45L45.01,45L46.26,45.72L45.02,45.01L45,45zM45,45L45,45L45,45.02L45,47.25L45,45.02L45,45zM45,45.01L44.99,45.03L44.04,46.68L44.99,45.02L45,45.01z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="2"/>
-    <path android:fillAlpha="1" android:fillColor="#0066cc"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="2" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#0066cc"
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="2"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="2" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeWidth="2" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2"/>
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeWidth="2" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_255.xml b/app/src/main/res/drawable/ic_download_progress_255.xml
index f6ec04e95..631386a4f 100644
--- a/app/src/main/res/drawable/ic_download_progress_255.xml
+++ b/app/src/main/res/drawable/ic_download_progress_255.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,44.99L45,45L45,45L45,45L45,45L1.91,56.53C2.89,60.21 4.37,63.84 6.37,67.3L6.37,67.3C6.37,67.3 6.37,67.3 6.37,67.3C6.39,67.33 6.4,67.36 6.42,67.39L6.42,67.38C8.32,70.65 10.65,73.73 13.44,76.53C13.45,76.53 13.45,76.53 13.45,76.54C13.45,76.54 13.45,76.54 13.46,76.54C16.15,79.24 19.24,81.63 22.7,83.63C22.72,83.65 22.75,83.66 22.78,83.68L22.78,83.67C26.06,85.55 29.62,87.06 33.43,88.08L33.43,88.08C37.12,89.07 41,89.61 45,89.61L45,89.61C45.03,89.61 45.07,89.61 45.1,89.61L45.1,89.6C48.88,89.59 52.72,89.11 56.54,88.09C56.58,88.08 56.61,88.07 56.64,88.06L56.64,88.06C60.28,87.07 63.86,85.62 67.29,83.64C67.29,83.64 67.3,83.63 67.3,83.63C67.3,83.63 67.31,83.63 67.31,83.63C70.6,81.72 73.71,79.37 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45,44.99L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45zM45,45L45.01,45L45.01,45L46.26,45.72L45.02,45.01L45,45zM45,45L45,45L45,45.02L45,47.25L45,45.02L45,45zM45,45.01L44.99,45.03L44.04,46.68L44.99,45.02L45,45.01z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_270.xml b/app/src/main/res/drawable/ic_download_progress_270.xml
index 27ea33ca6..94361c197 100644
--- a/app/src/main/res/drawable/ic_download_progress_270.xml
+++ b/app/src/main/res/drawable/ic_download_progress_270.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,44.99L45,45L45,45L45,45L45,45L44.98,45L0.39,44.98C0.39,48.8 0.88,52.67 1.91,56.53L1.91,56.53C1.91,56.53 1.91,56.54 1.91,56.54C1.91,56.55 1.91,56.55 1.91,56.55C2.9,60.23 4.37,63.85 6.37,67.3L6.37,67.3C6.37,67.3 6.37,67.3 6.37,67.3C6.39,67.33 6.4,67.36 6.42,67.39L6.42,67.38C8.32,70.65 10.65,73.73 13.44,76.53C13.45,76.53 13.45,76.53 13.45,76.54C13.45,76.54 13.45,76.54 13.46,76.54C16.15,79.24 19.24,81.63 22.7,83.63C22.72,83.65 22.75,83.66 22.78,83.68L22.78,83.67C26.06,85.55 29.62,87.06 33.43,88.08L33.43,88.08C37.12,89.07 41,89.61 45,89.61L45,89.61C45.03,89.61 45.07,89.61 45.1,89.61L45.1,89.6C48.88,89.59 52.72,89.11 56.54,88.09C56.58,88.08 56.61,88.07 56.64,88.06L56.64,88.06C60.28,87.07 63.86,85.62 67.29,83.64C67.29,83.64 67.3,83.63 67.3,83.63C67.3,83.63 67.31,83.63 67.31,83.63C70.6,81.72 73.71,79.37 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45,44.99L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45zM45,45L45.01,45L45.01,45L46.26,45.72L45.02,45.01L45,45zM45,45L45,45L45,45.02L45,47.25L45,45.02L45,45zM45,45.01L44.99,45.03L44.04,46.68L44.99,45.02L45,45.01z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_285.xml b/app/src/main/res/drawable/ic_download_progress_285.xml
index 40546caa2..86dadf968 100644
--- a/app/src/main/res/drawable/ic_download_progress_285.xml
+++ b/app/src/main/res/drawable/ic_download_progress_285.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,44.99L45,45L45,45L45,45L44.98,45L42.75,45L44.98,45L45,45L1.92,33.44C0.93,37.12 0.39,41 0.39,45L0.39,45C0.39,45.03 0.39,45.06 0.39,45.1L0.4,45.1C0.41,48.87 0.89,52.71 1.91,56.53L1.91,56.53C1.91,56.53 1.91,56.54 1.91,56.54C1.91,56.55 1.91,56.55 1.91,56.55C2.9,60.23 4.37,63.85 6.37,67.3L6.37,67.3C6.37,67.3 6.37,67.3 6.37,67.3C6.39,67.33 6.4,67.36 6.42,67.39L6.42,67.38C8.32,70.65 10.65,73.73 13.44,76.53C13.45,76.53 13.45,76.53 13.45,76.54C13.45,76.54 13.45,76.54 13.46,76.54C16.15,79.24 19.24,81.63 22.7,83.63C22.72,83.65 22.75,83.66 22.78,83.68L22.78,83.67C26.06,85.55 29.62,87.06 33.43,88.08L33.43,88.08C37.12,89.07 41,89.61 45,89.61L45,89.61C45.03,89.61 45.07,89.61 45.1,89.61L45.1,89.6C48.88,89.59 52.72,89.11 56.54,88.09C56.58,88.08 56.61,88.07 56.64,88.06L56.64,88.06C60.28,87.07 63.86,85.62 67.29,83.64C67.29,83.64 67.3,83.63 67.3,83.63C67.3,83.63 67.31,83.63 67.31,83.63C70.6,81.72 73.71,79.37 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45,44.99L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45zM45,45L45.01,45L45.01,45L46.26,45.72L45.02,45.01L45,45zM45,45L45,45L45,45.02L45,47.25L45,45.02L45,45zM45,45.01L44.99,45.03L44.04,46.68L44.99,45.02L45,45.01z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_30.xml b/app/src/main/res/drawable/ic_download_progress_30.xml
index bb7984e51..75d572ac6 100644
--- a/app/src/main/res/drawable/ic_download_progress_30.xml
+++ b/app/src/main/res/drawable/ic_download_progress_30.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,44.99L45,45L45.01,44.98L67.32,6.38C64.02,4.47 60.42,2.95 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_300.xml b/app/src/main/res/drawable/ic_download_progress_300.xml
index fbc481142..3e38f350f 100644
--- a/app/src/main/res/drawable/ic_download_progress_300.xml
+++ b/app/src/main/res/drawable/ic_download_progress_300.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L44.98,45L42.75,45L44.98,45L45,45L44.98,44.99L6.38,22.68C4.47,25.98 2.95,29.58 1.92,33.44L1.92,33.44C1.91,33.44 1.91,33.45 1.91,33.46C1.91,33.46 1.91,33.46 1.91,33.46C1.91,33.47 1.9,33.49 1.9,33.51C1.9,33.52 1.89,33.54 1.89,33.55C0.92,37.2 0.39,41.04 0.39,45L0.39,45C0.39,45.03 0.39,45.06 0.39,45.1L0.4,45.1C0.41,48.87 0.89,52.71 1.91,56.53L1.91,56.53C1.91,56.53 1.91,56.54 1.91,56.54C1.91,56.55 1.91,56.55 1.91,56.55C2.9,60.23 4.37,63.85 6.37,67.3L6.37,67.3C6.37,67.3 6.37,67.3 6.37,67.3C6.39,67.33 6.4,67.36 6.42,67.39L6.42,67.38C8.32,70.65 10.65,73.73 13.44,76.53C13.45,76.53 13.45,76.53 13.45,76.54C13.45,76.54 13.45,76.54 13.46,76.54C16.15,79.24 19.24,81.63 22.7,83.63C22.72,83.65 22.75,83.66 22.78,83.68L22.78,83.67C26.06,85.55 29.62,87.06 33.43,88.08L33.43,88.08C37.12,89.07 41,89.61 45,89.61L45,89.61C45.03,89.61 45.07,89.61 45.1,89.61L45.1,89.6C48.88,89.59 52.72,89.11 56.54,88.09C56.58,88.08 56.61,88.07 56.64,88.06L56.64,88.06C60.28,87.07 63.86,85.62 67.29,83.64C67.29,83.64 67.3,83.63 67.3,83.63C67.3,83.63 67.31,83.63 67.31,83.63C70.6,81.72 73.71,79.37 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.34,44.41L45.01,44.98L45,44.99L45.01,44.98L45.34,44.41zM45.02,45L46.51,45L45.02,45L45.01,45L45.01,45L45,45L45.01,45L46.05,45.61L45.02,45.01L45,45L45.74,45.74L45.01,45.01L45,45L45,45.02L45,47.25L45,45.02L45,45L45,45L45,45L45,45L45,45L45.01,45L45.02,45zM45,45.01L44.99,45.03L44.07,46.62L44.99,45.02L45,45.01z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27C82.27,24.43 65.57,7.73 45,7.73Z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_315.xml b/app/src/main/res/drawable/ic_download_progress_315.xml
index 7f089ee0e..8d190097b 100644
--- a/app/src/main/res/drawable/ic_download_progress_315.xml
+++ b/app/src/main/res/drawable/ic_download_progress_315.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,44.99L45,45L45,45L45,45L44.98,45L42.75,45L44.98,45L45,45L44.99,45L44.98,44.99L43.86,44.34L44.98,44.99L44.99,45L13.47,13.44C10.77,16.14 8.37,19.23 6.37,22.69L6.37,22.7C6.35,22.72 6.34,22.75 6.32,22.78L6.33,22.78C4.45,26.06 2.94,29.62 1.92,33.44L1.92,33.44C1.91,33.44 1.91,33.45 1.91,33.46C1.91,33.46 1.91,33.46 1.91,33.46C1.91,33.47 1.9,33.49 1.9,33.51C1.9,33.52 1.89,33.54 1.89,33.55C0.92,37.2 0.39,41.04 0.39,45L0.39,45C0.39,45.03 0.39,45.06 0.39,45.1L0.4,45.1C0.41,48.87 0.89,52.71 1.91,56.53L1.91,56.53C1.91,56.53 1.91,56.54 1.91,56.54C1.91,56.55 1.91,56.55 1.91,56.55C2.9,60.23 4.37,63.85 6.37,67.3L6.37,67.3C6.37,67.3 6.37,67.3 6.37,67.3C6.39,67.33 6.4,67.36 6.42,67.39L6.42,67.38C8.32,70.65 10.65,73.73 13.44,76.53C13.45,76.53 13.45,76.53 13.45,76.54C13.45,76.54 13.45,76.54 13.46,76.54C16.15,79.24 19.24,81.63 22.7,83.63C22.72,83.65 22.75,83.66 22.78,83.68L22.78,83.67C26.06,85.55 29.62,87.06 33.43,88.08L33.43,88.08C37.12,89.07 41,89.61 45,89.61L45,89.61C45.03,89.61 45.07,89.61 45.1,89.61L45.1,89.6C48.88,89.59 52.72,89.11 56.54,88.09C56.58,88.08 56.61,88.07 56.64,88.06L56.64,88.06C60.28,87.07 63.86,85.62 67.29,83.64C67.29,83.64 67.3,83.63 67.3,83.63C67.3,83.63 67.31,83.63 67.31,83.63C70.6,81.72 73.71,79.37 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45,44.99L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45zM45,45L45.01,45L45.01,45L46.26,45.72L45.02,45.01L45,45zM45,45L45,45L45,45.02L45,47.25L45,45.02L45,45zM45,45.01L44.99,45.03L44.04,46.68L44.99,45.02L45,45.01z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27C82.27,24.43 65.57,7.73 45,7.73Z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_330.xml b/app/src/main/res/drawable/ic_download_progress_330.xml
index 2f76d525b..44772a168 100644
--- a/app/src/main/res/drawable/ic_download_progress_330.xml
+++ b/app/src/main/res/drawable/ic_download_progress_330.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L45,45L44.98,44.99L43.86,44.34L44.98,44.99L45,44.99L22.71,6.36C19.41,8.26 16.3,10.62 13.47,13.44C13.47,13.45 13.47,13.45 13.46,13.45C13.46,13.45 13.46,13.45 13.46,13.46L13.46,13.46C13.43,13.48 13.41,13.5 13.39,13.53C10.72,16.21 8.35,19.26 6.37,22.69L6.37,22.7C6.35,22.72 6.34,22.75 6.32,22.78L6.33,22.78C4.45,26.06 2.94,29.62 1.92,33.44L1.92,33.44C1.91,33.44 1.91,33.45 1.91,33.46C1.91,33.46 1.91,33.46 1.91,33.46C1.91,33.47 1.9,33.49 1.9,33.51C1.9,33.52 1.89,33.54 1.89,33.55C0.92,37.2 0.39,41.04 0.39,45L0.39,45C0.39,45.03 0.39,45.06 0.39,45.1L0.4,45.1C0.41,48.87 0.89,52.71 1.91,56.53L1.91,56.53C1.91,56.53 1.91,56.54 1.91,56.54C1.91,56.55 1.91,56.55 1.91,56.55C2.9,60.23 4.37,63.85 6.37,67.3L6.37,67.3C6.37,67.3 6.37,67.3 6.37,67.3C6.39,67.33 6.4,67.36 6.42,67.39L6.42,67.38C8.32,70.65 10.65,73.73 13.44,76.53C13.45,76.53 13.45,76.53 13.45,76.54C13.45,76.54 13.45,76.54 13.46,76.54C16.15,79.24 19.24,81.63 22.7,83.63C22.72,83.65 22.75,83.66 22.78,83.68L22.78,83.67C26.06,85.55 29.62,87.06 33.43,88.08L33.43,88.08C37.12,89.07 41,89.61 45,89.61L45,89.61C45.03,89.61 45.07,89.61 45.1,89.61L45.1,89.6C48.88,89.59 52.72,89.11 56.54,88.09C56.58,88.08 56.61,88.07 56.64,88.06L56.64,88.06C60.28,87.07 63.86,85.62 67.29,83.64C67.29,83.64 67.3,83.63 67.3,83.63C67.3,83.63 67.31,83.63 67.31,83.63C70.6,81.72 73.71,79.37 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.01,44.98L45.41,44.29zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45zM44.98,45L45,45L44.98,45L42.75,45L44.98,45zM45,45L45,45L45,45.02L45,47.25L45,45.02L45,45zM45.01,45L46.26,45.72L45.02,45.01L45.01,45zM45,45.01L44.99,45.03L44.04,46.68L44.99,45.02L45,45.01z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27C82.27,24.43 65.57,7.73 45,7.73Z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_345.xml b/app/src/main/res/drawable/ic_download_progress_345.xml
index 5e95469ca..0a4f9d40f 100644
--- a/app/src/main/res/drawable/ic_download_progress_345.xml
+++ b/app/src/main/res/drawable/ic_download_progress_345.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L33.47,1.91C29.79,2.89 26.17,4.36 22.71,6.36C22.69,6.37 22.67,6.39 22.65,6.4C22.64,6.41 22.62,6.41 22.61,6.42C19.35,8.31 16.27,10.65 13.47,13.44C13.47,13.45 13.47,13.45 13.46,13.45C13.46,13.45 13.46,13.45 13.46,13.46L13.46,13.46C13.43,13.48 13.41,13.5 13.39,13.53C10.72,16.21 8.35,19.26 6.37,22.69L6.37,22.7C6.35,22.72 6.34,22.75 6.32,22.78L6.33,22.78C4.45,26.06 2.94,29.62 1.92,33.44L1.92,33.44C1.91,33.44 1.91,33.45 1.91,33.46C1.91,33.46 1.91,33.46 1.91,33.46C1.91,33.47 1.9,33.49 1.9,33.51C1.9,33.52 1.89,33.54 1.89,33.55C0.92,37.2 0.39,41.04 0.39,45L0.39,45C0.39,45.03 0.39,45.06 0.39,45.1L0.4,45.1C0.41,48.87 0.89,52.71 1.91,56.53L1.91,56.53C1.91,56.53 1.91,56.54 1.91,56.54C1.91,56.55 1.91,56.55 1.91,56.55C2.9,60.23 4.37,63.85 6.37,67.3L6.37,67.3C6.37,67.3 6.37,67.3 6.37,67.3C6.39,67.33 6.4,67.36 6.42,67.39L6.42,67.38C8.32,70.65 10.65,73.73 13.44,76.53C13.45,76.53 13.45,76.53 13.45,76.54C13.45,76.54 13.45,76.54 13.46,76.54C16.15,79.24 19.24,81.63 22.7,83.63C22.72,83.65 22.75,83.66 22.78,83.68L22.78,83.67C26.06,85.55 29.62,87.06 33.43,88.08L33.43,88.08C37.12,89.07 41,89.61 45,89.61L45,89.61C45.03,89.61 45.07,89.61 45.1,89.61L45.1,89.6C48.88,89.59 52.72,89.11 56.54,88.09C56.58,88.08 56.61,88.07 56.64,88.06L56.64,88.06C60.28,87.07 63.86,85.62 67.29,83.64C67.29,83.64 67.3,83.63 67.3,83.63C67.3,83.63 67.31,83.63 67.31,83.63C70.6,81.72 73.71,79.37 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM43.86,44.34L44.98,44.99L44.99,45L44.98,44.99L43.86,44.34zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45zM44.98,45L45,45L45,45L45,45L44.98,45L42.75,45L44.98,45zM45,45L45.01,45L46.26,45.72L45.02,45.01L45,45zM45,45L45,45L45,45.02L45,47.25L45,45.02L45,45zM45,45.01L44.99,45.03L44.04,46.68L44.99,45.02L45,45.01z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27C82.27,24.43 65.57,7.73 45,7.73Z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_360.xml b/app/src/main/res/drawable/ic_download_progress_360.xml
index 53eb56bd7..ec0a72638 100644
--- a/app/src/main/res/drawable/ic_download_progress_360.xml
+++ b/app/src/main/res/drawable/ic_download_progress_360.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L44.9,0.4C41.12,0.41 37.28,0.89 33.45,1.91L33.46,1.91C33.42,1.92 33.39,1.93 33.36,1.94C29.72,2.93 26.14,4.38 22.71,6.36C22.69,6.37 22.67,6.39 22.65,6.4C22.64,6.41 22.62,6.41 22.61,6.42C19.35,8.31 16.27,10.65 13.47,13.44C13.47,13.45 13.47,13.45 13.46,13.45C13.46,13.45 13.46,13.45 13.46,13.46L13.46,13.46C13.43,13.48 13.41,13.5 13.39,13.53C10.72,16.21 8.35,19.26 6.37,22.69L6.37,22.7C6.35,22.72 6.34,22.75 6.32,22.78L6.33,22.78C4.45,26.06 2.94,29.62 1.92,33.44L1.92,33.44C1.91,33.44 1.91,33.45 1.91,33.46C1.91,33.46 1.91,33.46 1.91,33.46C1.91,33.47 1.9,33.49 1.9,33.51C1.9,33.52 1.89,33.54 1.89,33.55C0.92,37.2 0.39,41.04 0.39,45L0.39,45C0.39,45.03 0.39,45.06 0.39,45.1L0.4,45.1C0.41,48.87 0.89,52.71 1.91,56.53L1.91,56.53C1.91,56.53 1.91,56.54 1.91,56.54C1.91,56.55 1.91,56.55 1.91,56.55C2.9,60.23 4.37,63.85 6.37,67.3L6.37,67.3C6.37,67.3 6.37,67.3 6.37,67.3C6.39,67.33 6.4,67.36 6.42,67.39L6.42,67.38C8.32,70.65 10.65,73.73 13.44,76.53C13.45,76.53 13.45,76.53 13.45,76.54C13.45,76.54 13.45,76.54 13.46,76.54C16.15,79.24 19.24,81.63 22.7,83.63C22.72,83.65 22.75,83.66 22.78,83.68L22.78,83.67C26.06,85.55 29.62,87.06 33.43,88.08L33.43,88.08C37.12,89.07 41,89.61 45,89.61L45,89.61C45.03,89.61 45.07,89.61 45.1,89.61L45.1,89.6C48.88,89.59 52.72,89.11 56.54,88.09C56.58,88.08 56.61,88.07 56.64,88.06L56.64,88.06C60.28,87.07 63.86,85.62 67.29,83.64C67.29,83.64 67.3,83.63 67.3,83.63C67.3,83.63 67.31,83.63 67.31,83.63C70.6,81.72 73.71,79.37 76.53,76.55L76.53,76.56C76.53,76.55 76.54,76.55 76.54,76.54C79.24,73.85 81.63,70.76 83.63,67.3C83.65,67.28 83.66,67.25 83.68,67.22L83.67,67.22C85.55,63.94 87.06,60.38 88.08,56.56L88.08,56.56C88.09,56.56 88.09,56.55 88.09,56.54C88.09,56.54 88.09,56.54 88.09,56.54C88.09,56.52 88.1,56.51 88.1,56.49C89.08,52.82 89.61,48.97 89.61,45L89.61,45C89.61,44.97 89.61,44.94 89.61,44.9L89.6,44.9C89.59,41.12 89.11,37.28 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.97,0.39 45.01,0.39C45.01,0.39 45.01,0.39 45,0.39L45,0.39zM45,43.47L45,44.98L45,44.99L45,44.98L45,43.47zM45.41,44.29L45.01,44.98L45,44.99L45.01,44.98L45.41,44.29zM43.86,44.34L44.98,44.99L44.99,45L44.98,44.99L43.86,44.34zM45.02,45L46.51,45L45.02,45L45.01,45L45.02,45zM44.98,45L45,45L45,45L45,45L44.98,45L42.75,45L44.98,45zM45,45L45.01,45L46.26,45.72L45.02,45.01L45,45zM45,45L45,45L45,45.02L45,47.25L45,45.02L45,45zM45,45.01L44.99,45.03L44.04,46.68L44.99,45.02L45,45.01z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27C82.27,24.43 65.57,7.73 45,7.73Z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_45.xml b/app/src/main/res/drawable/ic_download_progress_45.xml
index 8e16b0e89..ccfac4b8a 100644
--- a/app/src/main/res/drawable/ic_download_progress_45.xml
+++ b/app/src/main/res/drawable/ic_download_progress_45.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L45,45L45,45L45,45L76.55,13.47C73.85,10.77 70.77,8.37 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.41,44.29z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_60.xml b/app/src/main/res/drawable/ic_download_progress_60.xml
index 8870e9fd8..c822dc030 100644
--- a/app/src/main/res/drawable/ic_download_progress_60.xml
+++ b/app/src/main/res/drawable/ic_download_progress_60.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L45,45L83.64,22.71C81.73,19.41 79.38,16.3 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.41,44.29z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_75.xml b/app/src/main/res/drawable/ic_download_progress_75.xml
index 8a9f96dc5..127fd7d2e 100644
--- a/app/src/main/res/drawable/ic_download_progress_75.xml
+++ b/app/src/main/res/drawable/ic_download_progress_75.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L88.09,33.47C87.11,29.79 85.64,26.17 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.41,44.29z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_progress_90.xml b/app/src/main/res/drawable/ic_download_progress_90.xml
index 4f9a2e3ef..39266fc6a 100644
--- a/app/src/main/res/drawable/ic_download_progress_90.xml
+++ b/app/src/main/res/drawable/ic_download_progress_90.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90.0"
+    android:viewportHeight="90.0">
     <path
         android:pathData="M45,0.39C44.97,0.39 44.94,0.39 44.9,0.39L45,44.98L45,44.99L45,45L45,45L45.02,45L89.61,45.02C89.61,41.2 89.12,37.32 88.09,33.46C88.08,33.42 88.07,33.39 88.06,33.36L88.06,33.36C87.07,29.72 85.62,26.14 83.64,22.71C83.64,22.71 83.63,22.7 83.63,22.7C83.63,22.7 83.63,22.69 83.63,22.69C81.72,19.4 79.37,16.29 76.55,13.47C76.55,13.47 76.55,13.46 76.54,13.46L76.54,13.46C76.52,13.43 76.49,13.41 76.47,13.39C73.79,10.72 70.73,8.35 67.3,6.37C67.28,6.35 67.25,6.34 67.22,6.32L67.22,6.33C63.94,4.45 60.38,2.94 56.56,1.92C56.56,1.92 56.56,1.92 56.56,1.92C56.56,1.92 56.55,1.91 56.54,1.91L56.54,1.91C56.51,1.9 56.48,1.9 56.45,1.89L56.45,1.89C52.8,0.92 48.96,0.39 45,0.39L45,0.39zM45.41,44.29L45.01,44.98L45,44.99L45.41,44.29z"
         android:strokeLineCap="butt"
@@ -11,7 +11,7 @@
         android:fillColor="#8ab000"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
         android:strokeLineCap="butt"
@@ -20,19 +20,19 @@
         android:fillColor="#0066cc"
         android:strokeWidth="2"
         android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
     <path
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
         android:fillAlpha="1"
         android:strokeColor="#00000000"
         android:fillColor="#ffffff"
         android:strokeWidth="2"
-        android:strokeAlpha="1"/>
+        android:strokeAlpha="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml
index 3920ae4d3..3c59fe3fb 100644
--- a/app/src/main/res/drawable/ic_email.xml
+++ b/app/src/main/res/drawable/ic_email.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM19.6,8.25l-7.07,4.42c-0.32,0.2 -0.74,0.2 -1.06,0L4.4,8.25c-0.25,-0.16 -0.4,-0.43 -0.4,-0.72 0,-0.67 0.73,-1.07 1.3,-0.72L12,11l6.7,-4.19c0.57,-0.35 1.3,0.05 1.3,0.72 0,0.29 -0.15,0.56 -0.4,0.72z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM19.6,8.25l-7.07,4.42c-0.32,0.2 -0.74,0.2 -1.06,0L4.4,8.25c-0.25,-0.16 -0.4,-0.43 -0.4,-0.72 0,-0.67 0.73,-1.07 1.3,-0.72L12,11l6.7,-4.19c0.57,-0.35 1.3,0.05 1.3,0.72 0,0.29 -0.15,0.56 -0.4,0.72z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index 4a693ce92..bf7a54d32 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,13c-0.55,0 -1,-0.45 -1,-1L11,8c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v4c0,0.55 -0.45,1 -1,1zM13,17h-2v-2h2v2z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,13c-0.55,0 -1,-0.45 -1,-1L11,8c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v4c0,0.55 -0.45,1 -1,1zM13,17h-2v-2h2v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_expand_less.xml b/app/src/main/res/drawable/ic_expand_less.xml
index adcce544e..0b5365df6 100644
--- a/app/src/main/res/drawable/ic_expand_less.xml
+++ b/app/src/main/res/drawable/ic_expand_less.xml
@@ -4,6 +4,5 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:pathData="M11.29,8.71L6.7,13.3c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L12,10.83l3.88,3.88c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L12.7,8.71c-0.38,-0.39 -1.02,-0.39 -1.41,0z"/>
+    <path android:pathData="M11.29,8.71L6.7,13.3c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L12,10.83l3.88,3.88c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L12.7,8.71c-0.38,-0.39 -1.02,-0.39 -1.41,0z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_expand_more.xml b/app/src/main/res/drawable/ic_expand_more.xml
index 4225e8b6e..48a98a2ee 100644
--- a/app/src/main/res/drawable/ic_expand_more.xml
+++ b/app/src/main/res/drawable/ic_expand_more.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal"
     tools:ignore="VectorRaster">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M15.88,9.29L12,13.17 8.12,9.29c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41l4.59,4.59c0.39,0.39 1.02,0.39 1.41,0l4.59,-4.59c0.39,-0.39 0.39,-1.02 0,-1.41 -0.39,-0.38 -1.03,-0.39 -1.42,0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M15.88,9.29L12,13.17 8.12,9.29c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41l4.59,4.59c0.39,0.39 1.02,0.39 1.41,0l4.59,-4.59c0.39,-0.39 0.39,-1.02 0,-1.41 -0.39,-0.38 -1.03,-0.39 -1.42,0z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_file_download.xml b/app/src/main/res/drawable/ic_file_download.xml
index 5804abbc0..231fc974c 100644
--- a/app/src/main/res/drawable/ic_file_download.xml
+++ b/app/src/main/res/drawable/ic_file_download.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M16.59,9H15V4c0,-0.55 -0.45,-1 -1,-1h-4c-0.55,0 -1,0.45 -1,1v5H7.41c-0.89,0 -1.34,1.08 -0.71,1.71l4.59,4.59c0.39,0.39 1.02,0.39 1.41,0l4.59,-4.59c0.63,-0.63 0.19,-1.71 -0.7,-1.71zM5,19c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H6c-0.55,0 -1,0.45 -1,1z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M16.59,9H15V4c0,-0.55 -0.45,-1 -1,-1h-4c-0.55,0 -1,0.45 -1,1v5H7.41c-0.89,0 -1.34,1.08 -0.71,1.71l4.59,4.59c0.39,0.39 1.02,0.39 1.41,0l4.59,-4.59c0.63,-0.63 0.19,-1.71 -0.7,-1.71zM5,19c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H6c-0.55,0 -1,0.45 -1,1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_known_vuln_overlay.xml b/app/src/main/res/drawable/ic_known_vuln_overlay.xml
index 382d6dfe3..908c5232b 100644
--- a/app/src/main/res/drawable/ic_known_vuln_overlay.xml
+++ b/app/src/main/res/drawable/ic_known_vuln_overlay.xml
@@ -1,19 +1,42 @@
-<vector android:height="24dp" android:viewportHeight="12.7"
-    android:viewportWidth="12.7" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
+<vector android:height="24dp"
+    android:viewportHeight="12.7"
+    android:viewportWidth="12.7"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
         android:pathData="M6.35,6.35m-6.35,0a6.35,6.35 0,1 1,12.7 0a6.35,6.35 0,1 1,-12.7 0"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="0.52916664"/>
-    <path android:fillAlpha="1" android:fillColor="#ff3600"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.52916664" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ff3600"
         android:pathData="M6.35,6.35m-5.33,0a5.33,5.33 0,1 1,10.661 0a5.33,5.33 0,1 1,-10.661 0"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="0.52916664"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.52916664" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
         android:pathData="M5.863,3.778h0.904v3.082h-0.904z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="0.52916664"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.52916664" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
         android:pathData="M5.863,8.899l0.904,0l0,-0.973l-0.904,0z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="0.52916664"/>
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.52916664" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_latest.xml b/app/src/main/res/drawable/ic_latest.xml
index afaba1b55..65917ed60 100644
--- a/app/src/main/res/drawable/ic_latest.xml
+++ b/app/src/main/res/drawable/ic_latest.xml
@@ -1,10 +1,17 @@
-<vector android:height="24dp" android:viewportHeight="47.0"
+<vector android:height="24dp"
+    android:viewportHeight="47.0"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="47.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff"
+    android:viewportWidth="47.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#ffffff"
         android:pathData="M23.9,10.2l-11.4,1.64l8.25,7.94l-1.95,11.22l10.2,-5.3l10.2,5.3l-1.95,-11.22l8.25,-7.94l-11.4,-1.64l-5.1,-10.2z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#ffffff"
         android:pathData="m17.07,35.44c-0.58,0 -1.15,-0.18 -1.64,-0.53 -0.86,-0.62 -1.29,-1.68 -1.11,-2.72L16.06,22.07 15.04,21.09L4.21,21.09c-1.5,0 -2.71,1.21 -2.71,2.71L1.5,44.29c0,1.5 1.21,2.71 2.71,2.71L24.7,47c1.5,0 2.71,-1.21 2.71,-2.71L27.41,30.36l-9.05,4.76c-0.41,0.21 -0.85,0.32 -1.3,0.32"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
index d642fe39a..384d0d364 100644
--- a/app/src/main/res/drawable/ic_lock.xml
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -1,6 +1,10 @@
 <vector android:height="24dp"
     android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_nearby.xml b/app/src/main/res/drawable/ic_nearby.xml
index 5407a14f1..59566d6b2 100644
--- a/app/src/main/res/drawable/ic_nearby.xml
+++ b/app/src/main/res/drawable/ic_nearby.xml
@@ -1,19 +1,33 @@
-<vector android:height="24dp" android:viewportHeight="48.0"
+<vector android:height="24dp"
+    android:viewportHeight="48.0"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff"
+    android:viewportWidth="48.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#ffffff"
         android:pathData="m22.75,12.78c-6.19,0 -11.22,5.03 -11.22,11.22 0,0.55 0.05,1.08 0.13,1.61 1.71,0.27 3.29,0.93 4.64,1.91 -0.57,-1.05 -0.9,-2.24 -0.9,-3.52 0,-4.05 3.3,-7.35 7.35,-7.35 4.05,0 7.35,3.3 7.35,7.35 0,4.05 -3.3,7.35 -7.35,7.35 -1.38,0 -2.66,-0.39 -3.77,-1.05 0.92,1.39 1.53,2.99 1.73,4.73 0.66,0.12 1.34,0.2 2.04,0.2 6.19,0 11.22,-5.03 11.22,-11.22 0,-6.19 -5.03,-11.22 -11.22,-11.22"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#ffffff"
         android:pathData="m42.28,25.4c-0.36,0 -0.71,-0.02 -1.06,-0.06 -0.69,9.6 -8.71,17.2 -18.48,17.2 -1.28,0 -2.53,-0.13 -3.74,-0.38 -0.83,1.26 -1.91,2.33 -3.18,3.15 2.18,0.71 4.5,1.1 6.91,1.1 12.03,0 21.87,-9.54 22.38,-21.45 -0.9,0.29 -1.85,0.44 -2.84,0.44"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#ffffff"
         android:pathData="m42.28,10.64c-2.96,0 -5.36,2.41 -5.36,5.36 0,2.96 2.41,5.36 5.36,5.36 2.96,0 5.36,-2.41 5.36,-5.36 0,-2.96 -2.41,-5.36 -5.36,-5.36"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#ffffff"
         android:pathData="m10,29.5c-3.72,0 -6.75,3.03 -6.75,6.75 0,3.72 3.03,6.75 6.75,6.75 3.72,0 6.75,-3.03 6.75,-6.75 0,-3.72 -3.03,-6.75 -6.75,-6.75"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
         android:pathData="m4.47,27.01c-0.16,-0.98 -0.25,-1.98 -0.25,-3.01 0,-10.22 8.31,-18.53 18.53,-18.53 4.68,0 8.97,1.75 12.23,4.63C35.81,9.08 36.85,8.24 38.03,7.64 34.02,3.9 28.65,1.6 22.75,1.6 10.4,1.6 0.35,11.65 0.35,24c0,2.1 0.3,4.13 0.84,6.05 0.87,-1.23 1.99,-2.27 3.28,-3.04"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_nearby_share.xml b/app/src/main/res/drawable/ic_nearby_share.xml
index 9aba68fa7..081261e0f 100644
--- a/app/src/main/res/drawable/ic_nearby_share.xml
+++ b/app/src/main/res/drawable/ic_nearby_share.xml
@@ -1,18 +1,31 @@
-<vector android:height="48dp" android:viewportHeight="100.0"
-    android:viewportWidth="100.0" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#0066CC"
+<vector android:height="48dp"
+    android:viewportHeight="100.0"
+    android:viewportWidth="100.0"
+    android:width="48dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#0066CC"
         android:pathData="M82.21,71.93C75.18,82.46 63.17,89.42 49.55,89.42C45.85,89.42 42.29,88.87 38.9,87.92C37.72,90.05 36.2,91.96 34.44,93.61C39.18,95.26 44.25,96.2 49.55,96.2C66.77,96.2 81.8,86.71 89.68,72.73C89.17,72.77 88.65,72.81 88.12,72.81C86.07,72.81 84.08,72.5 82.21,71.93"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#0066CC"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#0066CC"
         android:pathData="M10.34,50.39C10.34,28.87 27.93,11.37 49.55,11.37C64.69,11.37 77.83,19.97 84.36,32.51C85.58,32.28 86.84,32.15 88.12,32.15C89.42,32.15 90.68,32.28 91.91,32.51C84.89,16.12 68.55,4.59 49.55,4.59C24.18,4.59 3.54,25.14 3.54,50.39C3.54,53.15 3.82,55.84 4.3,58.46C6.2,57 8.33,55.82 10.64,54.99C10.46,53.48 10.34,51.95 10.34,50.39"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#0066CC"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#0066CC"
         android:pathData="M49.55,74.61C58.46,74.61 66.24,69.81 70.48,62.68C68.72,59.68 67.7,56.2 67.7,52.47C67.7,47.96 69.2,43.8 71.7,40.43C67.87,32.03 59.4,26.17 49.55,26.17C36.13,26.17 25.22,37.04 25.22,50.39C25.22,51.87 25.37,53.3 25.62,54.7C33.91,57.34 40.15,64.47 41.49,73.22C44.02,74.11 46.72,74.61 49.55,74.61L49.55,74.61ZM35.05,50.39C35.05,42.43 41.55,35.96 49.55,35.96C57.54,35.96 64.05,42.43 64.05,50.39C64.05,58.35 57.54,64.82 49.55,64.82C41.55,64.82 35.05,58.35 35.05,50.39L35.05,50.39Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#0066CC"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#0066CC"
         android:pathData="M18.53,65.2C12.13,65.2 6.93,70.37 6.93,76.74C6.93,83.12 12.13,88.29 18.53,88.29C24.94,88.29 30.13,83.12 30.13,76.74C30.13,70.37 24.94,65.2 18.53,65.2"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#0066CC"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#0066CC"
         android:pathData="M88.12,43.19C82.97,43.19 78.79,47.35 78.79,52.48C78.79,57.61 82.97,61.77 88.12,61.77C93.27,61.77 97.45,57.61 97.45,52.48C97.45,47.35 93.27,43.19 88.12,43.19"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_nfc.xml b/app/src/main/res/drawable/ic_nfc.xml
index 231f25d6b..68eae50c7 100644
--- a/app/src/main/res/drawable/ic_nfc.xml
+++ b/app/src/main/res/drawable/ic_nfc.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM19,20L5,20c-0.55,0 -1,-0.45 -1,-1L4,5c0,-0.55 0.45,-1 1,-1h14c0.55,0 1,0.45 1,1v14c0,0.55 -0.45,1 -1,1zM16,6h-3c-1.1,0 -2,0.9 -2,2v2.28c-0.6,0.35 -1,0.98 -1,1.72 0,1.1 0.9,2 2,2s2,-0.9 2,-2c0,-0.74 -0.4,-1.38 -1,-1.72L13,8h3v7c0,0.55 -0.45,1 -1,1L9,16c-0.55,0 -1,-0.45 -1,-1L8,8h1c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L8,6c-1.1,0 -2,0.9 -2,2v8c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,8c0,-1.1 -0.9,-2 -2,-2z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM19,20L5,20c-0.55,0 -1,-0.45 -1,-1L4,5c0,-0.55 0.45,-1 1,-1h14c0.55,0 1,0.45 1,1v14c0,0.55 -0.45,1 -1,1zM16,6h-3c-1.1,0 -2,0.9 -2,2v2.28c-0.6,0.35 -1,0.98 -1,1.72 0,1.1 0.9,2 2,2s2,-0.9 2,-2c0,-0.74 -0.4,-1.38 -1,-1.72L13,8h3v7c0,0.55 -0.45,1 -1,1L9,16c-0.55,0 -1,-0.45 -1,-1L8,8h1c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L8,6c-1.1,0 -2,0.9 -2,2v8c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,8c0,-1.1 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
index d3d6edf7a..ecba10fa2 100644
--- a/app/src/main/res/drawable/ic_notification.xml
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -1,8 +1,16 @@
-<vector android:height="24dp" android:viewportHeight="48.0"
+<vector android:height="24dp"
+    android:viewportHeight="48.0"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
+    android:viewportWidth="48.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
         android:pathData="m2.61,1.25c-0.45,0.01 -0.76,0.19 -0.98,0.45 0,0 0,0 0.01,0.01 -0,0 -0.01,0.01 -0.01,0.01 -0,-0 -0,-0 -0,-0.01 -0,0 -0.01,0.02 -0.02,0.03 -0.01,0.01 -0.01,0.02 -0.02,0.03 -0.15,0.2 -0.49,0.8 0.01,1.5L5.21,7.93C5.08,8.26 5,8.62 5,9v3,1 2.46L5,16c0,1.66 1.34,3 3,3h32c1.66,0 3,-1.34 3,-3L43,15.46 43,9.54 43,9C43,8.62 42.92,8.26 42.79,7.93l3.61,-4.66c0.5,-0.7 0.16,-1.3 0.01,-1.5 -0.01,-0.01 -0.01,-0.02 -0.02,-0.03 -0,-0.01 -0.01,-0.02 -0.02,-0.03 -0,0 -0,0 -0,0.01 -0,-0 -0.01,-0.01 -0.01,-0.01 0,-0 0,-0 0.01,-0.01 -0.22,-0.26 -0.53,-0.44 -0.98,-0.45 -0.38,0.01 -0.74,0.18 -0.97,0.49L40.99,6.18C40.86,6.13 40.74,6.09 40.61,6.06 40.41,6.02 40.21,6 40,6L8,6C7.65,6 7.32,6.07 7.01,6.18L3.58,1.74C3.35,1.43 2.99,1.26 2.61,1.25ZM14.38,9.75c1.86,0 3.38,1.51 3.38,3.38 0,1.86 -1.51,3.38 -3.38,3.38C12.51,16.5 11,14.99 11,13.13 11,11.26 12.51,9.75 14.38,9.75ZM33.88,9.75c1.86,0 3.38,1.51 3.38,3.38 0,1.86 -1.51,3.38 -3.38,3.38 -1.86,0 -3.38,-1.51 -3.38,-3.38 0,-1.86 1.51,-3.38 3.38,-3.38zM8,20.97c-1.66,0 -3,1.34 -3,3L5,30 5,36 5,42.23 5,43c0,1.66 1.34,3 3,3h32c1.66,0 3,-1.34 3,-3L43,42.23 43,24.73 43,23.97c0,-1.66 -1.34,-3 -3,-3z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="round" android:strokeLineJoin="miter" android:strokeWidth="2.5"/>
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="2.5" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_notification_download.xml b/app/src/main/res/drawable/ic_notification_download.xml
index 5dcc185c3..31752c523 100644
--- a/app/src/main/res/drawable/ic_notification_download.xml
+++ b/app/src/main/res/drawable/ic_notification_download.xml
@@ -1,13 +1,29 @@
-<vector android:height="36dp" android:viewportHeight="90.0"
-    android:viewportWidth="90.0" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#0066cc"
+<vector android:height="36dp"
+    android:viewportHeight="90.0"
+    android:viewportWidth="90.0"
+    android:width="36dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#0066cc"
         android:pathData="m45,7.73c-20.57,0 -37.27,16.7 -37.27,37.27 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="2"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="2" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
         android:pathData="M30.78,56.85h27.97v4.04h-27.97z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeWidth="2" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
         android:pathData="m38.8,26.93 l0,12.18 -7.71,0 13.86,13.57 13.86,-13.57 -7.83,0 0,-12.18z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2"/>
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeWidth="2" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_notifications_off.xml b/app/src/main/res/drawable/ic_notifications_off.xml
index 871d66f7a..e9093f999 100644
--- a/app/src/main/res/drawable/ic_notifications_off.xml
+++ b/app/src/main/res/drawable/ic_notifications_off.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,11c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.24,0.06 -0.47,0.15 -0.69,0.23L18,13.1L18,11zM5.41,3.35L4,4.76l2.81,2.81C6.29,8.57 6,9.73 6,11v5l-1.29,1.29c-0.63,0.63 -0.19,1.71 0.7,1.71h12.83l1.74,1.74 1.41,-1.41L5.41,3.35z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,11c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.24,0.06 -0.47,0.15 -0.69,0.23L18,13.1L18,11zM5.41,3.35L4,4.76l2.81,2.81C6.29,8.57 6,9.73 6,11v5l-1.29,1.29c-0.63,0.63 -0.19,1.71 0.7,1.71h12.83l1.74,1.74 1.41,-1.41L5.41,3.35z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_notifications_paused.xml b/app/src/main/res/drawable/ic_notifications_paused.xml
index 5845c1396..8086ba815 100644
--- a/app/src/main/res/drawable/ic_notifications_paused.xml
+++ b/app/src/main/res/drawable/ic_notifications_paused.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM19.29,17.29L18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-1.29,1.29c-0.63,0.63 -0.19,1.71 0.7,1.71h13.17c0.9,0 1.34,-1.08 0.71,-1.71zM14.5,9.33c0,0.31 -0.11,0.6 -0.3,0.84l-2.5,3.03h1.9c0.5,0 0.9,0.4 0.9,0.9s-0.4,0.9 -0.9,0.9h-2.78c-0.73,0 -1.32,-0.59 -1.32,-1.32v-0.01c0,-0.31 0.11,-0.6 0.3,-0.84l2.5,-3.03h-1.9c-0.5,0 -0.9,-0.4 -0.9,-0.9s0.4,-0.9 0.9,-0.9h2.78c0.73,0 1.32,0.59 1.32,1.33z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM19.29,17.29L18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-1.29,1.29c-0.63,0.63 -0.19,1.71 0.7,1.71h13.17c0.9,0 1.34,-1.08 0.71,-1.71zM14.5,9.33c0,0.31 -0.11,0.6 -0.3,0.84l-2.5,3.03h1.9c0.5,0 0.9,0.4 0.9,0.9s-0.4,0.9 -0.9,0.9h-2.78c-0.73,0 -1.32,-0.59 -1.32,-1.32v-0.01c0,-0.31 0.11,-0.6 0.3,-0.84l2.5,-3.03h-1.9c-0.5,0 -0.9,-0.4 -0.9,-0.9s0.4,-0.9 0.9,-0.9h2.78c0.73,0 1.32,0.59 1.32,1.33z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_perm_device_info.xml b/app/src/main/res/drawable/ic_perm_device_info.xml
index 931fb1520..c6498bc61 100644
--- a/app/src/main/res/drawable/ic_perm_device_info.xml
+++ b/app/src/main/res/drawable/ic_perm_device_info.xml
@@ -18,5 +18,5 @@
     android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M26.0,14.0l-4.0,0.0l0.0,4.0l4.0,0.0l0.0,-4.0zm0.0,8.0l-4.0,0.0l0.0,12.0l4.0,0.0L26.0,22.0zm8.0,-19.98L14.0,2.0c-2.21,0.0 -4.0,1.79 -4.0,4.0l0.0,36.0c0.0,2.21 1.79,4.0 4.0,4.0l20.0,0.0c2.21,0.0 4.0,-1.79 4.0,-4.0L38.0,6.0c0.0,-2.21 -1.79,-3.98 -4.0,-3.98zM34.0,38.0L14.0,38.0L14.0,10.0l20.0,0.0l0.0,28.0z"/>
+        android:pathData="M26.0,14.0l-4.0,0.0l0.0,4.0l4.0,0.0l0.0,-4.0zm0.0,8.0l-4.0,0.0l0.0,12.0l4.0,0.0L26.0,22.0zm8.0,-19.98L14.0,2.0c-2.21,0.0 -4.0,1.79 -4.0,4.0l0.0,36.0c0.0,2.21 1.79,4.0 4.0,4.0l20.0,0.0c2.21,0.0 4.0,-1.79 4.0,-4.0L38.0,6.0c0.0,-2.21 -1.79,-3.98 -4.0,-3.98zM34.0,38.0L14.0,38.0L14.0,10.0l20.0,0.0l0.0,28.0z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index 98b79300e..bcaf581ab 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92 -1.31,-2.92 -2.92,-2.92z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.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_sort.xml b/app/src/main/res/drawable/ic_sort.xml
index ce3583a0e..35ca67e78 100644
--- a/app/src/main/res/drawable/ic_sort.xml
+++ b/app/src/main/res/drawable/ic_sort.xml
@@ -1,11 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:autoMirrored="true"
-        android:height="36dp"
-        android:width="36dp"
-        android:tint="?attr/colorControlNormal"
-        android:viewportHeight="24"
-        android:viewportWidth="24">
+    android:autoMirrored="true"
+    android:height="36dp"
+    android:width="36dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
     <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z" />
+        android:fillColor="#FFFFFF"
+        android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_video.xml b/app/src/main/res/drawable/ic_video.xml
index 8dbe47235..0b7b5f603 100644
--- a/app/src/main/res/drawable/ic_video.xml
+++ b/app/src/main/res/drawable/ic_video.xml
@@ -4,5 +4,7 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#FFFFFF" android:pathData="M10,16.5V7.5L16,12M20,4.4C19.4,4.2 15.7,4 12,4C8.3,4 4.6,4.19 4,4.38C2.44,4.9 2,8.4 2,12C2,15.59 2.44,19.1 4,19.61C4.6,19.81 8.3,20 12,20C15.7,20 19.4,19.81 20,19.61C21.56,19.1 22,15.59 22,12C22,8.4 21.56,4.91 20,4.4Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M10,16.5V7.5L16,12M20,4.4C19.4,4.2 15.7,4 12,4C8.3,4 4.6,4.19 4,4.38C2.44,4.9 2,8.4 2,12C2,15.59 2.44,19.1 4,19.61C4.6,19.81 8.3,20 12,20C15.7,20 19.4,19.81 20,19.61C21.56,19.1 22,15.59 22,12C22,8.4 21.56,4.91 20,4.4Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
index c78190ddc..5beaae92b 100644
--- a/app/src/main/res/drawable/ic_warning.xml
+++ b/app/src/main/res/drawable/ic_warning.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#ffffffff"
-      android:pathData="M4.47,21h15.06c1.54,0 2.5,-1.67 1.73,-3L13.73,4.99c-0.77,-1.33 -2.69,-1.33 -3.46,0L2.74,18c-0.77,1.33 0.19,3 1.73,3zM12,14c-0.55,0 -1,-0.45 -1,-1v-2c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2c0,0.55 -0.45,1 -1,1zM13,18h-2v-2h2v2z"/>
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M4.47,21h15.06c1.54,0 2.5,-1.67 1.73,-3L13.73,4.99c-0.77,-1.33 -2.69,-1.33 -3.46,0L2.74,18c-0.77,1.33 0.19,3 1.73,3zM12,14c-0.55,0 -1,-0.45 -1,-1v-2c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2c0,0.55 -0.45,1 -1,1zM13,18h-2v-2h2v2z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_website.xml b/app/src/main/res/drawable/ic_website.xml
index 5f089747c..aae74b23a 100644
--- a/app/src/main/res/drawable/ic_website.xml
+++ b/app/src/main/res/drawable/ic_website.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#ffffff"
-      android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,9h10.5v3.5L4,12.5L4,9zM4,14.5h10.5L14.5,18L5,18c-0.55,0 -1,-0.45 -1,-1v-2.5zM19,18h-2.5L16.5,9L20,9v8c0,0.55 -0.45,1 -1,1z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,9h10.5v3.5L4,12.5L4,9zM4,14.5h10.5L14.5,18L5,18c-0.55,0 -1,-0.45 -1,-1v-2.5zM19,18h-2.5L16.5,9L20,9v8c0,0.55 -0.45,1 -1,1z" />
 </vector>
diff --git a/app/src/main/res/drawable/no_updates_bg.xml b/app/src/main/res/drawable/no_updates_bg.xml
index 418a40e32..909ec0b63 100644
--- a/app/src/main/res/drawable/no_updates_bg.xml
+++ b/app/src/main/res/drawable/no_updates_bg.xml
@@ -1,7 +1,12 @@
-<vector android:height="24dp" android:viewportHeight="634.0"
-        android:viewportWidth="720.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="24dp"
+    android:viewportHeight="634.0"
+    android:viewportWidth="720.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-          android:fillAlpha="1" android:fillColor="#f9f9f9"
-          android:pathData="m 412.46036,501.73018 a 47.11509,47.11509 0 0 1 -47.11509,47.11509 47.11509,47.11509 0 0 1 -47.11509,-47.11509 h 94.23018 M 365.34527,77.69437 a 23.557545,23.557545 0 0 1 23.55755,23.55754 v 25.44215 c 66.90342,11.30762 117.78772,69.49476 117.78772,139.46067 V 407.5 l 70.67264,70.67263 H 153.32737 L 224,407.5 V 266.15473 c 0,-69.96591 50.8843,-128.15305 117.78773,-139.46067 v -25.44215 a 23.557545,23.557545 0 0 1 23.55754,-23.55754 z"
-          android:strokeColor="#00000000" android:strokeWidth="1"/>
+        android:fillAlpha="1"
+        android:fillColor="#f9f9f9"
+        android:pathData="m 412.46036,501.73018 a 47.11509,47.11509 0 0 1 -47.11509,47.11509 47.11509,47.11509 0 0 1 -47.11509,-47.11509 h 94.23018 M 365.34527,77.69437 a 23.557545,23.557545 0 0 1 23.55755,23.55754 v 25.44215 c 66.90342,11.30762 117.78772,69.49476 117.78772,139.46067 V 407.5 l 70.67264,70.67263 H 153.32737 L 224,407.5 V 266.15473 c 0,-69.96591 50.8843,-128.15305 117.78773,-139.46067 v -25.44215 a 23.557545,23.557545 0 0 1 23.55754,-23.55754 z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
 </vector>
diff --git a/app/src/main/res/drawable/screenshot_placeholder.xml b/app/src/main/res/drawable/screenshot_placeholder.xml
index 4cbc66d6f..9e2429256 100644
--- a/app/src/main/res/drawable/screenshot_placeholder.xml
+++ b/app/src/main/res/drawable/screenshot_placeholder.xml
@@ -1,15 +1,33 @@
-<vector android:height="169dp" android:viewportHeight="169.33333"
-    android:viewportWidth="95.25" android:width="92dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#e8e8e8"
+<vector android:height="169dp"
+    android:viewportHeight="169.33333"
+    android:viewportWidth="95.25"
+    android:width="92dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#e8e8e8"
         android:pathData="M1.75,0L93.5,0A1.75,1.75 0,0 1,95.25 1.75L95.25,167.59A1.75,1.75 0,0 1,93.5 169.33L1.75,169.33A1.75,1.75 0,0 1,0 167.59L0,1.75A1.75,1.75 0,0 1,1.75 0z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="0.52916664"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.52916664" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
         android:pathData="M40.77,53.63L54.38,53.63A1.75,1.75 0,0 1,56.13 55.37L56.13,68.98A1.75,1.75 0,0 1,54.38 70.73L40.77,70.73A1.75,1.75 0,0 1,39.03 68.98L39.03,55.37A1.75,1.75 0,0 1,40.77 53.63z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="0.52916664"/>
-    <path android:fillAlpha="1" android:fillColor="#e8e8e8"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.52916664" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#e8e8e8"
         android:pathData="m41.01,67.8 l3.21,-4.2 2.46,2.79 3.26,-4.16 4.16,5.58z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.26458332"/>
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="0.26458332" />
 </vector>
diff --git a/app/src/main/res/layout-v11/app_permission_item.xml b/app/src/main/res/layout-v11/app_permission_item.xml
index 328c62c4f..b7b3e142c 100644
--- a/app/src/main/res/layout-v11/app_permission_item.xml
+++ b/app/src/main/res/layout-v11/app_permission_item.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!-- Copyright (C) 2008 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/layout-v11/install_confirm.xml b/app/src/main/res/layout-v11/install_confirm.xml
index dc599a42f..ea5e7b770 100644
--- a/app/src/main/res/layout-v11/install_confirm.xml
+++ b/app/src/main/res/layout-v11/install_confirm.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!-- Copyright (C) 2008 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/layout-v17/app_permission_item_money.xml b/app/src/main/res/layout-v17/app_permission_item_money.xml
index 46ae16c39..cf9f859b2 100644
--- a/app/src/main/res/layout-v17/app_permission_item_money.xml
+++ b/app/src/main/res/layout-v17/app_permission_item_money.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!-- Copyright (C) 2012 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +19,7 @@
   Defines the layout of a single permission item that costs money.
 -->
 
-<view
-    class="org.fdroid.fdroid.privileged.views.AppSecurityPermissions$PermissionItemView"
+<view class="org.fdroid.fdroid.privileged.views.AppSecurityPermissions$PermissionItemView"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -43,8 +43,8 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        >
+        android:layout_marginStart="8dp">
+
         <TextView
             android:id="@+id/perm_name"
             android:textAppearance="?android:attr/textAppearanceSmall"
@@ -53,6 +53,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true" />
+
         <ImageView
             android:id="@+id/perm_money_icon"
             android:layout_width="wrap_content"
@@ -63,6 +64,7 @@
             app:tint="@color/perms_costs_money"
             android:tintMode="src_in"
             app:srcCompat="@drawable/ic_coins_s" />
+
         <TextView
             android:id="@+id/perm_money_label"
             android:textAppearance="?android:attr/textAppearanceSmall"
diff --git a/app/src/main/res/layout-v21/app_details2.xml b/app/src/main/res/layout-v21/app_details2.xml
index 2ce6c826b..6f887ad85 100644
--- a/app/src/main/res/layout-v21/app_details2.xml
+++ b/app/src/main/res/layout-v21/app_details2.xml
@@ -1,62 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context="org.fdroid.fdroid.views.AppDetailsActivity"
-        android:background="?attr/appDetailsBackground"
-        android:fitsSystemWindows="true"
-        android:id="@+id/rootCoordinator">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="org.fdroid.fdroid.views.AppDetailsActivity"
+    android:background="?attr/appDetailsBackground"
+    android:fitsSystemWindows="true"
+    android:id="@+id/rootCoordinator">
 
     <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/app_bar_height"
-            android:fitsSystemWindows="true"
-            app:layout_behavior="org.fdroid.fdroid.views.FixAppBarLayoutBehavior">
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/app_bar_height"
+        android:fitsSystemWindows="true"
+        app:layout_behavior="org.fdroid.fdroid.views.FixAppBarLayoutBehavior">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fitsSystemWindows="true"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-                app:contentScrim="?attr/colorPrimarySurface"
-                app:statusBarScrim="?attr/colorPrimarySurface"
-                app:expandedTitleTextAppearance="@style/TextAppearance.App.CollapsingToolbar.Expanded"
-                app:collapsedTitleTextAppearance="@style/TextAppearance.App.CollapsingToolbar.Collapsed"
-                app:expandedTitleMarginTop="24dp">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            app:contentScrim="?attr/colorPrimarySurface"
+            app:statusBarScrim="?attr/colorPrimarySurface"
+            app:expandedTitleTextAppearance="@style/TextAppearance.App.CollapsingToolbar.Expanded"
+            app:collapsedTitleTextAppearance="@style/TextAppearance.App.CollapsingToolbar.Collapsed"
+            app:expandedTitleMarginTop="24dp">
 
             <org.fdroid.fdroid.views.apps.FeatureImage
-                    android:id="@+id/feature_graphic"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    android:fitsSystemWindows="true"
-                    app:layout_collapseMode="parallax" />
+                android:id="@+id/feature_graphic"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                android:fitsSystemWindows="true"
+                app:layout_collapseMode="parallax" />
 
             <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    app:navigationIcon="@drawable/ic_back"
-                    android:background="@android:color/transparent"
-                    app:layout_collapseMode="pin"
-                    style="@style/Widget.MaterialComponents.Toolbar.PrimarySurface"
-                    android:elevation="0dp" />
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:navigationIcon="@drawable/ic_back"
+                android:background="@android:color/transparent"
+                app:layout_collapseMode="pin"
+                style="@style/Widget.MaterialComponents.Toolbar.PrimarySurface"
+                android:elevation="0dp" />
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rvDetails"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            app:layoutManager="LinearLayoutManager"
-            tools:context="org.fdroid.fdroid.views.AppDetailsActivity"
-            tools:showIn="@layout/app_details2" />
+        android:id="@+id/rvDetails"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layoutManager="LinearLayoutManager"
+        tools:context="org.fdroid.fdroid.views.AppDetailsActivity"
+        tools:showIn="@layout/app_details2" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v21/app_details2_header.xml b/app/src/main/res/layout-v21/app_details2_header.xml
index 106693c31..f6648f040 100644
--- a/app/src/main/res/layout-v21/app_details2_header.xml
+++ b/app/src/main/res/layout-v21/app_details2_header.xml
@@ -37,10 +37,10 @@
                     android:layout_width="72dp"
                     android:layout_height="72dp"
                     android:layout_alignParentStart="true"
-                    
+
                     android:layout_alignParentTop="true"
                     android:layout_marginEnd="8dp"
-                    
+
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_repo_app_default"
                     android:transitionName="@string/transition_app_item_icon" />
@@ -51,10 +51,10 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentTop="true"
                     android:layout_alignParentEnd="true"
-                    
+
                     android:layout_marginTop="8dp"
                     android:layout_toEndOf="@id/icon"
-                    
+
                     android:orientation="vertical">
 
                     <TextView
@@ -94,7 +94,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
-                    
+
                     android:layout_centerVertical="true"
                     android:contentDescription="@string/app__tts__cancel_download"
                     android:src="@android:drawable/ic_menu_close_clear_cancel" />
@@ -104,7 +104,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentStart="true"
-                    
+
                     android:contentDescription="@string/downloading"
                     android:focusable="true"
                     android:text="@string/downloading"
@@ -115,7 +115,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_toStartOf="@id/progress_cancel"
-                    
+
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     tools:text="500%" />
 
@@ -126,9 +126,8 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/progress_label"
                     android:layout_alignParentStart="true"
-                    
-                    android:layout_toStartOf="@id/progress_cancel"
-                     />
+
+                    android:layout_toStartOf="@id/progress_cancel" />
             </RelativeLayout>
 
             <!-- Install, Uninstall, Update, Open buttons -->
@@ -157,7 +156,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
-                    
+
                     android:layout_weight="0"
                     android:ellipsize="marquee"
                     tools:text="Open" />
@@ -223,7 +222,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:drawableStart="@drawable/ic_warning"
-                
+
                 android:drawablePadding="10dp"
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
@@ -249,7 +248,7 @@
                 android:id="@+id/anti_features_full_listing"
                 android:layout_marginBottom="8dp"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/addrepo.xml b/app/src/main/res/layout/addrepo.xml
index c9d2d6522..53d193574 100644
--- a/app/src/main/res/layout/addrepo.xml
+++ b/app/src/main/res/layout/addrepo.xml
@@ -47,7 +47,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="10dp"
-            tools:text="This repo is already setup, this will add new key information."/>
+            tools:text="This repo is already setup, this will add new key information." />
 
     </LinearLayout>
 
@@ -60,7 +60,9 @@
         android:layout_height="wrap_content"
         tools:text="Searching for repository at\nhttps://www.example.com/fdroid/repo/" />
 
-</RelativeLayout><!--
+</RelativeLayout>
+
+<!--
  * Copyright (C) 2009  Roberto Jacinto
  * roberto.jacinto@caixamagica.pt
  *
diff --git a/app/src/main/res/layout/app_card_horizontal.xml b/app/src/main/res/layout/app_card_horizontal.xml
index 437d93c3a..83adf84a5 100644
--- a/app/src/main/res/layout/app_card_horizontal.xml
+++ b/app/src/main/res/layout/app_card_horizontal.xml
@@ -40,7 +40,8 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <include layout="@layout/app_status_new"
+        <include
+            layout="@layout/app_status_new"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/new_tag"
diff --git a/app/src/main/res/layout/app_card_large.xml b/app/src/main/res/layout/app_card_large.xml
index 0c927b105..2381b5deb 100644
--- a/app/src/main/res/layout/app_card_large.xml
+++ b/app/src/main/res/layout/app_card_large.xml
@@ -46,7 +46,8 @@
             app:layout_constraintLeft_toLeftOf="parent"
             android:layout_marginTop="8dp" />
 
-        <include layout="@layout/app_status_new"
+        <include
+            layout="@layout/app_status_new"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/new_tag"
diff --git a/app/src/main/res/layout/app_card_list_item.xml b/app/src/main/res/layout/app_card_list_item.xml
index e2cc03833..9ee1ffacc 100644
--- a/app/src/main/res/layout/app_card_list_item.xml
+++ b/app/src/main/res/layout/app_card_list_item.xml
@@ -41,7 +41,8 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:layout_editor_absoluteY="8dp" />
 
-        <include layout="@layout/app_status_new"
+        <include
+            layout="@layout/app_status_new"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/new_tag"
diff --git a/app/src/main/res/layout/app_details2_link_item.xml b/app/src/main/res/layout/app_details2_link_item.xml
index 10789bd2c..b86d126ea 100644
--- a/app/src/main/res/layout/app_details2_link_item.xml
+++ b/app/src/main/res/layout/app_details2_link_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/AppDetailsLink"
diff --git a/app/src/main/res/layout/app_details2_links.xml b/app/src/main/res/layout/app_details2_links.xml
index 88915d546..e5246bfa6 100644
--- a/app/src/main/res/layout/app_details2_links.xml
+++ b/app/src/main/res/layout/app_details2_links.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
@@ -42,6 +41,5 @@
         android:orientation="vertical"
         android:layout_marginLeft="@dimen/layout_horizontal_margin"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:visibility="gone">
-    </LinearLayout>
+        android:visibility="gone"></LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/app_list_item.xml b/app/src/main/res/layout/app_list_item.xml
index 1afcded97..7e5076f9e 100644
--- a/app/src/main/res/layout/app_list_item.xml
+++ b/app/src/main/res/layout/app_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/app_perms_summary.xml b/app/src/main/res/layout/app_perms_summary.xml
index 03beeb776..a96c20242 100644
--- a/app/src/main/res/layout/app_perms_summary.xml
+++ b/app/src/main/res/layout/app_perms_summary.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!-- Copyright (C) 2008 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +17,7 @@
 
 <!-- Describes permission item consisting of a group name and the list of permissions under the group -->
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/crash_report_dialog.xml b/app/src/main/res/layout/crash_report_dialog.xml
index 6f0ebddb3..9079d3b94 100644
--- a/app/src/main/res/layout/crash_report_dialog.xml
+++ b/app/src/main/res/layout/crash_report_dialog.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:orientation="vertical"
@@ -12,31 +10,27 @@
         android:paddingLeft="24dp"
         android:paddingRight="24dp"
         android:paddingBottom="24dp"
-        android:paddingTop="20dp"
-        >
+        android:paddingTop="20dp">
 
         <TextView
             android:id="@android:id/text1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/crash_dialog_text"
-            />
+            android:text="@string/crash_dialog_text" />
 
         <TextView
             android:id="@android:id/text2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:text="@string/crash_dialog_comment_prompt"
-            />
+            android:text="@string/crash_dialog_comment_prompt" />
 
         <EditText
             android:id="@android:id/input"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="textMultiLine"
-            android:layout_marginTop="20dp"
-            />
+            android:layout_marginTop="20dp" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/donate_generic.xml b/app/src/main/res/layout/donate_generic.xml
index b68c4d556..66b56c5e9 100644
--- a/app/src/main/res/layout/donate_generic.xml
+++ b/app/src/main/res/layout/donate_generic.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:drawableLeft="@drawable/ic_donate"
diff --git a/app/src/main/res/layout/install_app_details.xml b/app/src/main/res/layout/install_app_details.xml
index 5fa67e8a9..04a764165 100644
--- a/app/src/main/res/layout/install_app_details.xml
+++ b/app/src/main/res/layout/install_app_details.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (C) 2008 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +18,9 @@
 <!--
 Defines the layout of the application snippet that appears on top of the
 installation screens
---><!-- The snippet about the application - title, icon, description.  -->
+-->
+
+<!-- The snippet about the application - title, icon, description.  -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/app_snippet"
diff --git a/app/src/main/res/layout/install_confirm.xml b/app/src/main/res/layout/install_confirm.xml
index d3a621034..a266ca04e 100644
--- a/app/src/main/res/layout/install_confirm.xml
+++ b/app/src/main/res/layout/install_confirm.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (C) 2008 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/install_start.xml b/app/src/main/res/layout/install_start.xml
index 189936bab..5aee1d147 100644
--- a/app/src/main/res/layout/install_start.xml
+++ b/app/src/main/res/layout/install_start.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (C) 2008 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/installed_app_list_item.xml b/app/src/main/res/layout/installed_app_list_item.xml
index 681629bee..bb788bd91 100644
--- a/app/src/main/res/layout/installed_app_list_item.xml
+++ b/app/src/main/res/layout/installed_app_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -72,13 +71,13 @@
         android:layout_marginLeft="8dp" />
 
     <CheckBox
-            android:id="@+id/checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/icon"
-            android:clickable="false"
-            android:visibility="gone"/>
+        android:id="@+id/checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/icon"
+        android:clickable="false"
+        android:visibility="gone" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/listitem_antifeaturelisting.xml b/app/src/main/res/layout/listitem_antifeaturelisting.xml
index 7f0e8c207..291287c50 100644
--- a/app/src/main/res/layout/listitem_antifeaturelisting.xml
+++ b/app/src/main/res/layout/listitem_antifeaturelisting.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clickable="true"
@@ -8,21 +7,21 @@
     android:paddingBottom="6dp"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
-    android:background="?attr/selectableItemBackground" >
+    android:background="?attr/selectableItemBackground">
 
     <View
         android:id="@+id/anti_feature_icon"
         android:backgroundTint="?attr/appDetailsAntiFeatureIconColor"
         android:layout_width="32dp"
         android:layout_height="32dp"
-        android:layout_centerVertical="true"/>
+        android:layout_centerVertical="true" />
 
-        <TextView
-            android:id="@+id/anti_feature_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@id/anti_feature_icon" />
+    <TextView
+        android:id="@+id/anti_feature_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@id/anti_feature_icon" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/login.xml b/app/src/main/res/layout/login.xml
index 463d049a4..277068ca3 100644
--- a/app/src/main/res/layout/login.xml
+++ b/app/src/main/res/layout/login.xml
@@ -43,7 +43,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="10dp"
-            tools:text="This repo is already setup, this will add new key information."/>
+            tools:text="This repo is already setup, this will add new key information." />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/main_tab_settings.xml b/app/src/main/res/layout/main_tab_settings.xml
index 97d338420..0598bbc3e 100644
--- a/app/src/main/res/layout/main_tab_settings.xml
+++ b/app/src/main/res/layout/main_tab_settings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.fdroid.fdroid.views.main.SettingsView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<org.fdroid.fdroid.views.main.SettingsView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/permissions_list.xml b/app/src/main/res/layout/permissions_list.xml
index b6affc630..deb4853a7 100644
--- a/app/src/main/res/layout/permissions_list.xml
+++ b/app/src/main/res/layout/permissions_list.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2012 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (C) 2012 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/share_item.xml b/app/src/main/res/layout/share_item.xml
index 7b0aed7d6..faf1bb78d 100644
--- a/app/src/main/res/layout/share_item.xml
+++ b/app/src/main/res/layout/share_item.xml
@@ -31,7 +31,6 @@
         android:minLines="2"
         android:maxLines="2"
         android:ellipsize="marquee"
-        app:fontFamily="sans-serif-condensed"
-        />
+        app:fontFamily="sans-serif-condensed" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/updateable_app_list_item.xml b/app/src/main/res/layout/updateable_app_list_item.xml
index 2a52a1427..237f105b9 100644
--- a/app/src/main/res/layout/updateable_app_list_item.xml
+++ b/app/src/main/res/layout/updateable_app_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/updates_header.xml b/app/src/main/res/layout/updates_header.xml
index eca3c09e4..ec72c35ab 100644
--- a/app/src/main/res/layout/updates_header.xml
+++ b/app/src/main/res/layout/updates_header.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/menu/details2.xml b/app/src/main/res/menu/details2.xml
index af0a69b36..f2563afa2 100644
--- a/app/src/main/res/menu/details2.xml
+++ b/app/src/main/res/menu/details2.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_share"
         android:icon="@drawable/ic_share"
         android:title="@string/menu_share"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_ignore_all"
         android:icon="@drawable/ic_notifications_off"
         android:title="@string/menu_ignore_all"
         android:checkable="true"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_ignore_this"
         android:icon="@drawable/ic_notifications_paused"
         android:title="@string/menu_ignore_this"
         android:checkable="true"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/menu/install_history.xml b/app/src/main/res/menu/install_history.xml
index 363c6fc38..736a99ab8 100644
--- a/app/src/main/res/menu/install_history.xml
+++ b/app/src/main/res/menu/install_history.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-            android:id="@+id/menu_share"
-            android:icon="@drawable/ic_share"
-            android:title="@string/menu_share"
-            app:showAsAction="ifRoom" />
+        android:id="@+id/menu_share"
+        android:icon="@drawable/ic_share"
+        android:title="@string/menu_share"
+        app:showAsAction="ifRoom" />
     <item
-            android:id="@+id/menu_show"
-            android:visible="false"
-            android:icon="@drawable/ic_delete"
-            android:title="@string/menu_show_fdroid_metrics_report" />
+        android:id="@+id/menu_show"
+        android:visible="false"
+        android:icon="@drawable/ic_delete"
+        android:title="@string/menu_show_fdroid_metrics_report" />
     <item
-            android:id="@+id/menu_delete"
-            android:icon="@drawable/ic_delete"
-            android:title="@string/delete" />
+        android:id="@+id/menu_delete"
+        android:icon="@drawable/ic_delete"
+        android:title="@string/delete" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/installed_apps.xml b/app/src/main/res/menu/installed_apps.xml
index 834c5afa6..f3ac312c3 100644
--- a/app/src/main/res/menu/installed_apps.xml
+++ b/app/src/main/res/menu/installed_apps.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-            android:id="@+id/menu_share"
-            android:icon="@drawable/ic_share"
-            android:title="@string/menu_share"
-            app:showAsAction="ifRoom"/>
+        android:id="@+id/menu_share"
+        android:icon="@drawable/ic_share"
+        android:title="@string/menu_share"
+        app:showAsAction="ifRoom" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/manage_repos.xml b/app/src/main/res/menu/manage_repos.xml
index bbbc3564f..1345b77ed 100644
--- a/app/src/main/res/menu/manage_repos.xml
+++ b/app/src/main/res/menu/manage_repos.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_add_repo"
         android:icon="@drawable/ic_add"
         android:title="@string/menu_add_repo"
-        app:showAsAction="ifRoom|withText"/>
+        app:showAsAction="ifRoom|withText" />
 
 </menu>
diff --git a/app/src/main/res/menu/repo_details_activity.xml b/app/src/main/res/menu/repo_details_activity.xml
index 6815ec291..3d064a35c 100644
--- a/app/src/main/res/menu/repo_details_activity.xml
+++ b/app/src/main/res/menu/repo_details_activity.xml
@@ -7,7 +7,7 @@
         android:id="@+id/action_share"
         android:icon="@drawable/ic_share"
         android:title="@string/menu_share"
-        app:showAsAction="ifRoom|withText"/>
+        app:showAsAction="ifRoom|withText" />
     <item
         android:id="@+id/menu_enable_nfc"
         android:icon="@drawable/ic_nfc"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 30defd366..9b6b0591c 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 ~ Copyright (C) 2019 The Android Open Source Project
 ~
diff --git a/app/src/main/res/values-sw360dp-v13/values-preference.xml b/app/src/main/res/values-sw360dp-v13/values-preference.xml
index c0908edd5..b43e99ab2 100644
--- a/app/src/main/res/values-sw360dp-v13/values-preference.xml
+++ b/app/src/main/res/values-sw360dp-v13/values-preference.xml
@@ -1,5 +1,9 @@
 <!-- Taken from here: https://stackoverflow.com/a/53969021 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <bool name="config_materialPreferenceIconSpaceReserved" tools:ignore="MissingDefaultResource,PrivateResource,UnusedResources">false</bool>
-    <dimen name="preference_category_padding_start" tools:ignore="MissingDefaultResource,PrivateResource,UnusedResources">0dp</dimen>
+    <bool name="config_materialPreferenceIconSpaceReserved" tools:ignore="MissingDefaultResource,PrivateResource,UnusedResources">
+        false
+    </bool>
+    <dimen name="preference_category_padding_start" tools:ignore="MissingDefaultResource,PrivateResource,UnusedResources">
+        0dp
+    </dimen>
 </resources>
diff --git a/app/src/main/res/values-tt/strings.xml b/app/src/main/res/values-tt/strings.xml
index e86b2f337..3a0906840 100644
--- a/app/src/main/res/values-tt/strings.xml
+++ b/app/src/main/res/values-tt/strings.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources/>
\ No newline at end of file
+<resources />
\ No newline at end of file
diff --git a/app/src/main/res/values-v16/styles.xml b/app/src/main/res/values-v16/styles.xml
index ebbe249c9..b83a59632 100644
--- a/app/src/main/res/values-v16/styles.xml
+++ b/app/src/main/res/values-v16/styles.xml
@@ -4,7 +4,8 @@
     <style name="BodyTextV16" parent="BodyTextBase">
         <item name="android:lineSpacingMultiplier">1.25</item>
     </style>
-    <style name="BodyText" parent="BodyTextV16"/>
+
+    <style name="BodyText" parent="BodyTextV16" />
 
     <style name="AppListItemStatusText" parent="AppListItemStatusTextBase">
         <item name="fontFamily">sans-serif-light</item>
diff --git a/app/src/main/res/values-v17/styles.xml b/app/src/main/res/values-v17/styles.xml
index 5437f3bff..2223f8f9d 100644
--- a/app/src/main/res/values-v17/styles.xml
+++ b/app/src/main/res/values-v17/styles.xml
@@ -5,12 +5,12 @@
         <item name="android:textDirection">locale</item>
     </style>
 
-    <style name="CaptionText" parent="CaptionTextV17"/>
+    <style name="CaptionText" parent="CaptionTextV17" />
 
     <style name="BodyTextV17" parent="BodyTextV16">
         <item name="android:textDirection">locale</item>
     </style>
 
-    <style name="BodyText" parent="BodyTextV17"/>
+    <style name="BodyText" parent="BodyTextV17" />
 
 </resources>
diff --git a/app/src/main/res/values-v17/styles_detail.xml b/app/src/main/res/values-v17/styles_detail.xml
index 9f1d06a40..c7af1eac2 100644
--- a/app/src/main/res/values-v17/styles_detail.xml
+++ b/app/src/main/res/values-v17/styles_detail.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="DetailsButtonStyle" parent="DetailsButtonStyleBase">
         <item name="paddingStart">20dp</item>
         <item name="paddingEnd">20dp</item>
diff --git a/app/src/main/res/values-v21/styles_detail.xml b/app/src/main/res/values-v21/styles_detail.xml
index 113503a48..ab4470d30 100644
--- a/app/src/main/res/values-v21/styles_detail.xml
+++ b/app/src/main/res/values-v21/styles_detail.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="DetailsButtonStyle" parent="DetailsButtonStyleBase">
         <item name="android:stateListAnimator">@null</item>  <!-- no elevation change on hover -->
         <item name="android:letterSpacing">0.05</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 84dc425a7..f2b3e0997 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
 ~ Copyright (C) 2019 The Android Open Source Project
 ~
 ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
index 05248e2f8..4877a5369 100644
--- a/app/src/main/res/xml/backup_rules.xml
+++ b/app/src/main/res/xml/backup_rules.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <full-backup-content>
-	<!-- Don't include apks or the local swap repo -->
-    <exclude domain="file" path="."/>
+    <!-- Don't include apks or the local swap repo -->
+    <exclude
+        domain="file"
+        path="." />
 </full-backup-content>
\ No newline at end of file
diff --git a/app/src/main/res/xml/installer_file_provider.xml b/app/src/main/res/xml/installer_file_provider.xml
index 9b5dfbcd5..5780fceab 100644
--- a/app/src/main/res/xml/installer_file_provider.xml
+++ b/app/src/main/res/xml/installer_file_provider.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths>
-    <cache-path name="install_history" path="install_history"/>
-    <external-path name="external" path="/"/>
+    <cache-path
+        name="install_history"
+        path="install_history" />
+    <external-path
+        name="external"
+        path="/" />
 </paths>
\ No newline at end of file
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index 103af9dad..cbc732a26 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <base-config cleartextTrafficPermitted="true"/>
+    <base-config cleartextTrafficPermitted="true" />
 
     <domain-config cleartextTrafficPermitted="false">
         <domain includeSubdomains="true">amazonaws.com</domain>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 5622d5b84..1ea8bf304 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -183,17 +183,17 @@
             android:summary="@string/keep_install_history_summary"
             android:title="@string/keep_install_history" />
         <CheckBoxPreference
-                android:key="sendToFdroidMetrics"
-                android:title="@string/send_to_fdroid_metrics"
-                android:summary="@string/send_to_fdroid_metrics_summary"
-                android:defaultValue="false"
-                android:dependency="expert"/>
+            android:key="sendToFdroidMetrics"
+            android:title="@string/send_to_fdroid_metrics"
+            android:summary="@string/send_to_fdroid_metrics_summary"
+            android:defaultValue="false"
+            android:dependency="expert" />
         <CheckBoxPreference
-                android:key="hideAllNotifications"
-                android:title="@string/hide_all_notifications"
-                android:summary="@string/hide_all_notifications_summary"
-                android:defaultValue="false"
-                android:dependency="expert"/>
+            android:key="hideAllNotifications"
+            android:title="@string/hide_all_notifications"
+            android:summary="@string/hide_all_notifications_summary"
+            android:defaultValue="false"
+            android:dependency="expert" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:dependency="expert"
diff --git a/app/src/main/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml
index 76581020d..0f0cffcd0 100644
--- a/app/src/main/res/xml/searchable.xml
+++ b/app/src/main/res/xml/searchable.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
     android:label="@string/app_name"
-    android:hint="@string/search_hint" >
-</searchable>
+    android:hint="@string/search_hint"></searchable>