diff --git a/addons/website/static/src/img/blocks/twitter_scroll.png b/addons/website/static/src/img/blocks/twitter_scroll.png
deleted file mode 100644
index b8d602d519a..00000000000
Binary files a/addons/website/static/src/img/blocks/twitter_scroll.png and /dev/null differ
diff --git a/addons/website/static/src/img/snippets_thumbs/s_color_block.png b/addons/website/static/src/img/snippets_thumbs/s_color_block.png
deleted file mode 100644
index 9894311998e..00000000000
Binary files a/addons/website/static/src/img/snippets_thumbs/s_color_block.png and /dev/null differ
diff --git a/addons/website/static/src/img/snippets_thumbs/s_color_blocks_2.png b/addons/website/static/src/img/snippets_thumbs/s_color_blocks_2.png
index 0c3c6c9a5c7..01ede5f31b3 100644
Binary files a/addons/website/static/src/img/snippets_thumbs/s_color_blocks_2.png and b/addons/website/static/src/img/snippets_thumbs/s_color_blocks_2.png differ
diff --git a/addons/website/static/src/img/snippets_thumbs/s_faq.png b/addons/website/static/src/img/snippets_thumbs/s_faq_collapse.png
similarity index 100%
rename from addons/website/static/src/img/snippets_thumbs/s_faq.png
rename to addons/website/static/src/img/snippets_thumbs/s_faq_collapse.png
diff --git a/addons/website/static/src/img/snippets_thumbs/s_separator.png b/addons/website/static/src/img/snippets_thumbs/s_hr.png
similarity index 100%
rename from addons/website/static/src/img/snippets_thumbs/s_separator.png
rename to addons/website/static/src/img/snippets_thumbs/s_hr.png
diff --git a/addons/website/static/src/img/snippets_thumbs/s_process_step.png b/addons/website/static/src/img/snippets_thumbs/s_process_step.png
deleted file mode 100644
index d1b68f93877..00000000000
Binary files a/addons/website/static/src/img/snippets_thumbs/s_process_step.png and /dev/null differ
diff --git a/addons/website/static/src/img/snippets_thumbs/s_process_steps.png b/addons/website/static/src/img/snippets_thumbs/s_process_steps.png
new file mode 100644
index 00000000000..a3911eb709c
Binary files /dev/null and b/addons/website/static/src/img/snippets_thumbs/s_process_steps.png differ
diff --git a/addons/website/static/src/img/snippets_thumbs/s_product_list.png b/addons/website/static/src/img/snippets_thumbs/s_product_list.png
index 0d59406e4f4..adfa1656dc7 100644
Binary files a/addons/website/static/src/img/snippets_thumbs/s_product_list.png and b/addons/website/static/src/img/snippets_thumbs/s_product_list.png differ
diff --git a/addons/website/static/src/img/snippets_thumbs/s_showcase.jpg b/addons/website/static/src/img/snippets_thumbs/s_showcase.jpg
deleted file mode 100644
index da8ea09c695..00000000000
Binary files a/addons/website/static/src/img/snippets_thumbs/s_showcase.jpg and /dev/null differ
diff --git a/addons/website/static/src/img/snippets_thumbs/s_showcase.png b/addons/website/static/src/img/snippets_thumbs/s_showcase.png
new file mode 100644
index 00000000000..48e28374c07
Binary files /dev/null and b/addons/website/static/src/img/snippets_thumbs/s_showcase.png differ
diff --git a/addons/website/static/src/img/snippets_thumbs/s_text_highlight.png b/addons/website/static/src/img/snippets_thumbs/s_text_highlight.png
new file mode 100644
index 00000000000..c4c76f5ca1f
Binary files /dev/null and b/addons/website/static/src/img/snippets_thumbs/s_text_highlight.png differ
diff --git a/addons/website/static/src/img/s_website_form.png b/addons/website/static/src/img/snippets_thumbs/s_website_form.png
similarity index 100%
rename from addons/website/static/src/img/s_website_form.png
rename to addons/website/static/src/img/snippets_thumbs/s_website_form.png
diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index 032519a20e1..ff05fe02a3e 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -35,7 +35,7 @@
                     <t t-snippet="website.s_image_gallery" t-thumbnail="/website/static/src/img/snippets_thumbs/s_image_gallery.png"/>
                     <t t-snippet="website.s_carousel" t-thumbnail="/website/static/src/img/snippets_thumbs/s_carousel.png"/>
                     <t t-snippet="website.s_media_list" t-thumbnail="/website/static/src/img/snippets_thumbs/s_media_list.png"/>
-                    <t t-snippet="website.s_showcase" t-thumbnail="/website/static/src/img/snippets_thumbs/s_showcase.jpg"/>
+                    <t t-snippet="website.s_showcase" t-thumbnail="/website/static/src/img/snippets_thumbs/s_showcase.png"/>
                     <t t-snippet="website.s_parallax" t-thumbnail="/website/static/src/img/snippets_thumbs/s_parallax.png"/>
                 </div>
             </div>
@@ -49,13 +49,13 @@
                     <t t-snippet="website.s_company_team" t-thumbnail="/website/static/src/img/snippets_thumbs/s_company_team.png"/>
                     <t t-snippet="website.s_call_to_action" t-thumbnail="/website/static/src/img/snippets_thumbs/s_call_to_action.png"/>
                     <t t-snippet="website.s_references" t-thumbnail="/website/static/src/img/snippets_thumbs/s_references.png"/>
-                    <t t-snippet="website.s_faq_collapse" t-thumbnail="/website/static/src/img/snippets_thumbs/s_faq.png"/>
+                    <t t-snippet="website.s_faq_collapse" t-thumbnail="/website/static/src/img/snippets_thumbs/s_faq_collapse.png"/>
                     <t t-snippet="website.s_features_grid" t-thumbnail="/website/static/src/img/snippets_thumbs/s_features_grid.png"/>
                     <t t-snippet="website.s_product_catalog" t-thumbnail="/website/static/src/img/snippets_thumbs/s_product_catalog.png"/>
                     <t t-snippet="website.s_product_list" t-thumbnail="/website/static/src/img/snippets_thumbs/s_product_list.png"/>
                     <t t-snippet="website.s_tabs" t-thumbnail="/website/static/src/img/snippets_thumbs/s_tabs.png"/>
                     <t t-snippet="website.s_timeline" t-thumbnail="/website/static/src/img/snippets_thumbs/s_timeline.png"/>
-                    <t t-snippet="website.s_process_steps" t-thumbnail="/website/static/src/img/snippets_thumbs/s_process_step.png"/>
+                    <t t-snippet="website.s_process_steps" t-thumbnail="/website/static/src/img/snippets_thumbs/s_process_steps.png"/>
                     <t t-snippet="website.s_quotes_carousel" t-thumbnail="/website/static/src/img/snippets_thumbs/s_quotes_carousel.png"/>
                 </div>
             </div>
@@ -87,14 +87,14 @@
                     <i class="fa fa-indent"/> Inner content
                 </div>
                 <div class="o_panel_body">
-                    <t t-snippet="website.s_hr" t-thumbnail="/website/static/src/img/snippets_thumbs/s_separator.png"/>
+                    <t t-snippet="website.s_hr" t-thumbnail="/website/static/src/img/snippets_thumbs/s_hr.png"/>
                     <t t-snippet="website.s_alert" t-thumbnail="/website/static/src/img/snippets_thumbs/s_alert.png"/>
                     <t t-snippet="website.s_rating" t-thumbnail="/website/static/src/img/snippets_thumbs/s_rating.png"/>
                     <t t-snippet="website.s_card" t-thumbnail="/website/static/src/img/snippets_thumbs/s_card.png"/>
                     <t t-snippet="website.s_share" t-thumbnail="/website/static/src/img/snippets_thumbs/s_share.png"/>
                     <t id="sale_product_search_input_hook"/>
                     <t id="mass_mailing_newsletter_hook"/>
-                    <t t-snippet="website.s_text_highlight" t-thumbnail="/website/static/src/img/snippets_thumbs/s_color_block.png"/>
+                    <t t-snippet="website.s_text_highlight" t-thumbnail="/website/static/src/img/snippets_thumbs/s_text_highlight.png"/>
                     <t t-snippet="website.s_chart" t-thumbnail="/website/static/src/img/snippets_thumbs/s_chart.png"/>
                     <t t-snippet="website.s_progress_bar" t-thumbnail="/website/static/src/img/snippets_thumbs/s_progress_bar.png"/>
                     <t t-snippet="website.s_badge" t-thumbnail="/website/static/src/img/snippets_thumbs/s_badge.png"/>
@@ -112,7 +112,7 @@
 
 <template id="external_snippets" inherit_id="website.snippets" priority="8">
     <xpath expr="//div[@id='snippet_effect']//t[@t-snippet][last()]" position="after">
-        <t t-install="website_form" string="Form Builder" t-thumbnail="/website/static/src/img/s_website_form.png"/>
+        <t t-install="website_form" string="Form Builder" t-thumbnail="/website/static/src/img/snippets_thumbs/s_website_form.png"/>
         <t id="newsletter_popup_snippet" t-install="mass_mailing" string="Newsletter Popup" t-thumbnail="/website/static/src/img/snippets_thumbs/newsletter_subscribe_popup.png"/>
         <t t-install="website_mail_channel" string="Discussion Group" t-thumbnail="/website/static/src/img/snippets_thumbs/s_channel.png"/>
         <t t-install="website_twitter" string="Twitter Scroller" t-thumbnail="/website/static/src/img/snippets_thumbs/s_twitter_scroll.png"/>
diff --git a/addons/website_form/views/snippets.xml b/addons/website_form/views/snippets.xml
index f362505387b..c8d6a488b56 100644
--- a/addons/website_form/views/snippets.xml
+++ b/addons/website_form/views/snippets.xml
@@ -19,7 +19,7 @@
 
         <template id="register_s_website_form" inherit_id="website.snippets" name="Snippet Form Builder">
             <xpath expr="//t[@id='form_form_hook']" position="replace">
-                <t t-snippet="website_form.s_website_form" t-thumbnail="/website/static/src/img/s_website_form.png"/>
+                <t t-snippet="website_form.s_website_form" t-thumbnail="/website/static/src/img/snippets_thumbs/s_website_form.png"/>
             </xpath>
         </template>
 
diff --git a/addons/website_twitter/views/website_twitter_snippet_templates.xml b/addons/website_twitter/views/website_twitter_snippet_templates.xml
index fd1f9f01674..2ec7fae9110 100644
--- a/addons/website_twitter/views/website_twitter_snippet_templates.xml
+++ b/addons/website_twitter/views/website_twitter_snippet_templates.xml
@@ -11,7 +11,7 @@
     </template>
      <template id="website_twitter_snippet" inherit_id="website.snippets">
         <xpath expr="//t[@id='twitter_favorite_tweets_hook']" position="replace">
-            <t t-snippet="website_twitter.s_twitter" t-thumbnail="/website/static/src/img/blocks/twitter_scroll.png"/>
+            <t t-snippet="website_twitter.s_twitter" t-thumbnail="/website/static/src/img/snippets_thumbs/s_twitter_scroll.png"/>
         </xpath>
     </template>