diff --git a/app/src/main/java/com/simplemobiletools/gallery/adapters/MediaAdapter.java b/app/src/main/java/com/simplemobiletools/gallery/adapters/MediaAdapter.java
index 7a28d8e25..5e811429e 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/adapters/MediaAdapter.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/adapters/MediaAdapter.java
@@ -33,7 +33,7 @@ public class MediaAdapter extends BaseAdapter {
         final Medium medium = mMedia.get(position);
         ViewHolder viewHolder;
         if (convertView == null) {
-            convertView = mInflater.inflate(R.layout.video_item, parent, false);
+            convertView = mInflater.inflate(R.layout.photo_video_item, parent, false);
             viewHolder = new ViewHolder(convertView);
             convertView.setTag(viewHolder);
         } else {
diff --git a/app/src/main/res/layout-v21/photo_video_tmb.xml b/app/src/main/res/layout-v21/photo_video_tmb.xml
new file mode 100644
index 000000000..4f1627c04
--- /dev/null
+++ b/app/src/main/res/layout-v21/photo_video_tmb.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.simplemobiletools.gallery.MyImageView
+    android:id="@+id/medium_thumbnail"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:foreground="@drawable/selector"/>
diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/photo_video_item.xml
similarity index 67%
rename from app/src/main/res/layout/video_item.xml
rename to app/src/main/res/layout/photo_video_item.xml
index dbbd17e70..941a6cfa8 100644
--- a/app/src/main/res/layout/video_item.xml
+++ b/app/src/main/res/layout/photo_video_item.xml
@@ -3,13 +3,9 @@
     android:id="@+id/media_item_holder"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:foreground="@drawable/selector">
+    android:layout_height="match_parent">
 
-    <com.simplemobiletools.gallery.MyImageView
-        android:id="@+id/medium_thumbnail"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+    <include layout="@layout/photo_video_tmb"/>
 
     <ImageView
         android:id="@+id/play_outline"
diff --git a/app/src/main/res/layout/photo_video_tmb.xml b/app/src/main/res/layout/photo_video_tmb.xml
new file mode 100644
index 000000000..5abd9b300
--- /dev/null
+++ b/app/src/main/res/layout/photo_video_tmb.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge>
+
+    <FrameLayout
+        android:id="@+id/medium_thumbnail_holder"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:foreground="@drawable/selector">
+
+        <com.simplemobiletools.gallery.MyImageView
+            android:id="@+id/medium_thumbnail"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </FrameLayout>
+</merge>