diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
index d3db11795..969a59047 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
@@ -496,7 +496,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
 
         toolbar.setBackgroundColor(currentView.getToolbarColour());
         toolbar.setTitle(currentView.getToolbarTitle());
-        toolbar.setNavigationIcon(R.drawable.ic_close_white_24dp);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java b/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
index 27b8cf34b..138c144f5 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
@@ -63,7 +63,7 @@ public class WifiPeer implements Peer {
 
     @Override
     public int getIcon() {
-        return R.drawable.ic_network_wifi;
+        return R.drawable.ic_wifi;
     }
 
     @Override
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
index 1264c4aee..46655d9de 100644
--- a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
@@ -21,8 +21,6 @@ package org.fdroid.fdroid.panic;
 
 import android.annotation.SuppressLint;
 import android.database.Cursor;
-import android.graphics.LightingColorFilter;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -117,14 +115,7 @@ public class SelectInstalledAppsActivity extends AppCompatActivity implements Lo
         MenuItem menuItem = menu.add(R.string.menu_select_for_wipe);
         menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         checkId = menuItem.getItemId();
-        if (FDroidApp.isAppThemeLight()) {
-            Drawable icon = ContextCompat.getDrawable(this, R.drawable.check);
-            icon.setColorFilter(new LightingColorFilter(0xffffffff, ContextCompat.getColor(this,
-                    android.R.color.white)));
-            menuItem.setIcon(icon);
-        } else {
-            menuItem.setIcon(R.drawable.check);
-        }
+        menuItem.setIcon(R.drawable.check);
         return true;
     }
 
diff --git a/app/src/full/res/drawable-hdpi/ic_qr_grey.png b/app/src/full/res/drawable-hdpi/ic_qr_grey.png
deleted file mode 100644
index e636db631..000000000
Binary files a/app/src/full/res/drawable-hdpi/ic_qr_grey.png and /dev/null differ
diff --git a/app/src/full/res/drawable-ldpi/ic_qr_grey.png b/app/src/full/res/drawable-ldpi/ic_qr_grey.png
deleted file mode 100644
index 3bd028688..000000000
Binary files a/app/src/full/res/drawable-ldpi/ic_qr_grey.png and /dev/null differ
diff --git a/app/src/full/res/drawable-mdpi/ic_qr_grey.png b/app/src/full/res/drawable-mdpi/ic_qr_grey.png
deleted file mode 100644
index 0c6c180c9..000000000
Binary files a/app/src/full/res/drawable-mdpi/ic_qr_grey.png and /dev/null differ
diff --git a/app/src/full/res/drawable-xhdpi/ic_qr_grey.png b/app/src/full/res/drawable-xhdpi/ic_qr_grey.png
deleted file mode 100644
index 294aaa831..000000000
Binary files a/app/src/full/res/drawable-xhdpi/ic_qr_grey.png and /dev/null differ
diff --git a/app/src/full/res/drawable-xxhdpi/ic_qr_grey.png b/app/src/full/res/drawable-xxhdpi/ic_qr_grey.png
deleted file mode 100644
index 5d633af88..000000000
Binary files a/app/src/full/res/drawable-xxhdpi/ic_qr_grey.png and /dev/null differ
diff --git a/app/src/full/res/drawable-xxxhdpi/ic_qr_grey.png b/app/src/full/res/drawable-xxxhdpi/ic_qr_grey.png
deleted file mode 100644
index bfae8b55d..000000000
Binary files a/app/src/full/res/drawable-xxxhdpi/ic_qr_grey.png and /dev/null differ
diff --git a/app/src/full/res/drawable/check.xml b/app/src/full/res/drawable/check.xml
index 064f846ae..ad2fc074f 100644
--- a/app/src/full/res/drawable/check.xml
+++ b/app/src/full/res/drawable/check.xml
@@ -1,8 +1,9 @@
-<!-- drawable/check.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" />
+<!-- drawable/check.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path android:fillColor="#000" android:pathData="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/full/res/drawable/ic_add_circle_outline.xml b/app/src/full/res/drawable/ic_add_circle_outline.xml
index 69f1469be..0c2492156 100644
--- a/app/src/full/res/drawable/ic_add_circle_outline.xml
+++ b/app/src/full/res/drawable/ic_add_circle_outline.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M13,7h-2v4L7,11v2h4v4h2v-4h4v-2h-4L13,7zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M12,7c-0.55,0 -1,0.45 -1,1v3L8,11c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h3v3c0,0.55 0.45,1 1,1s1,-0.45 1,-1v-3h3c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-3L13,8c0,-0.55 -0.45,-1 -1,-1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
 </vector>
diff --git a/app/src/full/res/drawable/ic_arrow_forward.xml b/app/src/full/res/drawable/ic_arrow_forward.xml
index 91bc94449..8a3f43c4c 100644
--- a/app/src/full/res/drawable/ic_arrow_forward.xml
+++ b/app/src/full/res/drawable/ic_arrow_forward.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<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,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
diff --git a/app/src/full/res/drawable/ic_bluetooth.xml b/app/src/full/res/drawable/ic_bluetooth.xml
index 8ded8624f..e2329ce25 100644
--- a/app/src/full/res/drawable/ic_bluetooth.xml
+++ b/app/src/full/res/drawable/ic_bluetooth.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M17,7l-4.29,-4.29c-0.63,-0.63 -1.71,-0.19 -1.71,0.7v6.18L7.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,0L11,14.41v6.18c0,0.89 1.08,1.34 1.71,0.71L17,17c0.39,-0.39 0.39,-1.02 0,-1.41L13.41,12 17,8.42c0.39,-0.39 0.39,-1.03 0,-1.42zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
 </vector>
diff --git a/app/src/full/res/drawable/ic_bluetooth_searching.xml b/app/src/full/res/drawable/ic_bluetooth_searching.xml
new file mode 100644
index 000000000..24ff79def
--- /dev/null
+++ b/app/src/full/res/drawable/ic_bluetooth_searching.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M15.98,10.28l-1.38,1.38c-0.2,0.2 -0.2,0.51 0,0.71l1.38,1.38c0.28,0.28 0.75,0.15 0.85,-0.23 0.11,-0.5 0.17,-1 0.17,-1.52 0,-0.51 -0.06,-1.01 -0.18,-1.48 -0.09,-0.38 -0.56,-0.52 -0.84,-0.24zM20.1,7.78c-0.25,-0.55 -0.98,-0.67 -1.4,-0.24 -0.26,0.26 -0.31,0.64 -0.17,0.98 0.46,1.07 0.72,2.24 0.72,3.47 0,1.24 -0.26,2.42 -0.73,3.49 -0.14,0.32 -0.09,0.69 0.16,0.94 0.41,0.41 1.1,0.29 1.35,-0.23 0.63,-1.3 0.98,-2.76 0.98,-4.3 -0.01,-1.45 -0.33,-2.85 -0.91,-4.11zM11.41,12L15,8.42c0.39,-0.39 0.39,-1.02 0,-1.42l-4.29,-4.29c-0.63,-0.63 -1.71,-0.19 -1.71,0.7v6.18L5.11,5.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41L8.59,12 3.7,16.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L9,14.41v6.18c0,0.89 1.08,1.34 1.71,0.71L15,17c0.39,-0.39 0.39,-1.02 0,-1.42L11.41,12zM11,5.83l1.88,1.88L11,9.59L11,5.83zM11,18.17v-3.76l1.88,1.88L11,18.17z"/>
+</vector>
diff --git a/app/src/full/res/drawable/ic_check_circle.xml b/app/src/full/res/drawable/ic_check_circle.xml
index 2f5407af2..6e255457a 100644
--- a/app/src/full/res/drawable/ic_check_circle.xml
+++ b/app/src/full/res/drawable/ic_check_circle.xml
@@ -1,5 +1,12 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    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,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    tools:ignore="VectorRaster">
+  <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,2zM9.29,16.29L5.7,12.7c-0.39,-0.39 -0.39,-1.02 0,-1.41 0.39,-0.39 1.02,-0.39 1.41,0L10,14.17l6.88,-6.88c0.39,-0.39 1.02,-0.39 1.41,0 0.39,0.39 0.39,1.02 0,1.41l-7.59,7.59c-0.38,0.39 -1.02,0.39 -1.41,0z"/>
 </vector>
diff --git a/app/src/full/res/drawable/ic_network_wifi.xml b/app/src/full/res/drawable/ic_network_wifi.xml
deleted file mode 100644
index 196df1370..000000000
--- a/app/src/full/res/drawable/ic_network_wifi.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    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.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/>
-</vector>
diff --git a/app/src/full/res/drawable/ic_qr_code.xml b/app/src/full/res/drawable/ic_qr_code.xml
new file mode 100644
index 000000000..8239660dc
--- /dev/null
+++ b/app/src/full/res/drawable/ic_qr_code.xml
@@ -0,0 +1,40 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M5,11h4c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2H5C3.9,3 3,3.9 3,5v4C3,10.1 3.9,11 5,11zM5,5h4v4H5V5z"/>
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M5,21h4c1.1,0 2,-0.9 2,-2v-4c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v4C3,20.1 3.9,21 5,21zM5,15h4v4H5V15z"/>
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M13,5v4c0,1.1 0.9,2 2,2h4c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2h-4C13.9,3 13,3.9 13,5zM19,9h-4V5h4V9z"/>
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M21,20.5v-1c0,-0.28 -0.22,-0.5 -0.5,-0.5h-1c-0.28,0 -0.5,0.22 -0.5,0.5v1c0,0.28 0.22,0.5 0.5,0.5h1C20.78,21 21,20.78 21,20.5z"/>
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M13,13.5v1c0,0.28 0.22,0.5 0.5,0.5h1c0.28,0 0.5,-0.22 0.5,-0.5v-1c0,-0.28 -0.22,-0.5 -0.5,-0.5h-1C13.22,13 13,13.22 13,13.5z"/>
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M16.5,15h-1c-0.28,0 -0.5,0.22 -0.5,0.5v1c0,0.28 0.22,0.5 0.5,0.5h1c0.28,0 0.5,-0.22 0.5,-0.5v-1C17,15.22 16.78,15 16.5,15z"/>
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M13,17.5v1c0,0.28 0.22,0.5 0.5,0.5h1c0.28,0 0.5,-0.22 0.5,-0.5v-1c0,-0.28 -0.22,-0.5 -0.5,-0.5h-1C13.22,17 13,17.22 13,17.5z"/>
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M15.5,21h1c0.28,0 0.5,-0.22 0.5,-0.5v-1c0,-0.28 -0.22,-0.5 -0.5,-0.5h-1c-0.28,0 -0.5,0.22 -0.5,0.5v1C15,20.78 15.22,21 15.5,21z"/>
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M17.5,19h1c0.28,0 0.5,-0.22 0.5,-0.5v-1c0,-0.28 -0.22,-0.5 -0.5,-0.5h-1c-0.28,0 -0.5,0.22 -0.5,0.5v1C17,18.78 17.22,19 17.5,19z"/>
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M18.5,13h-1c-0.28,0 -0.5,0.22 -0.5,0.5v1c0,0.28 0.22,0.5 0.5,0.5h1c0.28,0 0.5,-0.22 0.5,-0.5v-1C19,13.22 18.78,13 18.5,13z"/>
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M19.5,17h1c0.28,0 0.5,-0.22 0.5,-0.5v-1c0,-0.28 -0.22,-0.5 -0.5,-0.5h-1c-0.28,0 -0.5,0.22 -0.5,0.5v1C19,16.78 19.22,17 19.5,17z"/>
+</vector>
diff --git a/app/src/full/res/drawable/ic_wifi.xml b/app/src/full/res/drawable/ic_wifi.xml
index c7f44455a..709530074 100644
--- a/app/src/full/res/drawable/ic_wifi.xml
+++ b/app/src/full/res/drawable/ic_wifi.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M2.06,10.06c0.51,0.51 1.32,0.56 1.87,0.1 4.67,-3.84 11.45,-3.84 16.13,-0.01 0.56,0.46 1.38,0.42 1.89,-0.09 0.59,-0.59 0.55,-1.57 -0.1,-2.1 -5.71,-4.67 -13.97,-4.67 -19.69,0 -0.65,0.52 -0.7,1.5 -0.1,2.1zM9.82,17.82l1.47,1.47c0.39,0.39 1.02,0.39 1.41,0l1.47,-1.47c0.47,-0.47 0.37,-1.28 -0.23,-1.59 -1.22,-0.63 -2.68,-0.63 -3.91,0 -0.57,0.31 -0.68,1.12 -0.21,1.59zM6.09,14.09c0.49,0.49 1.26,0.54 1.83,0.13 2.44,-1.73 5.72,-1.73 8.16,0 0.57,0.4 1.34,0.36 1.83,-0.13l0.01,-0.01c0.6,-0.6 0.56,-1.62 -0.13,-2.11 -3.44,-2.49 -8.13,-2.49 -11.58,0 -0.69,0.5 -0.73,1.51 -0.12,2.12z" />
 </vector>
diff --git a/app/src/full/res/drawable/ic_wifi_tethering.xml b/app/src/full/res/drawable/ic_wifi_tethering.xml
index 8adefdf8d..bdc1e2354 100644
--- a/app/src/full/res/drawable/ic_wifi_tethering.xml
+++ b/app/src/full/res/drawable/ic_wifi_tethering.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    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,11c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13c0,-3.31 -2.69,-6 -6,-6s-6,2.69 -6,6c0,2.22 1.21,4.15 3,5.19l1,-1.74c-1.19,-0.7 -2,-1.97 -2,-3.45 0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,1.48 -0.81,2.75 -2,3.45l1,1.74c1.79,-1.04 3,-2.97 3,-5.19zM12,3C6.48,3 2,7.48 2,13c0,3.7 2.01,6.92 4.99,8.65l1,-1.73C5.61,18.53 4,15.96 4,13c0,-4.42 3.58,-8 8,-8s8,3.58 8,8c0,2.96 -1.61,5.53 -4,6.92l1,1.73c2.99,-1.73 5,-4.95 5,-8.65 0,-5.52 -4.48,-10 -10,-10z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,11c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13c0,-3.56 -3.11,-6.4 -6.75,-5.95 -2.62,0.32 -4.78,2.41 -5.18,5.02 -0.33,2.15 0.49,4.11 1.93,5.4 0.48,0.43 1.23,0.33 1.56,-0.23l0.01,-0.01c0.24,-0.42 0.14,-0.93 -0.22,-1.26 -1.03,-0.93 -1.59,-2.37 -1.22,-3.94 0.33,-1.42 1.48,-2.57 2.9,-2.91C13.65,8.49 16,10.47 16,13c0,1.18 -0.52,2.23 -1.33,2.96 -0.36,0.32 -0.47,0.84 -0.23,1.26l0.01,0.01c0.31,0.53 1.03,0.69 1.5,0.28C17.2,16.41 18,14.8 18,13zM10.83,3.07c-4.62,0.52 -8.35,4.33 -8.78,8.96 -0.35,3.7 1.32,7.02 4.02,9.01 0.48,0.35 1.16,0.2 1.46,-0.31 0.25,-0.43 0.14,-0.99 -0.26,-1.29 -2.28,-1.69 -3.65,-4.55 -3.16,-7.7 0.54,-3.5 3.46,-6.29 6.98,-6.68C15.91,4.51 20,8.28 20,13c0,2.65 -1.29,4.98 -3.27,6.44 -0.4,0.3 -0.51,0.85 -0.26,1.29 0.3,0.52 0.98,0.66 1.46,0.31C20.4,19.22 22,16.3 22,13c0,-5.91 -5.13,-10.62 -11.17,-9.93z"/>
 </vector>
diff --git a/app/src/full/res/layout/swap_start_swap.xml b/app/src/full/res/layout/swap_start_swap.xml
index 1cb6c1774..eec69f06f 100644
--- a/app/src/full/res/layout/swap_start_swap.xml
+++ b/app/src/full/res/layout/swap_start_swap.xml
@@ -25,9 +25,8 @@
         <ImageView
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:tint="@color/swap_grey_icon"
                 android:contentDescription="@string/use_bluetooth"
-                android:src="@drawable/ic_bluetooth"/>
+                android:src="@drawable/ic_bluetooth_searching"/>
 
         <LinearLayout
                 android:layout_width="0dp"
@@ -74,9 +73,8 @@
         <ImageView
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:tint="@color/swap_grey_icon"
                 android:contentDescription="@string/wifi"
-                android:src="@drawable/ic_network_wifi"/>
+                android:src="@drawable/ic_wifi"/>
 
         <LinearLayout
                 android:layout_width="0dp"
@@ -156,32 +154,20 @@
             android:layout_alignParentBottom="true">
 
         <Button
-                android:id="@+id/btn_send_fdroid"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/ic_fdroid_grey"
-                android:drawableStart="@drawable/ic_fdroid_grey"
-                android:text="@string/swap_send_fdroid"
-                android:drawablePadding="10dp"
-                android:paddingLeft="25dp"
-                android:paddingRight="25dp"
-                android:paddingStart="25dp"
-                android:paddingEnd="25dp"
-                android:background="@android:color/transparent"/>
+            android:id="@+id/btn_send_fdroid"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="wrap_content"
+            swap:icon="@drawable/ic_fdroid_grey"
+            android:layout_height="wrap_content"
+            android:text="@string/swap_send_fdroid" />
 
         <Button
-                android:id="@+id/btn_scan_qr"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/ic_qr_grey"
-                android:drawableStart="@drawable/ic_qr_grey"
-                android:text="@string/swap_scan_qr"
-                android:drawablePadding="10dp"
-                android:paddingLeft="25dp"
-                android:paddingRight="25dp"
-                android:paddingStart="25dp"
-                android:paddingEnd="25dp"
-                android:background="@android:color/transparent"/>
+            android:id="@+id/btn_scan_qr"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/swap_scan_qr"
+            swap:icon="@drawable/ic_qr_code" />
 
     </LinearLayout>
 
diff --git a/app/src/full/res/values/colors.xml b/app/src/full/res/values/colors.xml
index b7793017e..522213b38 100644
--- a/app/src/full/res/values/colors.xml
+++ b/app/src/full/res/values/colors.xml
@@ -7,7 +7,6 @@
     <color name="swap_deny">#ff21488c</color>
     <color name="swap_bright_blue">#00b9e6</color>
     <color name="swap_light_text">#bbbbbb</color>
-    <color name="swap_grey_icon">#4a4a4a</color>
     <color name="swap_light_grey_icon">#bbbbbb</color>
 
     <color name="panic_destructive_light">#fff0f0</color>
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
index b70dfa3da..6798e2b79 100644
--- a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
+++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
@@ -31,9 +31,6 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Parcel;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.appcompat.app.AlertDialog;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -44,6 +41,11 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.R;
 
diff --git a/app/src/main/res/drawable-anydpi-v21/ic_cancel.xml b/app/src/main/res/drawable-anydpi-v21/ic_cancel.xml
deleted file mode 100644
index 784cc0b1e..000000000
--- a/app/src/main/res/drawable-anydpi-v21/ic_cancel.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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">
-    <path android:fillColor="#30000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi-v21/ic_file_download.xml b/app/src/main/res/drawable-anydpi-v21/ic_file_download.xml
deleted file mode 100644
index 11b5def17..000000000
--- a/app/src/main/res/drawable-anydpi-v21/ic_file_download.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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">
-    <path android:fillColor="#30000000" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
-</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_cancel.png b/app/src/main/res/drawable-hdpi/ic_cancel.png
deleted file mode 100644
index 44807fb43..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_file_download.png b/app/src/main/res/drawable-hdpi/ic_file_download.png
deleted file mode 100644
index e3406230d..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_file_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldrtl/ic_back_black_24dp.xml b/app/src/main/res/drawable-ldrtl/ic_back_black_24dp.xml
deleted file mode 100644
index ec94ba255..000000000
--- a/app/src/main/res/drawable-ldrtl/ic_back_black_24dp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Would like to use the android:autoMirror property, but that is not suppoted on pre-lollipop
-     unless using VectorDrawableCompat (instead of using build-tools to produce .pngs for us). -->
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M 4,11 H 16.17 L 10.58,5.41 12,4 20,12 12,20 10.59,18.59 16.17,13 H 4 Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldrtl/ic_back_white_24dp.xml b/app/src/main/res/drawable-ldrtl/ic_back_white_24dp.xml
deleted file mode 100644
index c486e30c3..000000000
--- a/app/src/main/res/drawable-ldrtl/ic_back_white_24dp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Would like to use the android:autoMirror property, but that is not suppoted on pre-lollipop
-     unless using VectorDrawableCompat (instead of using build-tools to produce .pngs for us). -->
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M 4,11 H 16.17 L 10.58,5.41 12,4 20,12 12,20 10.59,18.59 16.17,13 H 4 Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-mdpi/ic_back.png b/app/src/main/res/drawable-mdpi/ic_back.png
deleted file mode 100644
index 0aea40eb1..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_back.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_cancel.png b/app/src/main/res/drawable-mdpi/ic_cancel.png
deleted file mode 100644
index 7d3d5d204..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_file_download.png b/app/src/main/res/drawable-mdpi/ic_file_download.png
deleted file mode 100644
index 427959efc..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_file_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_more.png b/app/src/main/res/drawable-mdpi/ic_more.png
deleted file mode 100644
index b49e87a5f..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_more.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_back.png b/app/src/main/res/drawable-xhdpi/ic_back.png
deleted file mode 100644
index 498f5e06a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_back.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_cancel.png b/app/src/main/res/drawable-xhdpi/ic_cancel.png
deleted file mode 100644
index 82ccadf30..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_file_download.png b/app/src/main/res/drawable-xhdpi/ic_file_download.png
deleted file mode 100644
index de8d6e64d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_file_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_more.png b/app/src/main/res/drawable-xhdpi/ic_more.png
deleted file mode 100644
index c8c196304..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_more.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_back.png b/app/src/main/res/drawable-xxhdpi/ic_back.png
deleted file mode 100644
index d3d8b61ec..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_back.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_cancel.png b/app/src/main/res/drawable-xxhdpi/ic_cancel.png
deleted file mode 100644
index b0f4d10e3..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_download.png b/app/src/main/res/drawable-xxhdpi/ic_file_download.png
deleted file mode 100644
index f453d59a6..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_file_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_more.png b/app/src/main/res/drawable-xxhdpi/ic_more.png
deleted file mode 100644
index 7dfefd807..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_more.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cancel.png b/app/src/main/res/drawable-xxxhdpi/ic_cancel.png
deleted file mode 100644
index 894269fac..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_download.png b/app/src/main/res/drawable-xxxhdpi/ic_file_download.png
deleted file mode 100644
index be96465bb..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_file_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_access_time.xml b/app/src/main/res/drawable/ic_access_time.xml
index 659bbd962..4f999321e 100644
--- a/app/src/main/res/drawable/ic_access_time.xml
+++ b/app/src/main/res/drawable/ic_access_time.xml
@@ -1,6 +1,9 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    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">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="VectorRaster">
     <path 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"/>
     <path android:fillColor="#FFFFFF" android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index 07602be66..b38b4e6c6 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#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 0e64a7776..b43689753 100644
--- a/app/src/main/res/drawable/ic_antifeature_ads.xml
+++ b/app/src/main/res/drawable/ic_antifeature_ads.xml
@@ -1,5 +1,8 @@
-<vector android:height="24dp" android:viewportHeight="48"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:tools="http://schemas.android.com/tools"
+    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"
+    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"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml b/app/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml
index c44d42931..134bfb20c 100644
--- a/app/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml
+++ b/app/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml
@@ -1,5 +1,8 @@
-<vector android:height="24dp" android:viewportHeight="48"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:tools="http://schemas.android.com/tools"
+    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"
+    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"/>
diff --git a/app/src/main/res/drawable/ic_antifeature_knownvuln.xml b/app/src/main/res/drawable/ic_antifeature_knownvuln.xml
index 2e52f1d7d..61138cc8d 100644
--- a/app/src/main/res/drawable/ic_antifeature_knownvuln.xml
+++ b/app/src/main/res/drawable/ic_antifeature_knownvuln.xml
@@ -1,5 +1,8 @@
-<vector android:height="24dp" android:viewportHeight="48"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:tools="http://schemas.android.com/tools"
+    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"
+    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"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreeadd.xml b/app/src/main/res/drawable/ic_antifeature_nonfreeadd.xml
index 880b5efbe..e61ab095b 100644
--- a/app/src/main/res/drawable/ic_antifeature_nonfreeadd.xml
+++ b/app/src/main/res/drawable/ic_antifeature_nonfreeadd.xml
@@ -1,4 +1,5 @@
 <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"/>
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreeassets.xml b/app/src/main/res/drawable/ic_antifeature_nonfreeassets.xml
index f95fb2689..bee58b812 100644
--- a/app/src/main/res/drawable/ic_antifeature_nonfreeassets.xml
+++ b/app/src/main/res/drawable/ic_antifeature_nonfreeassets.xml
@@ -1,4 +1,5 @@
 <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"/>
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreedep.xml b/app/src/main/res/drawable/ic_antifeature_nonfreedep.xml
index 5ae690aa5..f2498d171 100644
--- a/app/src/main/res/drawable/ic_antifeature_nonfreedep.xml
+++ b/app/src/main/res/drawable/ic_antifeature_nonfreedep.xml
@@ -1,4 +1,5 @@
 <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"/>
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreenet.xml b/app/src/main/res/drawable/ic_antifeature_nonfreenet.xml
index 98d48a4e4..a208ae22c 100644
--- a/app/src/main/res/drawable/ic_antifeature_nonfreenet.xml
+++ b/app/src/main/res/drawable/ic_antifeature_nonfreenet.xml
@@ -1,4 +1,5 @@
 <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"/>
diff --git a/app/src/main/res/drawable/ic_antifeature_nosourcesince.xml b/app/src/main/res/drawable/ic_antifeature_nosourcesince.xml
index 1637ee001..684e971e0 100644
--- a/app/src/main/res/drawable/ic_antifeature_nosourcesince.xml
+++ b/app/src/main/res/drawable/ic_antifeature_nosourcesince.xml
@@ -1,4 +1,5 @@
 <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"/>
diff --git a/app/src/main/res/drawable/ic_antifeature_tracking.xml b/app/src/main/res/drawable/ic_antifeature_tracking.xml
index f5c38d6b0..c78bdfd1d 100644
--- a/app/src/main/res/drawable/ic_antifeature_tracking.xml
+++ b/app/src/main/res/drawable/ic_antifeature_tracking.xml
@@ -1,4 +1,5 @@
 <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"/>
diff --git a/app/src/main/res/drawable/ic_antifeature_upstreamnonfree.xml b/app/src/main/res/drawable/ic_antifeature_upstreamnonfree.xml
index 56cfb73d6..fb7aae5d9 100644
--- a/app/src/main/res/drawable/ic_antifeature_upstreamnonfree.xml
+++ b/app/src/main/res/drawable/ic_antifeature_upstreamnonfree.xml
@@ -1,4 +1,5 @@
 <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"/>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
new file mode 100644
index 000000000..4904e191a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_back.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    tools:ignore="VectorRaster">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M19,11H7.83l4.88,-4.88c0.39,-0.39 0.39,-1.03 0,-1.42 -0.39,-0.39 -1.02,-0.39 -1.41,0l-6.59,6.59c-0.39,0.39 -0.39,1.02 0,1.41l6.59,6.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L7.83,13H19c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_back_black_24dp.xml b/app/src/main/res/drawable/ic_back_black_24dp.xml
deleted file mode 100644
index d5dfb2713..000000000
--- a/app/src/main/res/drawable/ic_back_black_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_back_white_24dp.xml b/app/src/main/res/drawable/ic_back_white_24dp.xml
deleted file mode 100644
index 0bf3489b1..000000000
--- a/app/src/main/res/drawable/ic_back_white_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_cancel.xml b/app/src/main/res/drawable/ic_cancel.xml
new file mode 100644
index 000000000..a18d5d4bc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cancel.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#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 ab39a6725..74b639b7c 100644
--- a/app/src/main/res/drawable/ic_categories.xml
+++ b/app/src/main/res/drawable/ic_categories.xml
@@ -1,4 +1,5 @@
 <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: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"
diff --git a/app/src/main/res/drawable/ic_changelog.xml b/app/src/main/res/drawable/ic_changelog.xml
index add9e7973..83174bdc8 100644
--- a/app/src/main/res/drawable/ic_changelog.xml
+++ b/app/src/main/res/drawable/ic_changelog.xml
@@ -1,11 +1,10 @@
-<vector android:height="24dp" android:tint="#B4B4B4"
-    android:viewportHeight="25.4" android:viewportWidth="25.4" android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF"
-        android:pathData="m14.7645,2.1027c-3.0002,0.008 -6.0001,0.0156 -7.5003,0.0196 -1.5002,0.004 -1.5,0.004 -1.5808,0.0171 -0.0808,0.0131 -0.2428,0.0392 -0.4129,0.1359 -0.1701,0.0967 -0.3481,0.2638 -0.5152,0.4754 -0.1671,0.2116 -0.3228,0.4679 -0.4119,0.7297 -0.0891,0.2618 -0.1116,0.5285 -0.1338,0.7958 0,4.7997 -0.0001,9.5997 -0.0057,12.5119 -0.0056,2.9122 -0.0168,3.9368 0.2227,4.6829 0.2396,0.7461 0.7296,1.2138 1.0971,1.4531 0.3675,0.2393 0.6123,0.2504 0.8573,0.2615 3.8458,0.0318 7.703,0.0638 9.9472,0.0501 2.2441,-0.0137 2.9017,-0.0731 3.3977,-0.2284 0.496,-0.1553 0.8407,-0.4097 1.0501,-0.6449 0.2093,-0.2352 0.2882,-0.4554 0.3669,-0.6759l-0.0708,-13.2292zM13.6974,3.7419 L19.1766,9.388 13.7645,9.4547zM11.5993,12.4261 L13.6307,12.4494c0,0 0.0162,0.5361 0.0238,0.8036 0.0554,0.1656 0.1105,0.331 0.1654,0.4961 0.1263,0.1105 0.252,0.2208 0.3778,0.3307 0.1814,0.0318 0.3628,0.0634 0.5436,0.0946 0.3389,-0.1572 1.0154,-0.4728 1.0154,-0.4728l0.9452,1.6774c0,0 -0.5197,0.41 -0.7798,0.6144 -0.0785,0.1656 -0.1572,0.3464 -0.2362,0.5193 0.0633,0.2286 0.1264,0.4571 0.1891,0.6852 0.2916,0.1971 0.8738,0.5907 0.8738,0.5907l-1.0392,1.7482c0,0 -0.5038,-0.2202 -0.756,-0.3307 -0.2438,0.0318 -0.5038,0.0634 -0.756,0.0946 -0.1257,0.1578 -0.2515,0.3151 -0.3778,0.4723 -0.0155,0.3625 -0.0475,1.0868 -0.0475,1.0868l-2.0552,-0.0475c0,0 0.0003,-0.5663 0,-0.8501 -0.1021,-0.1809 -0.2043,-0.3623 -0.307,-0.5436 -0.1966,-0.0627 -0.3935,-0.1254 -0.5907,-0.1886 -0.3541,0.1578 -1.0868,0.4723 -1.0868,0.4723l-1.11,-1.7952c0,0 0.5669,-0.4094 0.8501,-0.6144 0.0633,-0.2517 0.1264,-0.5038 0.1891,-0.756 -0.11,-0.1966 -0.2361,-0.3935 -0.3545,-0.5907 -0.2517,-0.1336 -0.7555,-0.4015 -0.7555,-0.4015l1.0862,-1.819c0,0 0.5202,0.252 0.7798,0.3778 0.1578,0.0003 0.3151,0.0003 0.4723,0 0.1499,-0.0549 0.2997,-0.11 0.4491,-0.1654 0.1026,-0.1887 0.2049,-0.3776 0.307,-0.5669 -0.008,-0.3147 -0.047,-0.9446 -0.047,-0.9446z"
-        android:strokeColor="#FFFFFF" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="0.264999"/>
-    <path android:fillColor="#000000"
-        android:pathData="M12.0137,16.6651a0.6649,0.654 0,1 0,1.3298 0a0.6649,0.654 0,1 0,-1.3298 0z"
-        android:strokeColor="#FFFFFF" android:strokeWidth="1.30501"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#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_close_black_24dp.xml b/app/src/main/res/drawable/ic_close_black_24dp.xml
deleted file mode 100644
index ede4b7108..000000000
--- a/app/src/main/res/drawable/ic_close_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable/ic_close_white_24dp.xml
deleted file mode 100644
index 1e2d044be..000000000
--- a/app/src/main/res/drawable/ic_close_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 2e5ece8a9..d53f9f0db 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#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_do_not_disturb.xml b/app/src/main/res/drawable/ic_do_not_disturb.xml
deleted file mode 100644
index b5f3e57ab..000000000
--- a/app/src/main/res/drawable/ic_do_not_disturb.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    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,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_donate.xml b/app/src/main/res/drawable/ic_donate.xml
index 13855949b..3e6940a42 100644
--- a/app/src/main/res/drawable/ic_donate.xml
+++ b/app/src/main/res/drawable/ic_donate.xml
@@ -1,4 +1,5 @@
-<vector android:height="24dp" android:tint="#B4B4B4"
+<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"/>
diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml
index 0a71bb486..3920ae4d3 100644
--- a/app/src/main/res/drawable/ic_email.xml
+++ b/app/src/main/res/drawable/ic_email.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#B4B4B4"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <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,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#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 4d691f295..4a693ce92 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#B4B4B4"
-    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,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#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 c1d4ac5bb..adcce544e 100644
--- a/app/src/main/res/drawable/ic_expand_less.xml
+++ b/app/src/main/res/drawable/ic_expand_less.xml
@@ -1,5 +1,9 @@
-<vector android:height="24dp" android:tint="#B4B4B4"
-    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,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android: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 e6aa60301..4225e8b6e 100644
--- a/app/src/main/res/drawable/ic_expand_more.xml
+++ b/app/src/main/res/drawable/ic_expand_more.xml
@@ -1,5 +1,12 @@
-<vector android:height="24dp" android:tint="#B4B4B4"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    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"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_file_download.xml b/app/src/main/res/drawable/ic_file_download.xml
new file mode 100644
index 000000000..5804abbc0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_file_download.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#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_latest.xml b/app/src/main/res/drawable/ic_latest.xml
index c9df81f3a..afaba1b55 100644
--- a/app/src/main/res/drawable/ic_latest.xml
+++ b/app/src/main/res/drawable/ic_latest.xml
@@ -1,4 +1,5 @@
 <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: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"
diff --git a/app/src/main/res/drawable/ic_license.xml b/app/src/main/res/drawable/ic_license.xml
index a5bac7f3f..89c1c4d88 100644
--- a/app/src/main/res/drawable/ic_license.xml
+++ b/app/src/main/res/drawable/ic_license.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#B4B4B4"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="64.0"
     android:viewportHeight="64.0">
     <path
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
index 901637dfd..d642fe39a 100644
--- a/app/src/main/res/drawable/ic_lock.xml
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -1,4 +1,5 @@
-<vector android:height="24dp" android:tint="#B4B4B4"
+<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"/>
diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml
new file mode 100644
index 000000000..379883ebf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_nearby.xml b/app/src/main/res/drawable/ic_nearby.xml
index cbf95c45b..5407a14f1 100644
--- a/app/src/main/res/drawable/ic_nearby.xml
+++ b/app/src/main/res/drawable/ic_nearby.xml
@@ -1,4 +1,5 @@
 <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: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"
diff --git a/app/src/main/res/drawable/ic_nfc.xml b/app/src/main/res/drawable/ic_nfc.xml
index bd4a6ecc0..231f25d6b 100644
--- a/app/src/main/res/drawable/ic_nfc.xml
+++ b/app/src/main/res/drawable/ic_nfc.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <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,-2zM20,20L4,20L4,4h16v16zM18,6h-5c-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,8h3v8L8,16L8,8h2L10,6L6,6v12h12L18,6z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#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 b34e2a5ff..d3d6edf7a 100644
--- a/app/src/main/res/drawable/ic_notification.xml
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -1,4 +1,5 @@
 <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: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"
diff --git a/app/src/main/res/drawable/ic_notifications_off.xml b/app/src/main/res/drawable/ic_notifications_off.xml
new file mode 100644
index 000000000..871d66f7a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notifications_off.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#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
new file mode 100644
index 000000000..5845c1396
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notifications_paused.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#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 a0570f228..931fb1520 100644
--- a/app/src/main/res/drawable/ic_perm_device_info.xml
+++ b/app/src/main/res/drawable/ic_perm_device_info.xml
@@ -14,7 +14,8 @@
     android:width="24.0dp"
     android:height="24.0dp"
     android:viewportWidth="48.0"
-    android:viewportHeight="48.0">
+    android:viewportHeight="48.0"
+    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"/>
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
index 3f0828504..e9b1ec853 100644
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index abd67c9b9..2c8ee1f05 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 583bfe9f1..f614ce1e4 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,6 +1,10 @@
-<vector android:height="24dp" android:viewportHeight="40.0"
-    android:viewportWidth="39.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff"
-        android:pathData="m34.32,21.96c0.08,-0.64 0.14,-1.28 0.14,-1.96 0,-0.68 -0.06,-1.32 -0.14,-1.96l4.22,-3.3c0.38,-0.3 0.48,-0.84 0.24,-1.28l-4,-6.92c-0.24,-0.44 -0.78,-0.6 -1.22,-0.44l-4.98,2c-1.04,-0.8 -2.16,-1.46 -3.38,-1.96l-0.76,-5.3c-0.06,-0.48 -0.48,-0.84 -0.98,-0.84h-8c-0.5,0 -0.92,0.36 -0.98,0.84l-0.76,5.3c-1.22,0.5 -2.34,1.18 -3.38,1.96l-4.98,-2C4.9,5.92 4.38,6.1 4.14,6.54l-4,6.92c-0.26,0.44 -0.14,0.98 0.24,1.28l4.22,3.3c-0.08,0.64 -0.14,1.3 -0.14,1.96 0,0.66 0.06,1.32 0.14,1.96l-4.22,3.3c-0.38,0.3 -0.48,0.84 -0.24,1.28l4,6.92c0.24,0.44 0.78,0.6 1.22,0.44l4.98,-2c1.04,0.8 2.16,1.46 3.38,1.96l0.76,5.3c0.06,0.48 0.48,0.84 0.98,0.84h8c0.5,0 0.92,-0.36 0.98,-0.84l0.76,-5.3c1.22,-0.5 2.34,-1.18 3.38,-1.96l4.98,2c0.46,0.18 0.98,0 1.22,-0.44l4,-6.92c0.24,-0.44 0.14,-0.98 -0.24,-1.28zM19.46,27c-3.86,0 -7,-3.14 -7,-7 0,-3.86 3.14,-7 7,-7 3.86,0 7,3.14 7,7 0,3.86 -3.14,7 -7,7z"
-        />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="39.0"
+    android:viewportHeight="40.0">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="m34.32,21.96c0.08,-0.64 0.14,-1.28 0.14,-1.96 0,-0.68 -0.06,-1.32 -0.14,-1.96l4.22,-3.3c0.38,-0.3 0.48,-0.84 0.24,-1.28l-4,-6.92c-0.24,-0.44 -0.78,-0.6 -1.22,-0.44l-4.98,2c-1.04,-0.8 -2.16,-1.46 -3.38,-1.96l-0.76,-5.3c-0.06,-0.48 -0.48,-0.84 -0.98,-0.84h-8c-0.5,0 -0.92,0.36 -0.98,0.84l-0.76,5.3c-1.22,0.5 -2.34,1.18 -3.38,1.96l-4.98,-2C4.9,5.92 4.38,6.1 4.14,6.54l-4,6.92c-0.26,0.44 -0.14,0.98 0.24,1.28l4.22,3.3c-0.08,0.64 -0.14,1.3 -0.14,1.96 0,0.66 0.06,1.32 0.14,1.96l-4.22,3.3c-0.38,0.3 -0.48,0.84 -0.24,1.28l4,6.92c0.24,0.44 0.78,0.6 1.22,0.44l4.98,-2c1.04,0.8 2.16,1.46 3.38,1.96l0.76,5.3c0.06,0.48 0.48,0.84 0.98,0.84h8c0.5,0 0.92,-0.36 0.98,-0.84l0.76,-5.3c1.22,-0.5 2.34,-1.18 3.38,-1.96l4.98,2c0.46,0.18 0.98,0 1.22,-0.44l4,-6.92c0.24,-0.44 0.14,-0.98 -0.24,-1.28zM19.46,27c-3.86,0 -7,-3.14 -7,-7 0,-3.86 3.14,-7 7,-7 3.86,0 7,3.14 7,7 0,3.86 -3.14,7 -7,7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index ccb2ea41c..98b79300e 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    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,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#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_by_alpha.xml b/app/src/main/res/drawable/ic_sort_by_alpha.xml
index d4fb66964..cecad4568 100644
--- a/app/src/main/res/drawable/ic_sort_by_alpha.xml
+++ b/app/src/main/res/drawable/ic_sort_by_alpha.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M14.94,4.66h-4.72l2.36,-2.36zM10.25,19.37h4.66l-2.33,2.33zM6.1,6.27L1.6,17.73h1.84l0.92,-2.45h5.11l0.92,2.45h1.84L7.74,6.27L6.1,6.27zM4.97,13.64l1.94,-5.18 1.94,5.18L4.97,13.64zM15.73,16.14h6.12v1.59h-8.53v-1.29l5.92,-8.56h-5.88v-1.6h8.3v1.26l-5.93,8.6z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M14.94,4.66h-4.72l2.36,-2.36zM10.25,19.37h4.66l-2.33,2.33zM6.1,6.27L1.6,17.73h1.84l0.92,-2.45h5.11l0.92,2.45h1.84L7.74,6.27L6.1,6.27zM4.97,13.64l1.94,-5.18 1.94,5.18L4.97,13.64zM15.73,16.14h6.12v1.59h-8.53v-1.29l5.92,-8.56h-5.88v-1.6h8.3v1.26l-5.93,8.6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_source_code.xml b/app/src/main/res/drawable/ic_source_code.xml
index 9d93d9cb9..405fce75e 100644
--- a/app/src/main/res/drawable/ic_source_code.xml
+++ b/app/src/main/res/drawable/ic_source_code.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#B4B4B4"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_translation.xml b/app/src/main/res/drawable/ic_translation.xml
index a8baf206d..6e92a2428 100644
--- a/app/src/main/res/drawable/ic_translation.xml
+++ b/app/src/main/res/drawable/ic_translation.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="#B4B4B4"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_updates.xml b/app/src/main/res/drawable/ic_updates.xml
index 7da41aced..279e48f76 100644
--- a/app/src/main/res/drawable/ic_updates.xml
+++ b/app/src/main/res/drawable/ic_updates.xml
@@ -1,6 +1,12 @@
-<vector android:height="24dp" android:viewportHeight="42.0"
-    android:viewportWidth="42.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="42.0"
+    android:viewportHeight="42.0">
+    <path
+        android:fillColor="#ffffff"
         android:pathData="m21,42c2.37,0 4.31,-1.94 4.31,-4.31H16.69C16.69,40.06 18.61,42 21,42ZM33.92,29.08V18.31C33.92,11.7 30.39,6.16 24.23,4.7V3.23C24.23,1.44 22.79,0 21,0 19.21,0 17.77,1.44 17.77,3.23V4.7C11.59,6.16 8.08,11.67 8.08,18.31v10.77l-4.31,4.31v2.15H38.23v-2.15z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_video.xml b/app/src/main/res/drawable/ic_video.xml
index b40237a82..8dbe47235 100644
--- a/app/src/main/res/drawable/ic_video.xml
+++ b/app/src/main/res/drawable/ic_video.xml
@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="#B4B4B4"
+    android:tint="?attr/colorControlNormal"
     android:height="24dp"
     android:width="24dp"
     android:viewportWidth="24"
diff --git a/app/src/main/res/drawable/ic_warning_black_24dp.xml b/app/src/main/res/drawable/ic_warning_black_24dp.xml
index b3a9e036b..873ddf3e8 100644
--- a/app/src/main/res/drawable/ic_warning_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_warning_black_24dp.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_warning_white_24dp.xml b/app/src/main/res/drawable/ic_warning_white_24dp.xml
index d633ad87f..9cea06334 100644
--- a/app/src/main/res/drawable/ic_warning_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_warning_white_24dp.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_website.xml b/app/src/main/res/drawable/ic_website.xml
index c56efed40..5f089747c 100644
--- a/app/src/main/res/drawable/ic_website.xml
+++ b/app/src/main/res/drawable/ic_website.xml
@@ -1,11 +1,10 @@
-<vector android:tint="#B4B4B4"
-    android:height="24dp" android:viewportHeight="24.342"
-    android:viewportWidth="24.342" android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000"
-        android:pathData="M3.0421,12.18a9.1189,9.2024 0,1 0,18.2378 0a9.1189,9.2024 0,1 0,-18.2378 0z"
-        android:strokeColor="#ffffff" android:strokeWidth="1.8281"/>
-    <path android:fillColor="#ffffff"
-        android:pathData="m15.162,4.92c-0.0056,0.2061 -0.0167,0.6182 -0.1559,0.9856 -0.1392,0.3674 -0.4065,0.6903 -0.6625,0.874 -0.256,0.1837 -0.501,0.2283 -1.0522,0.2506 -0.5512,0.0223 -1.409,0.0223 -2.2664,0.0223 0.0334,0.8018 0.0668,1.6039 0.0334,2.0938s-0.1337,0.6681 -0.3117,0.7682c-0.178,0.1002 -0.4342,0.1224 -0.8796,0.1336 -0.4454,0.0111 -1.0805,0.0111 -1.7152,0.0111v2.0713c2.0936,-0.0111 4.1875,-0.0223 5.29,0.0112s1.2139,0.1115 1.3196,0.2006c0.1058,0.0891 0.206,0.1893 0.2895,0.2729 0.0835,0.0835 0.1503,0.1503 0.1725,0.735 0.0221,0.5847 -0.0001,1.6869 -0.0224,2.7894 0.4343,0.0111 0.8689,0.0223 1.2141,0.0669 0.3453,0.0446 0.6014,0.1225 0.8185,0.2451 0.2171,0.1226 0.3953,0.2896 0.5456,0.5235 0.1503,0.2339 0.2726,0.5342 0.3951,0.8349 -0.245,0.2339 -0.49,0.4677 -0.8103,0.7275s-0.7265,0.5531 -1.2331,0.8315c-0.5067,0.2784 -1.1191,0.5457 -1.5813,0.7071 -0.4621,0.1615 -0.7739,0.2172 -1.1303,0.2729 -0.3564,0.0557 -0.7573,0.1114 -1.147,0.1225 -0.3897,0.0112 -0.7686,-0.0223 -1.1473,-0.0557l-0.0334,-2.2384c-0.1893,-0.0223 -0.3783,-0.0445 -0.5955,-0.1168 -0.2171,-0.0723 -0.4621,-0.1948 -0.6738,-0.3562 -0.2116,-0.1614 -0.3898,-0.3619 -0.4901,-0.6124 -0.1003,-0.2506 -0.1226,-0.5512 -0.1286,-0.8518 -0.006,-0.3005 0.006,-0.6464 0.0171,-0.9693l-5.0113,-5.0113c0.0891,-0.3118 0.1781,-0.6235 0.3079,-0.9711 0.1297,-0.3476 0.3157,-0.7661 0.505,-1.128 0.1893,-0.362 0.3898,-0.6849 0.6348,-1.0134 0.245,-0.3286 0.5346,-0.6626 0.8353,-0.9578 0.3007,-0.2951 0.6125,-0.5513 0.9967,-0.813 0.3842,-0.2617 0.8408,-0.529 1.3865,-0.7573 0.5457,-0.2283 1.1805,-0.4176 1.793,-0.529 0.6125,-0.1113 1.2027,-0.1447 1.8153,-0.128 0.6125,0.0167 1.2473,0.0835 1.7094,0.1782 0.4622,0.0947 0.7514,0.2171 1.0409,0.3396 -0.0223,0.078 -0.0446,0.1561 -0.0557,0.195 -0.0111,0.0389 -0.0111,0.0389 -0.0167,0.245z"
-        android:strokeColor="#ffffff" android:strokeWidth=".26458"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#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/layout/app_details2_link_item.xml b/app/src/main/res/layout/app_details2_link_item.xml
index 1f806502d..10789bd2c 100644
--- a/app/src/main/res/layout/app_details2_link_item.xml
+++ b/app/src/main/res/layout/app_details2_link_item.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
-    android:drawableLeft="@drawable/ic_website"
-    android:drawableStart="@drawable/ic_website"
     android:paddingLeft="@dimen/layout_horizontal_margin"
     android:paddingStart="@dimen/layout_horizontal_margin"
     tools:text="@string/menu_website"
-    android:background="?selectableItemBackground"/>
\ No newline at end of file
+    android:background="?selectableItemBackground"
+    app:drawableLeftCompat="@drawable/ic_website"
+    app:drawableStartCompat="@drawable/ic_website" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_details2_links.xml b/app/src/main/res/layout/app_details2_links.xml
index 01263d8a6..88915d546 100644
--- a/app/src/main/res/layout/app_details2_links.xml
+++ b/app/src/main/res/layout/app_details2_links.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
     android:layout_height="wrap_content"
@@ -27,11 +28,11 @@
             android:paddingStart="@dimen/details_activity__collapsable_lists__padding__horizontal"
             android:paddingRight="@dimen/details_activity__collapsable_lists__padding__horizontal"
             android:paddingEnd="@dimen/details_activity__collapsable_lists__padding__horizontal"
-            android:drawableRight="@drawable/ic_expand_more"
-            android:drawableEnd="@drawable/ic_expand_more"
-            android:drawableLeft="@drawable/ic_website"
-            android:drawableStart="@drawable/ic_website"
-            android:background="?selectableItemBackground" />
+            android:background="?selectableItemBackground"
+            app:drawableEndCompat="@drawable/ic_expand_more"
+            app:drawableStartCompat="@drawable/ic_website"
+            app:drawableLeftCompat="@drawable/ic_website"
+            app:drawableRightCompat="@drawable/ic_expand_more" />
     </FrameLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/share_chooser.xml b/app/src/main/res/layout/share_chooser.xml
index c2bbe0551..92e61cbb5 100644
--- a/app/src/main/res/layout/share_chooser.xml
+++ b/app/src/main/res/layout/share_chooser.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center_horizontal|bottom"
-    android:paddingStart="4dp"
-    android:paddingEnd="4dp"
     android:background="@android:color/transparent"
-    >
+    android:gravity="center_horizontal|bottom"
+    android:orientation="vertical"
+    android:paddingStart="4dp"
+    android:paddingEnd="4dp">
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="@string/menu_share"
         android:layout_marginBottom="10dp"
-        />
+        android:text="@string/menu_share"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view_apps"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#ffffff" />
+        android:layout_height="match_parent" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/share_header_item.xml b/app/src/main/res/layout/share_header_item.xml
index 5ec578b95..809d4f9f4 100644
--- a/app/src/main/res/layout/share_header_item.xml
+++ b/app/src/main/res/layout/share_header_item.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -35,7 +33,6 @@
         android:layout_toRightOf="@id/icon"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
         android:text="@string/swap_nearby"
-        android:textColor="@android:color/black"
         android:textStyle="bold"
         android:gravity="start"
         />
@@ -51,7 +48,6 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
         android:text="@string/swap_intro"
         android:id="@+id/tvShare"
-        android:textColor="@android:color/darker_gray"
         android:gravity="start"
         />
 
diff --git a/app/src/main/res/layout/share_item.xml b/app/src/main/res/layout/share_item.xml
index e48a3b0d1..7b0aed7d6 100644
--- a/app/src/main/res/layout/share_item.xml
+++ b/app/src/main/res/layout/share_item.xml
@@ -2,13 +2,13 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:minWidth="80dp"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
     android:focusable="true"
-    android:background="?attr/selectableItemBackgroundBorderless"
-    >
+    android:background="?attr/selectableItemBackgroundBorderless">
 
     <ImageView
         android:layout_width="@android:dimen/app_icon_size"
@@ -23,16 +23,15 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:text="Small Text"
         android:id="@+id/tvShare"
-        android:textColor="@android:color/black"
         android:layout_marginTop="8dp"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="4dp"
         android:textSize="12sp"
-        android:fontFamily="sans-serif-condensed"
         android:gravity="top|center_horizontal"
         android:minLines="2"
         android:maxLines="2"
         android:ellipsize="marquee"
+        app:fontFamily="sans-serif-condensed"
         />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/details2.xml b/app/src/main/res/menu/details2.xml
index 4000adab8..af0a69b36 100644
--- a/app/src/main/res/menu/details2.xml
+++ b/app/src/main/res/menu/details2.xml
@@ -9,13 +9,13 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_ignore_all"
-        android:icon="@drawable/ic_do_not_disturb"
+        android:icon="@drawable/ic_notifications_off"
         android:title="@string/menu_ignore_all"
         android:checkable="true"
         app:showAsAction="never"/>
     <item
         android:id="@+id/action_ignore_this"
-        android:icon="@drawable/ic_do_not_disturb"
+        android:icon="@drawable/ic_notifications_paused"
         android:title="@string/menu_ignore_this"
         android:checkable="true"
         app:showAsAction="never"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 218c2c48f..933eeaa5c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -22,8 +22,6 @@
         <item name="appListItem">#ffffff</item>
         <item name="lightGrayTextColor">#a6a6a6</item>
         <item name="antiFeaturesWarning">@drawable/ic_warning_white_24dp</item>
-        <item name="backButtonDrawable">@drawable/ic_back_white_24dp</item>
-        <item name="clearButtonDrawable">@drawable/ic_close_white_24dp</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="appDetailsAntiFeatureIconColor">#ffffff</item>
     </style>
@@ -49,8 +47,6 @@
         <item name="appListItem">#424242</item>
         <item name="lightGrayTextColor">#4a4a4a</item>
         <item name="antiFeaturesWarning">@drawable/ic_warning_black_24dp</item>
-        <item name="backButtonDrawable">@drawable/ic_back_black_24dp</item>
-        <item name="clearButtonDrawable">@drawable/ic_close_black_24dp</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="appDetailsAntiFeatureIconColor">#000000</item>
     </style>