diff --git a/app/src/debug/res/xml-v25/shortcuts.xml b/app/src/debug/res/xml-v25/shortcuts.xml
index 6db5b5f64..4e990dd15 100644
--- a/app/src/debug/res/xml-v25/shortcuts.xml
+++ b/app/src/debug/res/xml-v25/shortcuts.xml
@@ -3,7 +3,7 @@
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_star_white_24dp"
+        android:icon="@drawable/ic_shortcut_star"
         android:shortcutId="shortcut_quick_access"
         android:shortcutLongLabel="@string/quick"
         android:shortcutShortLabel="@string/quick">
@@ -15,7 +15,7 @@
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_history_white_24dp"
+        android:icon="@drawable/ic_shortcut_history"
         android:shortcutId="shortcut_recent"
         android:shortcutLongLabel="@string/recent"
         android:shortcutShortLabel="@string/recent">
@@ -27,7 +27,7 @@
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_android_white_24dp"
+        android:icon="@drawable/ic_shortcut_android"
         android:shortcutId="shortcut_apps"
         android:shortcutLongLabel="@string/apps"
         android:shortcutShortLabel="@string/apps">
@@ -39,7 +39,7 @@
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_ftp_white_24dp"
+        android:icon="@drawable/ic_shortcut_ftp"
         android:shortcutId="shortcut_ftp"
         android:shortcutLongLabel="@string/ftp"
         android:shortcutShortLabel="@string/ftp">
diff --git a/app/src/main/res/drawable-night/ic_android_white_24dp.xml b/app/src/main/res/drawable-night/ic_android_white_24dp.xml
deleted file mode 100644
index 342ca5316..000000000
--- a/app/src/main/res/drawable-night/ic_android_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="@color/vectors_white"
-        android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_ftp_white_24dp.xml b/app/src/main/res/drawable-night/ic_ftp_white_24dp.xml
deleted file mode 100644
index 0909bb2d0..000000000
--- a/app/src/main/res/drawable-night/ic_ftp_white_24dp.xml
+++ /dev/null
@@ -1,12 +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:pathData="M20,13v5h-16v-10h11v-2h-3l-2,-2h-6c-1.1,0 -2,0.9 -2,2l0,12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-5L20,13z"
-        android:fillColor="@color/vectors_white"/>
-    <path
-        android:pathData="M16.6,4.6v1.2c3.1,0 5.5,2.5 5.5,5.5h1.2C23.3,7.7 20.3,4.6 16.6,4.6zM16.6,9.5v1.8h1.8C18.4,10.4 17.6,9.5 16.6,9.5zM16.6,7.1v1.2c1.7,0 3.1,1.4 3.1,3.1h1.2C20.9,9 19,7.1 16.6,7.1z"
-        android:fillColor="@color/vectors_white"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_history_white_24dp.xml b/app/src/main/res/drawable-night/ic_history_white_24dp.xml
deleted file mode 100644
index 90185c2a6..000000000
--- a/app/src/main/res/drawable-night/ic_history_white_24dp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:alpha="0.90"
-        android:autoMirrored="true"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0"
-        android:width="24dp">
-    <path android:fillColor="@color/vectors_white"
-          android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_star_white_24dp.xml b/app/src/main/res/drawable-night/ic_star_white_24dp.xml
deleted file mode 100644
index a9c644f88..000000000
--- a/app/src/main/res/drawable-night/ic_star_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="@color/vectors_white"
-        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_shortcut_android.xml b/app/src/main/res/drawable/ic_shortcut_android.xml
new file mode 100644
index 000000000..ab3d3bca8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shortcut_android.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="@color/accent_indigo"
+        android:pathData="M 48,24 A 24,24 0 0 1 24,48 24,24 0 0 1 0,24 24,24 0 0 1 24,0 24,24 0 0 1 48,24 Z" />
+
+    <path
+        android:fillColor="@color/vectors_white"
+        android:pathData="m 16.603215,31.396785 c 0,0.678037 0.554759,1.232796 1.232799,1.232796 h 1.232796 v 4.314792 c 0,1.023221 0.825975,1.849196 1.849196,1.849196 1.023221,0 1.849196,-0.825975 1.849196,-1.849196 v -4.314792 h 2.465595 v 4.314792 c 0,1.023221 0.825975,1.849196 1.849197,1.849196 1.023221,0 1.849196,-0.825975 1.849196,-1.849196 v -4.314792 h 1.232797 c 0.678038,0 1.232798,-0.554759 1.232798,-1.232796 V 19.068811 H 16.603215 Z M 13.521222,19.068811 c -1.023221,0 -1.849195,0.825974 -1.849195,1.849195 v 8.629582 c 0,1.023223 0.825974,1.849197 1.849195,1.849197 1.023223,0 1.849197,-0.825974 1.849197,-1.849197 v -8.629582 c 0,-1.023221 -0.825974,-1.849195 -1.849197,-1.849195 z m 20.957556,0 c -1.023224,0 -1.849198,0.825974 -1.849198,1.849195 v 8.629582 c 0,1.023223 0.825974,1.849197 1.849198,1.849197 1.023221,0 1.849194,-0.825974 1.849194,-1.849197 v -8.629582 c 0,-1.023221 -0.825973,-1.849195 -1.849194,-1.849195 z m -6.127004,-7.199538 1.602638,-1.602636 c 0.246558,-0.246559 0.246558,-0.6287268 0,-0.8752859 -0.24656,-0.2465596 -0.628727,-0.2465596 -0.875288,0 L 27.254585,11.215892 C 26.280676,10.722772 25.171157,10.439229 24,10.439229 c -1.183486,0 -2.293003,0.283543 -3.279241,0.776663 L 18.88389,9.3913511 c -0.246558,-0.2465596 -0.628725,-0.2465596 -0.875286,0 -0.246558,0.2465591 -0.246558,0.6287269 0,0.8752859 l 1.614966,1.614965 c -1.824541,1.343748 -3.020355,3.501145 -3.020355,5.954412 h 14.79357 c 0,-2.453267 -1.195815,-4.622991 -3.045011,-5.966741 z m -6.817368,3.501147 h -1.232799 v -1.232799 h 1.232799 z m 6.163986,0 h -1.232799 v -1.232799 h 1.232799 z" />
+
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shortcut_ftp.xml b/app/src/main/res/drawable/ic_shortcut_ftp.xml
new file mode 100644
index 000000000..afa57795c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shortcut_ftp.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="@color/accent_pink"
+        android:pathData="M 48,24 A 24,24 0 0 1 24,48 24,24 0 0 1 0,24 24,24 0 0 1 24,0 24,24 0 0 1 48,24 Z" />
+
+    <path
+        android:fillColor="@color/vectors_white"
+        android:pathData="m 13.748715,13.359606 c -1.438886,0 -2.616154,1.177269 -2.616154,2.616153 v 15.696918 c 0,1.438884 1.177268,2.616155 2.616154,2.616155 H 34.67794 c 1.438886,0 2.616153,-1.177271 2.616153,-2.616155 V 25.132295 H 34.67794 v 6.540382 H 13.748715 V 18.591912 h 14.388841 v -2.616153 h -3.924228 l -2.616153,-2.616153 z m 16.482348,0.78543 v 1.56794 c 4.055037,0 7.194422,3.270191 7.194422,7.194421 h 1.570858 c 0,-4.709075 -3.925396,-8.762361 -8.76528,-8.762361 z m 0,3.270191 v 1.56794 c 2.223731,0 4.055623,1.831891 4.055623,4.055622 h 1.57086 c 0,-3.139384 -2.487099,-5.623562 -5.626483,-5.623562 z m 0,3.1388 v 2.35337 h 2.35629 c 0,-1.177269 -1.048214,-2.35337 -2.35629,-2.35337 z" />
+
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shortcut_history.xml b/app/src/main/res/drawable/ic_shortcut_history.xml
new file mode 100644
index 000000000..09a63d50d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shortcut_history.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="@color/accent_deep_orange"
+        android:pathData="M 48,24 A 24,24 0 0 1 24,48 24,24 0 0 1 0,24 24,24 0 0 1 24,0 24,24 0 0 1 48,24 Z" />
+
+    <path
+        android:fillColor="@color/vectors_white"
+        android:pathData="m 24.24847,12.301563 c -6.460138,0 -11.698437,5.2383 -11.698437,11.698437 H 8.6505544 L 13.706878,29.056324 13.797868,29.2383 19.049164,24 h -3.899479 c 0,-5.030328 4.068457,-9.098784 9.098785,-9.098784 5.030328,0 9.098785,4.068456 9.098785,9.098784 0,5.030328 -4.068457,9.098784 -9.098785,9.098784 -2.508665,0 -4.783361,-1.026862 -6.421143,-2.677642 l -1.845753,1.845754 c 2.118716,2.118717 5.030328,3.431541 8.266896,3.431541 6.460138,0 11.698438,-5.2383 11.698438,-11.698437 0,-6.460137 -5.2383,-11.698437 -11.698438,-11.698437 z m -1.299826,6.499131 v 6.499132 l 5.563257,3.30156 0.935875,-1.57279 -4.549392,-2.70364 v -5.524262 z" />
+
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shortcut_star.xml b/app/src/main/res/drawable/ic_shortcut_star.xml
new file mode 100644
index 000000000..8463e40d4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shortcut_star.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="@color/accent_pink"
+        android:pathData="M 48,24 A 24,24 0 0 1 24,48 24,24 0 0 1 0,24 24,24 0 0 1 24,0 24,24 0 0 1 48,24 Z" />
+
+    <path
+        android:fillColor="@color/vectors_white"
+        android:pathData="M 24,30.603836 33.10249,36.097734 30.686943,25.743283 38.728949,18.776489 28.138835,17.878024 24,8.1127304 19.861165,17.878024 9.2710513,18.776489 17.313057,25.743283 14.89751,36.097734 Z" />
+
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml
index 4f1bc38bc..13cc686aa 100644
--- a/app/src/main/res/xml-v25/shortcuts.xml
+++ b/app/src/main/res/xml-v25/shortcuts.xml
@@ -3,8 +3,8 @@
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_star_white_24dp"
-        android:shortcutId="shortcut_quick_access   "
+        android:icon="@drawable/ic_shortcut_star"
+        android:shortcutId="shortcut_quick_access"
         android:shortcutLongLabel="@string/quick"
         android:shortcutShortLabel="@string/quick">
         <intent
@@ -15,7 +15,7 @@
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_history_white_24dp"
+        android:icon="@drawable/ic_shortcut_history"
         android:shortcutId="shortcut_recent"
         android:shortcutLongLabel="@string/recent"
         android:shortcutShortLabel="@string/recent">
@@ -27,7 +27,7 @@
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_android_white_24dp"
+        android:icon="@drawable/ic_shortcut_android"
         android:shortcutId="shortcut_apps"
         android:shortcutLongLabel="@string/apps"
         android:shortcutShortLabel="@string/apps">
@@ -39,7 +39,7 @@
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_ftp_white_24dp"
+        android:icon="@drawable/ic_shortcut_ftp"
         android:shortcutId="shortcut_ftp"
         android:shortcutLongLabel="@string/ftp"
         android:shortcutShortLabel="@string/ftp">