diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 8f249271a573..7f879c27b337 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -86,13 +86,8 @@ class HomePagePickerFragment : Fragment() {
     }
 
     private fun HomePagePickerFragmentBinding.setupUi() {
-        with(modalLayoutPickerHeaderSection) {
-            modalLayoutPickerTitleRow?.header?.apply {
-                textAlignment = View.TEXT_ALIGNMENT_TEXT_START
-                setText(R.string.hpp_title)
-            }
-            modalLayoutPickerSubtitleRow?.root?.visibility = View.GONE
-        }
+        siteCreationThemeHeader.title?.setText(R.string.hpp_title)
+        siteCreationThemeHeader.subtitle?.isGone = true
         modalLayoutPickerLayoutsSkeleton.skeletonCardView.updateLayoutParams {
             height = thumbDimensionProvider.previewHeight
             width = thumbDimensionProvider.previewWidth
@@ -138,8 +133,8 @@ class HomePagePickerFragment : Fragment() {
 
     private fun HomePagePickerFragmentBinding.setHeaderVisibility(visible: Boolean) {
         uiHelper.fadeInfadeOutViews(
-                homePagePickerTitlebar.title,
-                modalLayoutPickerHeaderSection.modalLayoutPickerTitleRow?.header,
+                homePagePickerTitlebar.appBarTitle,
+                siteCreationThemeHeader.title,
                 visible
         )
     }
diff --git a/WordPress/src/main/res/layout/home_page_picker_fragment.xml b/WordPress/src/main/res/layout/home_page_picker_fragment.xml
index c9d401cc8da7..58390be957d7 100644
--- a/WordPress/src/main/res/layout/home_page_picker_fragment.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_fragment.xml
@@ -22,8 +22,8 @@
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
             <include
-                android:id="@+id/modal_layout_picker_header_section"
-                layout="@layout/modal_layout_picker_header_section"
+                android:id="@+id/site_creation_theme_header"
+                layout="@layout/site_creation_header_v2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
diff --git a/WordPress/src/main/res/layout/home_page_picker_titlebar.xml b/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
index a8db0a41ab12..5ba7b522689c 100644
--- a/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
@@ -14,7 +14,7 @@
         android:tint="?attr/colorOnSurface" />
 
     <TextView
-        android:id="@+id/title"
+        android:id="@+id/appBarTitle"
         style="@style/ModalLayoutPickerHeader"
         android:layout_width="0dp"
         android:layout_weight="1"
diff --git a/WordPress/src/main/res/layout/site_creation_header_v2.xml b/WordPress/src/main/res/layout/site_creation_header_v2.xml
index 932f3509387f..9c11635d10a1 100644
--- a/WordPress/src/main/res/layout/site_creation_header_v2.xml
+++ b/WordPress/src/main/res/layout/site_creation_header_v2.xml
@@ -8,7 +8,7 @@
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/title"
-        style="@style/ModalLayoutPickerTitle"
+        style="@style/SiteCreationHeaderV2Title"
         android:lineSpacingExtra="-4sp"
         android:letterSpacing="0.01"
         android:paddingBottom="@dimen/margin_large"
@@ -18,7 +18,7 @@
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/subtitle"
-        style="@style/ModalLayoutPickerSubtitle"
+        style="@style/SiteCreationHeaderV2Subtitle"
         android:paddingBottom="@dimen/margin_extra_medium_large"
         android:lineSpacingExtra="5sp"
         android:letterSpacing="0.01"
diff --git a/WordPress/src/main/res/layout/site_creation_intents_titlebar.xml b/WordPress/src/main/res/layout/site_creation_intents_titlebar.xml
index af9b668f6f3c..1eae66ba7bd4 100644
--- a/WordPress/src/main/res/layout/site_creation_intents_titlebar.xml
+++ b/WordPress/src/main/res/layout/site_creation_intents_titlebar.xml
@@ -18,8 +18,7 @@
         style="@style/ModalLayoutPickerHeader"
         android:layout_width="0dp"
         android:layout_weight="1"
-        android:layout_marginStart="@dimen/siq_title_padding_start"
-        android:layout_marginEnd="0dp"
+        android:textAlignment="textStart"
         android:text="@string/new_site_creation_intents_title" />
 
     <Button
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index eb07ff86433c..f2d449b6b798 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -656,7 +656,6 @@
     <dimen name="hpp_recommended_row_height">500dp</dimen>
 
     <!-- Site Intent Question -->
-    <dimen name="siq_title_padding_start">@dimen/margin_extra_extra_large</dimen>
     <dimen name="siq_header_scroll_snap_threshold">-96dp</dimen>
 
     <!-- Login Prologue -->
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 0f98f5730a2b..0da75bfa0b23 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -1488,6 +1488,34 @@
         <item name="android:paddingBottom">@dimen/margin_small_medium</item>
     </style>
 
+    <!-- Site Creation Header Styles -->
+
+    <style name="SiteCreationHeaderV2Text">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAlignment">textStart</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="SiteCreationHeaderV2Title" parent="SiteCreationHeaderV2Text">
+        <item name="android:paddingTop">@dimen/mlp_titles_top_margin</item>
+        <item name="android:paddingBottom">@dimen/margin_small_medium</item>
+        <item name="android:textAppearance">?attr/textAppearanceHeadline4</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:maxLines">3</item>
+        <item name="fontFamily">serif</item>
+    </style>
+
+    <style name="SiteCreationHeaderV2Subtitle" parent="SiteCreationHeaderV2Text">
+        <item name="android:paddingTop">@dimen/margin_small</item>
+        <item name="android:paddingBottom">@dimen/mlp_titles_bottom_margin</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
+        <item name="android:maxLines">5</item>
+        <item name="android:alpha">0.6</item>
+        <item name="fontFamily">sans-serif</item>
+    </style>
+
     <!-- Modal Layout Picker Styles -->
 
     <style name="ModalLayoutPickerText">