diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index 47eff4f7c..66a4eb984 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -212,6 +212,8 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
 
             findItem(R.id.increase_column_count).isVisible = config.viewTypeFiles == VIEW_TYPE_GRID && config.mediaColumnCnt < 10
             findItem(R.id.reduce_column_count).isVisible = config.viewTypeFiles == VIEW_TYPE_GRID && config.mediaColumnCnt > 1
+
+            findItem(R.id.toggle_filename).isVisible = config.viewTypeFiles == VIEW_TYPE_GRID
         }
 
         return true
@@ -272,6 +274,9 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         RadioGroupDialog(this, items, config.viewTypeFiles) {
             config.viewTypeFiles = it as Int
             invalidateOptionsMenu()
+            setupLayoutManager()
+            media_grid.adapter = null
+            setupAdapter()
         }
     }
 
@@ -365,6 +370,13 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     private fun getRecyclerAdapter() = (media_grid.adapter as MediaAdapter)
 
     private fun setupLayoutManager() {
+        if (config.viewTypeFiles == VIEW_TYPE_GRID)
+            setupGridLayoutManager()
+        else
+            setupListLayoutManager()
+    }
+
+    private fun setupGridLayoutManager() {
         val layoutManager = media_grid.layoutManager as GridLayoutManager
         if (config.scrollHorizontally) {
             layoutManager.orientation = GridLayoutManager.HORIZONTAL
@@ -402,6 +414,14 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         }
     }
 
+    private fun setupListLayoutManager() {
+        media_grid.isDragSelectionEnabled = true
+        media_grid.isZoomingEnabled = false
+
+        val layoutManager = media_grid.layoutManager as GridLayoutManager
+        layoutManager.spanCount = 1
+    }
+
     private fun increaseColumnCount() {
         config.mediaColumnCnt = ++(media_grid.layoutManager as GridLayoutManager).spanCount
         invalidateOptionsMenu()
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
index 3c71c7f6c..e89d3b8c4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
@@ -250,7 +250,7 @@ class MediaAdapter(val activity: SimpleActivity, var media: MutableList<Medium>,
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        itemViews.put(position, holder.bindView(media[position], displayFilenames, scrollVertically))
+        itemViews.put(position, holder.bindView(media[position], displayFilenames || isListViewType, scrollVertically))
         toggleItemSelection(selectedPositions.contains(position), position)
         holder.itemView.tag = holder
     }
diff --git a/app/src/main/res/layout/directory_item_list.xml b/app/src/main/res/layout/directory_item_list.xml
index 3ecc8152d..5d5b4c21f 100644
--- a/app/src/main/res/layout/directory_item_list.xml
+++ b/app/src/main/res/layout/directory_item_list.xml
@@ -69,7 +69,8 @@
         android:layout_alignParentRight="true"
         android:layout_marginRight="@dimen/small_margin"
         android:gravity="end"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingBottom="@dimen/tiny_margin">
 
         <ImageView
             android:id="@+id/dir_sd_card"
diff --git a/app/src/main/res/layout/photo_video_item_list.xml b/app/src/main/res/layout/photo_video_item_list.xml
index a8fdf5d21..8fd7e34f3 100644
--- a/app/src/main/res/layout/photo_video_item_list.xml
+++ b/app/src/main/res/layout/photo_video_item_list.xml
@@ -4,12 +4,13 @@
     android:id="@+id/media_item_holder"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="1px">
+    android:paddingLeft="@dimen/small_margin"
+    android:paddingTop="@dimen/small_margin">
 
     <com.simplemobiletools.gallery.views.MySquareImageView
         android:id="@+id/medium_thumbnail"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_width="@dimen/list_view_folder_thumbnail_size"
+        android:layout_height="@dimen/list_view_folder_thumbnail_size"/>
 
     <ImageView
         android:id="@+id/medium_check"
@@ -23,31 +24,39 @@
         android:padding="@dimen/tiny_margin"
         android:src="@drawable/ic_check"/>
 
+    <TextView
+        android:id="@+id/photo_name"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignBottom="@+id/medium_thumbnail"
+        android:layout_alignTop="@+id/medium_thumbnail"
+        android:layout_toRightOf="@+id/medium_thumbnail"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:maxLines="3"
+        android:paddingLeft="6dp"
+        android:paddingRight="@dimen/normal_margin"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/bigger_text_size"/>
+
     <ImageView
         android:id="@+id/play_outline"
-        android:layout_width="@dimen/selection_check_size"
-        android:layout_height="@dimen/selection_check_size"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="@dimen/small_margin"
+        android:layout_width="@dimen/play_outline_icon_size"
+        android:layout_height="@dimen/play_outline_icon_size"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="@dimen/small_margin"
+        android:paddingBottom="6dp"
         android:src="@drawable/img_play_outline"
         android:visibility="gone"/>
 
     <TextView
-        android:id="@+id/photo_name"
+        android:id="@+id/dir_list_divider"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/medium_thumbnail"
-        android:layout_alignParentBottom="true"
-        android:layout_alignRight="@+id/medium_thumbnail"
-        android:background="@drawable/gradient_background"
-        android:gravity="bottom"
-        android:maxLines="3"
-        android:paddingBottom="@dimen/small_margin"
-        android:paddingLeft="@dimen/small_margin"
-        android:paddingRight="@dimen/small_margin"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/smaller_text_size"/>
+        android:layout_height="1dp"
+        android:layout_alignBottom="@+id/medium_thumbnail"
+        android:layout_marginTop="2dp"
+        android:layout_toRightOf="@+id/medium_thumbnail"
+        android:background="@drawable/divider"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 0c8d41eea..58e7e8c8e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,6 +3,7 @@
     <dimen name="dir_tmb_size">150dp</dimen>
     <dimen name="medium_tmb_size">100dp</dimen>
     <dimen name="sd_card_icon_size">20dp</dimen>
+    <dimen name="play_outline_icon_size">22dp</dimen>
     <dimen name="selection_check_size">26dp</dimen>
     <dimen name="play_outline_size_big">150dp</dimen>
     <dimen name="timer_padding">24dp</dimen>