diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
index f775acdc946f..b1b54da0286c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
@@ -9,6 +9,7 @@ data class LayoutListItemUiState(
     val slug: String,
     val title: String,
     val preview: String,
+    val mShotPreview: String,
     val selected: Boolean,
     val onItemTapped: (() -> Unit),
     val onThumbnailReady: (() -> Unit)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt
index dde4ded7b34f..d57f0b4c1ac0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt
@@ -3,7 +3,8 @@ package org.wordpress.android.ui.layoutpicker
 interface LayoutPickerTracker {
     fun trackPreviewModeChanged(mode: String)
 
-    fun trackThumbnailModeTapped(mode: String)
+    fun trackThumbnailModeTapped(mode: String) {
+    }
 
     fun trackPreviewModeTapped(mode: String)
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
index d8cf46b5fdf0..314aa04cfcb1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
@@ -64,6 +64,7 @@ abstract class LayoutPickerViewModel(
         }
 
     abstract val useCachedData: Boolean
+    abstract val shouldUseMobileThumbnail: Boolean
 
     var nestedScrollStates: Bundle = Bundle()
 
@@ -155,14 +156,17 @@ abstract class LayoutPickerViewModel(
             selectedCategories.forEach { category ->
 
                 val layouts = layouts.getFilteredLayouts(category.slug).map { layout ->
+                    val preview = when (_previewMode.value) {
+                        MOBILE -> layout.previewMobile
+                        TABLET -> layout.previewTablet
+                        else -> layout.preview
+                    }
+                    val thumbnailPreview = if (shouldUseMobileThumbnail) layout.previewMobile else preview
                     LayoutListItemUiState(
                             slug = layout.slug,
                             title = layout.title,
-                            preview = when (_previewMode.value) {
-                                MOBILE -> layout.previewMobile
-                                TABLET -> layout.previewTablet
-                                else -> layout.preview
-                            },
+                            preview = preview,
+                            mShotPreview = thumbnailPreview,
                             selected = layout.slug == state.selectedLayoutSlug,
                             onItemTapped = { onLayoutTapped(layoutSlug = layout.slug) },
                             onThumbnailReady = { onThumbnailReady(layoutSlug = layout.slug) }
@@ -187,7 +191,7 @@ abstract class LayoutPickerViewModel(
      * Layout tapped
      * @param layoutSlug the slug of the tapped layout
      */
-    fun onLayoutTapped(layoutSlug: String) {
+    open fun onLayoutTapped(layoutSlug: String) {
         (uiState.value as? Content)?.let { state ->
             if (!state.loadedThumbnailSlugs.contains(layoutSlug)) return // No action
             if (layoutSlug == state.selectedLayoutSlug) { // deselect
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
index bc615cd39068..a39cb00e387f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
@@ -22,7 +22,7 @@ class LayoutViewHolder(
         uiState: LayoutListItemUiState,
         imageManager: ImageManager
     ) {
-        imageManager.loadWithResultListener(binding.preview, MShot(uiState.preview),
+        imageManager.loadWithResultListener(binding.preview, MShot(uiState.mShotPreview),
                 object : RequestListener<Drawable> {
                     override fun onLoadFailed(e: Exception?, model: Any?) {
                     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
index b3b172fce2ff..99a742eac9b4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
@@ -118,7 +118,7 @@ class ModalLayoutPickerFragment : FullscreenBottomSheetDialogFragment() {
     private fun ModalLayoutPickerFragmentBinding.setupViewModel(savedInstanceState: Bundle?) {
         viewModel.loadSavedState(savedInstanceState)
 
-        viewModel.uiState.observe(this@ModalLayoutPickerFragment, { uiState ->
+        viewModel.uiState.observe(this@ModalLayoutPickerFragment) { uiState ->
             setHeaderVisibility(uiState.isHeaderVisible)
             setDescriptionVisibility(uiState.isDescriptionVisible)
             setButtonsVisibility(uiState.buttonsUiState)
@@ -135,13 +135,13 @@ class ModalLayoutPickerFragment : FullscreenBottomSheetDialogFragment() {
                     uiState.subtitle?.let { modalLayoutPickerError.actionableEmptyView.subtitle.setText(it) }
                 }
             }
-        })
+        }
 
-        viewModel.onThumbnailModeButtonPressed.observe(viewLifecycleOwner, {
+        viewModel.onThumbnailModeButtonPressed.observe(viewLifecycleOwner) {
             previewModeSelectorPopup.show(viewModel)
-        })
+        }
 
-        viewModel.onPreviewActionPressed.observe(viewLifecycleOwner, { action ->
+        viewModel.onPreviewActionPressed.observe(viewLifecycleOwner) { action ->
             activity?.supportFragmentManager?.let { fm ->
                 when (action) {
                     is Show -> {
@@ -153,11 +153,11 @@ class ModalLayoutPickerFragment : FullscreenBottomSheetDialogFragment() {
                     }
                 }
             }
-        })
+        }
 
-        viewModel.onCategorySelectionChanged.observeEvent(this@ModalLayoutPickerFragment, {
+        viewModel.onCategorySelectionChanged.observeEvent(this@ModalLayoutPickerFragment) {
             layoutsRecyclerView.smoothScrollToPosition(0)
-        })
+        }
     }
 
     private fun ModalLayoutPickerFragmentBinding.setHeaderVisibility(visible: Boolean) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt
index 927007df38c5..33423b588c96 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt
@@ -167,13 +167,6 @@ class SiteCreationTracker @Inject constructor(val tracker: AnalyticsTrackerWrapp
         )
     }
 
-    override fun trackThumbnailModeTapped(mode: String) {
-        tracker.track(
-                AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_THUMBNAIL_MODE_BUTTON_TAPPED,
-                mapOf(PREVIEW_MODE.key to mode)
-        )
-    }
-
     fun trackSiteDesignSkipped() {
         designSelectionSkipped = true
         tracker.track(AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_SKIPPED)
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 d301592cdf65..1fcb01902c87 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
@@ -15,7 +15,6 @@ import com.google.android.material.appbar.AppBarLayout
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.databinding.HomePagePickerFragmentBinding
-import org.wordpress.android.ui.PreviewModeSelectorPopup
 import org.wordpress.android.ui.layoutpicker.CategoriesAdapter
 import org.wordpress.android.ui.layoutpicker.LayoutCategoryAdapter
 import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState
@@ -23,7 +22,6 @@ import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreview
 import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreviewAction.Show
 import org.wordpress.android.ui.sitecreation.theme.DesignPreviewFragment.Companion.DESIGN_PREVIEW_TAG
 import org.wordpress.android.ui.utils.UiHelpers
-import org.wordpress.android.util.AniUtils
 import org.wordpress.android.util.DisplayUtilsWrapper
 import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.config.SiteNameFeatureConfig
@@ -43,7 +41,6 @@ class HomePagePickerFragment : Fragment() {
     @Inject lateinit var siteNameFeatureConfig: SiteNameFeatureConfig
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: HomePagePickerViewModel
-    private lateinit var previewModeSelectorPopup: PreviewModeSelectorPopup
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
@@ -83,28 +80,21 @@ class HomePagePickerFragment : Fragment() {
             setupUi()
             setupViewModel()
             setupActionListeners()
-            previewModeSelectorPopup = PreviewModeSelectorPopup(
-                    requireActivity(),
-                    homePagePickerTitlebar.previewTypeSelectorButton
-            )
         }
     }
 
     private fun HomePagePickerFragmentBinding.setupUi() {
         homePagePickerTitlebar.title.isInvisible = !displayUtils.isPhoneLandscape()
-        modalLayoutPickerHeaderSection.modalLayoutPickerTitleRow?.header?.setText(R.string.hpp_title)
-        modalLayoutPickerHeaderSection.modalLayoutPickerSubtitleRow?.description?.setText(R.string.hpp_subtitle)
-        if (siteNameFeatureConfig.isEnabled()) {
-            homePagePickerBottomToolbar.chooseButton.setText(R.string.hpp_choose_and_create_site)
+        with(modalLayoutPickerHeaderSection) {
+            modalLayoutPickerTitleRow?.header?.setText(R.string.hpp_title)
+            modalLayoutPickerSubtitleRow?.root?.visibility = View.GONE
         }
     }
 
     private fun HomePagePickerFragmentBinding.setupViewModel() {
-        viewModel.uiState.observe(viewLifecycleOwner, { uiState ->
+        viewModel.uiState.observe(viewLifecycleOwner) { uiState ->
             setHeaderVisibility(uiState.isHeaderVisible)
-            setDescriptionVisibility(uiState.isDescriptionVisible)
             setContentVisibility(uiState.loadingSkeletonVisible, uiState.errorViewVisible)
-            setToolbarVisibility(uiState.isToolbarVisible)
             when (uiState) {
                 is LayoutPickerUiState.Loading -> { // Nothing more to do here
                 }
@@ -116,9 +106,9 @@ class HomePagePickerFragment : Fragment() {
                     uiState.toast?.let { ToastUtils.showToast(requireContext(), it) }
                 }
             }
-        })
+        }
 
-        viewModel.onPreviewActionPressed.observe(viewLifecycleOwner, { action ->
+        viewModel.onPreviewActionPressed.observe(viewLifecycleOwner) { action ->
             activity?.supportFragmentManager?.let { fm ->
                 when (action) {
                     is Show -> {
@@ -130,15 +120,11 @@ class HomePagePickerFragment : Fragment() {
                     }
                 }
             }
-        })
-
-        viewModel.onThumbnailModeButtonPressed.observe(viewLifecycleOwner, {
-            previewModeSelectorPopup.show(viewModel)
-        })
+        }
 
-        viewModel.onCategorySelectionChanged.observeEvent(viewLifecycleOwner, {
+        viewModel.onCategorySelectionChanged.observeEvent(viewLifecycleOwner) {
             layoutsRecyclerView.smoothScrollToPosition(0)
-        })
+        }
 
         viewModel.start(displayUtils.isTablet())
     }
@@ -151,15 +137,6 @@ class HomePagePickerFragment : Fragment() {
         )
     }
 
-    /**
-     * Sets the header description visibility
-     * @param visible if true the description is visible else invisible
-     */
-    private fun HomePagePickerFragmentBinding.setDescriptionVisibility(visible: Boolean) {
-        modalLayoutPickerHeaderSection.modalLayoutPickerSubtitleRow?.description?.visibility =
-                if (visible) View.VISIBLE else View.INVISIBLE
-    }
-
     private fun HomePagePickerFragmentBinding.setContentVisibility(skeleton: Boolean, error: Boolean) {
         modalLayoutPickerCategoriesSkeleton.categoriesSkeleton.setVisible(skeleton)
         categoriesRecyclerView.setVisible(!skeleton && !error)
@@ -168,17 +145,10 @@ class HomePagePickerFragment : Fragment() {
         errorView.setVisible(error)
     }
 
-    private fun HomePagePickerFragmentBinding.setToolbarVisibility(visible: Boolean) {
-        AniUtils.animateBottomBar(homePagePickerBottomToolbar.bottomToolbar, visible)
-    }
-
     private fun HomePagePickerFragmentBinding.setupActionListeners() {
-        homePagePickerBottomToolbar.previewButton.setOnClickListener { viewModel.onPreviewTapped() }
-        homePagePickerBottomToolbar.chooseButton.setOnClickListener { viewModel.onChooseTapped() }
         homePagePickerTitlebar.skipButton.setOnClickListener { viewModel.onSkippedTapped() }
         errorView.button.setOnClickListener { viewModel.onRetryClicked() }
         homePagePickerTitlebar.backButton.setOnClickListener { viewModel.onBackPressed() }
-        homePagePickerTitlebar.previewTypeSelectorButton.setOnClickListener { viewModel.onThumbnailModePressed() }
         setScrollListener()
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 074a87baa8de..96241ca69415 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -41,6 +41,7 @@ class HomePagePickerViewModel @Inject constructor(
     val onBackButtonPressed: LiveData<Unit> = _onBackButtonPressed
 
     override val useCachedData: Boolean = false
+    override val shouldUseMobileThumbnail = true
 
     sealed class DesignSelectionAction(val template: String) {
         object Skip : DesignSelectionAction(defaultTemplateSlug)
@@ -85,12 +86,20 @@ class HomePagePickerViewModel @Inject constructor(
         }
     }
 
+    override fun onLayoutTapped(layoutSlug: String) {
+        // TODO: open preview instead of updating uistate to make buttons and border visible
+        // The parent class function super.onPreviewTapped() does not accept a slug, so we if we use this here, we first
+        // need to set the selectedLayoutSlug in the uistate
+        super.onLayoutTapped(layoutSlug)
+    }
+
     override fun onPreviewChooseTapped() {
         super.onPreviewChooseTapped()
         onChooseTapped()
     }
 
     fun onChooseTapped() {
+        // TODO: adapt this to the new flow
         selectedLayout?.let { layout ->
             val template = layout.slug
             analyticsTracker.trackSiteDesignSelected(template)
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt
index 6b0a09c48a0e..a7101ad944e6 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt
@@ -66,6 +66,7 @@ class ModalLayoutPickerViewModel @Inject constructor(
     }
 
     override val useCachedData: Boolean = true
+    override val shouldUseMobileThumbnail = false
 
     override val selectedLayout: LayoutModel?
         get() = (uiState.value as? Content)?.let { state ->
diff --git a/WordPress/src/main/res/layout-sw600dp/home_page_picker_bottom_toolbar.xml b/WordPress/src/main/res/layout-sw600dp/home_page_picker_bottom_toolbar.xml
deleted file mode 100644
index b9ea6d9eb1b5..000000000000
--- a/WordPress/src/main/res/layout-sw600dp/home_page_picker_bottom_toolbar.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/bottomToolbar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/mlp_bottom_shadow_height"
-        android:background="@drawable/modal_layout_picker_bottom_shadow" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/layoutPickerBackground"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"
-        android:paddingTop="@dimen/picker_bottom_button_vertical_margin">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/previewButton"
-            style="@style/Widget.ModalLayoutPicker.Button.Secondary"
-            android:layout_width="@dimen/hpp_button_max_width"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/mlp_bottom_button_horizontal_central_margin"
-            android:layout_marginStart="@dimen/mlp_bottom_button_horizontal_margin"
-            android:text="@string/mlp_preview_page" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/chooseButton"
-            style="@style/Widget.ModalLayoutPicker.Button.Primary"
-            android:layout_width="@dimen/hpp_button_max_width"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/mlp_bottom_button_horizontal_margin"
-            android:text="@string/hpp_choose_button" />
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/WordPress/src/main/res/layout/home_page_picker_bottom_toolbar.xml b/WordPress/src/main/res/layout/home_page_picker_bottom_toolbar.xml
deleted file mode 100644
index b937dd3838f2..000000000000
--- a/WordPress/src/main/res/layout/home_page_picker_bottom_toolbar.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/bottomToolbar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/mlp_bottom_shadow_height"
-        android:background="@drawable/modal_layout_picker_bottom_shadow" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/layoutPickerBackground"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"
-        android:paddingTop="@dimen/picker_bottom_button_vertical_margin">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/previewButton"
-            style="@style/Widget.ModalLayoutPicker.Button.Secondary"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/mlp_bottom_button_horizontal_central_margin"
-            android:layout_marginStart="@dimen/mlp_bottom_button_horizontal_margin"
-            android:layout_weight="1"
-            android:text="@string/mlp_preview_page" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/chooseButton"
-            style="@style/Widget.ModalLayoutPicker.Button.Primary"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/mlp_bottom_button_horizontal_margin"
-            android:layout_weight="1"
-            android:text="@string/hpp_choose_button" />
-
-    </LinearLayout>
-</LinearLayout>
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 afb5d4960868..c9d401cc8da7 100644
--- a/WordPress/src/main/res/layout/home_page_picker_fragment.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_fragment.xml
@@ -105,12 +105,4 @@
         app:aevSubtitle="@string/hpp_error_subtitle"
         app:aevTitle="@string/hpp_error_title"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    <include
-        android:id="@+id/home_page_picker_bottom_toolbar"
-        layout="@layout/home_page_picker_bottom_toolbar"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
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 c5584a073539..1cca93fc5537 100644
--- a/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
@@ -22,16 +22,6 @@
         android:paddingEnd="0dp"
         android:text="@string/hpp_title" />
 
-    <ImageButton
-        android:id="@+id/previewTypeSelectorButton"
-        style="@style/WebPreviewNavbarButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_weight="0"
-        android:contentDescription="@string/preview_type_desc"
-        android:src="@drawable/ic_devices_white_24dp" />
-
     <Button
         android:id="@+id/skipButton"
         style="@style/HomePagePickerSkipButton"
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index 1727f2c91174..ac608d16b442 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -646,7 +646,6 @@
     <dimen name="mlp_layout_skeleton_line_width">100dp</dimen>
 
     <!-- Home Page Picker -->
-    <dimen name="hpp_button_max_width">244dp</dimen>
     <dimen name="hpp_title_padding_start">@dimen/margin_extra_extra_medium_large</dimen>
 
     <!-- Site Intent Question -->
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index e929bc5890ae..806f38db7e3e 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -3340,14 +3340,13 @@
     <string name="mlp_network_error_subtitle">Tap retry when you\'re back online or create a blank page using the button below.</string>
 
     <!-- Home Page Picker -->
-    <string name="hpp_title">Choose a design</string>
-    <string name="hpp_subtitle">Pick your favorite homepage layout. You can edit and customize it later.</string>
+    <string name="hpp_title">Choose a theme</string>
     <string name="hpp_choose_button">Choose</string>
     <string name="hpp_choose_and_create_site">Create site</string>
     <string name="hpp_error_title">Layouts not available while offline</string>
     <string name="hpp_error_subtitle">Tap retry when you\'re back online.</string>
     <string name="hpp_retry_error">Please Check your internet connection and retry.</string>
-    <string name="hpp_choose_error">There was an error while selecting the design.</string>
+    <string name="hpp_choose_error">There was an error while selecting the theme.</string>
 
     <!-- Stories -->
     <string name="dialog_edit_story_limited_title">Limited Story Editing</string>
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
index deceebd11695..b640f36f77b6 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
@@ -53,7 +53,7 @@ class HomePagePickerViewModelTest {
 
     private lateinit var viewModel: HomePagePickerViewModel
 
-    val mockCategory = StarterDesignCategory(
+    private val mockCategory = StarterDesignCategory(
             slug = "about",
             title = "About",
             description = "About pages",
@@ -213,7 +213,7 @@ class HomePagePickerViewModelTest {
     }
 
     @Test
-    fun `when the picker starts on a phone the mobile thumbnails or preview load by default`() = mockResponse {
+    fun `when the picker starts on a phone the mobile previews load by default`() = mockResponse {
         viewModel.start(isTablet = false)
         val captor = ArgumentCaptor.forClass(PreviewMode::class.java)
         verify(previewModeObserver).onChanged(captor.capture())
@@ -221,7 +221,7 @@ class HomePagePickerViewModelTest {
     }
 
     @Test
-    fun `when the picker starts on a tablet the tablet thumbnails or preview load by default`() = mockResponse {
+    fun `when the picker starts on a tablet the tablet preview loads by default`() = mockResponse {
         viewModel.start(isTablet = true)
         val captor = ArgumentCaptor.forClass(PreviewMode::class.java)
         verify(previewModeObserver).onChanged(captor.capture())
@@ -229,7 +229,7 @@ class HomePagePickerViewModelTest {
     }
 
     @Test
-    fun `when the changes the preview mode the thumbnails or preview change`() = mockResponse {
+    fun `when the user changes the preview mode the previews change`() = mockResponse {
         viewModel.start()
         viewModel.onPreviewModeChanged(PreviewMode.DESKTOP)
         val captor = ArgumentCaptor.forClass(PreviewMode::class.java)
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
index 9cf7c18daf03..73462a191b8f 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
@@ -481,7 +481,6 @@ public enum Stat {
         ENHANCED_SITE_CREATION_ERROR_SHOWN,
         ENHANCED_SITE_CREATION_BACKGROUND_SERVICE_UPDATED,
         ENHANCED_SITE_CREATION_SITE_DESIGN_VIEWED,
-        ENHANCED_SITE_CREATION_SITE_DESIGN_THUMBNAIL_MODE_BUTTON_TAPPED,
         ENHANCED_SITE_CREATION_SITE_DESIGN_SELECTED,
         ENHANCED_SITE_CREATION_SITE_DESIGN_SKIPPED,
         ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_VIEWED,
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
index 437867af8abc..c55e4a1e7f92 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
@@ -1393,8 +1393,6 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "enhanced_site_creation_background_service_updated";
             case ENHANCED_SITE_CREATION_SITE_DESIGN_VIEWED:
                 return "enhanced_site_creation_site_design_viewed";
-            case ENHANCED_SITE_CREATION_SITE_DESIGN_THUMBNAIL_MODE_BUTTON_TAPPED:
-                return "enhanced_site_creation_site_design_thumbnail_mode_button_tapped";
             case ENHANCED_SITE_CREATION_SITE_DESIGN_SELECTED:
                 return "enhanced_site_creation_site_design_selected";
             case ENHANCED_SITE_CREATION_SITE_DESIGN_SKIPPED: