diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 97568e37f35..ff3ed030f76 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -39,7 +39,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'carousel',
+                    snippet:   '#snippet_structure .oe_snippet:first',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a Banner"),
                     content:   _t("Drag the Banner block and drop it in your page."),
@@ -47,14 +47,14 @@
                 },
                 {
                     waitFor:   '.oe_overlay_options .oe_options:visible',
-                    element:   '#wrap .carousel:first .carousel-caption',
+                    element:   '#wrap .carousel:first .carousel-caption > div',
                     placement: 'top',
-                    title:     _("Customize banner's text"),
-                    content:   _("Click in the text and start editing it."),
+                    title:     _t("Customize banner's text"),
+                    content:   _t("Click in the text and start editing it."),
                     popover:   { next: _t("Continue") },
                 },
                 {
-                    element:   '.oe_overlay_options .oe_options',
+                    element:   '.oe_overlay_options .oe_options:visible',
                     placement: 'left',
                     title:     _t("Customize the banner"),
                     content:   _t("Customize any block through this menu. Try to change the background of the banner."),
@@ -69,7 +69,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'features',
+                    snippet:   '#snippet_structure .oe_snippet:eq(6)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop This Block"),
                     content:   _t("Drag the <em>'Features'</em> block and drop it below the banner."),
@@ -85,8 +85,8 @@
                 },
                 {
                     waitFor:   'button[data-action=edit]:visible',
-                    title:     _("Good Job!"),
-                    content:   _("Well done, you created your homepage."),
+                    title:     _t("Good Job!"),
+                    content:   _t("Well done, you created your homepage."),
                     popover:   { next: _t("Continue") },
                 },
                 {
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 2416cb511f1..33fe11f5e81 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -205,7 +205,7 @@ website.Tour = openerp.Class.extend({
 
             if (!step.element) step.orphan = true;
             if (step.snippet) {
-                step.element = '#oe_snippets div.oe_snippet[data-snippet-id="'+step.snippet+'"] .oe_snippet_thumbnail';
+                step.element = '#oe_snippets '+step.snippet+' .oe_snippet_thumbnail';
             }
 
         }
diff --git a/addons/website/static/src/js/website.tour.test.admin.js b/addons/website/static/src/js/website.tour.test.admin.js
index 787f05beb23..01f4448abb2 100644
--- a/addons/website/static/src/js/website.tour.test.admin.js
+++ b/addons/website/static/src/js/website.tour.test.admin.js
@@ -57,7 +57,7 @@
                 },
                 {
                     title:     'add snippets',
-                    snippet:   'carousel',
+                    snippet:   '#snippet_structure .oe_snippet:first',
                 },
                 {
                     title:     'try to save',
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index c2c9f9a55fe..53e2d87186d 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -947,8 +947,8 @@
     </div>
 
     <div data-snippet-option-id='content'
-        data-selector="p, h1, h2, h3, blockquote, .well, .panel"
-        data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
+        data-selector="blockquote, .well, .panel"
+        data-selector-siblings="blockquote, .well, .panel"
         data-selector-children=".content">
     </div>
 
@@ -967,12 +967,6 @@
         </li>
     </div>
 
-    <div data-snippet-option-id='content'
-        data-selector="p, h1, h2, h3, blockquote, .well, .panel"
-        data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
-        data-selector-children=".content">
-    </div>
-
 </template>
 
 
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
index e76e793dfda..3470e2e383b 100644
--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -65,7 +65,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'image-text',
+                    snippet:   '#snippet_structure .oe_snippet:eq(2)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a Block"),
                     content:   _t("Drag this block and drop it in your page."),
@@ -79,7 +79,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'text-block',
+                    snippet:   '#snippet_structure .oe_snippet:eq(4)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a block"),
                     content:   _t("Drag this block and drop it below the image block."),
diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js
index a9e40a5f65b..ef013398acb 100644
--- a/addons/website_event/static/src/js/website.tour.event.js
+++ b/addons/website_event/static/src/js/website.tour.event.js
@@ -65,7 +65,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'image-text',
+                    snippet:   '#snippet_structure .oe_snippet:eq(2)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a block"),
                     content:   _t("Drag the 'Image-Text' block and drop it in your page."),
@@ -80,7 +80,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'text-block',
+                    snippet:   '#snippet_structure .oe_snippet:eq(4)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a block"),
                     content:   _t("Drag the 'Text Block' in your event page."),
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index 24dd5fd2d66..adb4a9e556c 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -109,7 +109,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'big-picture',
+                    snippet:   '#snippet_structure .oe_snippet:eq(7)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a block"),
                     content:   _t("Drag the 'Big Picture' block and drop it in your page."),