diff --git a/app/src/main/res/layout/photo_video_item_grid.xml b/app/src/main/res/layout/photo_video_item_grid.xml
index 14c85348d..b584db3cd 100644
--- a/app/src/main/res/layout/photo_video_item_grid.xml
+++ b/app/src/main/res/layout/photo_video_item_grid.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/media_item_holder"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -13,26 +14,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-    <ImageView
-        android:id="@+id/medium_check"
-        android:layout_width="@dimen/selection_check_size"
-        android:layout_height="@dimen/selection_check_size"
-        android:layout_alignRight="@+id/medium_name"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_margin="@dimen/small_margin"
-        android:background="@drawable/circle_background"
-        android:padding="@dimen/tiny_margin"
-        android:src="@drawable/ic_check"
-        android:visibility="gone"/>
-
     <ImageView
         android:id="@+id/play_outline"
         android:layout_width="@dimen/selection_check_size"
         android:layout_height="@dimen/selection_check_size"
         android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_margin="@dimen/small_margin"
         android:src="@drawable/img_play_outline"
@@ -42,25 +28,37 @@
         android:id="@+id/video_duration"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true"
-        android:background="@drawable/gradient_background"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
         android:ellipsize="end"
-        android:gravity="right"
+        android:gravity="end"
         android:maxLines="1"
         android:paddingLeft="@dimen/small_margin"
         android:paddingRight="@dimen/small_margin"
-        android:paddingBottom="@dimen/small_margin"
         android:textColor="@android:color/white"
         android:textSize="@dimen/normal_text_size"
+        android:visibility="gone"
+        tools:text="02:34"/>
+
+    <ImageView
+        android:id="@+id/medium_check"
+        android:layout_width="@dimen/selection_check_size"
+        android:layout_height="@dimen/selection_check_size"
+        android:layout_alignEnd="@+id/medium_name"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_margin="@dimen/small_margin"
+        android:background="@drawable/circle_background"
+        android:padding="@dimen/tiny_margin"
+        android:src="@drawable/ic_check"
         android:visibility="gone"/>
 
     <TextView
         android:id="@+id/medium_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/medium_thumbnail"
-        android:layout_alignRight="@+id/medium_thumbnail"
+        android:layout_alignStart="@+id/medium_thumbnail"
+        android:layout_alignEnd="@+id/medium_thumbnail"
         android:layout_alignParentBottom="true"
         android:background="@drawable/gradient_background"
         android:ellipsize="end"
@@ -70,6 +68,7 @@
         android:paddingRight="@dimen/small_margin"
         android:paddingBottom="@dimen/small_margin"
         android:textColor="@android:color/white"
-        android:textSize="@dimen/smaller_text_size"/>
+        android:textSize="@dimen/smaller_text_size"
+        tools:text="My photo"/>
 
 </RelativeLayout>
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 46f772e8a..aada823ec 100644
--- a/app/src/main/res/layout/photo_video_item_list.xml
+++ b/app/src/main/res/layout/photo_video_item_list.xml
@@ -41,7 +41,8 @@
         android:paddingLeft="6dp"
         android:paddingRight="@dimen/normal_margin"
         android:textColor="@android:color/white"
-        android:textSize="@dimen/bigger_text_size"/>
+        android:textSize="@dimen/bigger_text_size"
+        tools:text="My photo"/>
 
     <ImageView
         android:id="@+id/play_outline"