diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/StorageFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/StorageFragment.kt
index a5e8d34e..ac1c0bd9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/StorageFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/StorageFragment.kt
@@ -18,7 +18,6 @@ import kotlinx.android.synthetic.main.storage_fragment.view.*
 import java.util.*
 import kotlin.collections.HashMap
 
-
 class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) {
     private val IMAGES = "images"
     private val VIDEOS = "videos"
diff --git a/app/src/main/res/layout/storage_fragment.xml b/app/src/main/res/layout/storage_fragment.xml
index 196b8662..4148a10a 100644
--- a/app/src/main/res/layout/storage_fragment.xml
+++ b/app/src/main/res/layout/storage_fragment.xml
@@ -4,284 +4,296 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/storage_fragment"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:ignore="RelativeOverlap">
+    android:layout_height="match_parent">
 
-    <RelativeLayout
-        android:id="@+id/free_space_holder"
+    <ScrollView
+        android:id="@+id/storage_scrollview"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/selectableItemBackground"
-        android:paddingStart="@dimen/activity_margin"
-        android:paddingTop="@dimen/activity_margin"
-        android:paddingEnd="@dimen/activity_margin">
+        android:layout_height="wrap_content">
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/free_space_value"
+        <RelativeLayout
+            android:id="@+id/storage_holder"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/storage_free_space_text_size"
-            tools:text="23 GB" />
+            tools:ignore="RelativeOverlap">
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/free_space_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/total_space"
-            android:layout_alignBaseline="@+id/free_space_value"
-            android:layout_alignBottom="@+id/free_space_value"
-            android:layout_marginStart="@dimen/medium_margin"
-            android:layout_toEndOf="@+id/free_space_value"
-            android:text="@string/storage_free"
-            android:textSize="@dimen/big_text_size"
-            android:visibility="invisible" />
+            <RelativeLayout
+                android:id="@+id/free_space_holder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/activity_margin"
+                android:paddingEnd="@dimen/activity_margin">
 
-        <com.google.android.material.progressindicator.LinearProgressIndicator
-            android:id="@+id/main_storage_usage_progressbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/free_space_value"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_marginBottom="@dimen/medium_margin"
-            android:max="100"
-            android:visibility="invisible"
-            app:trackThickness="4dp" />
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/free_space_value"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="@dimen/storage_free_space_text_size"
+                    tools:text="23 GB" />
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/total_space"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/main_storage_usage_progressbar"
-            android:layout_marginBottom="@dimen/big_margin"
-            android:textSize="@dimen/big_text_size"
-            tools:text="Total storage: 64 GB" />
-    </RelativeLayout>
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/free_space_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_above="@+id/total_space"
+                    android:layout_alignBaseline="@+id/free_space_value"
+                    android:layout_alignBottom="@+id/free_space_value"
+                    android:layout_marginStart="@dimen/medium_margin"
+                    android:layout_toEndOf="@+id/free_space_value"
+                    android:text="@string/storage_free"
+                    android:textSize="@dimen/big_text_size"
+                    android:visibility="invisible" />
 
-    <RelativeLayout
-        android:id="@+id/images_holder"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/free_space_holder"
-        android:background="?attr/selectableItemBackground"
-        android:paddingStart="@dimen/activity_margin"
-        android:paddingTop="@dimen/normal_margin"
-        android:paddingEnd="@dimen/activity_margin"
-        android:paddingBottom="@dimen/normal_margin">
+                <com.google.android.material.progressindicator.LinearProgressIndicator
+                    android:id="@+id/main_storage_usage_progressbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/free_space_value"
+                    android:layout_marginTop="@dimen/medium_margin"
+                    android:layout_marginBottom="@dimen/medium_margin"
+                    android:max="100"
+                    android:visibility="invisible"
+                    app:trackThickness="4dp" />
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/images_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/images"
-            android:textSize="@dimen/bigger_text_size" />
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/total_space"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/main_storage_usage_progressbar"
+                    android:layout_marginBottom="@dimen/big_margin"
+                    android:textSize="@dimen/big_text_size"
+                    tools:text="Total storage: 64 GB" />
+            </RelativeLayout>
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/images_size"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:alpha="0.7"
-            android:textSize="@dimen/normal_text_size"
-            tools:text="20 GB" />
+            <RelativeLayout
+                android:id="@+id/images_holder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/free_space_holder"
+                android:background="?attr/selectableItemBackground"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/normal_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/normal_margin">
 
-        <com.google.android.material.progressindicator.LinearProgressIndicator
-            android:id="@+id/images_progressbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/images_label"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_marginBottom="@dimen/medium_margin"
-            android:max="100"
-            app:trackThickness="2dp" />
-    </RelativeLayout>
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/images_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/images"
+                    android:textSize="@dimen/bigger_text_size" />
 
-    <RelativeLayout
-        android:id="@+id/videos_holder"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/images_holder"
-        android:background="?attr/selectableItemBackground"
-        android:paddingStart="@dimen/activity_margin"
-        android:paddingTop="@dimen/normal_margin"
-        android:paddingEnd="@dimen/activity_margin"
-        android:paddingBottom="@dimen/normal_margin">
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/images_size"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:alpha="0.7"
+                    android:textSize="@dimen/normal_text_size"
+                    tools:text="20 GB" />
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/videos_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/videos"
-            android:textSize="@dimen/bigger_text_size" />
+                <com.google.android.material.progressindicator.LinearProgressIndicator
+                    android:id="@+id/images_progressbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/images_label"
+                    android:layout_marginTop="@dimen/medium_margin"
+                    android:layout_marginBottom="@dimen/medium_margin"
+                    android:max="100"
+                    app:trackThickness="2dp" />
+            </RelativeLayout>
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/videos_size"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:alpha="0.7"
-            android:textSize="@dimen/normal_text_size"
-            tools:text="20 GB" />
+            <RelativeLayout
+                android:id="@+id/videos_holder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/images_holder"
+                android:background="?attr/selectableItemBackground"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/normal_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/normal_margin">
 
-        <com.google.android.material.progressindicator.LinearProgressIndicator
-            android:id="@+id/videos_progressbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/videos_label"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_marginBottom="@dimen/medium_margin"
-            android:max="100"
-            app:trackThickness="2dp" />
-    </RelativeLayout>
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/videos_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/videos"
+                    android:textSize="@dimen/bigger_text_size" />
 
-    <RelativeLayout
-        android:id="@+id/audio_holder"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/videos_holder"
-        android:background="?attr/selectableItemBackground"
-        android:paddingStart="@dimen/activity_margin"
-        android:paddingTop="@dimen/normal_margin"
-        android:paddingEnd="@dimen/activity_margin"
-        android:paddingBottom="@dimen/normal_margin">
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/videos_size"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:alpha="0.7"
+                    android:textSize="@dimen/normal_text_size"
+                    tools:text="20 GB" />
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/audio_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/audio"
-            android:textSize="@dimen/bigger_text_size" />
+                <com.google.android.material.progressindicator.LinearProgressIndicator
+                    android:id="@+id/videos_progressbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/videos_label"
+                    android:layout_marginTop="@dimen/medium_margin"
+                    android:layout_marginBottom="@dimen/medium_margin"
+                    android:max="100"
+                    app:trackThickness="2dp" />
+            </RelativeLayout>
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/audio_size"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:alpha="0.7"
-            android:textSize="@dimen/normal_text_size"
-            tools:text="20 GB" />
+            <RelativeLayout
+                android:id="@+id/audio_holder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/videos_holder"
+                android:background="?attr/selectableItemBackground"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/normal_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/normal_margin">
 
-        <com.google.android.material.progressindicator.LinearProgressIndicator
-            android:id="@+id/audio_progressbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/audio_label"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_marginBottom="@dimen/medium_margin"
-            android:max="100"
-            app:trackThickness="2dp" />
-    </RelativeLayout>
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/audio_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/audio"
+                    android:textSize="@dimen/bigger_text_size" />
 
-    <RelativeLayout
-        android:id="@+id/documents_holder"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/audio_holder"
-        android:background="?attr/selectableItemBackground"
-        android:paddingStart="@dimen/activity_margin"
-        android:paddingTop="@dimen/normal_margin"
-        android:paddingEnd="@dimen/activity_margin"
-        android:paddingBottom="@dimen/normal_margin">
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/audio_size"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:alpha="0.7"
+                    android:textSize="@dimen/normal_text_size"
+                    tools:text="20 GB" />
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/documents_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/documents"
-            android:textSize="@dimen/bigger_text_size" />
+                <com.google.android.material.progressindicator.LinearProgressIndicator
+                    android:id="@+id/audio_progressbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/audio_label"
+                    android:layout_marginTop="@dimen/medium_margin"
+                    android:layout_marginBottom="@dimen/medium_margin"
+                    android:max="100"
+                    app:trackThickness="2dp" />
+            </RelativeLayout>
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/documents_size"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:alpha="0.7"
-            android:textSize="@dimen/normal_text_size"
-            tools:text="20 GB" />
+            <RelativeLayout
+                android:id="@+id/documents_holder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/audio_holder"
+                android:background="?attr/selectableItemBackground"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/normal_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/normal_margin">
 
-        <com.google.android.material.progressindicator.LinearProgressIndicator
-            android:id="@+id/documents_progressbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/documents_label"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_marginBottom="@dimen/medium_margin"
-            android:max="100"
-            app:trackThickness="2dp" />
-    </RelativeLayout>
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/documents_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/documents"
+                    android:textSize="@dimen/bigger_text_size" />
 
-    <RelativeLayout
-        android:id="@+id/archives_holder"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/documents_holder"
-        android:background="?attr/selectableItemBackground"
-        android:paddingStart="@dimen/activity_margin"
-        android:paddingTop="@dimen/normal_margin"
-        android:paddingEnd="@dimen/activity_margin"
-        android:paddingBottom="@dimen/normal_margin">
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/documents_size"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:alpha="0.7"
+                    android:textSize="@dimen/normal_text_size"
+                    tools:text="20 GB" />
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/archives_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/archives"
-            android:textSize="@dimen/bigger_text_size" />
+                <com.google.android.material.progressindicator.LinearProgressIndicator
+                    android:id="@+id/documents_progressbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/documents_label"
+                    android:layout_marginTop="@dimen/medium_margin"
+                    android:layout_marginBottom="@dimen/medium_margin"
+                    android:max="100"
+                    app:trackThickness="2dp" />
+            </RelativeLayout>
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/archives_size"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:alpha="0.7"
-            android:textSize="@dimen/normal_text_size"
-            tools:text="20 GB" />
+            <RelativeLayout
+                android:id="@+id/archives_holder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/documents_holder"
+                android:background="?attr/selectableItemBackground"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/normal_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/normal_margin">
 
-        <com.google.android.material.progressindicator.LinearProgressIndicator
-            android:id="@+id/archives_progressbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/archives_label"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_marginBottom="@dimen/medium_margin"
-            android:max="100"
-            app:trackThickness="2dp" />
-    </RelativeLayout>
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/archives_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/archives"
+                    android:textSize="@dimen/bigger_text_size" />
 
-    <RelativeLayout
-        android:id="@+id/others_holder"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/archives_holder"
-        android:background="?attr/selectableItemBackground"
-        android:paddingStart="@dimen/activity_margin"
-        android:paddingTop="@dimen/normal_margin"
-        android:paddingEnd="@dimen/activity_margin"
-        android:paddingBottom="@dimen/normal_margin">
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/archives_size"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:alpha="0.7"
+                    android:textSize="@dimen/normal_text_size"
+                    tools:text="20 GB" />
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/others_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/others"
-            android:textSize="@dimen/bigger_text_size" />
+                <com.google.android.material.progressindicator.LinearProgressIndicator
+                    android:id="@+id/archives_progressbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/archives_label"
+                    android:layout_marginTop="@dimen/medium_margin"
+                    android:layout_marginBottom="@dimen/medium_margin"
+                    android:max="100"
+                    app:trackThickness="2dp" />
+            </RelativeLayout>
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/others_size"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:alpha="0.7"
-            android:textSize="@dimen/normal_text_size"
-            tools:text="20 GB" />
+            <RelativeLayout
+                android:id="@+id/others_holder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/archives_holder"
+                android:background="?attr/selectableItemBackground"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/normal_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/normal_margin">
 
-        <com.google.android.material.progressindicator.LinearProgressIndicator
-            android:id="@+id/others_progressbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/others_label"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_marginBottom="@dimen/medium_margin"
-            android:max="100"
-            app:trackThickness="2dp" />
-    </RelativeLayout>
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/others_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/others"
+                    android:textSize="@dimen/bigger_text_size" />
+
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/others_size"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:alpha="0.7"
+                    android:textSize="@dimen/normal_text_size"
+                    tools:text="20 GB" />
+
+                <com.google.android.material.progressindicator.LinearProgressIndicator
+                    android:id="@+id/others_progressbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/others_label"
+                    android:layout_marginTop="@dimen/medium_margin"
+                    android:layout_marginBottom="@dimen/medium_margin"
+                    android:max="100"
+                    app:trackThickness="2dp" />
+            </RelativeLayout>
+        </RelativeLayout>
+    </ScrollView>
 </com.simplemobiletools.filemanager.pro.fragments.StorageFragment>