diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
index 6f4ec0e5bd3..b243743c6c7 100644
--- a/addons/website/__manifest__.py
+++ b/addons/website/__manifest__.py
@@ -41,7 +41,6 @@
         'views/snippets/s_card.xml',
         'views/snippets/s_share.xml',
         'views/snippets/s_rating.xml',
-        'views/snippets/s_btn.xml',
         'views/snippets/s_hr.xml',
         'views/snippets/s_facebook_page.xml',
         'views/snippets/s_image_gallery.xml',
@@ -69,6 +68,9 @@
         'views/res_partner_views.xml',
         'wizard/base_language_install_views.xml',
         'wizard/website_robots.xml',
+
+        # Old snippets
+        'views/snippets/s_btn.xml',
     ],
     'demo': [
         'data/website_demo.xml',
diff --git a/addons/website/static/src/img/snippets_thumbs/s_button.png b/addons/website/static/src/img/snippets_thumbs/s_button.png
deleted file mode 100755
index 3fb1b920a9b..00000000000
Binary files a/addons/website/static/src/img/snippets_thumbs/s_button.png and /dev/null differ
diff --git a/addons/website/views/snippets/s_btn.xml b/addons/website/views/snippets/s_btn.xml
index 45354007321..23b7a902c35 100644
--- a/addons/website/views/snippets/s_btn.xml
+++ b/addons/website/views/snippets/s_btn.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="s_btn" name="Button">
-    <div class="s_btn text-center pt16 pb16" data-name="Buttons">
-        <a href="#" class="btn btn-primary">Read more</a>
-    </div>
-</template>
-
 <template id="assets_snippet_s_btn_css_000" inherit_id="website.assets_frontend">
     <xpath expr="//link[last()]" position="after">
         <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_btn/000.scss"/>
diff --git a/addons/website/views/snippets/s_call_to_action.xml b/addons/website/views/snippets/s_call_to_action.xml
index 956e878fd20..756a5d3f90c 100644
--- a/addons/website/views/snippets/s_call_to_action.xml
+++ b/addons/website/views/snippets/s_call_to_action.xml
@@ -9,11 +9,13 @@
                     <h3><b>50,000+ companies</b> run Odoo to grow their businesses.</h3>
                     <p class="lead">Join us and make your company a better place.</p>
                 </div>
-                <div class="col-lg-3 s_btn text-right pt8 pb24">
-                    <a href="/contactus" class="btn btn-primary btn-lg">
-                        <span>Contact us</span>
-                        <i class="fa fa-1x fa-fw fa-arrow-circle-right ml-1"/>
-                    </a>
+                <div class="col-lg-3">
+                    <p class="text-right">
+                        <a href="/contactus" class="btn btn-primary btn-lg">
+                            <span>Contact us</span>
+                            <i class="fa fa-1x fa-fw fa-arrow-circle-right ml-1"/>
+                        </a>
+                    </p>
                 </div>
             </div>
         </div>
diff --git a/addons/website/views/snippets/s_carousel.xml b/addons/website/views/snippets/s_carousel.xml
index b02ae93f63c..27c54a3a873 100644
--- a/addons/website/views/snippets/s_carousel.xml
+++ b/addons/website/views/snippets/s_carousel.xml
@@ -21,10 +21,10 @@
                                     <h2><font style="font-size: 62px;">Slide Title</font></h2>
                                 </div>
                                 <p class="lead">Use this snippet to presents your content in a slideshow-like format.<br/> Don't write about products or services here, write about solutions.</p>
-                                <div class="s_btn text-left pt16 pb16" data-name="Buttons">
+                                <p>
                                     <a href="/aboutus" class="btn btn-secondary flat">About us</a>
                                     <a href="/contactus" class="btn btn-primary flat">Contact us</a>
-                                </div>
+                                </p>
                             </div>
                         </div>
                     </div>
@@ -39,9 +39,7 @@
                                     <hr class="s_hr_5px s_hr_dotted border-600 w-25 border-epsilon mx-auto text-center"/>
                                 </div>
                                 <p class="lead">Storytelling is powerful.<br/> It draws readers in and engages them.</p>
-                                <div class="s_btn text-center pt16 pb16" data-name="Buttons">
-                                    <a href="/" class="btn btn-epsilon rounded-circle">Start your journey</a>
-                                </div>
+                                <p><a href="/" class="btn btn-epsilon rounded-circle">Start your journey</a></p>
                             </div>
                         </div>
                     </div>
diff --git a/addons/website/views/snippets/s_image_text.xml b/addons/website/views/snippets/s_image_text.xml
index 858620c2851..dcfd160a1e8 100644
--- a/addons/website/views/snippets/s_image_text.xml
+++ b/addons/website/views/snippets/s_image_text.xml
@@ -12,9 +12,7 @@
                     <h2>Section Subtitle</h2>
                     <p>Write one or two paragraphs describing your product or services. <br/>To be successful your content needs to be useful to your readers.</p>
                     <p>Start with the customer – find out what they want and give it to them.</p>
-                    <div class="s_btn text-left pt16 pb16">
-                        <a href="#" class="btn btn-outline-primary">Discover more</a>
-                    </div>
+                    <p><a href="#" class="btn btn-outline-primary">Discover more</a></p>
                 </div>
             </div>
         </div>
diff --git a/addons/website/views/snippets/s_popup.xml b/addons/website/views/snippets/s_popup.xml
index 303487ad79b..08cc1046b92 100644
--- a/addons/website/views/snippets/s_popup.xml
+++ b/addons/website/views/snippets/s_popup.xml
@@ -20,9 +20,7 @@
                                         </div>
                                         <div class="col-lg-12 pt8 pb32 s_col_no_bgcolor">
                                             <p class="lead">Order now, and get 20$ discount on your first order with the coupon:<br/></p>
-                                        </div>
-                                        <div class="col-lg-12 s_btn text-left pt16 pb16">
-                                            <button class="btn btn-epsilon rounded-circle">NEWCUSTOMER</button>
+                                            <p><button class="btn btn-epsilon rounded-circle">NEWCUSTOMER</button></p>
                                         </div>
                                     </div>
                                 </div>
diff --git a/addons/website/views/snippets/s_text_image.xml b/addons/website/views/snippets/s_text_image.xml
index 39049973654..c6cfaba768b 100644
--- a/addons/website/views/snippets/s_text_image.xml
+++ b/addons/website/views/snippets/s_text_image.xml
@@ -9,9 +9,7 @@
                     <h2>A Section Subtitle</h2>
                     <p>Write one or two paragraphs describing your product or services. <br/>To be successful your content needs to be useful to your readers.</p>
                     <p>Start with the customer – find out what they want and give it to them.</p>
-                    <div class="s_btn text-left pt16 pb16" data-name="Buttons">
-                        <a href="#" class="btn btn-primary">Learn more</a>
-                    </div>
+                    <p><a href="#" class="btn btn-primary">Learn more</a></p>
                 </div>
                 <div class="col-lg-6 pt16 pb16">
                     <img src="/web/image/website.s_text_image_default_image" class="img img-fluid mx-auto" alt="Odoo • Text and Image"/>
diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index f09607e2318..b3de737207f 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -67,7 +67,6 @@
                     <i class="fa fa-indent"/> Inner content
                 </div>
                 <div class="o_panel_body">
-                    <t t-snippet="website.s_btn" t-thumbnail="/website/static/src/img/snippets_thumbs/s_button.png"/>
                     <t t-snippet="website.s_hr" t-thumbnail="/website/static/src/img/snippets_thumbs/s_separator.png"/>
                     <t t-snippet="website.s_alert" t-thumbnail="/website/static/src/img/snippets_thumbs/s_alert.png"/>
                     <t t-snippet="website.s_card" t-thumbnail="/website/static/src/img/snippets_thumbs/s_card.png"/>
@@ -138,8 +137,8 @@
             data-color-prefix="bg-"/>
     </div>
 
-    <!-- H-ALIGN | .s_btn -->
-    <div id="so_text_align" data-selector=".s_btn, .s_share">
+    <!-- H-ALIGN -->
+    <div id="so_text_align" data-selector=".s_share">
         <we-select string="Alignment">
             <we-button data-select-class="text-left">Left</we-button>
             <we-button data-select-class="text-center">Center</we-button>
@@ -293,7 +292,7 @@
     </div>
 
     <div data-js="sizing_y"
-        data-selector="section, .row > div, .parallax, .s_hr, .s_btn, .carousel-item, .s_rating"
+        data-selector="section, .row > div, .parallax, .s_hr, .carousel-item, .s_rating"
         data-exclude="section:has(> .carousel), .o_gallery .carousel-item, .s_col_no_resize.row > div"/>
 
     <div data-js="sizing_x"
@@ -306,7 +305,7 @@
         t-att-data-selector="so_snippet_addition_selector"
         data-drop-in=":not(p).oe_structure:not(.oe_structure_solo), :not(p)[data-oe-type=html], :not(p).oe_structure.oe_structure_solo:not(:has(> section, > div))"/>
 
-    <t t-set="so_content_addition_selector" t-translation="off">blockquote, .s_btn, .s_card, .s_alert, .o_facebook_page, .s_share, .s_rating, .s_hr, .s_countdown, .s_chart</t>
+    <t t-set="so_content_addition_selector" t-translation="off">blockquote, .s_card, .s_alert, .o_facebook_page, .s_share, .s_rating, .s_hr, .s_countdown, .s_chart</t>
     <div id="so_content_addition"
         t-att-data-selector="so_content_addition_selector"
         t-attf-data-drop-near="p, h1, h2, h3, .row > div > img, #{so_content_addition_selector}"
diff --git a/addons/website_slides/data/slide_slide_demo.xml b/addons/website_slides/data/slide_slide_demo.xml
index 2358cff2933..31b2d49c8c0 100644
--- a/addons/website_slides/data/slide_slide_demo.xml
+++ b/addons/website_slides/data/slide_slide_demo.xml
@@ -235,10 +235,10 @@
             </div>
             <div class="col-lg-12 s_text pt16 pb16">
                 <p class="lead o_default_snippet_text" style="text-align: center;">Write one or two paragraphs describing your product, services or a specific feature.<br/> To be successful your content needs to be useful to your readers.</p>
-            </div>
-            <div class="col-lg-12 s_btn text-center pt16 pb16">
-                <a href="/aboutus" class="btn btn-delta rounded-circle o_default_snippet_text">About us</a>
-                <a href="/contactus" class="btn btn-primary rounded-circle o_default_snippet_text">Contact us</a>
+                <p>
+                    <a href="/aboutus" class="btn btn-delta rounded-circle o_default_snippet_text">About us</a>
+                    <a href="/contactus" class="btn btn-primary rounded-circle o_default_snippet_text">Contact us</a>
+                </p>
             </div>
         </div>
     </div>
@@ -253,9 +253,7 @@
                 <h2 class="o_default_snippet_text">Section Subtitle</h2>
                 <p class="o_default_snippet_text">Write one or two paragraphs describing your product or services. <br/>To be successful your content needs to be useful to your readers.</p>
                 <p class="o_default_snippet_text">Start with the customer – find out what they want and give it to them.</p>
-                <div class="s_btn text-left pt16 pb16">
-                    <a href="#" class="btn btn-outline-primary o_default_snippet_text">Discover more</a>
-                </div>
+                <p class="o_default_snippet_text"><a href="#" class="btn btn-outline-primary">Discover more</a></p>
             </div>
         </div>
     </div>
@@ -472,10 +470,10 @@
             </div>
             <div class="col-lg-12 s_text pt16 pb16">
                 <p class="lead o_default_snippet_text" style="text-align: center;">Write one or two paragraphs describing your product, services or a specific feature.<br/> To be successful your content needs to be useful to your readers.</p>
-            </div>
-            <div class="col-lg-12 s_btn text-center pt16 pb16">
-                <a href="/aboutus" class="btn btn-delta rounded-circle o_default_snippet_text">About us</a>
-                <a href="/contactus" class="btn btn-primary rounded-circle o_default_snippet_text">Contact us</a>
+                <p class="o_default_snippet_text">
+                    <a href="/aboutus" class="btn btn-delta rounded-circle">About us</a>
+                    <a href="/contactus" class="btn btn-primary rounded-circle">Contact us</a>
+                </p>
             </div>
         </div>
     </div>
@@ -490,9 +488,9 @@
                 <h2 class="o_default_snippet_text">Section Subtitle</h2>
                 <p class="o_default_snippet_text">Write one or two paragraphs describing your product or services. <br/>To be successful your content needs to be useful to your readers.</p>
                 <p class="o_default_snippet_text">Start with the customer – find out what they want and give it to them.</p>
-                <div class="s_btn text-left pt16 pb16">
-                    <a href="#" class="btn btn-outline-primary o_default_snippet_text">Discover more</a>
-                </div>
+                <p class="o_default_snippet_text">
+                    <a href="#" class="btn btn-outline-primary">Discover more</a>
+                </p>
             </div>
         </div>
     </div>
@@ -713,4 +711,4 @@
     <!-- CHANNEL 6: DIY Furniture -->
     <!-- ======================================= -->
 
-</data></odoo>
\ No newline at end of file
+</data></odoo>