diff --git a/app/src/main/res/layout/directory_item.xml b/app/src/main/res/layout/directory_item.xml
index 63642099d..27a363c9b 100644
--- a/app/src/main/res/layout/directory_item.xml
+++ b/app/src/main/res/layout/directory_item.xml
@@ -6,7 +6,14 @@
     android:layout_height="wrap_content"
     android:padding="1px">
 
-    <include layout="@layout/directory_tmb"/>
+    <FrameLayout
+        android:id="@+id/tmb_wrapper"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include layout="@layout/directory_tmb"/>
+
+    </FrameLayout>
 
     <ImageView
         android:id="@+id/dir_pin"
@@ -29,7 +36,9 @@
         android:id="@+id/dir_bottom_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/tmb_wrapper"
         android:layout_alignParentBottom="true"
+        android:layout_alignRight="@+id/tmb_wrapper"
         android:gravity="bottom"
         android:orientation="vertical"
         android:paddingBottom="@dimen/small_margin"
diff --git a/app/src/main/res/layout/photo_video_item.xml b/app/src/main/res/layout/photo_video_item.xml
index cb52c8f10..1ba94a083 100644
--- a/app/src/main/res/layout/photo_video_item.xml
+++ b/app/src/main/res/layout/photo_video_item.xml
@@ -6,7 +6,14 @@
     android:layout_height="wrap_content"
     android:padding="1px">
 
-    <include layout="@layout/photo_video_tmb"/>
+    <FrameLayout
+        android:id="@+id/tmb_wrapper"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include layout="@layout/photo_video_tmb"/>
+
+    </FrameLayout>
 
     <ImageView
         android:id="@+id/play_outline"
@@ -23,7 +30,9 @@
         android:id="@+id/photo_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/tmb_wrapper"
         android:layout_alignParentBottom="true"
+        android:layout_alignRight="@+id/tmb_wrapper"
         android:background="@drawable/gradient_background"
         android:gravity="bottom"
         android:maxLines="3"