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 6126da209..2677804af 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/adapters/MediaAdapter.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/adapters/MediaAdapter.java
@@ -26,16 +26,21 @@ public class MediaAdapter extends BaseAdapter {
 
     @Override
     public View getView(int position, View view, ViewGroup parent) {
+        final Media medium = media.get(position);
         ViewHolder holder;
         if (view == null) {
-            view = inflater.inflate(R.layout.medium_item, parent, false);
+            int layout = R.layout.photo_item;
+            if (medium.getIsVideo()) {
+                layout = R.layout.video_item;
+            }
+            view = inflater.inflate(layout, parent, false);
             holder = new ViewHolder(view);
             view.setTag(holder);
         } else {
             holder = (ViewHolder) view.getTag();
         }
 
-        final String path = media.get(position).getPath();
+        final String path = medium.getPath();
         Glide.with(context).load(path).placeholder(R.color.tmb_background).centerCrop().crossFade().into(holder.photoThumbnail);
 
         return view;
diff --git a/app/src/main/res/layout/medium_item.xml b/app/src/main/res/layout/photo_item.xml
similarity index 91%
rename from app/src/main/res/layout/medium_item.xml
rename to app/src/main/res/layout/photo_item.xml
index 3f4b67b5c..d18d298a4 100644
--- a/app/src/main/res/layout/medium_item.xml
+++ b/app/src/main/res/layout/photo_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    android:id="@+id/photo_item_holder"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/video_item.xml
new file mode 100644
index 000000000..5b01d90d0
--- /dev/null
+++ b/app/src/main/res/layout/video_item.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    android:id="@+id/video_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">
+
+    <com.simplemobiletools.gallery.MyImageView
+        android:id="@+id/medium_thumbnail"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <ImageView
+        android:id="@+id/play_outline"
+        android:layout_width="@dimen/play_outline_size"
+        android:layout_height="@dimen/play_outline_size"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:src="@mipmap/play_outline"/>
+
+</RelativeLayout>
diff --git a/app/src/main/res/mipmap-hdpi/play_outline.png b/app/src/main/res/mipmap-hdpi/play_outline.png
new file mode 100644
index 000000000..6e1b578c5
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/play_outline.png differ
diff --git a/app/src/main/res/mipmap-mdpi/play_outline.png b/app/src/main/res/mipmap-mdpi/play_outline.png
new file mode 100644
index 000000000..615b80d08
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/play_outline.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/play_outline.png b/app/src/main/res/mipmap-xhdpi/play_outline.png
new file mode 100644
index 000000000..516f64326
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/play_outline.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/play_outline.png b/app/src/main/res/mipmap-xxhdpi/play_outline.png
new file mode 100644
index 000000000..0311f899d
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/play_outline.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/play_outline.png b/app/src/main/res/mipmap-xxxhdpi/play_outline.png
new file mode 100644
index 000000000..7a5a16858
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/play_outline.png differ
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 58495b016..986f5b7ac 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -2,5 +2,6 @@
     <dimen name="activity_margin">16dp</dimen>
     <dimen name="dir_tmb_size">150dp</dimen>
     <dimen name="medium_tmb_size">100dp</dimen>
+    <dimen name="play_outline_size">40dp</dimen>
     <dimen name="undo_padding">8dp</dimen>
 </resources>