diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml
index 867c5e0618..572f4f402a 100644
--- a/app/src/main/res/layout/list_item.xml
+++ b/app/src/main/res/layout/list_item.xml
@@ -159,10 +159,24 @@
 
             <LinearLayout
                 android:id="@+id/file_detail_group"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
+                android:gravity="center"
                 android:layout_height="match_parent"
                 android:orientation="horizontal">
 
+                <TextView
+                    android:id="@+id/live_photo_indicator"
+                    android:visibility="gone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/file_list_live"
+                    android:drawablePadding="@dimen/standard_eight_padding"
+                    android:gravity="center"
+                    android:textColor="@color/list_item_lastmod_and_filesize_text"
+                    android:layout_marginEnd="@dimen/standard_quarter_margin"
+                    android:textSize="@dimen/two_line_secondary_text_size"
+                    app:drawableLeftCompat="@drawable/ic_play_circle" />
+
                 <TextView
                     android:id="@+id/file_size"
                     android:layout_width="wrap_content"
@@ -218,21 +232,18 @@
 
         <ImageView
             android:id="@+id/sharedIcon"
-            android:layout_width="48dp"
-            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="top"
             android:clickable="true"
             android:contentDescription="@string/shared_icon_share"
             android:focusable="true"
-            android:minHeight="@dimen/min_list_item_size"
-            android:paddingStart="@dimen/list_item_share_right_margin"
-            android:paddingEnd="@dimen/list_item_share_right_margin"
             android:src="@drawable/ic_unshared" />
 
         <com.owncloud.android.ui.AvatarGroupLayout
             android:id="@+id/sharedAvatars"
-            android:layout_width="100dp"
-            android:layout_height="@dimen/min_list_item_size"
+            android:layout_width="75dp"
+            android:layout_height="match_parent"
             android:layout_gravity="top"
             android:contentDescription="@string/shared_avatar_desc"
             android:gravity="center_vertical"
@@ -241,19 +252,18 @@
         <ImageView
             android:id="@+id/custom_checkbox"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="top"
             android:clickable="false"
             android:contentDescription="@string/checkbox"
             android:focusable="false"
-            android:minHeight="@dimen/min_list_item_size"
             android:paddingStart="@dimen/standard_half_padding"
             android:paddingEnd="@dimen/alternate_padding"
             android:src="@drawable/ic_checkbox_blank_outline" />
 
         <ImageView
             android:id="@+id/overflow_menu"
-            android:layout_width="48dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="top"
             android:clickable="true"