diff --git a/addons/website/views/snippets/s_faq_collapse.xml b/addons/website/views/snippets/s_faq_collapse.xml
index 7cb20fad7b6..2154b51b251 100644
--- a/addons/website/views/snippets/s_faq_collapse.xml
+++ b/addons/website/views/snippets/s_faq_collapse.xml
@@ -2,40 +2,31 @@
 <odoo>
 
 <template id="s_faq_collapse" name="Accordion">
-    <section class="s_faq_collapse pt48 pb32">
+    <section class="s_faq_collapse pt32 pb32">
         <div class="container">
-            <div class="row s_nb_column_fixed">
-                <div class="col-lg-12 s_title pt16 pb16">
-                    <h1 class="s_title_thin"><font style="font-size: 62px;">FAQ</font></h1>
+            <div id="myCollapse" class="accordion" role="tablist">
+                <div class="card bg-white" data-name="Item">
+                    <a href="#" role="tab" data-toggle="collapse" aria-expanded="true" class="card-header">Terms of service</a>
+                    <div class="collapse show" role="tabpanel">
+                        <div class="card-body">
+                            <p class="card-text">These terms of service ("Terms", "Agreement") are an agreement between the website ("Website operator", "us", "we" or "our") and you ("User", "you" or "your"). This Agreement sets forth the general terms and conditions of your use of this website and any of its products or services (collectively, "Website" or "Services").</p>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="row s_col_no_bgcolor">
-                <div class="col-lg-12 pt16 pb16">
-                    <div id="myCollapse" class="accordion" role="tablist">
-                        <div class="card bg-white">
-                            <a href="#" role="tab" data-toggle="collapse" aria-expanded="true" class="card-header">Terms of service</a>
-                            <div class="collapse show" role="tabpanel">
-                                <div class="card-body">
-                                    <p class="card-text">These terms of service ("Terms", "Agreement") are an agreement between the website ("Website operator", "us", "we" or "our") and you ("User", "you" or "your"). This Agreement sets forth the general terms and conditions of your use of this website and any of its products or services (collectively, "Website" or "Services").</p>
-                                </div>
-                            </div>
+                <div class="card bg-white" data-name="Item">
+                    <a href="#" role="tab" data-toggle="collapse" aria-expanded="false" class="collapsed card-header">Links to other Websites</a>
+                    <div class="collapse" role="tabpanel">
+                        <div class="card-body">
+                            <p class="card-text">Although this Website may be linked to other websites, we are not, directly or indirectly, implying any approval, association, sponsorship, endorsement, or affiliation with any linked website, unless specifically stated herein.</p>
+                            <p class="card-text">You should carefully review the legal statements and other conditions of use of any website which you access through a link from this Website. Your linking to any other off-site pages or other websites is at your own risk.</p>
                         </div>
-                        <div class="card bg-white">
-                            <a href="#" role="tab" data-toggle="collapse" aria-expanded="false" class="collapsed card-header">Links to other Websites</a>
-                            <div class="collapse" role="tabpanel">
-                                <div class="card-body">
-                                    <p class="card-text">Although this Website may be linked to other websites, we are not, directly or indirectly, implying any approval, association, sponsorship, endorsement, or affiliation with any linked website, unless specifically stated herein.</p>
-                                    <p class="card-text">You should carefully review the legal statements and other conditions of use of any website which you access through a link from this Website. Your linking to any other off-site pages or other websites is at your own risk.</p>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="card bg-white">
-                            <a href="#" role="tab" data-toggle="collapse" aria-expanded="false" class="collapsed card-header">Use of Cookies</a>
-                            <div class="collapse" role="tabpanel">
-                                <div class="card-body">
-                                    <p class="card-text">Website may use cookies to personalize and facilitate maximum navigation of the User by this site. The User may configure his / her browser to notify and reject the installation of the cookies sent by us.</p>
-                                </div>
-                            </div>
+                    </div>
+                </div>
+                <div class="card bg-white" data-name="Item">
+                    <a href="#" role="tab" data-toggle="collapse" aria-expanded="false" class="collapsed card-header">Use of Cookies</a>
+                    <div class="collapse" role="tabpanel">
+                        <div class="card-body">
+                            <p class="card-text">Website may use cookies to personalize and facilitate maximum navigation of the User by this site. The User may configure his / her browser to notify and reject the installation of the cookies sent by us.</p>
                         </div>
                     </div>
                 </div>
diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index 746129ed94a..7860285c538 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -211,7 +211,7 @@
 
     <!-- Move snippets around -->
     <div data-js="SnippetMove"
-         data-selector="section">
+         data-selector="section, .accordion > .card">
         <we-button class="fa fa-fw fa-angle-up" data-move-snippet="prev" data-no-preview="true"/>
         <we-button class="fa fa-fw fa-angle-down" data-move-snippet="next" data-no-preview="true"/>
     </div>