diff --git a/app/build.gradle b/app/build.gradle
index 700b5b08..9c121c79 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -95,6 +95,7 @@ dependencies {
         transitive = false
     }
     implementation 'com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2'
+    implementation 'com.gu:option:1.3'
     implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt
index c235eac3..042854e2 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt
@@ -186,7 +186,7 @@ class DownloadLocationDialogFragment : DialogFragment() {
                         if (key == null) entries[key]!!.location_available.text = downloadFolder
                     }
                     else
-                        Preferences["download_folder"] = File(directory).canonicalPath
+                        Preferences["download_folder"] = File(directory).toURI().toString()
                 }
             }
             else -> super.onActivityResult(requestCode, resultCode, data)
diff --git a/app/src/main/res/layout/item_galleryblock.xml b/app/src/main/res/layout/item_galleryblock.xml
index 7d6a9f4f..efab2973 100644
--- a/app/src/main/res/layout/item_galleryblock.xml
+++ b/app/src/main/res/layout/item_galleryblock.xml
@@ -100,7 +100,8 @@
 				android:contentDescription="@string/galleryblock_thumbnail_description"
 				android:adjustViewBounds="true"
 				app:layout_constraintLeft_toLeftOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/galleryblock_progressbar"/>
+				app:layout_constraintTop_toBottomOf="@id/galleryblock_progressbar"
+				app:layout_constraintBottom_toBottomOf="@id/barrier"/>
 
 			<TextView
 				style="@style/TextAppearance.AppCompat.Headline"