diff --git a/app/src/main/java/org/mozilla/fenix/compose/SectionHeader.kt b/app/src/main/java/org/mozilla/fenix/compose/SectionHeader.kt
index b53c87c48d..a358fcd1eb 100644
--- a/app/src/main/java/org/mozilla/fenix/compose/SectionHeader.kt
+++ b/app/src/main/java/org/mozilla/fenix/compose/SectionHeader.kt
@@ -60,7 +60,7 @@ fun HomeSectionHeader(
             fontSize = 16.sp,
             lineHeight = 20.sp
         ),
-        maxLines = 1,
+        maxLines = 2,
         overflow = TextOverflow.Ellipsis,
         color = FirefoxTheme.colors.textPrimary
     )
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/pocket/PocketStoriesViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/pocket/PocketStoriesViewHolder.kt
index e3d357e2c3..35d3262705 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/pocket/PocketStoriesViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/pocket/PocketStoriesViewHolder.kt
@@ -11,8 +11,10 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
@@ -98,6 +100,7 @@ fun PocketStories(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(horizontal = horizontalPadding.dp)
+                .wrapContentHeight(align = Alignment.Top)
         )
 
         Spacer(Modifier.height(17.dp))
@@ -111,6 +114,7 @@ fun PocketStories(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(horizontal = horizontalPadding.dp)
+                .wrapContentHeight(align = Alignment.Top)
         )
 
         Spacer(Modifier.height(17.dp))
diff --git a/app/src/main/res/layout/history_metadata_header.xml b/app/src/main/res/layout/history_metadata_header.xml
index 56f30d3844..138bfd42ca 100644
--- a/app/src/main/res/layout/history_metadata_header.xml
+++ b/app/src/main/res/layout/history_metadata_header.xml
@@ -8,18 +8,20 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="@dimen/home_item_horizontal_margin"
-    android:layout_marginTop="40dp">
+    android:layout_marginTop="40dp"
+    android:layout_marginBottom="16dp">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/header"
         style="@style/Header16TextStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:text="@string/history_metadata_header_3"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:maxLines="2"
-        android:gravity="center_vertical"
+        android:text="@string/history_metadata_header_3"
+        android:gravity="top"
+        android:paddingTop="1dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/show_all_button"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.button.MaterialButton
@@ -28,15 +30,15 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
-        android:text="@string/recent_tabs_show_all"
-        android:textColor="@color/home_show_all_button_text"
         android:contentDescription="@string/past_explorations_show_all_content_description"
-        android:paddingVertical="16dp"
+        android:gravity="top"
+        android:insetTop="0dp"
+        android:minHeight="16dp"
         android:paddingStart="16dp"
         android:paddingEnd="0dp"
-        android:gravity="end"
         android:maxLines="1"
+        android:text="@string/recent_tabs_show_all"
+        android:textColor="@color/home_show_all_button_text"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/recent_bookmarks_header.xml b/app/src/main/res/layout/recent_bookmarks_header.xml
index e08ffdd189..0c97c2285f 100644
--- a/app/src/main/res/layout/recent_bookmarks_header.xml
+++ b/app/src/main/res/layout/recent_bookmarks_header.xml
@@ -14,14 +14,15 @@
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/header"
         style="@style/Header16TextStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:contentDescription="@string/recently_saved_bookmarks_content_description"
         android:maxLines="2"
         android:text="@string/recent_bookmarks_title"
-        android:gravity="center_vertical"
+        android:gravity="top"
+        android:paddingTop="1dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/showAllBookmarksButton"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.button.MaterialButton
@@ -31,15 +32,15 @@
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/recently_saved_show_all_content_description"
+        android:gravity="top"
+        android:insetTop="0dp"
+        android:minHeight="16dp"
         android:paddingStart="16dp"
         android:paddingEnd="0dp"
-        android:gravity="end"
-        android:text="@string/recently_saved_show_all"
-        android:textColor="@color/home_show_all_button_text"
         android:maxLines="1"
-        android:scrollbars="none"
         android:nestedScrollingEnabled="false"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        android:text="@string/recently_saved_show_all"
+        android:textColor="@color/home_show_all_button_text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/recent_tabs_header.xml b/app/src/main/res/layout/recent_tabs_header.xml
index 76a9e5820f..6876c48a30 100644
--- a/app/src/main/res/layout/recent_tabs_header.xml
+++ b/app/src/main/res/layout/recent_tabs_header.xml
@@ -7,35 +7,38 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="@dimen/home_item_horizontal_margin"
-    android:layout_marginTop="40dp">
+    android:layout_marginTop="40dp"
+    android:layout_marginBottom="16dp">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/header"
         style="@style/Header16TextStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:text="@string/recent_tabs_header"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:maxLines="2"
-        android:gravity="center_vertical"
+        android:text="@string/recent_tabs_header"
+        android:gravity="top"
+        android:paddingTop="1dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintEnd_toStartOf="@id/show_all_button"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/show_all_button"
         style="@style/Button14TextStyle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
-        android:text="@string/recent_tabs_show_all"
-        android:textColor="@color/home_show_all_button_text"
         android:contentDescription="@string/recent_tabs_show_all_content_description"
-        android:paddingVertical="16dp"
+        android:gravity="top"
+        android:insetTop="0dp"
+        android:minHeight="16dp"
         android:paddingStart="16dp"
         android:paddingEnd="0dp"
-        android:gravity="end"
         android:maxLines="1"
+        android:nestedScrollingEnabled="false"
+        android:text="@string/recent_tabs_show_all"
+        android:textColor="@color/home_show_all_button_text"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>