diff --git a/app/src/main/res/layout/photo_item_grid.xml b/app/src/main/res/layout/photo_item_grid.xml
index de16a756e..37f7be306 100644
--- a/app/src/main/res/layout/photo_item_grid.xml
+++ b/app/src/main/res/layout/photo_item_grid.xml
@@ -17,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
-        android:layout_alignParentBottom="true"
+        android:layout_alignParentTop="true"
         android:layout_margin="@dimen/small_margin"
         android:fontFamily="sans-serif-medium"
         android:shadowColor="@color/default_background_color"
@@ -32,9 +32,9 @@
         android:layout_width="@dimen/favorite_icon_size"
         android:layout_height="@dimen/favorite_icon_size"
         android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
         android:layout_margin="@dimen/small_margin"
-        android:padding="@dimen/tiny_margin"
+        android:padding="@dimen/small_margin"
         android:gravity="end"
         android:background="@drawable/circle_black_background"
         android:src="@drawable/ic_star_vector"
diff --git a/app/src/main/res/layout/photo_item_list.xml b/app/src/main/res/layout/photo_item_list.xml
index 6d49f6f52..dca1dbee2 100644
--- a/app/src/main/res/layout/photo_item_list.xml
+++ b/app/src/main/res/layout/photo_item_list.xml
@@ -19,11 +19,11 @@
 
     <ImageView
         android:id="@+id/favorite"
-        android:layout_width="@dimen/favorite_icon_size"
-        android:layout_height="@dimen/favorite_icon_size"
+        android:layout_width="@dimen/favorite_list_icon_size"
+        android:layout_height="@dimen/favorite_list_icon_size"
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
-        android:layout_margin="@dimen/small_margin"
+        android:layout_margin="@dimen/smaller_margin"
         android:padding="@dimen/tiny_margin"
         android:gravity="end"
         android:background="@drawable/circle_black_background"
diff --git a/app/src/main/res/layout/video_item_grid.xml b/app/src/main/res/layout/video_item_grid.xml
index 6c9eaf5e8..fe8de5bf4 100644
--- a/app/src/main/res/layout/video_item_grid.xml
+++ b/app/src/main/res/layout/video_item_grid.xml
@@ -17,7 +17,7 @@
         android:layout_width="@dimen/selection_check_size"
         android:layout_height="@dimen/selection_check_size"
         android:layout_alignParentStart="true"
-        android:layout_alignParentBottom="true"
+        android:layout_alignParentTop="true"
         android:layout_margin="@dimen/small_margin"
         android:src="@drawable/ic_play_outline_vector"
         android:visibility="gone" />
@@ -27,9 +27,9 @@
         android:layout_width="@dimen/favorite_icon_size"
         android:layout_height="@dimen/favorite_icon_size"
         android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
         android:layout_margin="@dimen/small_margin"
-        android:padding="@dimen/tiny_margin"
+        android:padding="@dimen/small_margin"
         android:gravity="end"
         android:background="@drawable/circle_black_background"
         android:src="@drawable/ic_star_vector"
@@ -37,15 +37,14 @@
 
     <TextView
         android:id="@+id/video_duration"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
+        android:layout_alignParentTop="true"
+        android:layout_toRightOf="@id/play_portrait_outline"
+        android:layout_marginTop="@dimen/small_margin"
         android:ellipsize="end"
         android:gravity="end"
         android:maxLines="1"
-        android:paddingLeft="@dimen/small_margin"
-        android:paddingRight="@dimen/small_margin"
         android:shadowColor="@color/default_background_color"
         android:shadowRadius="4"
         android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/video_item_list.xml b/app/src/main/res/layout/video_item_list.xml
index 10e996639..ad4524388 100644
--- a/app/src/main/res/layout/video_item_list.xml
+++ b/app/src/main/res/layout/video_item_list.xml
@@ -19,11 +19,11 @@
 
     <ImageView
         android:id="@+id/favorite"
-        android:layout_width="@dimen/favorite_icon_size"
-        android:layout_height="@dimen/favorite_icon_size"
+        android:layout_width="@dimen/favorite_list_icon_size"
+        android:layout_height="@dimen/favorite_list_icon_size"
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
-        android:layout_margin="@dimen/small_margin"
+        android:layout_margin="@dimen/smaller_margin"
         android:padding="@dimen/tiny_margin"
         android:gravity="end"
         android:background="@drawable/circle_black_background"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e3525f1f2..872795646 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,7 +4,8 @@
     <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="favorite_icon_size">24dp</dimen>
+    <dimen name="favorite_list_icon_size">17dp</dimen>
+    <dimen name="favorite_icon_size">26dp</dimen>
     <dimen name="selection_check_size">26dp</dimen>
     <dimen name="drag_handle_size">34dp</dimen>
     <dimen name="play_outline_size_big">96dp</dimen>