diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/CategorySpan.java b/app/src/main/java/org/fdroid/fdroid/views/apps/CategorySpan.java
index d2c145f58..a864c483b 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/CategorySpan.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/CategorySpan.java
@@ -119,7 +119,7 @@ public class CategorySpan extends ReplacementSpan {
         canvas.drawRoundRect(iconBackgroundRect, cornerRadius, cornerRadius, iconBackgroundPaint);
 
         // Category icon on top of the circular background which was just drawn.
-        Drawable icon = ContextCompat.getDrawable(context, R.drawable.ic_category);
+        Drawable icon = ContextCompat.getDrawable(context, R.drawable.ic_categories);
         icon.setBounds(iconPadding, iconPadding, iconPadding + iconSize, iconPadding + iconSize);
         icon.draw(canvas);
 
diff --git a/app/src/main/res/drawable/ic_categories.xml b/app/src/main/res/drawable/ic_categories.xml
new file mode 100644
index 000000000..ab39a6725
--- /dev/null
+++ b/app/src/main/res/drawable/ic_categories.xml
@@ -0,0 +1,6 @@
+<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"
+        android:pathData="M38,3H4C2.9,3 2,3.9 2,5v12c0,1.1 0.9,2 2,2h34c1.1,0 2,-0.9 2,-2V5C40,3.9 39.1,3 38,3m0,20H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h34c1.1,0 2,-0.9 2,-2V25c0,-1.1 -0.9,-2 -2,-2"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_category.xml b/app/src/main/res/drawable/ic_category.xml
deleted file mode 100644
index b71523ac0..000000000
--- a/app/src/main/res/drawable/ic_category.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="M20,6h-8l-2,-2L4,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,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_latest.xml b/app/src/main/res/drawable/ic_latest.xml
new file mode 100644
index 000000000..c9df81f3a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_latest.xml
@@ -0,0 +1,9 @@
+<vector android:height="24dp" android:viewportHeight="47.0"
+    android:viewportWidth="47.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff"
+        android:pathData="M23.9,10.2l-11.4,1.64l8.25,7.94l-1.95,11.22l10.2,-5.3l10.2,5.3l-1.95,-11.22l8.25,-7.94l-11.4,-1.64l-5.1,-10.2z"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m17.07,35.44c-0.58,0 -1.15,-0.18 -1.64,-0.53 -0.86,-0.62 -1.29,-1.68 -1.11,-2.72L16.06,22.07 15.04,21.09L4.21,21.09c-1.5,0 -2.71,1.21 -2.71,2.71L1.5,44.29c0,1.5 1.21,2.71 2.71,2.71L24.7,47c1.5,0 2.71,-1.21 2.71,-2.71L27.41,30.36l-9.05,4.76c-0.41,0.21 -0.85,0.32 -1.3,0.32"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_my_apps.xml b/app/src/main/res/drawable/ic_my_apps.xml
deleted file mode 100644
index 8bb1ec68b..000000000
--- a/app/src/main/res/drawable/ic_my_apps.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="64.0"
-    android:viewportWidth="64.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="m32,0a32,32 0,0 0,-32 32,32 32,0 0,0 32,32 32,32 0,0 0,32 -32,32 32,0 0,0 -32,-32zM32.56,10.63a9.46,9.46 0,0 1,9.46 9.46,9.46 9.46,0 0,1 -9.46,9.46 9.46,9.46 0,0 1,-9.46 -9.46,9.46 9.46,0 0,1 9.46,-9.46zM32,36.45a33.39,33.39 0,0 1,20.37 6.98,23.37 23.37,0 0,1 -20.37,11.94 23.37,23.37 0,0 1,-20.37 -11.96,33.39 33.39,0 0,1 20.37,-6.96z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_nearby.xml b/app/src/main/res/drawable/ic_nearby.xml
index c05402310..cbf95c45b 100644
--- a/app/src/main/res/drawable/ic_nearby.xml
+++ b/app/src/main/res/drawable/ic_nearby.xml
@@ -1,12 +1,18 @@
-<vector android:height="24dp" android:viewportHeight="64.0"
-    android:viewportWidth="64.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="24dp" android:viewportHeight="48.0"
+    android:viewportWidth="48.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff"
+        android:pathData="m22.75,12.78c-6.19,0 -11.22,5.03 -11.22,11.22 0,0.55 0.05,1.08 0.13,1.61 1.71,0.27 3.29,0.93 4.64,1.91 -0.57,-1.05 -0.9,-2.24 -0.9,-3.52 0,-4.05 3.3,-7.35 7.35,-7.35 4.05,0 7.35,3.3 7.35,7.35 0,4.05 -3.3,7.35 -7.35,7.35 -1.38,0 -2.66,-0.39 -3.77,-1.05 0.92,1.39 1.53,2.99 1.73,4.73 0.66,0.12 1.34,0.2 2.04,0.2 6.19,0 11.22,-5.03 11.22,-11.22 0,-6.19 -5.03,-11.22 -11.22,-11.22"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m42.28,25.4c-0.36,0 -0.71,-0.02 -1.06,-0.06 -0.69,9.6 -8.71,17.2 -18.48,17.2 -1.28,0 -2.53,-0.13 -3.74,-0.38 -0.83,1.26 -1.91,2.33 -3.18,3.15 2.18,0.71 4.5,1.1 6.91,1.1 12.03,0 21.87,-9.54 22.38,-21.45 -0.9,0.29 -1.85,0.44 -2.84,0.44"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m42.28,10.64c-2.96,0 -5.36,2.41 -5.36,5.36 0,2.96 2.41,5.36 5.36,5.36 2.96,0 5.36,-2.41 5.36,-5.36 0,-2.96 -2.41,-5.36 -5.36,-5.36"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m10,29.5c-3.72,0 -6.75,3.03 -6.75,6.75 0,3.72 3.03,6.75 6.75,6.75 3.72,0 6.75,-3.03 6.75,-6.75 0,-3.72 -3.03,-6.75 -6.75,-6.75"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
     <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="m31.52,0.48a31.52,31.52 45.69,0 0,-31.52 31.52,31.52 31.52,45.64 0,0 0.45,5.11 16.53,16.53 53.72,0 1,4.52 -2.34,26.71 26.71,48.01 0,1 -0.18,-2.78 26.71,26.71 49.01,0 1,26.72 -26.71,26.71 26.71,48.46 0,1 23.41,13.91 14.8,14.8 67.3,0 1,2.73 -0.26,14.8 14.8,67.32 0,1 2.62,0.24 31.52,31.52 0,0 0,-28.76 -18.69zM31.52,14.32a17.68,17.68 99.47,0 0,-17.68 17.68,17.68 17.68,99.47 0,0 0.18,2.39 16.53,16.53 53.72,0 1,12.62 14.6,17.68 17.68,99.47 0,0 4.88,0.69 17.68,17.68 99.2,0 0,14.22 -7.21,14.8 14.8,66.35 0,1 -2.88,-8.75 14.8,14.8 67.3,0 1,4.14 -10.27,17.68 17.68,99.2 0,0 -15.48,-9.15zM31.52,21.62a10.38,10.38 75.21,0 1,10.38 10.38,10.38 10.38,75.3 0,1 -10.38,10.38 10.38,10.38 76.55,0 1,-10.38 -10.38,10.38 10.38,76.21 0,1 10.38,-10.38zM53.04,47.77a26.71,26.71 48.42,0 1,-21.52 10.94,26.71 26.71,48.96 0,1 -6.56,-0.85 16.53,16.53 54.54,0 1,-2.96 4.15,31.52 31.52,45.67 0,0 9.52,1.51 31.52,31.52 47.06,0 0,26.83 -15.03,14.8 14.8,67.3 0,1 -0.69,0.04 14.8,14.8 67.32,0 1,-4.61 -0.76z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="M10.19,50.45m-7.88,0a7.88,7.88 53.72,1 1,15.76 0a7.88,7.88 53.29,1 1,-15.76 0"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="M57.66,33.73m-6.34,0a6.34,6.34 114.83,1 1,12.68 0a6.34,6.34 114.83,1 1,-12.68 0"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2"/>
+        android:pathData="m4.47,27.01c-0.16,-0.98 -0.25,-1.98 -0.25,-3.01 0,-10.22 8.31,-18.53 18.53,-18.53 4.68,0 8.97,1.75 12.23,4.63C35.81,9.08 36.85,8.24 38.03,7.64 34.02,3.9 28.65,1.6 22.75,1.6 10.4,1.6 0.35,11.65 0.35,24c0,2.1 0.3,4.13 0.84,6.05 0.87,-1.23 1.99,-2.27 3.28,-3.04"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_overview.xml b/app/src/main/res/drawable/ic_overview.xml
deleted file mode 100644
index 8aec73afc..000000000
--- a/app/src/main/res/drawable/ic_overview.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="64.0"
-    android:viewportWidth="64.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="m40.15,0.71 l-9.57,5.97 -10.14,-4.94 -4.23,10.45 -11.11,1.96 2.72,10.95 -7.83,8.11 8.63,7.25 -1.56,11.17 11.25,0.79 5.3,9.95 9.57,-5.97 10.14,4.94 4.23,-10.45 11.11,-1.96 -2.72,-10.94 7.83,-8.12 -8.63,-7.25 1.56,-11.17 -11.25,-0.79 -5.3,-9.95zM28.45,15.95 L34.06,15.95 34.06,32.52 28.45,32.52 28.45,15.95zM28.45,38 L34.06,38 34.06,43.6 28.45,43.6 28.45,38z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 7fb01b86a..583bfe9f1 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,6 +1,6 @@
-<vector android:height="24dp" android:viewportHeight="64.0"
-    android:viewportWidth="64.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="m23.4,0.01 l0,8.54c0.02,1.79 -5.02,5.64 -7.4,4.27l-7.4,-4.27 -8.6,14.9 7.4,4.27c2.65,1.48 2.93,6.85 0,8.54l-7.4,4.27 8.6,14.9 7.4,-4.27c2.29,-1.36 7.4,0.81 7.4,4.27l0,8.55 17.2,0 0,-8.55c0,-3.23 4.16,-6.14 7.4,-4.27l7.4,4.27 8.6,-14.9 -7.4,-4.27c-2.47,-1.43 -2.98,-6.82 0,-8.54l7.4,-4.27 -8.6,-14.9 -7.4,4.27c-2.16,1.29 -7.4,-0.67 -7.4,-4.27l0,-8.54 -17.2,0zM32.14,20.4a11.76,11.76 0,0 1,11.76 11.76,11.76 11.76,0 0,1 -11.76,11.76 11.76,11.76 0,0 1,-11.75 -11.76,11.76 11.76,0 0,1 11.75,-11.76z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2"/>
+<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>
diff --git a/app/src/main/res/drawable/ic_updates.xml b/app/src/main/res/drawable/ic_updates.xml
new file mode 100644
index 000000000..7da41aced
--- /dev/null
+++ b/app/src/main/res/drawable/ic_updates.xml
@@ -0,0 +1,6 @@
+<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"
+        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"/>
+</vector>
diff --git a/app/src/main/res/menu/main_activity_screens.xml b/app/src/main/res/menu/main_activity_screens.xml
index 5573400ce..54cb02f4a 100644
--- a/app/src/main/res/menu/main_activity_screens.xml
+++ b/app/src/main/res/menu/main_activity_screens.xml
@@ -3,12 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:title="@string/main_menu__latest_apps"
-        android:icon="@drawable/ic_overview"
+        android:icon="@drawable/ic_latest"
         app:showAsAction="ifRoom|withText"
         android:id="@+id/whats_new" />
     <item
         android:title="@string/main_menu__categories"
-        android:icon="@drawable/ic_category"
+        android:icon="@drawable/ic_categories"
         app:showAsAction="ifRoom|withText"
         android:id="@+id/categories" />
     <item
@@ -18,7 +18,7 @@
         android:id="@+id/nearby" />
     <item
         android:title="@string/preference_category__my_apps"
-        android:icon="@drawable/ic_my_apps"
+        android:icon="@drawable/ic_updates"
         app:showAsAction="ifRoom|withText"
         android:id="@+id/my_apps" />
     <item