diff --git a/app/src/main/res/drawable-hdpi/ic_bookmark.png b/app/src/main/res/drawable-hdpi/ic_bookmark.png
deleted file mode 100644
index 8dbfafa9..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_bookmark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_delete.png b/app/src/main/res/drawable-hdpi/ic_delete.png
deleted file mode 100644
index a37caccf..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_logout.png b/app/src/main/res/drawable-hdpi/ic_logout.png
deleted file mode 100644
index 12f49341..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_logout.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_notif.png b/app/src/main/res/drawable-hdpi/ic_notif.png
deleted file mode 100644
index 6e71dbfa..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_notif.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_submit.png b/app/src/main/res/drawable-hdpi/ic_submit.png
deleted file mode 100644
index 54775ebd..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_submit.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_warning.png b/app/src/main/res/drawable-hdpi/ic_warning.png
deleted file mode 100644
index e0c9ce34..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_warning.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/nav_up.png b/app/src/main/res/drawable-hdpi/nav_up.png
deleted file mode 100755
index 99622e7c..00000000
Binary files a/app/src/main/res/drawable-hdpi/nav_up.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_bookmark.png b/app/src/main/res/drawable-mdpi/ic_bookmark.png
deleted file mode 100644
index d37d3cd9..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_bookmark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_delete.png b/app/src/main/res/drawable-mdpi/ic_delete.png
deleted file mode 100644
index 04e26b3f..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_logout.png b/app/src/main/res/drawable-mdpi/ic_logout.png
deleted file mode 100644
index 43335d7e..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_logout.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_notif.png b/app/src/main/res/drawable-mdpi/ic_notif.png
deleted file mode 100644
index 55db697c..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_notif.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_submit.png b/app/src/main/res/drawable-mdpi/ic_submit.png
deleted file mode 100644
index 9dee29dd..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_submit.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_warning.png b/app/src/main/res/drawable-mdpi/ic_warning.png
deleted file mode 100644
index f5fb4ae6..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_warning.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/nav_up.png b/app/src/main/res/drawable-mdpi/nav_up.png
deleted file mode 100755
index f2b35ac2..00000000
Binary files a/app/src/main/res/drawable-mdpi/nav_up.png and /dev/null differ
diff --git a/app/src/main/res/drawable-night-hdpi/nav_up.png b/app/src/main/res/drawable-night-hdpi/nav_up.png
deleted file mode 100755
index d7b27da8..00000000
Binary files a/app/src/main/res/drawable-night-hdpi/nav_up.png and /dev/null differ
diff --git a/app/src/main/res/drawable-night-mdpi/nav_up.png b/app/src/main/res/drawable-night-mdpi/nav_up.png
deleted file mode 100755
index edd9b1dd..00000000
Binary files a/app/src/main/res/drawable-night-mdpi/nav_up.png and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xhdpi/nav_up.png b/app/src/main/res/drawable-night-xhdpi/nav_up.png
deleted file mode 100755
index 8ac0552c..00000000
Binary files a/app/src/main/res/drawable-night-xhdpi/nav_up.png and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/nav_up.png b/app/src/main/res/drawable-night-xxhdpi/nav_up.png
deleted file mode 100755
index 5e61c3d1..00000000
Binary files a/app/src/main/res/drawable-night-xxhdpi/nav_up.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bookmark.png b/app/src/main/res/drawable-xhdpi/ic_bookmark.png
deleted file mode 100644
index 6dae7417..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_bookmark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_delete.png b/app/src/main/res/drawable-xhdpi/ic_delete.png
deleted file mode 100644
index fb6c1b9c..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_logout.png b/app/src/main/res/drawable-xhdpi/ic_logout.png
deleted file mode 100644
index 46b2e904..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_logout.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notif.png b/app/src/main/res/drawable-xhdpi/ic_notif.png
deleted file mode 100644
index 146975d9..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_notif.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_submit.png b/app/src/main/res/drawable-xhdpi/ic_submit.png
deleted file mode 100644
index 6dc1a3f0..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_submit.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_warning.png b/app/src/main/res/drawable-xhdpi/ic_warning.png
deleted file mode 100644
index 10426e1a..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_warning.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/nav_up.png b/app/src/main/res/drawable-xhdpi/nav_up.png
deleted file mode 100755
index fca5022c..00000000
Binary files a/app/src/main/res/drawable-xhdpi/nav_up.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bookmark.png b/app/src/main/res/drawable-xxhdpi/ic_bookmark.png
deleted file mode 100644
index 620babe1..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_bookmark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete.png b/app/src/main/res/drawable-xxhdpi/ic_delete.png
deleted file mode 100644
index 75f41bb8..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_logout.png b/app/src/main/res/drawable-xxhdpi/ic_logout.png
deleted file mode 100644
index 665f4767..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_logout.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notif.png b/app/src/main/res/drawable-xxhdpi/ic_notif.png
deleted file mode 100644
index 7e1866fe..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_notif.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_submit.png b/app/src/main/res/drawable-xxhdpi/ic_submit.png
deleted file mode 100644
index a017055b..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_submit.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_warning.png b/app/src/main/res/drawable-xxhdpi/ic_warning.png
deleted file mode 100644
index 36c514e4..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_warning.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/nav_up.png b/app/src/main/res/drawable-xxhdpi/nav_up.png
deleted file mode 100755
index f5299450..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/nav_up.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_arrow_upward_24.xml b/app/src/main/res/drawable/ic_arrow_upward_24.xml
new file mode 100644
index 00000000..07b7a836
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_upward_24.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="@android:color/white"
+      android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_bookmark.xml b/app/src/main/res/drawable/ic_bookmark.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_bookmark.xml
rename to app/src/main/res/drawable/ic_bookmark.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_delete.xml
rename to app/src/main/res/drawable/ic_delete.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_logout.xml b/app/src/main/res/drawable/ic_logout.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_logout.xml
rename to app/src/main/res/drawable/ic_logout.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_notif.xml b/app/src/main/res/drawable/ic_notif.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_notif.xml
rename to app/src/main/res/drawable/ic_notif.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_submit.xml b/app/src/main/res/drawable/ic_submit.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_submit.xml
rename to app/src/main/res/drawable/ic_submit.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_warning.xml
rename to app/src/main/res/drawable/ic_warning.xml
diff --git a/app/src/main/res/layout/layout_directory_chooser.xml b/app/src/main/res/layout/layout_directory_chooser.xml
index f1a60021..561a3920 100755
--- a/app/src/main/res/layout/layout_directory_chooser.xml
+++ b/app/src/main/res/layout/layout_directory_chooser.xml
@@ -1,5 +1,6 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -69,7 +70,7 @@
             android:contentDescription="@string/nav_up"
             android:padding="8dp"
             android:scaleType="fitCenter"
-            android:src="@drawable/nav_up" />
+            app:srcCompat="@drawable/ic_arrow_upward_24" />
 
         <TextView
             android:id="@+id/txtvSelectedFolderLabel"