diff --git a/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml b/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
index 80b8036756d8..954ce5a6419f 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
@@ -11,13 +11,17 @@
 
     <TextView
         android:id="@+id/subtitle"
+        android:layout_width="match_parent"
         style="@style/ModalLayoutPickerLayoutsSubtitle"
         android:layout_marginStart="@dimen/mlp_layout_card_margin_start"
+        android:layout_marginEnd="@dimen/mlp_layout_card_margin_end"
         android:layout_marginBottom="@dimen/hpp_recommended_subtitle_margin"
         android:text="@string/hpp_recommended_subtitle" />
     <TextView
         android:id="@+id/title"
+        android:layout_width="match_parent"
         style="@style/ModalLayoutPickerLayoutsTitle"
+        android:layout_marginEnd="@dimen/mlp_layout_card_margin_end"
         android:layout_marginStart="@dimen/mlp_layout_card_margin_start"
         tools:text="Some layout title" />
 
@@ -27,8 +31,8 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:clipToPadding="false"
-        android:paddingStart="@dimen/mlp_layout_card_margin_start"
-        android:paddingEnd="@dimen/mlp_layout_card_margin_end"
+        android:paddingStart="@dimen/mlp_layout_card_padding_start"
+        android:paddingEnd="@dimen/mlp_layout_card_padding_end"
         android:descendantFocusability="beforeDescendants"
         android:orientation="horizontal"
         android:scrollbars="none" />
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index d87518662299..1f56cf0938a6 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -638,6 +638,7 @@
     <dimen name="mlp_layout_card_height">240dp</dimen>
     <dimen name="mlp_layout_card_width">160dp</dimen>
     <dimen name="mlp_layout_card_margin_start">20dp</dimen>
+    <dimen name="mlp_layout_card_margin_end">20dp</dimen>
     <dimen name="mlp_layouts_category_radius">40dp</dimen>
     <dimen name="mlp_layouts_category_height">36dp</dimen>
     <dimen name="mlp_category_horizontal_margin">@dimen/margin_large</dimen>
@@ -646,7 +647,8 @@
     <dimen name="mlp_categories_emoji_size">18dp</dimen>
     <dimen name="mlp_titles_top_margin">14dp</dimen>
     <dimen name="mlp_titles_bottom_margin">28dp</dimen>
-    <dimen name="mlp_layout_card_margin_end">@dimen/margin_medium</dimen>
+    <dimen name="mlp_layout_card_padding_start">20dp</dimen>
+    <dimen name="mlp_layout_card_padding_end">@dimen/margin_medium</dimen>
     <dimen name="mlp_layout_card_margin_top">@dimen/margin_extra_large</dimen>
     <dimen name="mlp_layout_card_elevation">@dimen/margin_small</dimen>
     <dimen name="mlp_layout_card_radius">@dimen/margin_small</dimen>