diff --git a/addons/website/static/src/components/views/theme_preview.xml b/addons/website/static/src/components/views/theme_preview.xml
index a5f789cc6b4..f6d32f41029 100644
--- a/addons/website/static/src/components/views/theme_preview.xml
+++ b/addons/website/static/src/components/views/theme_preview.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates id="template" xml:space="preserve">
-    <t t-name="website.ThemePreview.Buttons" owl="1">
-        <div>
-            <div class="o_form_buttons_view" role="toolbar" aria-label="Main actions">
-                <ViewButton className="'btn btn-primary o_use_theme'"
-                            clickParams="{type: 'object', name: 'button_choose_theme'}"
-                            record="this.model.root">
-                    <t t-set-slot="contents">Start Now</t>
-                </ViewButton>
-                <button class="btn btn-link o_switch_theme" t-on-click.stop="this.back">
-                    Choose another theme
-                </button>
+    <t t-name="website.ThemePreviewForm.ControlPanel" t-inherit="web.ControlPanel" t-inherit-mode="primary" owl="1">
+        <xpath expr="//div[hasclass('o_control_panel_navigation')]" position="replace">
+        <div class="d-none d-md-flex align-items-end justify-content-end order-2 order-lg-1 w-100 gap-1" role="group">
+                <input class="btn-check" id="themeViewerDesktop" type="radio" name="viewer" data-mode='desktop' autocomplete="off" checked='checked'/>
+                <label class="btn btn-secondary" for="themeViewerDesktop" t-on-click="this.onDesktopClick">Desktop</label>
+                <input class="btn-check"  id="themeViewerMobile" type="radio" name="viewer" data-mode='mobile' autocomplete="off"/>
+                <label class="btn btn-secondary" for="themeViewerMobile" t-on-click="this.onMobileClick">Mobile</label>
             </div>
-        </div>
+        </xpath>
+    </t>
+
+    <t t-name="website.ThemePreviewFormController" t-inherit="web.FormView" t-inherit-mode="primary" owl="1">
+        <xpath expr="//Layout" position="inside">
+            <t t-set-slot="layout-actions">
+                <div>
+                    <div class="o_form_buttons_view" role="toolbar" aria-label="Main actions">
+                        <ViewButton className="'btn btn-primary o_use_theme'"
+                                    clickParams="{type: 'object', name: 'button_choose_theme'}"
+                                    record="this.model.root">
+                            <t t-set-slot="contents">Start Now</t>
+                        </ViewButton>
+                        <button class="btn btn-link o_switch_theme" t-on-click.stop="this.back">
+                            Choose another theme
+                        </button>
+                    </div>
+                </div>
+            </t>
+        </xpath>
     </t>
 
     <t t-name="website.ThemePreviewKanban.ControlPanel.BreadCrumbs" owl="1">
diff --git a/addons/website/static/src/components/views/theme_preview_form.js b/addons/website/static/src/components/views/theme_preview_form.js
index 0170cf2a627..6864e4650ef 100644
--- a/addons/website/static/src/components/views/theme_preview_form.js
+++ b/addons/website/static/src/components/views/theme_preview_form.js
@@ -72,6 +72,7 @@ class ThemePreviewFormController extends FormController {
     }
 }
 ThemePreviewFormController.components = { ...FormController.components, ViewButton };
+ThemePreviewFormController.template = 'website.ThemePreviewFormController';
 
 class ThemePreviewFormControlPanel extends ControlPanel {
     /**
@@ -92,10 +93,6 @@ ThemePreviewFormControlPanel.template = 'website.ThemePreviewForm.ControlPanel';
 
 const ThemePreviewFormView = {
     ...formView,
-    display: {
-        controlPanel: {}
-    },
-    buttonTemplate: 'website.ThemePreview.Buttons',
     Controller: ThemePreviewFormController,
     ControlPanel: ThemePreviewFormControlPanel,
 };