diff --git a/src/Resources/translations/messages.en.yaml b/src/Resources/translations/messages.en.yaml
index 95a3a5a..63fc374 100644
--- a/src/Resources/translations/messages.en.yaml
+++ b/src/Resources/translations/messages.en.yaml
@@ -24,6 +24,8 @@ monsieurbiz_cms_page:
     actions:
       create: 'Create a new page'
       preview: 'Preview'
+    banner:
+      preview: 'Preview'
 monsieurbiz_menu:
     provider:
         page: 'Page'
diff --git a/src/Resources/translations/messages.fr.yaml b/src/Resources/translations/messages.fr.yaml
index 31f7e2b..35d786b 100644
--- a/src/Resources/translations/messages.fr.yaml
+++ b/src/Resources/translations/messages.fr.yaml
@@ -24,6 +24,8 @@ monsieurbiz_cms_page:
     actions:
       create: 'Créer une nouvelle page'
       preview: 'Prévisualiser'
+    banner:
+      preview: 'Prévisualisation'
 monsieurbiz_menu:
     provider:
         page: 'Page'
diff --git a/src/Resources/translations/messages.pl.yaml b/src/Resources/translations/messages.pl.yaml
index 64049ae..7829e13 100644
--- a/src/Resources/translations/messages.pl.yaml
+++ b/src/Resources/translations/messages.pl.yaml
@@ -24,6 +24,8 @@ monsieurbiz_cms_page:
         actions:
             create: 'Utwórz nową stronę'
             preview: 'Podgląd'
+        banner:
+            preview: 'Podgląd'
 monsieurbiz_menu:
     provider:
         page: 'Strona'
diff --git a/src/Resources/views/Admin/Page/preview.html.twig b/src/Resources/views/Admin/Page/preview.html.twig
index 07faa88..6886edc 100644
--- a/src/Resources/views/Admin/Page/preview.html.twig
+++ b/src/Resources/views/Admin/Page/preview.html.twig
@@ -1,4 +1,31 @@
-{% extends '@MonsieurBizSyliusCmsPagePlugin/Shop/preview_layout.html.twig' %}
+{# This extends takes account of the potential theme template #}
+{% extends '@MonsieurBizSyliusCmsPagePlugin/Shop/Page/show.html.twig' %}
+
+{% block top %}
+    <div style="
+        text-transform: uppercase;
+        line-height: 30px;
+        z-index: 999;
+        position:fixed;
+        top:0;
+        left:0;
+        height: 30px;
+        background-color: red;
+        width: 100%;
+        color: white;
+        font-weight: bold;
+        padding: 0 30px;
+        display: flex;
+        justify-content: space-between;
+    ">
+        <div>
+            <a style="color: white;" href="{{ app.request.headers.get('referer') }}">&#x21A9; {{ 'monsieurbiz_cms_page.ui.back_to_admin' | trans }}</a>
+        </div>
+        <div>{{ 'monsieurbiz_cms_page.ui.banner.preview' | trans }}</div>
+    </div>
+
+    {{ parent() }}
+{% endblock %}
 
 {% block title %}{{ page.metaTitle }}{% endblock %}
 
@@ -15,11 +42,3 @@
         <meta name="keywords" content="{{ page.metaKeywords }}"/>
     {% endif %}
 {% endblock %}
-
-{% block content %}
-    <h1 class="ui monster dividing header">{{ page.title }}</h1>
-    <div>
-        {{ page.content|monsieurbiz_richeditor_render_field }}
-    </div>
-{% endblock %}
-
diff --git a/src/Resources/views/Shop/preview_layout.html.twig b/src/Resources/views/Shop/preview_layout.html.twig
deleted file mode 100644
index be709f9..0000000
--- a/src/Resources/views/Shop/preview_layout.html.twig
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends '@SyliusShop/layout.html.twig' %}
-
-{% block top %}
-    <div style="
-        text-transform: uppercase;
-        line-height: 30px;
-        z-index: 999;
-        position:fixed;
-        top:0;
-        height: 30px;
-        background-color: red;
-        width: 100%;
-        color: white;
-        font-weight: bold;
-        padding: 0 30px;
-        display: flex;
-        justify-content: space-between;
-    ">
-        <div>
-            <a style="color: white;" href="{{ app.request.headers.get('referer') }}">&#x21A9; {{ 'monsieurbiz_cms_page.ui.back_to_admin' | trans }}</a>
-        </div>
-        <div>{{ 'monsieurbiz_cms_page.ui.actions.preview' | trans }}</div>
-    </div>
-
-    {{ parent() }}
-{% endblock %}