diff --git a/addons/mass_mailing/data/ir_attachment_data.xml b/addons/mass_mailing/data/ir_attachment_data.xml
index 675d9e4211e..03b58faf59e 100644
--- a/addons/mass_mailing/data/ir_attachment_data.xml
+++ b/addons/mass_mailing/data/ir_attachment_data.xml
@@ -6,181 +6,157 @@
             <field name="public" eval="True"/>
             <field name="name">s_cover_default_image.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_block_banner.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_cover.jpg</field>
         </record>
         <record id="mass_mailing.s_media_list_default_image_1" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_media_list_default_image_1.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/s_media_list_1.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_media_list_1.jpg</field>
         </record>
         <record id="mass_mailing.s_media_list_default_image_2" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_media_list_default_image_2.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/s_media_list_2.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_media_list_2.jpg</field>
         </record>
         <record id="mass_mailing.s_media_list_default_image_3" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_media_list_default_image_3.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/s_media_list_3.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_media_list_3.jpg</field>
         </record>
         <record id="mass_mailing.s_company_team_default_image_1" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_company_team_default_image_1.png</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_1-circle.png</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_1.png</field>
         </record>
         <record id="mass_mailing.s_company_team_default_image_2" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_company_team_default_image_2.png</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2-circle.png</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.png</field>
         </record>
         <record id="mass_mailing.s_company_team_default_image_3" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_company_team_default_image_3.png</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_3-circle.png</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_3.png</field>
         </record>
         <record id="mass_mailing.s_company_team_default_image_4" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_company_team_default_image_4.png</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_4-circle.png</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_4.png</field>
         </record>
-        <record id="mass_mailing.s_reference_demo_image_1" model="ir.attachment">
+        <record id="mass_mailing.s_reference_default_image_1" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">s_reference_demo_image_1.png</field>
+            <field name="name">s_reference_default_image_1.png</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/s_references_1.png</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_references_1.png</field>
         </record>
-        <record id="mass_mailing.s_reference_demo_image_2" model="ir.attachment">
+        <record id="mass_mailing.s_reference_default_image_2" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">s_reference_demo_image_2.png</field>
+            <field name="name">s_reference_default_image_2.png</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/s_references_2.png</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_references_2.png</field>
         </record>
-        <record id="mass_mailing.s_reference_demo_image_3" model="ir.attachment">
+        <record id="mass_mailing.s_reference_default_image_3" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">s_reference_demo_image_3.png</field>
+            <field name="name">s_reference_default_image_3.png</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/s_references_3.png</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_references_3.png</field>
         </record>
-        <record id="mass_mailing.s_reference_demo_image_4" model="ir.attachment">
+        <record id="mass_mailing.s_reference_default_image_4" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">s_reference_demo_image_4.png</field>
+            <field name="name">s_reference_default_image_4.png</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/s_references_4.png</field>
-        </record>
-        <record id="mass_mailing.s_reference_demo_image_5" model="ir.attachment">
-            <field name="public" eval="True"/>
-            <field name="name">s_reference_demo_image_5.png</field>
-            <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/s_references_5.png</field>
-        </record>
-        <record id="mass_mailing.s_reference_default_image_6" model="ir.attachment">
-            <field name="public" eval="True"/>
-            <field name="name">s_reference_default_image_6.png</field>
-            <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/s_references_6.png</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_references_4.png</field>
         </record>
         <record id="mass_mailing.s_product_list_default_image_1" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_product_list_default_image_1.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/furniture.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_product_1.jpg</field>
         </record>
         <record id="mass_mailing.s_product_list_default_image_2" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_product_list_default_image_2.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/clothes.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_product_2.jpg</field>
         </record>
         <record id="mass_mailing.s_product_list_default_image_3" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_product_list_default_image_3.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/books.jpg</field>
-        </record>
-        <record id="mass_mailing.s_product_list_default_image_4" model="ir.attachment">
-            <field name="public" eval="True"/>
-            <field name="name">s_product_list_default_image_4.jpg</field>
-            <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/essentials_oils.jpg</field>
-        </record>
-        <record id="mass_mailing.s_product_list_default_image_5" model="ir.attachment">
-            <field name="public" eval="True"/>
-            <field name="name">s_product_list_default_image_5.jpg</field>
-            <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/services.jpg</field>
-        </record>
-        <record id="mass_mailing.s_product_list_default_image_6" model="ir.attachment">
-            <field name="public" eval="True"/>
-            <field name="name">s_product_list_default_image_6.jpg</field>
-            <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/multimedia.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_product_3.jpg</field>
         </record>
         <record id="mass_mailing.s_blockquote_default_image" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_blockquote_default_image.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/s_team_member_2.png</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.png</field>
         </record>
         <record id="mass_mailing.s_image_text_default_image" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_image_text_default_image.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_block_image_text.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_image_text.jpg</field>
         </record>
-        <record id="mass_mailing.s_mail_block_event_default_image" model="ir.attachment">
+        <record id="mass_mailing.s_event_default_image_1" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">s_mail_block_event_default_image.jpg</field>
+            <field name="name">s_event_default_image_1.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_block_event.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_event_1.jpg</field>
+        </record>
+        <record id="mass_mailing.s_event_default_image_2" model="ir.attachment">
+            <field name="public" eval="True"/>
+            <field name="name">s_event_default_image_2.jpg</field>
+            <field name="type">url</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_event_2.jpg</field>
         </record>
         <record id="mass_mailing.s_masonry_block_default_image_1" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_masonry_block_default_image_1.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/s_masonry_block_1.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_masonry_block_1.jpg</field>
         </record>
         <record id="mass_mailing.s_masonry_block_default_image_2" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_masonry_block_default_image_2.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/s_cover.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_masonry_block_2.jpg</field>
         </record>
         <record id="mass_mailing.s_picture_default_image" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_picture_default_image.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_block_image.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_picture.jpg</field>
         </record>
         <record id="mass_mailing.s_text_image_default_image" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_text_image_default_image.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_block_text_image.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_text_image.jpg</field>
         </record>
         <record id="mass_mailing.s_three_columns_default_image_1" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_three_columns_default_image_1.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_1.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_three_cols_1.jpg</field>
         </record>
         <record id="mass_mailing.s_three_columns_default_image_2" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_three_columns_default_image_2.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_2.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_three_cols_2.jpg</field>
         </record>
         <record id="mass_mailing.s_three_columns_default_image_3" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">s_three_columns_default_image_3.jpg</field>
             <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_3.jpg</field>
+            <field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_three_cols_3.jpg</field>
         </record>
     </data>
 </odoo>
diff --git a/addons/mass_mailing/static/src/img/blocks/block_banner.png b/addons/mass_mailing/static/src/img/blocks/block_banner.png
deleted file mode 100755
index bcf62bd1e6f..00000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_banner.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/blocks/block_comparison_table.png b/addons/mass_mailing/static/src/img/blocks/block_comparison_table.png
deleted file mode 100644
index e640d80a8df..00000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_comparison_table.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/blocks/block_text_image.png b/addons/mass_mailing/static/src/img/blocks/block_text_image.png
deleted file mode 100755
index c0832ebd612..00000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_text_image.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/blocks/block_title_sub.png b/addons/mass_mailing/static/src/img/blocks/block_title_sub.png
deleted file mode 100755
index 1320ccc538b..00000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_title_sub.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/blocks/block_two_cols.png b/addons/mass_mailing/static/src/img/blocks/block_two_cols.png
deleted file mode 100755
index 79e19de059d..00000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_two_cols.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/essentials_oils.jpg b/addons/mass_mailing/static/src/img/snippets_demo/essentials_oils.jpg
deleted file mode 100644
index 9561a605bc9..00000000000
Binary files a/addons/mass_mailing/static/src/img/snippets_demo/essentials_oils.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/multimedia.jpg b/addons/mass_mailing/static/src/img/snippets_demo/multimedia.jpg
deleted file mode 100644
index 9fa60a94225..00000000000
Binary files a/addons/mass_mailing/static/src/img/snippets_demo/multimedia.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_references_5.png b/addons/mass_mailing/static/src/img/snippets_demo/s_references_5.png
deleted file mode 100755
index e4801a37a0d..00000000000
Binary files a/addons/mass_mailing/static/src/img/snippets_demo/s_references_5.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_references_6.png b/addons/mass_mailing/static/src/img/snippets_demo/s_references_6.png
deleted file mode 100644
index 896d3d7e709..00000000000
Binary files a/addons/mass_mailing/static/src/img/snippets_demo/s_references_6.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/services.jpg b/addons/mass_mailing/static/src/img/snippets_demo/services.jpg
deleted file mode 100644
index 126a83020ff..00000000000
Binary files a/addons/mass_mailing/static/src/img/snippets_demo/services.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/size_large.svg b/addons/mass_mailing/static/src/img/snippets_demo/size_large.svg
deleted file mode 100644
index 13541780689..00000000000
--- a/addons/mass_mailing/static/src/img/snippets_demo/size_large.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="23" height="12" viewBox="0 0 23 12">
-  <g fill="none" fill-rule="evenodd" class="symbols">
-    <g class="3_buttons_copy_7" transform="translate(-203 -5)">
-      <g class="size_large" transform="translate(203 5)">
-        <path fill="#B8B8B8" d="M23 0v12H0V0h23zm-1 1H1v10h21V1z" class="o_subdle"/>
-        <rect width="19" height="8" x="2" y="2" fill="#FFF" class="o_graphic"/>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/size_medium.svg b/addons/mass_mailing/static/src/img/snippets_demo/size_medium.svg
deleted file mode 100644
index 00b3a3d43d0..00000000000
--- a/addons/mass_mailing/static/src/img/snippets_demo/size_medium.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="23" height="12" viewBox="0 0 23 12">
-  <g fill="none" fill-rule="evenodd" class="symbols">
-    <g class="3_buttons_copy_7" transform="translate(-170 -5)">
-      <g class="size_medium" transform="translate(170 5)">
-        <path fill="#B8B8B8" d="M23 0v12H0V0h23zm-4 2H4v8h15V2z" class="o_subdle"/>
-        <rect width="13" height="6" x="5" y="3" fill="#FFF" class="o_graphic"/>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/size_small.svg b/addons/mass_mailing/static/src/img/snippets_demo/size_small.svg
deleted file mode 100644
index aaa36a67385..00000000000
--- a/addons/mass_mailing/static/src/img/snippets_demo/size_small.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="23" height="12" viewBox="0 0 23 12">
-  <g fill="none" fill-rule="evenodd" class="symbols">
-    <g class="3_buttons_copy_7" transform="translate(-137 -5)">
-      <g class="size_small" transform="translate(137 5)">
-        <path fill="#B8B8B8" d="M23 0v12H0V0h23zm-8 3H8v6h7V3z" class="o_subdle"/>
-        <rect width="5" height="4" x="9" y="4" fill="#FFF" class="o_graphic"/>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/addons/mass_mailing/static/src/img/blocks/block_discount1.png b/addons/mass_mailing/static/src/img/snippets_thumbs/block_discount1.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/blocks/block_discount1.png
rename to addons/mass_mailing/static/src/img/snippets_thumbs/block_discount1.png
diff --git a/addons/mass_mailing/static/src/img/blocks/block_discount2.png b/addons/mass_mailing/static/src/img/snippets_thumbs/block_discount2.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/blocks/block_discount2.png
rename to addons/mass_mailing/static/src/img/snippets_thumbs/block_discount2.png
diff --git a/addons/mass_mailing/static/src/img/blocks/block_event.png b/addons/mass_mailing/static/src/img/snippets_thumbs/block_event.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/blocks/block_event.png
rename to addons/mass_mailing/static/src/img/snippets_thumbs/block_event.png
diff --git a/addons/mass_mailing/static/src/img/blocks/block_footer_social.png b/addons/mass_mailing/static/src/img/snippets_thumbs/block_footer_social.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/blocks/block_footer_social.png
rename to addons/mass_mailing/static/src/img/snippets_thumbs/block_footer_social.png
diff --git a/addons/mass_mailing/static/src/img/blocks/block_footer_social_left.png b/addons/mass_mailing/static/src/img/snippets_thumbs/block_footer_social_left.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/blocks/block_footer_social_left.png
rename to addons/mass_mailing/static/src/img/snippets_thumbs/block_footer_social_left.png
diff --git a/addons/mass_mailing/static/src/img/blocks/block_header_browser.png b/addons/mass_mailing/static/src/img/snippets_thumbs/block_header_browser.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/blocks/block_header_browser.png
rename to addons/mass_mailing/static/src/img/snippets_thumbs/block_header_browser.png
diff --git a/addons/mass_mailing/static/src/img/blocks/block_header_logo.png b/addons/mass_mailing/static/src/img/snippets_thumbs/block_header_logo.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/blocks/block_header_logo.png
rename to addons/mass_mailing/static/src/img/snippets_thumbs/block_header_logo.png
diff --git a/addons/mass_mailing/static/src/img/blocks/block_header_social.png b/addons/mass_mailing/static/src/img/snippets_thumbs/block_header_social.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/blocks/block_header_social.png
rename to addons/mass_mailing/static/src/img/snippets_thumbs/block_header_social.png
diff --git a/addons/mass_mailing/static/src/img/blocks/block_header_text_social.png b/addons/mass_mailing/static/src/img/snippets_thumbs/block_header_text_social.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/blocks/block_header_text_social.png
rename to addons/mass_mailing/static/src/img/snippets_thumbs/block_header_text_social.png
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_banner.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_banner.jpg
deleted file mode 100644
index 872366f9985..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_banner.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_event.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_event.jpg
deleted file mode 100644
index 50a9d033190..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_image.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_image.jpg
deleted file mode 100644
index 047516fe8d5..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_image_text.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_image_text.jpg
deleted file mode 100644
index 59a1806df7a..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_image_text.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_text_image.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_text_image.jpg
deleted file mode 100644
index 0009598d3cb..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_1.jpg
deleted file mode 100644
index 7a7f2bbd2e4..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_2.jpg
deleted file mode 100644
index 7a7f2bbd2e4..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_3.jpg
deleted file mode 100644
index 7a7f2bbd2e4..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_two_cols_1.jpg
deleted file mode 100644
index 98ed24c6037..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_two_cols_2.jpg
deleted file mode 100644
index 98ed24c6037..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_logo.png
deleted file mode 100644
index 064f09c1a0a..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_logo.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_two_cols_1.jpg
deleted file mode 100755
index 9a55e53533b..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_two_cols_2.jpg
deleted file mode 100755
index 38c77b3c178..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_banner.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_cover.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_default/s_default_image_block_banner.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_cover.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_event_1.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_event_1.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_default/s_event_1.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_event_1.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_event_2.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_event_2.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_default/s_event_2.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_event_2.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_header_logo.png
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_default/s_default_image_logo.png
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_header_logo.png
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_image_text.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_image_text.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_default/s_default_image_block_image_text.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_image_text.jpg
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_masonry_block_1.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_masonry_block_1.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/s_masonry_block_1.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_masonry_block_1.jpg
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_cover.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_masonry_block_2.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/s_cover.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_masonry_block_2.jpg
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_media_list_1.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_media_list_1.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/s_media_list_1.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_media_list_1.jpg
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_media_list_2.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_media_list_2.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/s_media_list_2.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_media_list_2.jpg
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_media_list_3.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_media_list_3.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/s_media_list_3.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_media_list_3.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_image.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_picture.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_default/s_default_image_block_image.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_picture.jpg
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/furniture.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_product_1.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/furniture.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_product_1.jpg
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/clothes.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_product_2.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/clothes.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_product_2.jpg
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/books.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_product_3.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/books.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_product_3.jpg
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_references_1.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_references_1.png
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/s_references_1.png
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_references_1.png
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_references_2.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_references_2.png
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/s_references_2.png
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_references_2.png
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_references_3.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_references_3.png
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/s_references_3.png
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_references_3.png
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_references_4.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_references_4.png
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/s_references_4.png
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_references_4.png
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_team_member_1.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_1.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/s_team_member_1.png
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_1.png
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_team_member_2.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/s_team_member_2.png
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.png
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_team_member_3.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_3.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/s_team_member_3.png
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_3.png
diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_team_member_4.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_4.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/snippets_demo/s_team_member_4.png
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_4.png
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_text_image.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_text_image.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_default/s_default_image_block_text_image.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_text_image.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_three_cols_1.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_1.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_three_cols_1.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_three_cols_2.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_2.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_three_cols_2.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_three_cols_3.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_3.jpg
rename to addons/mass_mailing/static/src/img/theme_default/s_default_image_three_cols_3.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_two_cols_1.jpg
deleted file mode 100644
index 9a55e53533b..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_two_cols_2.jpg
deleted file mode 100644
index 38c77b3c178..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_banner.jpg b/addons/mass_mailing/static/src/img/theme_empty/s_default_image_cover.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_banner.jpg
rename to addons/mass_mailing/static/src/img/theme_empty/s_default_image_cover.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_empty/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_empty/s_default_image_header_logo.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_empty/s_default_image_logo.png
rename to addons/mass_mailing/static/src/img/theme_empty/s_default_image_header_logo.png
diff --git a/addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_image.jpg b/addons/mass_mailing/static/src/img/theme_empty/s_default_image_image.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_image.jpg
rename to addons/mass_mailing/static/src/img/theme_empty/s_default_image_image.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_image_text.jpg b/addons/mass_mailing/static/src/img/theme_empty/s_default_image_image_text.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_image_text.jpg
rename to addons/mass_mailing/static/src/img/theme_empty/s_default_image_image_text.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_empty/s_masonry_block_default_image_1.jpg b/addons/mass_mailing/static/src/img/theme_empty/s_default_image_masonry_block_1.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_empty/s_masonry_block_default_image_1.jpg
rename to addons/mass_mailing/static/src/img/theme_empty/s_default_image_masonry_block_1.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_text_image.jpg b/addons/mass_mailing/static/src/img/theme_empty/s_default_image_text_image.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_text_image.jpg
rename to addons/mass_mailing/static/src/img/theme_empty/s_default_image_text_image.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_empty/s_default_image_three_cols_1.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_three_cols_1.jpg
rename to addons/mass_mailing/static/src/img/theme_empty/s_default_image_three_cols_1.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_empty/s_default_image_three_cols_2.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_three_cols_2.jpg
rename to addons/mass_mailing/static/src/img/theme_empty/s_default_image_three_cols_2.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing/static/src/img/theme_empty/s_default_image_three_cols_3.jpg
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_empty/s_default_image_block_three_cols_3.jpg
rename to addons/mass_mailing/static/src/img/theme_empty/s_default_image_three_cols_3.jpg
diff --git a/addons/mass_mailing/static/src/img/theme_imgs/basic_thumb_logo.png b/addons/mass_mailing/static/src/img/theme_imgs/basic_thumb_logo.png
deleted file mode 100644
index 2a562249545..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_imgs/basic_thumb_logo.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_logo.png b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_logo.png
deleted file mode 100644
index 157ab85588c..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_logo.png and /dev/null differ
diff --git a/addons/mass_mailing/views/snippets/s_references.xml b/addons/mass_mailing/views/snippets/s_references.xml
index 388cc23cca5..3f6b3b30f87 100644
--- a/addons/mass_mailing/views/snippets/s_references.xml
+++ b/addons/mass_mailing/views/snippets/s_references.xml
@@ -8,16 +8,16 @@
             <p style="text-align: center;">We are in good company.</p>
             <div class="row">
                 <div class="col-lg-3 pt16 pb16">
-                    <img src="/web/image/mass_mailing.s_reference_demo_image_1" class="img img-fluid mx-auto" alt=""/>
+                    <img src="/web/image/mass_mailing.s_reference_default_image_1" class="img img-fluid mx-auto" alt=""/>
                 </div>
                 <div class="col-lg-3 pt16 pb16">
-                    <img src="/web/image/mass_mailing.s_reference_demo_image_2" class="img img-fluid mx-auto" alt=""/>
+                    <img src="/web/image/mass_mailing.s_reference_default_image_2" class="img img-fluid mx-auto" alt=""/>
                 </div>
                 <div class="col-lg-3 pt16 pb16">
-                    <img src="/web/image/mass_mailing.s_reference_demo_image_3" class="img img-fluid mx-auto" alt=""/>
+                    <img src="/web/image/mass_mailing.s_reference_default_image_3" class="img img-fluid mx-auto" alt=""/>
                 </div>
                 <div class="col-lg-3 pt16 pb16">
-                    <img src="/web/image/mass_mailing.s_reference_demo_image_4" class="img img-fluid mx-auto" alt=""/>
+                    <img src="/web/image/mass_mailing.s_reference_default_image_4" class="img img-fluid mx-auto" alt=""/>
                 </div>
             </div>
         </div>
diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml
index c1e6e9c478a..fd93b157015 100644
--- a/addons/mass_mailing/views/snippets_themes.xml
+++ b/addons/mass_mailing/views/snippets_themes.xml
@@ -44,11 +44,11 @@
             <div id="email_designer_default_headers" class="o_panel">
                 <div class="o_panel_header">Headers</div>
                 <div class="o_panel_body" id="email_designer_header_elements">
-                    <t t-snippet="mass_mailing.s_mail_block_header_social" t-thumbnail="/mass_mailing/static/src/img/blocks/block_header_social.png"/>
-                    <t t-snippet="mass_mailing.s_mail_block_header_text_social" t-thumbnail="/mass_mailing/static/src/img/blocks/block_header_text_social.png"/>
-                    <t t-snippet="mass_mailing.s_mail_block_header_logo" t-thumbnail="/mass_mailing/static/src/img/blocks/block_header_logo.png"/>
+                    <t t-snippet="mass_mailing.s_mail_block_header_social" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/block_header_social.png"/>
+                    <t t-snippet="mass_mailing.s_mail_block_header_text_social" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/block_header_text_social.png"/>
+                    <t t-snippet="mass_mailing.s_mail_block_header_logo" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/block_header_logo.png"/>
                     <t t-snippet="mass_mailing.s_cover" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/s_cover.svg"/>
-                    <t t-snippet="mass_mailing.s_mail_block_header_view" t-thumbnail="/mass_mailing/static/src/img/blocks/block_header_browser.png"/>
+                    <t t-snippet="mass_mailing.s_mail_block_header_view" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/block_header_browser.png"/>
                 </div>
             </div>
             <div id="email_designer_default_body" class="o_panel">
@@ -75,8 +75,8 @@
                     <t t-snippet="mass_mailing.s_company_team" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/s_company_team.svg"/>
                     <t t-snippet="mass_mailing.s_call_to_action" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/s_call_to_action.svg"/>
                     <t t-snippet="mass_mailing.s_references" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/s_references.svg"/>
-                    <t t-snippet="mass_mailing.s_coupon_code" t-thumbnail="/mass_mailing/static/src/img/blocks/block_discount2.png"/>
-                    <t t-snippet="mass_mailing.s_mail_block_discount1" t-thumbnail="/mass_mailing/static/src/img/blocks/block_discount1.png"/>
+                    <t t-snippet="mass_mailing.s_coupon_code" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/block_discount2.png"/>
+                    <t t-snippet="mass_mailing.s_mail_block_discount1" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/block_discount1.png"/>
                     <t t-snippet="mass_mailing.s_event" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/s_event.svg"/>
                     <t t-snippet="mass_mailing.s_product_list" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/s_product_list.svg"/>
                     <t t-snippet="mass_mailing.s_features_grid" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/s_features_grid.svg"/>
@@ -95,8 +95,8 @@
             <div id="email_designer_default_footer" class="o_panel">
                 <div class="o_panel_header">Footers</div>
                 <div class="o_panel_body" id="email_designer_footer_elements">
-                    <t t-snippet="mass_mailing.s_mail_block_footer_social" t-thumbnail="/mass_mailing/static/src/img/blocks/block_footer_social.png"/>
-                    <t t-snippet="mass_mailing.s_mail_block_footer_social_left" t-thumbnail="/mass_mailing/static/src/img/blocks/block_footer_social_left.png"/>
+                    <t t-snippet="mass_mailing.s_mail_block_footer_social" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/block_footer_social.png"/>
+                    <t t-snippet="mass_mailing.s_mail_block_footer_social_left" t-thumbnail="/mass_mailing/static/src/img/snippets_thumbs/block_footer_social_left.png"/>
                 </div>
             </div>
         </t>