diff --git a/app/src/main/res/layout/recommended_file_item.xml b/app/src/main/res/layout/recommended_file_item.xml
index c91949e72ef7..33fd0ff19ec7 100644
--- a/app/src/main/res/layout/recommended_file_item.xml
+++ b/app/src/main/res/layout/recommended_file_item.xml
@@ -50,10 +50,10 @@
         android:padding="@dimen/standard_quarter_padding"
         android:translationZ="4dp"
         app:layout_constraintBottom_toBottomOf="@+id/thumbnail"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/thumbnail"
         app:layout_constraintHorizontal_bias="0.85"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/thumbnail"
+        app:layout_constraintTop_toTopOf="@+id/thumbnail"
         app:layout_constraintVertical_bias="0.85">
 
         <ImageView
@@ -134,17 +134,18 @@
         android:layout_marginTop="@dimen/grid_checkbox_margin"
         android:contentDescription="@string/checkbox"
         android:src="@android:drawable/checkbox_off_background"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/thumbnail"
+        app:layout_constraintTop_toTopOf="@+id/thumbnail"
         tools:visibility="visible" />
 
     <LinearLayout
         android:id="@+id/filename_and_reason_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/grid_recommended_item_text_horizontal_margin"
         android:gravity="center"
-        app:layout_constraintEnd_toStartOf="@+id/more"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/thumbnail"
         android:orientation="vertical">
@@ -213,10 +214,10 @@
         android:id="@+id/more"
         android:layout_width="@dimen/grid_bottom_view_height"
         android:layout_height="@dimen/grid_bottom_view_height"
-        android:layout_marginHorizontal="@dimen/standard_half_margin"
+        android:layout_marginEnd="@dimen/standard_half_margin"
         android:contentDescription="@string/overflow_menu"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/thumbnail"
+        app:layout_constraintBottom_toBottomOf="@+id/filename_and_reason_layout"
+        app:layout_constraintTop_toTopOf="@+id/filename_and_reason_layout"
         app:layout_constraintEnd_toEndOf="parent"
         app:srcCompat="@drawable/ic_dots_vertical"
         android:background="?android:attr/selectableItemBackgroundBorderless"
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
index 14c61d430785..e936bf313819 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -58,6 +58,7 @@
     <dimen name="grid_checkbox_size">18dp</dimen>
     <dimen name="grid_checkbox_margin">6dp</dimen>
     <dimen name="grid_recommended_file_container_width">160dp</dimen>
+    <dimen name="grid_recommended_item_text_horizontal_margin">28dp</dimen>
     <dimen name="grid_container_default_max_file_name">80dp</dimen>
 
     <dimen name="album_container_height">300dp</dimen>