diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml
index 91e99d813..6cd864298 100644
--- a/app/src/main/res/layout/component_collection_creation.xml
+++ b/app/src/main/res/layout/component_collection_creation.xml
@@ -13,13 +13,13 @@
     <Button
         android:id="@+id/back_button"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_margin="16dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:drawableStart="@drawable/mozac_ic_back"
         android:drawablePadding="8dp"
         android:drawableTint="@color/neutral_text"
-        android:gravity="start"
+        android:gravity="start|center_vertical"
         android:text="@string/create_collection_select_tabs"
         android:textAppearance="@style/HeaderTextStyle"
         android:textColor="@color/neutral_text"
@@ -28,15 +28,15 @@
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_default="wrap"/>
+        app:layout_constraintWidth_default="wrap" />
 
     <Button
         android:id="@+id/select_all_button"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_margin="16dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:gravity="start"
+        android:gravity="start|center_vertical"
         android:text="@string/create_collection_select_all"
         android:textAllCaps="false"
         android:textColor="@color/neutral_text"
@@ -45,7 +45,7 @@
         app:layout_constraintHorizontal_bias="1"
         app:layout_constraintStart_toEndOf="@+id/guideline"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_default="wrap"/>
+        app:layout_constraintWidth_default="wrap" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
diff --git a/app/src/main/res/layout/component_collection_creation_name_collection.xml b/app/src/main/res/layout/component_collection_creation_name_collection.xml
index 125181d71..cf47986f1 100644
--- a/app/src/main/res/layout/component_collection_creation_name_collection.xml
+++ b/app/src/main/res/layout/component_collection_creation_name_collection.xml
@@ -13,12 +13,13 @@
     <Button
         android:id="@+id/back_button"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_margin="16dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:drawableStart="@drawable/mozac_ic_back"
         android:drawablePadding="8dp"
         android:drawableTint="@color/neutral_text"
+        android:gravity="start|center_vertical"
         android:text="@string/create_collection_name_collection"
         android:textAppearance="@style/HeaderTextStyle"
         android:textColor="@color/neutral_text"
diff --git a/app/src/main/res/layout/component_collection_creation_select_collection.xml b/app/src/main/res/layout/component_collection_creation_select_collection.xml
index cf38431e9..4e9fe58f5 100644
--- a/app/src/main/res/layout/component_collection_creation_select_collection.xml
+++ b/app/src/main/res/layout/component_collection_creation_select_collection.xml
@@ -13,11 +13,12 @@
     <Button
         android:id="@+id/back_button"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_margin="16dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:drawableStart="@drawable/mozac_ic_back"
         android:drawablePadding="8dp"
+        android:gravity="start|center_vertical"
         android:drawableTint="@color/neutral_text"
         android:text="@string/create_collection_select_collection"
         android:textAppearance="@style/HeaderTextStyle"