diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py
index fa03cd429a1..e0a4b5aba81 100644
--- a/addons/mass_mailing/__manifest__.py
+++ b/addons/mass_mailing/__manifest__.py
@@ -61,6 +61,7 @@
         'views/snippets/s_color_blocks_2.xml',
         'views/snippets/s_company_team.xml',
         'views/snippets/s_comparisons.xml',
+        'views/snippets/s_event.xml',
         'views/snippets/s_features.xml',
         'views/snippets/s_features_grid.xml',
         'views/snippets/s_hr.xml',
@@ -118,7 +119,6 @@
             'mass_mailing/static/tests/field_html_test.js',
             'mass_mailing/static/tests/mass_mailing_favourite_filter_tests.js',
             'mass_mailing/static/src/js/mass_mailing_snippets.js',
-            'mass_mailing/static/src/snippets/s_blockquote/options.js',
             'mass_mailing/static/src/snippets/s_media_list/options.js',
             'mass_mailing/static/src/snippets/s_showcase/options.js',
             'mass_mailing/static/src/snippets/s_rating/options.js',
diff --git a/addons/mass_mailing/data/ir_attachment_data.xml b/addons/mass_mailing/data/ir_attachment_data.xml
index 9f4881820e6..97bf71c8e9b 100644
--- a/addons/mass_mailing/data/ir_attachment_data.xml
+++ b/addons/mass_mailing/data/ir_attachment_data.xml
@@ -1,192 +1,162 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
+    <data noupdate="0">
         <!-- Snippets' Default Images -->
         <record id="mass_mailing.s_cover_default_image" model="ir.attachment">
             <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>
-        </record>
-        <record id="mass_mailing.s_blockquote_cover_default_image" model="ir.attachment">
-            <field name="public" eval="True"/>
-            <field name="name">s_blockquote_cover_default_image.jpg</field>
-            <field name="type">url</field>
-            <field name="url">/mass_mailing/static/src/img/snippets_demo/s_blockquote_cover.jpg</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/data/mailing_data_templates.xml b/addons/mass_mailing/data/mailing_data_templates.xml
index d35942f293c..7bfe1074532 100644
--- a/addons/mass_mailing/data/mailing_data_templates.xml
+++ b/addons/mass_mailing/data/mailing_data_templates.xml
@@ -61,7 +61,7 @@
                     text-decoration: none;
                 }
             @media screen and (max-width: 768px) {
-                .o_mail_table_styles {
+                .o_mail_snippet_general .container {
                     width: 100% !important;
                 }
                 .s_header_social table td, .s_header_text_social table td, .s_header_logo table td,
@@ -103,7 +103,7 @@
                 </p>
                 <p>
 		    <t t-if="mailing.ab_testing_winner_selection == 'manual'">Don't forget to send your preferred version</t>
-		    <t t-elif="not mailing.ab_testing_schedule_datetime">Since the date and time for this test has not been scheduled, don't forget to manually send your preferred version.</t>	
+		    <t t-elif="not mailing.ab_testing_schedule_datetime">Since the date and time for this test has not been scheduled, don't forget to manually send your preferred version.</t>
                     <t t-else="">
                         Then on <b><t t-out="mailing.ab_testing_schedule_datetime.strftime('%b %d, %Y')"/></b> the <t t-out="mailing.mailing_type_description"/> having the <b><t t-out="ab_testing_winner_selection_description"/></b> will be sent
                     </t> to the remaining <t t-out="remaining_ab_testing_pc"/>% of recipients.
diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index 3cd4458008c..b99e4d0ec60 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -92,7 +92,7 @@
             <div class="col o_mail_no_options o_mail_wrapper_td bg-white oe_structure" style="text-align:left;width:100%;">
                 <div class="o_mail_block_header_logo" data-snippet="s_mail_block_header_logo">
                     <div class="o_mail_snippet_general" style="margin:0px auto 0px auto;background-color:rgb(255, 255, 255);max-width:600px;width:100%;">
-                        <div class="container o_mail_table_styles o_mail_h_padding" style="padding:0 20px 0 20px;width:100%;border-collapse:separate;">
+                        <div class="container o_mail_h_padding" style="padding:0 20px 0 20px;width:100%;border-collapse:separate;">
                             <div class="row">
                                 <div valign="center" width="30%" class="col text-center o_mail_v_padding pb0" style="padding:20px 0 0px 0;vertical-align:middle;text-align:center;">
                                     <a href="http://www.example.com" style="text-decoration:none;font-weight:bold;background-color:transparent;color:rgb(100, 89, 116);">
@@ -105,7 +105,7 @@
                 </div>
                 <div class="o_mail_block_footer_separator" data-snippet="s_hr" style="margin:0 20px 0 20px;">
                     <div class="o_mail_snippet_general" style="margin:0px auto 0px auto;background-color:rgb(255, 255, 255);max-width:600px;width:100%;">
-                        <div class="container o_mail_table_styles o_mail_full_width_padding" style="width:100%;border-collapse:separate;">
+                        <div class="container" style="width:100%;border-collapse:separate;">
                             <div class="row">
                                 <div valign="top" style="padding:20px 0 20px 0;text-align:left;vertical-align:top;width:100%;" class="col o_mail_v_padding o_mail_no_colorpicker">
                                     <div style="background-color:rgb(245, 245, 245);height:2px;width:100%;" class="separator"></div>
@@ -116,7 +116,7 @@
                 </div>
                 <div class="o_mail_block_text" data-snippet="s_text_block">
                     <div class="o_mail_snippet_general" style="margin:0px auto 0px auto;background-color:rgb(255, 255, 255);max-width:600px;width:100%;">
-                        <div class="container o_mail_table_styles" style="width:100%;border-collapse:separate;">
+                        <div class="container" style="width:100%;border-collapse:separate;">
                             <div class="row">
                                 <div class="col-12 o_mail_h_padding o_mail_v_padding o_mail_no_colorpicker" style="padding:20px;text-align:left;vertical-align:top;">
                                     <p style="margin:0px 0 1rem 0;font-size:14px;">
@@ -130,7 +130,7 @@
                 </div>
                 <div class="o_mail_block_footer_social o_mail_footer_social_center" data-snippet="s_mail_block_footer_social">
                     <div class="o_mail_snippet_general" style="margin:0px auto 0px auto;background-color:rgb(255, 255, 255);max-width:600px;width:100%;">
-                        <div align="center" class="o_mail_table_styles container o_mail_full_width_padding" style="border-style:solid none none none;padding:20px 0 20px 0;border-top-color:rgb(245, 245, 245);border-top-width:2px;width:100%;border-collapse:separate;">
+                        <div align="center" class="container" style="border-style:solid none none none;padding:20px 0 20px 0;border-top-color:rgb(245, 245, 245);border-top-width:2px;width:100%;border-collapse:separate;">
                             <div class="row">
                                 <div class="col o_mail_footer_links o_default_snippet_text" style="padding:10px 0 10px 0;text-align:center;vertical-align:middle;">
                                     <a href="/unsubscribe_from_list" class="btn btn-link o_default_snippet_text" style="text-decoration:none;border-radius:0.25rem;border-style:solid;padding:0px;cursor:pointer;line-height:1.5;font-size:12px;border-start-color:transparent;border-bottom-color:transparent;border-end-color:transparent;border-top-color:transparent;border-start-width:1px;border-bottom-width:1px;border-end-width:1px;border-top-width:1px;user-select:none;vertical-align:middle;white-space:nowrap;text-align:center;font-weight:bold;display:inline-block;background-color:transparent;color:rgb(100, 89, 116);">Unsubscribe</a> |
@@ -151,7 +151,7 @@
             </div>
         </div>
     </div>
-    <div align="center" class="container o_mail_table_styles o_mail_full_width_padding" style="width:100%;border-collapse:separate;">
+    <div align="center" class="container" style="width:100%;border-collapse:separate;">
         <div class="row">
             <div align="center" style="padding:16px 0 16px 0;" class="col pt16 pb16">
                 Powered by <a target="_blank" href="https://www.odoo.com" style="text-decoration:none;background-color:transparent;color:#875A7B;">Odoo</a>
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_title_text.png b/addons/mass_mailing/static/src/img/blocks/block_title_text.png
deleted file mode 100644
index 4269a461a05..00000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_title_text.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_blockquote_cover.jpg b/addons/mass_mailing/static/src/img/snippets_demo/s_blockquote_cover.jpg
deleted file mode 100644
index c54b0378064..00000000000
Binary files a/addons/mass_mailing/static/src/img/snippets_demo/s_blockquote_cover.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/snippets_thumbs/s_event.svg b/addons/mass_mailing/static/src/img/snippets_thumbs/s_event.svg
new file mode 100644
index 00000000000..6a584fd475d
--- /dev/null
+++ b/addons/mass_mailing/static/src/img/snippets_thumbs/s_event.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 82 60" style="enable-background:new 0 0 82 60;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#path-8_00000095300066650753250720000002666093597020083331_);}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#path-8_00000093149943742714831120000011055561218156940933_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;fill-opacity:0.348;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;fill-opacity:0.78;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000153707667966277653250000009137429941846899595_);}
+</style>
+<g>
+	<g>
+		
+			<linearGradient id="path-8_00000176010670027675938670000004938458339886343844_" gradientUnits="userSpaceOnUse" x1="-1176.5044" y1="56.8991" x2="-1176.5044" y2="57.9573" gradientTransform="matrix(12.2244 0 0 12.2244 14408.0605 -682.6234)">
+			<stop  offset="0" style="stop-color:#00A09D"/>
+			<stop  offset="1" style="stop-color:#00E2FF"/>
+		</linearGradient>
+		
+			<path id="path-8_00000101807681392685050550000002881477577771196326_" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#path-8_00000176010670027675938670000004938458339886343844_);" d="
+			M26.9,16.1l2.4,2.4L25,22.8l-2.4-2.4L26.9,16.1L26.9,16.1z M25.3,23.5l4.7-4.7c0.2-0.2,0.2-0.2,0.2-0.3c0-0.2,0-0.3-0.2-0.3
+			l-2.7-2.7c-0.2-0.2-0.2-0.2-0.3-0.2c-0.2,0-0.3,0-0.3,0.2l-4.7,4.7c-0.2,0.2-0.2,0.2-0.2,0.3c0,0.2,0,0.3,0.2,0.3l2.7,2.7
+			c0.2,0.2,0.2,0.2,0.3,0.2C25,23.6,25.1,23.6,25.3,23.5L25.3,23.5z M32,18.7l-6.9,6.9c-0.2,0.2-0.5,0.3-0.6,0.3
+			c-0.3,0-0.5-0.2-0.6-0.3l-1-1c0.3-0.3,0.5-0.6,0.5-1c0-0.5-0.2-0.8-0.5-1c-0.3-0.3-0.6-0.5-1-0.5c-0.5,0-0.8,0.2-1,0.5l-1-1
+			c-0.2-0.2-0.3-0.5-0.3-0.6c0-0.3,0.2-0.5,0.3-0.6l6.9-6.9c0.2-0.2,0.5-0.3,0.6-0.3c0.3,0,0.5,0.2,0.6,0.3l1,1
+			c-0.3,0.3-0.5,0.6-0.5,1c0,0.5,0.2,0.8,0.5,1c0.3,0.3,0.6,0.5,1,0.5c0.5,0,0.8-0.2,1-0.5l1,1c0.2,0.2,0.3,0.5,0.3,0.6
+			C32.4,18.2,32.2,18.5,32,18.7L32,18.7z"/>
+	</g>
+	<g>
+		
+			<linearGradient id="path-8_00000132811078807879644690000010232793767224656295_" gradientUnits="userSpaceOnUse" x1="-1174.0503" y1="56.8991" x2="-1174.0503" y2="57.9573" gradientTransform="matrix(12.2244 0 0 12.2244 14408.0605 -682.6234)">
+			<stop  offset="0" style="stop-color:#00A09D"/>
+			<stop  offset="1" style="stop-color:#00E2FF"/>
+		</linearGradient>
+		
+			<path id="path-8_00000013173299018101056130000011854440310922134964_" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#path-8_00000132811078807879644690000010232793767224656295_);" d="
+			M56.9,16.1l2.4,2.4L55,22.8l-2.4-2.4L56.9,16.1L56.9,16.1z M55.3,23.5l4.7-4.7c0.2-0.2,0.2-0.2,0.2-0.3c0-0.2,0-0.3-0.2-0.3
+			l-2.7-2.7c-0.2-0.2-0.2-0.2-0.3-0.2c-0.2,0-0.3,0-0.3,0.2l-4.7,4.7c-0.2,0.2-0.2,0.2-0.2,0.3c0,0.2,0,0.3,0.2,0.3l2.7,2.7
+			c0.2,0.2,0.2,0.2,0.3,0.2C55.1,23.6,55.3,23.6,55.3,23.5L55.3,23.5z M62,18.7l-6.9,6.9c-0.2,0.2-0.5,0.3-0.6,0.3
+			c-0.3,0-0.5-0.2-0.6-0.3l-1-1c0.3-0.3,0.5-0.6,0.5-1c0-0.5-0.2-0.8-0.5-1c-0.3-0.3-0.6-0.5-1-0.5c-0.5,0-0.8,0.2-1,0.5l-1-1
+			c-0.2-0.2-0.3-0.5-0.3-0.6c0-0.3,0.2-0.5,0.3-0.6l6.9-6.9c0.2-0.2,0.5-0.3,0.6-0.3c0.3,0,0.5,0.2,0.6,0.3l1,1
+			c-0.3,0.3-0.5,0.6-0.5,1c0,0.5,0.2,0.8,0.5,1c0.3,0.3,0.6,0.5,1,0.5c0.5,0,0.8-0.2,1-0.5l1,1c0.2,0.2,0.3,0.5,0.3,0.6
+			C62.4,18.2,62.4,18.5,62,18.7L62,18.7z"/>
+	</g>
+	<g>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-1123.9047" y1="237.1782" x2="-1122.5414" y2="237.3699" gradientTransform="matrix(8 0 0 3 9011 -665)">
+			<stop  offset="0" style="stop-color:#00A09D"/>
+			<stop  offset="1" style="stop-color:#00E2FF"/>
+		</linearGradient>
+		<rect x="19.7" y="44.8" class="st2" width="11" height="4"/>
+		<g>
+			<g>
+				<path id="path-7" class="st3" d="M29.3,40.8v1H16v-1H29.3z M34.3,36.8v1H16v-1H34.3z"/>
+			</g>
+			<g>
+				<path id="path-7_00000049188432945054382670000012999828447748560522_" class="st4" d="M29.3,40.8v1H16v-1H29.3z M34.3,36.8v1
+					H16v-1H34.3z"/>
+			</g>
+		</g>
+		<g>
+			<g>
+				<rect id="path-11_00000042727771948489652620000007994651315568149948_" x="16" y="30.8" class="st3" width="20" height="3"/>
+			</g>
+			<g>
+				<rect id="path-11_00000069378958481318337710000011278380222473405829_" x="16" y="30.8" class="st5" width="20" height="3"/>
+			</g>
+		</g>
+	</g>
+	<g>
+		
+			<linearGradient id="SVGID_00000046328548324713994340000006507111683487087778_" gradientUnits="userSpaceOnUse" x1="-1120.0671" y1="237.1759" x2="-1118.7037" y2="237.3676" gradientTransform="matrix(8 0 0 3 9011 -665)">
+			<stop  offset="0" style="stop-color:#00A09D"/>
+			<stop  offset="1" style="stop-color:#00E2FF"/>
+		</linearGradient>
+		
+			<rect x="50.5" y="44.8" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000046328548324713994340000006507111683487087778_);" width="11" height="4"/>
+		<g>
+			<g>
+				<path id="path-7_00000073694205868785683900000016232603875333593771_" class="st3" d="M59.3,40.8v1H46v-1H59.3z M64.3,36.8v1
+					H46v-1H64.3z"/>
+			</g>
+			<g>
+				<path id="path-7_00000132075829523470887660000004823225826125989510_" class="st4" d="M59.3,40.8v1H46v-1H59.3z M64.3,36.8v1
+					H46v-1H64.3z"/>
+			</g>
+		</g>
+		<g>
+			<g>
+				<rect id="path-11_00000073705521831743585720000001575955891273760656_" x="46" y="30.8" class="st3" width="20" height="3"/>
+			</g>
+			<g>
+				<rect id="path-11_00000027596513270444160320000018432938704865459642_" x="46" y="30.8" class="st5" width="20" height="3"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
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_event.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_event.jpg
deleted file mode 100755
index 91fff96b8b4..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_event.jpg 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_default_image_event_1.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_event_1.jpg
new file mode 100644
index 00000000000..17d09602354
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_event_1.jpg differ
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_event_2.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_event_2.jpg
new file mode 100644
index 00000000000..99d8e54e347
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_event_2.jpg differ
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_header_logo.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_header_logo.png
new file mode 100644
index 00000000000..553fc560f24
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_header_logo.png differ
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_default/demo/signature.png b/addons/mass_mailing/static/src/img/theme_default/signature.png
similarity index 100%
rename from addons/mass_mailing/static/src/img/theme_default/demo/signature.png
rename to addons/mass_mailing/static/src/img/theme_default/signature.png
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_default/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_empty/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_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_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_empty/s_default_image_logo.png
deleted file mode 100644
index 1f5169a218f..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_empty/s_default_image_logo.png and /dev/null differ
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_large.png b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png
index d93ecd63550..e3098c6280e 100644
Binary files a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png and b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png 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/static/src/img/theme_imgs/default_thumb_small.png b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png
index 5c85179781b..499911bc463 100644
Binary files a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png and b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png differ
diff --git a/addons/mass_mailing/static/src/js/mass_mailing_design_constants.js b/addons/mass_mailing/static/src/js/mass_mailing_design_constants.js
index b692acd0678..cf6fbe0dbf7 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing_design_constants.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing_design_constants.js
@@ -28,7 +28,7 @@ export const PRIORITY_STYLES = {
     'a:not(.btn)': [],
     'a.btn.btn-primary': [],
     'a.btn.btn-secondary': [],
-    'hr': ['border-top-color'],
+    'hr': ['border-top-width','border-top-style','border-top-color'],
 };
 export const RE_CSS_TEXT_MATCH = /([^{]+)([^}]+)/;
 export const RE_SELECTOR_ENDS_WITH_GT_STAR = />\s*\*\s*$/;
diff --git a/addons/mass_mailing/static/src/js/mass_mailing_widget.js b/addons/mass_mailing/static/src/js/mass_mailing_widget.js
index be454197d34..699796cef17 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing_widget.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing_widget.js
@@ -16,7 +16,6 @@ var MassMailingFieldHtml = FieldHtml.extend({
     jsLibs: [
         '/mass_mailing/static/src/js/mass_mailing_link_dialog_fix.js',
         '/mass_mailing/static/src/js/mass_mailing_snippets.js',
-        '/mass_mailing/static/src/snippets/s_blockquote/options.js',
         '/mass_mailing/static/src/snippets/s_masonry_block/options.js',
         '/mass_mailing/static/src/snippets/s_media_list/options.js',
         '/mass_mailing/static/src/snippets/s_showcase/options.js',
diff --git a/addons/mass_mailing/static/src/scss/themes/theme_default.scss b/addons/mass_mailing/static/src/scss/themes/theme_default.scss
index 6045ea078f3..460443c2731 100644
--- a/addons/mass_mailing/static/src/scss/themes/theme_default.scss
+++ b/addons/mass_mailing/static/src/scss/themes/theme_default.scss
@@ -137,11 +137,6 @@ div.col:not([align]) {
 
 // ===== Snippets (specific) =====
 .o_mail_block_header_social, .o_mail_block_header_text_social, .o_mail_block_header_logo {
-    .o_mail_logo_container {
-        img {
-            width: auto;
-        }
-    }
     .o_mail_header_social {
         a:not(.btn), .btn.btn-link {
             display: inline-block;
@@ -156,29 +151,6 @@ div.col:not([align]) {
     .btn-link{
         padding: 0;
     }
-
-    .o_mail_table_styles {
-        padding-top: 20px;
-        padding-bottom: 20px;
-    }
-    .o_mail_footer_social > a {
-        text-decoration: none !important;
-    }
-    .o_mail_footer_links {
-        padding-top: 10px;
-        padding-bottom: 10px;
-    }
-
-    .o_mail_footer_copy {
-        font-size: 9px;
-        color: lighten($o-mm-def-text-color, 30%);
-    }
-
-    &.o_mail_footer_social_center {
-        .o_mail_footer_social, .o_mail_footer_links, .o_mail_footer_copy {
-            text-align: center;
-        }
-    }
 }
 
 // -- Bootstrap overrides for transparent colors -- //
@@ -199,15 +171,8 @@ div.col:not([align]) {
 }
 
 // ===== Misc =====
-.o_mail_no_margin {
-    margin: 0;
 
-    &.o_mail_display_coupon {
-        line-height: 1.1;
-    }
-}
-
-.o_mail_table_styles {
+.o_mail_snippet_general .container {
     width: 100%;
     border-collapse:separate;
 }
@@ -220,3 +185,34 @@ div.col:not([align]) {
 div.col[class*="mb"], div.col[class*="mt"] {
     margin: 0!important;
 }
+
+// DEFAULT_CSS styles
+
+.o_mail_wrapper {
+    h1 {
+        font-family: Arial,Helvetica Neue,Helvetica,sans-serif;
+    }
+    h2 {
+        font-family: Arial,Helvetica Neue,Helvetica,sans-serif;
+    }
+    h3 {
+        font-family: Arial,Helvetica Neue,Helvetica,sans-serif;
+    }
+    p, p > *, li, li > * {
+        font-family: Arial,Helvetica Neue,Helvetica,sans-serif;
+    }
+    a.btn-primary, a.btn-outline-primary, a.btn-fill-primary {
+        color: #FFFFFF;
+        background-color: #35979c;
+        border-color: #35979c;
+    }
+    a.btn-secondary, a.btn-outline-secondary, a.btn-fill-secondary {
+        color: #FFFFFF;
+        background-color: #685563;
+        border-color: #685563;
+    }
+    hr {
+        border-top-color: #212529;
+        width: 100%;
+    }
+}
diff --git a/addons/mass_mailing/static/src/snippets/s_alert/000.scss b/addons/mass_mailing/static/src/snippets/s_alert/000.scss
index 7675235e36a..ffb6ecb68aa 100644
--- a/addons/mass_mailing/static/src/snippets/s_alert/000.scss
+++ b/addons/mass_mailing/static/src/snippets/s_alert/000.scss
@@ -1,23 +1,29 @@
+.o_mail_snippet_general .s_mail_alert [class^="col-lg"]{
+    padding-left: 0!important;
+    padding-right: 0!important;
+}
 
 .s_mail_alert {
-    margin: $grid-gutter-width/2 0;
-    border-width: $alert-border-width;
-    border-style: solid;
-    border-radius: $alert-border-radius;
-    p, ul, ol {
-        &:last-child {
-            margin-bottom: 0;
+    .s_alert {
+        margin: auto;
+        border-width: $alert-border-width;
+        border-style: solid;
+        border-radius: $alert-border-radius;
+        p, ul, ol {
+            &:last-child {
+                margin-bottom: 0;
+            }
         }
     }
-    &.s_alert_sm {
+    .s_alert_sm {
         padding: $grid-gutter-width/3;
         font-size: $font-size-sm;
     }
-    &.s_alert_md {
+    .s_alert_md {
         padding: $grid-gutter-width/2;
         font-size: $font-size-base;
     }
-    &.s_alert_lg {
+    .s_alert_lg {
         padding: $grid-gutter-width;
         font-size: $font-size-lg;
     }
diff --git a/addons/mass_mailing/static/src/snippets/s_blockquote/options.js b/addons/mass_mailing/static/src/snippets/s_blockquote/options.js
deleted file mode 100644
index 34bfe54a0f2..00000000000
--- a/addons/mass_mailing/static/src/snippets/s_blockquote/options.js
+++ /dev/null
@@ -1,45 +0,0 @@
-odoo.define('mass_mailing.s_blockquote_options', function (require) {
-'use strict';
-
-const options = require('web_editor.snippets.options');
-
-options.registry.Blockquote = options.Class.extend({
-
-    //--------------------------------------------------------------------------
-    // Options
-    //--------------------------------------------------------------------------
-
-    /**
-     * Change blockquote design.
-     *
-     * @see this.selectClass for parameters
-     */
-    display: function (previewMode, widgetValue, params) {
-
-        // Classic
-        this.$target.find('.s_blockquote_avatar').toggleClass('d-none', widgetValue !== 'classic');
-
-        // Cover
-        const $blockquote = this.$target.find('.s_blockquote_content');
-        if (widgetValue === 'cover') {
-            $blockquote.css({"background-image": "url('/web/image/mass_mailing.s_blockquote_cover_default_image')"});
-            $blockquote.addClass('oe_img_bg o_bg_img_center');
-            if (!$blockquote.find('.o_we_bg_filter').length) {
-                const bgFilterEl = document.createElement('div');
-                bgFilterEl.classList.add('o_we_bg_filter', 'bg-white-50');
-                $blockquote.prepend(bgFilterEl);
-            }
-        } else {
-            $blockquote.css({"background-image": ""});
-            $blockquote.css({"background-position": ""});
-            $blockquote.removeClass('oe_img_bg o_bg_img_center');
-            $blockquote.find('.o_we_bg_filter').remove();
-            $blockquote.find('.s_blockquote_filter').contents().unwrap(); // Compatibility
-        }
-
-        // Minimalist
-        this.$target.find('.s_blockquote_icon').toggleClass('d-none', widgetValue === 'minimalist');
-        this.$target.find('footer').toggleClass('d-none', widgetValue === 'minimalist');
-    },
-});
-});
diff --git a/addons/mass_mailing/static/src/snippets/s_rating/001.scss b/addons/mass_mailing/static/src/snippets/s_rating/001.scss
index a1fc87c0996..1ffc89be84d 100644
--- a/addons/mass_mailing/static/src/snippets/s_rating/001.scss
+++ b/addons/mass_mailing/static/src/snippets/s_rating/001.scss
@@ -1,3 +1,7 @@
+.o_mail_snippet_general .s_rating{
+    padding-left: 0!important;
+    padding-right: 0!important;
+}
 
 .s_rating[data-vcss="001"] {
     &.s_rating_inline {
diff --git a/addons/mass_mailing/views/snippets/s_alert.xml b/addons/mass_mailing/views/snippets/s_alert.xml
index 22e2554baa4..bc283760ae4 100644
--- a/addons/mass_mailing/views/snippets/s_alert.xml
+++ b/addons/mass_mailing/views/snippets/s_alert.xml
@@ -1,43 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 <template id="s_alert" name="Alert">
-    <div class="s_mail_alert s_alert_md alert-info w-100 clearfix o_mail_snippet_general pt16 pb16 px-3" data-snippet="s_alert">
-        <div class="s_alert_icon" valign="top">
-            <i class="fa fa-2x fa-info-circle"/>
-        </div>
-        <div class="s_alert_content">
-            <p><b>Explain the benefits you offer</b>
-            <br/>Don't write about products or services here, write about solutions.</p>
+    <div class="s_mail_alert o_mail_snippet_general pt16 pb16 mx-auto">
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-12">
+                    <div class="s_alert s_alert_md s_alert_info w-100" style="background-color: rgb(209 236 241); border-width: 1px !important; border-color: rgb(190 229 235) !important;">
+                        <div class="s_alert_icon" valign="top">
+                            <i class="fa fa-2x fa-info-circle" style="color: rgb(12 84 96);"/>
+                        </div>
+                        <div class="s_alert_content">
+                            <h3><span style="color: rgb(12 84 96); font-size: 16px; font-weight: bolder;">Explain the benefits you offer</span></h3>
+                            <p><font style="color: rgb(12 84 96);">Don't write about products or services here, write about solutions.</font></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </template>
 
 <template id="s_alert_options" inherit_id="mass_mailing.snippet_options">
-    <xpath expr="//div[@id='so_width']" position="before">
-        <div data-selector=".s_mail_alert" data-js="Alert">
-            <we-select string="Type" data-apply-to=".fa.s_alert_icon" data-trigger="alert_colorpicker_opt">
-                <we-button data-select-class="fa-user-circle" data-trigger-value="primary">Primary</we-button>
-                <we-button data-select-class="fa-user-circle-o" data-trigger-value="secondary">Secondary</we-button>
-                <we-button data-select-class="fa-info-circle" data-trigger-value="info">Info</we-button>
-                <we-button data-select-class="fa-check-circle" data-trigger-value="success">Success</we-button>
-                <we-button data-select-class="fa-exclamation-triangle" data-trigger-value="warning">Warning</we-button>
-                <we-button data-select-class="fa-exclamation-circle" data-trigger-value="danger">Danger</we-button>
-            </we-select>
-        </div>
-    </xpath>
     <!-- Keep those options in separate xpath for options order -->
     <xpath expr="//div[@id='so_width']" position="after">
-        <div data-selector=".s_mail_alert">
+        <div data-selector=".s_mail_alert .s_alert">
             <we-select string="Size">
                 <we-button data-select-class="s_alert_sm">Small</we-button>
                 <we-button data-select-class="s_alert_md">Medium</we-button>
                 <we-button data-select-class="s_alert_lg">Large</we-button>
             </we-select>
-            <we-colorpicker string="Color" data-name="alert_colorpicker_opt"
+            <we-colorpicker string="Background Color" data-name="alert_colorpicker_opt"
                 data-select-style="true"
                 data-css-property="background-color"
                 data-color-prefix="alert-"/>
         </div>
+        <div data-selector=".s_mail_alert .s_alert">
+            <t t-call="mass_mailing.snippet_options_border_widgets">
+                <t t-set="so_rounded_no_dependencies" t-value="True"/>
+            </t>
+        </div>
     </xpath>
 </template>
 
diff --git a/addons/mass_mailing/views/snippets/s_blockquote.xml b/addons/mass_mailing/views/snippets/s_blockquote.xml
index 33b72eb0755..f5763fcb133 100644
--- a/addons/mass_mailing/views/snippets/s_blockquote.xml
+++ b/addons/mass_mailing/views/snippets/s_blockquote.xml
@@ -2,23 +2,23 @@
 <odoo>
 
 <template id="s_blockquote" name="Blockquote">
-    <div class="s_mail_blockquote o_cc o_cc2 pt16 pb16 o_mail_snippet_general s_blockquote_classic blockquote mb-0" data-snippet="s_blockquote">
+    <div class="s_mail_blockquote blockquote o_mail_snippet_general o_cc o_cc2 pt16 pb16 mb-0 w-100">
         <div class="container">
             <div class="row">
-                <div class="col-lg-1 d-flex align-items-start o_mail_no_resize" valign="top" align="right">
-                    <i class="s_blockquote_icon fa fa-1x fa-quote-left"/>
+                <div class="col-lg-1 pb80" style="text-align: right;">
+                    <i class="fa fa-quote-left"/>
                 </div>
-                <div class="col-lg-10 px-0">
-                    <div class="s_blockquote_content">
+                <div class="col-lg-10">
+                    <div>
                         <p><i>Write a quote here from one of your customers. Quotes are a great way to build confidence in your products or services.</i></p>
                         <div>
                             <img src="/mass_mailing/static/src/img/theme_default/team_member_2-circle.png" style="width: 40px" class="img me-2" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.jpg" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_2-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
-                            <span style="font-weight: bolder; font-size: 14px;">John DOE</span><span style="font-size: 14px;"> &#8226; CEO of MyCompany</span>
+                            <p style="font-weight: bolder; font-size: 14px;"><b>John DOE</b> &#8226; CEO of MyCompany</p>
                         </div>
                     </div>
                 </div>
-                <div class="col-lg-1 d-flex align-items-end o_mail_no_resize" valign="bottom" align="left">
-                    <i class="s_blockquote_icon fa fa-1x fa-quote-right"/>
+                <div class="col-lg-1 pt80" style="text-align: left;">
+                    <i class="fa fa-quote-right"/>
                 </div>
             </div>
         </div>
diff --git a/addons/mass_mailing/views/snippets/s_call_to_action.xml b/addons/mass_mailing/views/snippets/s_call_to_action.xml
index 04a645cab27..2b089107fb0 100644
--- a/addons/mass_mailing/views/snippets/s_call_to_action.xml
+++ b/addons/mass_mailing/views/snippets/s_call_to_action.xml
@@ -2,15 +2,15 @@
 <odoo>
 
 <template id="s_call_to_action" name="Call to Action">
-    <div class="s_call_to_action o_cc o_cc3 pt48 pb24 o_mail_snippet_general" data-snippet="s_call_to_action">
+    <div class="s_call_to_action o_mail_snippet_general o_cc o_cc3 pt48 pb24">
         <div class="container">
             <div class="row">
-                <div class="col-lg-9 pb16">
-                    <h3><b>50,000+ companies</b> run Odoo.</h3>
+                <div class="col-lg-9">
+                    <h3><span style="font-weight: bolder;">50,000+ companies</span> run Odoo.</h3>
                     <p>Join us and make your company a better place.</p>
                 </div>
-                <div class="col-lg-3 pt8">
-                    <a href="#" class="btn btn-primary btn-lg btn-block">Contact us</a>
+                <div class="col-lg-3" style="text-align: center;">
+                    <a href="#" class="btn btn-primary btn-lg">Contact us</a>
                 </div>
             </div>
         </div>
diff --git a/addons/mass_mailing/views/snippets/s_color_blocks_2.xml b/addons/mass_mailing/views/snippets/s_color_blocks_2.xml
index 526a7788893..4cf8a2b1ef2 100644
--- a/addons/mass_mailing/views/snippets/s_color_blocks_2.xml
+++ b/addons/mass_mailing/views/snippets/s_color_blocks_2.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <template id="s_color_blocks_2" name="Big Boxes">
-        <div class="s_mail_color_blocks_2 o_mail_snippet_general" data-snippet="s_color_blocks_2">
+        <div class="s_mail_color_blocks_2 o_mail_snippet_general">
             <div class="container">
                 <div class="row">
-                    <div class="col-lg-6 o_cc o_cc3 text-center pt32 pb32">
-                        <i class="fa fa-shield fa-5x m-3"/>
-                        <h2>A color block</h2>
-                        <p>Color blocks are a simple and effective way to <b>present and highlight your content</b>. Choose an image or a color for the background. You can even resize and duplicate the blocks to create your own layout. Add images or icons to customize the blocks.</p>
-                        <a href="#" class="btn btn-primary">More Details</a>
+                    <div class="col-lg-6 o_cc o_cc3 pt32 pb32">
+                        <i class="fa fa-shield fa-5x m-3 mx-auto d-block"/>
+                        <h2 style="text-align: center;">A color block</h2>
+                        <p style="text-align: center;">Color blocks are a simple and effective way to <b>present and highlight your content</b>. Choose an image or a color for the background. You can even resize and duplicate the blocks to create your own layout. Add images or icons to customize the blocks.</p>
+                        <p style="text-align: center;"><a href="#" class="btn btn-primary">More Details</a></p>
                     </div>
-                    <div class="col-lg-6 o_cc o_cc5 text-center pt32 pb32">
-                        <i class="fa fa-cube fa-5x m-3"/>
-                        <h2>Another color block</h2>
-                        <p>Color blocks are a simple and effective way to <b>present and highlight your content</b>. Choose an image or a color for the background. You can even resize and duplicate the blocks to create your own layout. Add images or icons to customize the blocks.</p>
-                        <a href="#" class="btn btn-primary">More Details</a>
+                    <div class="col-lg-6 o_cc o_cc5 pt32 pb32">
+                        <i class="fa fa-cube fa-5x m-3 mx-auto d-block"/>
+                        <h2 style="text-align: center;">Another color block</h2>
+                        <p style="text-align: center;">Color blocks are a simple and effective way to <b>present and highlight your content</b>. Choose an image or a color for the background. You can even resize and duplicate the blocks to create your own layout. Add images or icons to customize the blocks.</p>
+                        <p style="text-align: center;"><a href="#" class="btn btn-primary">More Details</a></p>
                     </div>
                 </div>
             </div>
diff --git a/addons/mass_mailing/views/snippets/s_company_team.xml b/addons/mass_mailing/views/snippets/s_company_team.xml
index 6d0fe004f4d..178bffbe714 100644
--- a/addons/mass_mailing/views/snippets/s_company_team.xml
+++ b/addons/mass_mailing/views/snippets/s_company_team.xml
@@ -2,9 +2,9 @@
 <odoo>
 
 <template id="s_company_team" name="Team">
-    <div class="s_company_team pt48 pb48 o_mail_snippet_general" data-snippet="s_company_team">
+    <div class="s_company_team o_mail_snippet_general">
         <div class="container">
-            <div class="row s_nb_column_fixed">
+            <div class="row">
                 <div class="col-lg-6 pt24 pb24">
                     <div class="container">
                         <div class="row">
@@ -12,12 +12,8 @@
                                 <img src="/web/image/mass_mailing.s_company_team_default_image_1" class="img-fluid mx-auto" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_1.png" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_1-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             </div>
                             <div class="col-lg-9">
-                                <h4>Tony Fred, CEO</h4>
-                                <p>
-                                    Founder and chief visionary, Tony is the driving force behind the company. He loves
-                                    to keep his hands full by participating in the development of the software,
-                                    marketing, and customer experience strategies.
-                                </p>
+                                <h3>Tony Fred, CEO</h3>
+                                <p>Founder and chief visionary, Tony is the driving force behind the company. He lovesto keep his hands full by participating in the development of the software, marketing, and customer experience strategies.</p>
                             </div>
                         </div>
                     </div>
@@ -29,14 +25,12 @@
                                 <img src="/web/image/mass_mailing.s_company_team_default_image_2" class="img-fluid mx-auto" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.png" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_2-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             </div>
                             <div class="col-lg-9">
-                                <h4>Mich Stark, COO</h4>
+                                <h3>Mich Stark, COO</h3>
                                 <p>Mich loves taking on challenges. With his multi-year experience as Commercial Director in the software industry, Mich has helped the company to get where it is today. Mich is among the best minds.</p>
                             </div>
                         </div>
                     </div>
                 </div>
-            </div>
-            <div class="row s_nb_column_fixed">
                 <div class="col-lg-6 pt24 pb24">
                     <div class="container">
                         <div class="row">
@@ -44,7 +38,7 @@
                                 <img src="/web/image/mass_mailing.s_company_team_default_image_3" class="img-fluid mx-auto" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_3.png" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_3-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             </div>
                             <div class="col-lg-9">
-                                <h4>Aline Turner, CTO</h4>
+                                <h3>Aline Turner, CTO</h3>
                                 <p>Aline is one of the iconic people in life who can say they love what they do. She mentors 100+ in-house developers and looks after the community of thousands of developers.</p>
                             </div>
                         </div>
@@ -57,7 +51,7 @@
                                 <img src="/web/image/mass_mailing.s_company_team_default_image_4" class="img-fluid mx-auto" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_4.png" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_4-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             </div>
                             <div class="col-lg-9">
-                                <h4>Iris Joe, CFO</h4>
+                                <h3>Iris Joe, CFO</h3>
                                 <p>Iris, with her international experience, helps us easily understand the numbers and improves them. She is determined to drive success and delivers her professional acumen to bring the company to the next level.</p>
                             </div>
                         </div>
diff --git a/addons/mass_mailing/views/snippets/s_comparisons.xml b/addons/mass_mailing/views/snippets/s_comparisons.xml
index aefd96c34d9..292aae1ebad 100644
--- a/addons/mass_mailing/views/snippets/s_comparisons.xml
+++ b/addons/mass_mailing/views/snippets/s_comparisons.xml
@@ -2,54 +2,56 @@
 <odoo>
 
 <template id="s_comparisons" name="Comparisons">
-    <div class="s_comparisons pt32 pb32 o_mail_snippet_general" data-snippet="s_comparisons">
+    <div class="s_comparisons o_mail_snippet_general pt32 pb32">
         <div class="container">
             <div class="row">
-                <div class="s_col_no_bgcolor text-center pt32 pb16 col-lg-6">
+                <div class="col-lg-6 s_col_no_bgcolor pt32 pb16">
                     <div class="card o_cc o_cc2">
-                        <div class="card-header"><span class="o_default_snippet_text" style="font-size:18px; font-weight: 500;">DEFAULT</span></div>
-                        <div class="card-body text-center">
-                            <h2 class="card-title o_mail_display_coupon text-center o_default_snippet_text">$8</h2>
-                            <small class="o_default_snippet_text">user / month (billed annually)</small>
-
+                        <div class="card-header"><h2 style="text-align: center;"><span style="font-weight: bolder;">DEFAULT</span></h2></div>
+                        <div class="bg-white pt24 pb24">
+                            <ul class="list-group list-group-flush">
+                                <li class="list-group-item">
+                                    <h3 class="card-title" style="text-align: center;">$8</h3>
+                                    <p class="card-title" style="text-align: center;"><span style="font-size: 11px">user / month (billed annually)</span></p>
+                                </li>
+                                <li class="list-group-item"><p style="text-align: center;">Basic features</p></li>
+                                <li class="list-group-item"><p style="text-align: center;">Basic management</p></li>
+                                <li class="list-group-item"><p style="text-align: center;">No customization</p></li>
+                                <li class="list-group-item"><p style="text-align: center;">No support</p></li>
+                            </ul>
                         </div>
-                        <ul class="list-group list-group-flush">
-                            <li class="list-group-item o_default_snippet_text">Basic features</li>
-                            <li class="list-group-item o_default_snippet_text">Basic management</li>
-                            <li class="list-group-item o_default_snippet_text">No customization</li>
-                            <li class="list-group-item o_default_snippet_text">No support</li>
-                        </ul>
-                        <div class="card-footer">
-                            <a href="#" class="btn btn-block btn-primary o_default_snippet_text">More</a>
+                        <div class="card-footer" style="text-align: center;">
+                            <a href="#" class="btn btn-primary">More</a>
                         </div>
                     </div>
                 </div>
-                <div class="s_col_no_bgcolor text-center pt32 pb16 col-lg-6">
+                <div class="col-lg-6 s_col_no_bgcolor pt32 pb16">
                     <div class="card o_cc o_cc3">
-                        <div class="card-header"><span class="o_default_snippet_text" style="font-size:18px; font-weight: 500;">PRO</span></div>
-                        <div class="card-body text-center">
-                            <h2 class="card-title o_mail_display_coupon text-center o_default_snippet_text">$18</h2>
-                            <small class="o_default_snippet_text">user / month (billed annually)</small>
-
+                        <div class="card-header"><h2 style="text-align: center;"><span style="font-weight: bolder;">PRO</span></h2></div>
+                        <div class="bg-white pt24 pb24">
+                            <ul class="list-group list-group-flush">
+                                <li class="list-group-item">
+                                    <h3 class="card-title" style="text-align: center;">$18</h3>
+                                    <p class="card-title" style="text-align: center;"><span style="font-size: 11px">user / month (billed annually)</span></p>
+                                </li>
+                                <li class="list-group-item">
+                                    <p style="text-align: center;"><span style="font-weight:bolder">Advanced</span>
+                                    features</p>
+                                </li>
+                                <li class="list-group-item">
+                                    <p style="text-align: center;"><span style="font-weight:bolder">Total</span>
+                                    management</p>
+                                </li>
+                                <li class="list-group-item">
+                                    <p style="text-align: center;"><span style="font-weight:bolder">Fully customizable</span></p>
+                                </li>
+                                <li class="list-group-item">
+                                    <p style="text-align: center;"><span style="font-weight:bolder">24/7 Support</span></p>
+                                </li>
+                            </ul>
                         </div>
-                        <ul class="list-group list-group-flush">
-                            <li class="list-group-item o_default_snippet_text">
-                                <strong class="o_default_snippet_text">Advanced</strong>
-                                features
-                            </li>
-                            <li class="list-group-item o_default_snippet_text">
-                                <strong class="o_default_snippet_text">Total</strong>
-                                management
-                            </li>
-                            <li class="list-group-item">
-                                <strong class="o_default_snippet_text">Fully customizable</strong>
-                            </li>
-                            <li class="list-group-item">
-                                <strong class="o_default_snippet_text">24/7 Support</strong>
-                            </li>
-                        </ul>
-                        <div class="card-footer">
-                            <a href="#" class="btn btn-block btn-primary o_default_snippet_text">More</a>
+                        <div class="card-footer" style="text-align: center;">
+                            <a href="#" class="btn btn-primary">More</a>
                         </div>
                     </div>
                 </div>
@@ -58,4 +60,4 @@
     </div>
 </template>
 
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/addons/mass_mailing/views/snippets/s_coupon_code.xml b/addons/mass_mailing/views/snippets/s_coupon_code.xml
index 3be721ba6f8..1d1663717ea 100644
--- a/addons/mass_mailing/views/snippets/s_coupon_code.xml
+++ b/addons/mass_mailing/views/snippets/s_coupon_code.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <template id="s_coupon_code" name="Promo Code">
-        <div class="o_mail_snippet_general o_mail_block_discount2 s_discount2 px-3 pt32 pb32">
-            <h2 class="text-center"><b>GET $20 OFF</b></h2>
-            <p class="text-center">
+        <div class="s_discount2 o_mail_block_discount2 o_mail_snippet_general pt32 pb32" style="padding-left: 15px; padding-right: 15px;">
+            <h2 style="text-align: center;"><span style="font-weight: bolder;">GET $20 OFF</span></h2>
+            <p style="text-align: center;">
                 Here's your coupon code - but hurry! Ends 9/28
             </p>
             <table border="0" cellpadding="0" cellspacing="0" align="center" class="border" style="border-collapse:collapse; mso-table-lspace:0pt; mso-table-rspace:0pt;">
                 <tr>
-                    <td width="50" height="50" align="center" class="o_mail_no_resize bg-300 text-center" style="width:50px!important; min-width: 50px; max-width:5.6rem;"><i class="fa fa-2x fa-ticket"></i></td>
-                    <td width="200" height="50" align="center" class="text-center" style="font-size: 15px; line-height: 22px; font-weight: 700; min-width: 150px; width: 200px;">ENDOFSUMMER20</td>
+                    <td width="50" height="50" align="center" class="o_mail_no_resize mx-auto o_cc o_cc3" style="width:50px!important; min-width: 50px; max-width:5.6rem; text-align: center;"><i class="fa fa-2x fa-ticket"></i></td>
+                    <td width="200" height="50" align="center" class="o_cc" style="font-size: 15px; line-height: 22px; font-weight: 700; min-width: 150px; width: 200px; text-align: center;"><p class="mb0">ENDOFSUMMER20</p></td>
                 </tr>
             </table>
-            <div class="text-center pt24">
+            <br/>
+            <p style="text-align:center;">
                 <a role="button" href="#" class="btn btn-primary">Use now</a>
-            </div>
+            </p>
         </div>
     </template>
 </odoo>
diff --git a/addons/mass_mailing/views/snippets/s_cover.xml b/addons/mass_mailing/views/snippets/s_cover.xml
index 8c5ad7651d8..9678f84c72e 100644
--- a/addons/mass_mailing/views/snippets/s_cover.xml
+++ b/addons/mass_mailing/views/snippets/s_cover.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <template id="s_cover" name="Cover">
-        <div class="s_cover o_mail_snippet_general" data-snippet="s_cover">
+        <div class="s_cover o_mail_snippet_general">
             <div class="container">
                 <div class="row">
                     <div class="col-lg-12 oe_img_bg  pt56 pb48" style="background-image: url('/web/image/mass_mailing.s_cover_default_image');">
diff --git a/addons/mass_mailing/views/snippets/s_event.xml b/addons/mass_mailing/views/snippets/s_event.xml
new file mode 100644
index 00000000000..247bf175baf
--- /dev/null
+++ b/addons/mass_mailing/views/snippets/s_event.xml
@@ -0,0 +1,43 @@
+<odoo>
+
+    <template id="s_event" name="Event">
+        <div class="s_mail_block_event o_mail_snippet_general bg-100">
+            <div class="container">
+                <div class="row align-items-center">
+                    <div class="s_col_no_bgcolor col-lg-6 pt32 pb32">
+                        <div class="card bg-white h-100 rounded" style="border-radius: 5px !important; border-color: rgb(233, 236, 239) !important;">
+                            <img class="card-img-top" src="/web/image/mass_mailing.s_event_default_image_1" alt=""/>
+                            <div class="card-body">
+                                <h3 class="card-title">
+                                    <font style="font-size: 18px;">Event One</font>
+                                </h3>
+                                <p><font class="text-o-color-1">25 September 2022 - 4:30 PM</font></p>
+                                <p>London, United Kingdom</p>
+                                <p>
+                                    <a href="#" target="_blank" class="btn btn-primary">Register Now</a>
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="s_col_no_bgcolor col-lg-6 pt32 pb32">
+                        <div class="card bg-white h-100 rounded" style="border-radius: 5px !important; border-color: rgb(233, 236, 239) !important;">
+                            <img class="card-img-top" src="/web/image/mass_mailing.s_event_default_image_2" alt=""/>
+                            <div class="card-body">
+                                <h3 class="card-title">
+                                    <font style="font-size: 18px">Event Two</font>
+                                </h3>
+                                <p><font class="text-o-color-1">26 September 2022 - 1:30 PM</font></p>
+                                <p>London, United Kingdom</p>
+                                <p>
+                                    <a href="#" target="_blank" class="btn btn-primary">Register Now</a>
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </template>
+
+</odoo>
diff --git a/addons/mass_mailing/views/snippets/s_features.xml b/addons/mass_mailing/views/snippets/s_features.xml
index bf1e90cbc00..67127025425 100644
--- a/addons/mass_mailing/views/snippets/s_features.xml
+++ b/addons/mass_mailing/views/snippets/s_features.xml
@@ -2,23 +2,29 @@
 <odoo>
 
 <template id="s_features" name="Features">
-    <div class="s_features pt32 pb32 o_mail_snippet_general" data-snippet="s_features">
+    <div class="s_features o_mail_snippet_general">
         <div class="container">
             <div class="row">
-                <div class="col-lg-4 text-center">
-                    <i class="fa fa-3x fa-gear bg-primary m-3" style="padding: 10px; border-radius: 3px !important;"></i>
+                <div class="col-lg-4 o_cc pt16 pb16" style="text-align: center;">
+                    <i class="fa fa-3x fa-gear bg-primary" style="padding: 10px; border-radius: 3px !important;"></i>
+                    <br/>
+                    <br/>
                     <h3>First Feature</h3>
-                    <p>Tell what's the value for the <br/>customer for this feature.</p>
+                    <p>Tell what's the value for the customer for this feature.</p>
                 </div>
-                <div class="col-lg-4 text-center">
-                    <i class="fa fa-3x fa-photo bg-o-color-5 m-3" style="padding: 10px; border-radius: 3px !important;"></i>
+                <div class="col-lg-4 o_cc pt16 pb16" style="text-align: center;">
+                    <i class="fa fa-3x fa-photo bg-o-color-5" style="padding: 10px; border-radius: 3px !important;"></i>
+                    <br/>
+                    <br/>
                     <h3>Second Feature</h3>
-                    <p>Write what the customer would like to know, <br/>not what you want to show.</p>
+                    <p>Write what the customer would like to know, not what you want to show.</p>
                 </div>
-                <div class="col-lg-4 text-center">
-                    <i class="fa fa-3x fa-leaf bg-secondary m-3" style="padding: 10px; border-radius: 3px !important;"></i>
+                <div class="col-lg-4 o_cc pt16 pb16" style="text-align: center;">
+                    <i class="fa fa-3x fa-leaf bg-secondary" style="padding: 10px; border-radius: 3px !important;"></i>
+                    <br/>
+                    <br/>
                     <h3>Third Feature</h3>
-                    <p>A small explanation of this great <br/>feature, in clear words.</p>
+                    <p>A small explanation of this great feature, in clear words.</p>
                 </div>
             </div>
         </div>
diff --git a/addons/mass_mailing/views/snippets/s_features_grid.xml b/addons/mass_mailing/views/snippets/s_features_grid.xml
index d26bdd49225..9b478dec294 100644
--- a/addons/mass_mailing/views/snippets/s_features_grid.xml
+++ b/addons/mass_mailing/views/snippets/s_features_grid.xml
@@ -2,78 +2,78 @@
 <odoo>
 
 <template id="s_features_grid" name="Features Grid">
-    <div class="s_mail_features_grid pt48 pb24 o_mail_snippet_general" data-snippet="s_features_grid">
+    <div class="s_mail_features_grid o_mail_snippet_general pt48 pb24">
         <div class="container">
             <div class="row">
-                <div class="col-lg-6 s_col_no_bgcolor pb24">
+                <div class="col-lg-6 o_cc">
                     <div class="container">
                         <div class="row g-0">
                             <div class="col-lg-12 pb24">
                                 <h2>First list of Features</h2>
-                                <h5>Add a great slogan.</h5>
+                                <p>Add a great slogan.</p>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-2 px-0 text-center s_mail_features_grid_icon">
+                            <div class="col-lg-2 px-0" style="text-align: center;">
                                 <i class="fa fa-2x fa-font-awesome bg-primary" style="padding: 10px; border-radius: 50px !important;"></i>
                             </div>
-                            <div class="col-lg-10 s_mail_features_grid_content pb16">
-                                <h4>Change Icons</h4>
+                            <div class="col-lg-10 pb16">
+                                <h3>Change Icons</h3>
                                 <p>Double click an icon to replace it with one of your choice.</p>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-2 px-0 text-center s_mail_features_grid_icon">
+                            <div class="col-lg-2 px-0" style="text-align: center;">
                                 <i class="fa fa-2x fa-files-o bg-primary" style="padding: 10px; border-radius: 50px !important;"></i>
                             </div>
-                            <div class="col-lg-10 s_mail_features_grid_content pb16">
-                                <h4>Duplicate</h4>
+                            <div class="col-lg-10 pb16">
+                                <h3>Duplicate</h3>
                                 <p>Duplicate blocks and columns to add more features.</p>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-2 px-0 text-center s_mail_features_grid_icon">
+                            <div class="col-lg-2 px-0" style="text-align: center;">
                                 <i class="fa fa-2x fa-trash bg-primary" style="padding: 10px; border-radius: 50px !important;"></i>
                             </div>
-                            <div class="col-lg-10 s_mail_features_grid_content pb16">
-                                <h4>Delete Blocks</h4>
+                            <div class="col-lg-10 pb16">
+                                <h3>Delete Blocks</h3>
                                 <p>Select and delete blocks to remove features.</p>
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="col-lg-6 s_col_no_bgcolor pb24">
+                <div class="col-lg-6 o_cc">
                     <div class="container">
                         <div class="row g-0">
                             <div class="col-lg-12 pb24">
                                 <h2>Second list of Features</h2>
-                                <h5>Add a great slogan.</h5>
+                                <p>Add a great slogan.</p>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-2 px-0 text-center s_mail_features_grid_icon">
+                            <div class="col-lg-2 px-0" style="text-align: center;">
                                 <i class="fa fa-2x fa-magic bg-secondary" style="padding: 10px; border-radius: 3px !important;"></i>
                             </div>
-                            <div class="col-lg-10 s_mail_features_grid_content pb16">
-                                <h4>Great Value</h4>
+                            <div class="col-lg-10 pb16">
+                                <h3>Great Value</h3>
                                 <p>Turn every feature into a benefit for your reader.</p>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-2 px-0 text-center s_mail_features_grid_icon">
+                            <div class="col-lg-2 px-0" style="text-align: center;">
                                 <i class="fa fa-2x fa-eyedropper bg-secondary" style="padding: 10px; border-radius: 3px !important;"></i>
                             </div>
-                            <div class="col-lg-10 s_mail_features_grid_content pb16">
-                                <h4>Edit Styles</h4>
+                            <div class="col-lg-10 pb16">
+                                <h3>Edit Styles</h3>
                                 <p>You can edit colors and backgrounds to highlight features.</p>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-2 px-0 text-center s_mail_features_grid_icon">
+                            <div class="col-lg-2 px-0" style="text-align: center;">
                                 <i class="fa fa-2x fa-picture-o bg-secondary" style="padding: 10px; border-radius: 3px !important;"></i>
                             </div>
-                            <div class="col-lg-10 s_mail_features_grid_content pb16">
-                                <h4>Sample Icons</h4>
+                            <div class="col-lg-10 pb16">
+                                <h3>Sample Icons</h3>
                                 <p>All these icons are completely free for commercial use.</p>
                             </div>
                         </div>
diff --git a/addons/mass_mailing/views/snippets/s_image_text.xml b/addons/mass_mailing/views/snippets/s_image_text.xml
index d43f14b8c90..2a0c3093eac 100644
--- a/addons/mass_mailing/views/snippets/s_image_text.xml
+++ b/addons/mass_mailing/views/snippets/s_image_text.xml
@@ -2,16 +2,16 @@
 <odoo>
 
 <template id="s_image_text" name="Image - Text">
-    <div class="s_text_image pt32 pb32 o_mail_snippet_general" data-snippet="s_image_text">
+    <div class="s_text_image o_mail_snippet_general pt32 pb32">
         <div class="container">
             <div class="row align-items-center">
-                <div class="col-lg-6 px-0">
+                <div class="col-lg-6 o_cc px-0">
                     <img src="/web/image/mass_mailing.s_image_text_default_image" class="img w-100" />
                 </div>
-                <div class="col-lg-6 pt16 pb16">
+                <div class="col-lg-6 o_cc pt16 pb16">
                     <h3>Omnichannel sales</h3>
-                    <p class="text-justify">Get your inside sales (CRM) fully integrated with online sales (eCommerce), in-store sales (Point of Sale) and marketplaces like eBay and Amazon.</p>
-                    <div class="text-start">
+                    <p style="text-align: justify;">Get your inside sales (CRM) fully integrated with online sales (eCommerce), in-store sales (Point of Sale) and marketplaces like eBay and Amazon.</p>
+                    <div style="text-align: left;">
                         <a href="#" class="btn btn-link">Read More</a>
                     </div>
                 </div>
diff --git a/addons/mass_mailing/views/snippets/s_masonry_block.xml b/addons/mass_mailing/views/snippets/s_masonry_block.xml
index 9f1a7fdda47..574d8e9e3d4 100644
--- a/addons/mass_mailing/views/snippets/s_masonry_block.xml
+++ b/addons/mass_mailing/views/snippets/s_masonry_block.xml
@@ -3,7 +3,7 @@
 
 <!-- Template -->
 <template id="s_masonry_block" name="Masonry">
-    <div class="s_masonry_block o_mail_snippet_general" data-vcss="001" data-snippet="s_masonry_block">
+    <div class="s_masonry_block o_mail_snippet_general" data-vcss="001">
         <div class="container text-white">
             <t t-call="mass_mailing.s_masonry_block_default_template"/>
         </div>
diff --git a/addons/mass_mailing/views/snippets/s_media_list.xml b/addons/mass_mailing/views/snippets/s_media_list.xml
index 0403d088129..32c3ba7f0d8 100644
--- a/addons/mass_mailing/views/snippets/s_media_list.xml
+++ b/addons/mass_mailing/views/snippets/s_media_list.xml
@@ -2,24 +2,24 @@
 <odoo>
 
 <template id="s_media_list" name="Media List">
-    <div class="s_media_list pt32 pb32 o_cc o_cc2 o_mail_snippet_general" data-vcss="001" data-snippet="s_media_list">
+    <div class="s_media_list o_mail_snippet_general pt8 pb8 o_cc o_cc2" data-vcss="001">
         <div class="container">
-            <div class="row s_nb_column_fixed s_col_no_bgcolor">
-                <div class="col-lg-12 s_media_list_item pt16 pb16 ps-0 pe-0" data-name="Media item">
-                    <div class="row s_col_no_resize s_col_no_bgcolor g-0 align-items-center o_cc o_cc1">
-                        <div class="col-lg-4 align-self-stretch s_media_list_img_wrapper">
+            <div class="row s_nb_column_fixed">
+                <div class="col-lg-12 s_media_list_item pt8 pb8" data-name="Media item">
+                    <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
+                        <div class="col-lg-4 s_media_list_img_wrapper align-self-stretch px-0">
                             <img src="/web/image/mass_mailing.s_media_list_default_image_1" class="s_media_list_img h-100 w-100" alt=""/>
                         </div>
                         <div class="col-lg-8 s_media_list_body">
                             <h3>Media heading</h3>
                             <p>Use this snippet to build various types of components that feature a left- or right-aligned image alongside textual content. Duplicate the element to create a list that fits your needs.</p>
-                            <a href="#" class="btn btn-primary mb-2">Discover</a>
+                            <a href="#" class="btn btn-primary">Discover</a>
                         </div>
                     </div>
                 </div>
-                <div class="col-lg-12 s_media_list_item pt16 pb16 ps-0 pe-0" data-name="Media item">
-                    <div class="row s_col_no_resize s_col_no_bgcolor g-0 align-items-center o_cc o_cc1">
-                        <div class="col-lg-4 align-self-stretch s_media_list_img_wrapper">
+                <div class="col-lg-12 s_media_list_item pt8 pb8" data-name="Media item">
+                    <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
+                        <div class="col-lg-4 s_media_list_img_wrapper align-self-stretch px-0">
                             <img src="/web/image/mass_mailing.s_media_list_default_image_2" class="s_media_list_img h-100 w-100" alt=""/>
                         </div>
                         <div class="col-lg-8 s_media_list_body">
@@ -28,9 +28,9 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-lg-12 s_media_list_item pt16 pb16 ps-0 pe-0" data-name="Media item">
-                    <div class="row s_col_no_resize s_col_no_bgcolor g-0 align-items-center o_cc o_cc1">
-                        <div class="col-lg-4 align-self-stretch s_media_list_img_wrapper">
+                <div class="col-lg-12 s_media_list_item pt8 pb8" data-name="Media item">
+                    <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
+                        <div class="col-lg-4 s_media_list_img_wrapper align-self-stretch px-0">
                             <img src="/web/image/mass_mailing.s_media_list_default_image_3" class="s_media_list_img h-100 w-100" alt=""/>
                         </div>
                         <div class="col-lg-8 s_media_list_body">
diff --git a/addons/mass_mailing/views/snippets/s_numbers.xml b/addons/mass_mailing/views/snippets/s_numbers.xml
index 1d9783b4c95..329def35224 100644
--- a/addons/mass_mailing/views/snippets/s_numbers.xml
+++ b/addons/mass_mailing/views/snippets/s_numbers.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <template id="s_numbers" name="Numbers">
-        <div class="s_numbers o_cc o_cc2 pt24 pb24 o_mail_snippet_general" data-snippet="s_numbers">
+        <div class="s_numbers o_mail_snippet_general o_cc o_cc1">
             <div class="container">
                 <div class="row">
-                    <div class="text-center pt24 pb24 col-lg-4" valign="top">
-                        <span class="s_number display-4 o_default_snippet_text">12</span>
-                        <h6 class="o_default_snippet_text">Useful options</h6>
+                    <div class="col-lg-4 pt24 pb24 o_cc o_cc2" style="text-align: center;">
+                        <span style="font-size: 48px;">12</span>
+                        <p>Useful options</p>
                     </div>
-                    <div class="text-center pt24 pb24 col-lg-4" valign="top">
-                        <span class="s_number display-4 o_default_snippet_text">45</span>
-                        <h6 class="">Beautiful snippets</h6>
+                    <div class="col-lg-4 pt24 pb24 o_cc o_cc4" style="text-align: center;">
+                        <span style="font-size: 48px;">45</span>
+                        <p>Beautiful snippets</p>
                     </div>
-                    <div class="text-center pt24 pb24 col-lg-4" valign="top">
-                        <span class="s_number display-4 o_default_snippet_text">8</span>
-                        <h6 class="o_default_snippet_text">Amazing pages</h6>
+                    <div class="col-lg-4 pt24 pb24 o_cc o_cc2" style="text-align: center;">
+                        <span style="font-size: 48px;">8</span>
+                        <p>Amazing pages</p>
                     </div>
                 </div>
             </div>
diff --git a/addons/mass_mailing/views/snippets/s_picture.xml b/addons/mass_mailing/views/snippets/s_picture.xml
index d0afde0f7a6..018f0794aa7 100644
--- a/addons/mass_mailing/views/snippets/s_picture.xml
+++ b/addons/mass_mailing/views/snippets/s_picture.xml
@@ -2,13 +2,15 @@
 <odoo>
 
 <template id="s_picture" name="Picture">
-    <div class="s_picture pt48 pb24 px-3 o_cc o_cc2 o_mail_snippet_general" data-snippet="s_picture">
-        <h2 class="text-center">
-            <font style="font-size: 48px;" class="o_default_snippet_text">A punchy Headline</font>
-        </h2>
-        <p class="text-center">With strong technical foundations, Odoo's framework is unique. It provides <strong>top notch usability that scales across all apps</strong>.</p>
-        <img src="/web/image/mass_mailing.s_picture_default_image" class="img-thumbnail padding-large mx-auto d-block" width="500" alt=""/>
-        <p class="figure-caption text-center py-3">Add a caption to enhance the meaning of this image.</p>
+    <div class="s_picture o_mail_snippet_general pt48 pb24 o_cc o_cc2" style="padding-left: 15px; padding-right: 15px;">
+        <div class="container s_allow_columns">
+            <h2 style="text-align: center;">
+                <font style="font-size: 48px;">A Punchy Headline</font>
+            </h2>
+            <p style="text-align: center;">With strong technical foundations, Odoo's framework is unique. It provides <span style="font-weight: bolder;">top notch usability that scales across all apps</span>.</p>
+            <img src="/web/image/mass_mailing.s_picture_default_image" style="padding: 10px;" class="mx-auto d-block mw-100" width="500" alt=""/>
+            <p style="text-align: center;"><font style="font-size: 12px;">Add a caption to enhance the meaning of this image.</font></p>
+        </div>
     </div>
 </template>
 
diff --git a/addons/mass_mailing/views/snippets/s_product_list.xml b/addons/mass_mailing/views/snippets/s_product_list.xml
index 54ae4e06aee..905bb2332e3 100644
--- a/addons/mass_mailing/views/snippets/s_product_list.xml
+++ b/addons/mass_mailing/views/snippets/s_product_list.xml
@@ -2,35 +2,29 @@
 <odoo>
 
 <template id="s_product_list" name="Items">
-    <div class="s_mail_product_list pt24 pb24 o_mail_snippet_general" data-snippet="s_product_list">
+    <div class="s_mail_product_list o_mail_snippet_general">
         <div class="container">
             <div class="row">
-                <div class="col-lg-4">
+                <div class="col-lg-4 o_cc pt16 pb16">
                     <a href="">
-                        <img src="/web/image/mass_mailing.s_product_list_default_image_1" alt="" class="img img-fluid"/>
+                        <img src="/web/image/mass_mailing.s_product_list_default_image_1" alt="" class="img img-fluid" style="padding: 15px 0px"/>
                     </a>
-                    <div class="pt16 text-center">
-                        <p>Check out all our furniture</p>
-                        <a class="btn btn-primary o_default_snippet_text" href="">Furniture</a>
-                    </div>
+                    <p style="text-align: center;">Check out all our furniture</p>
+                    <p style="text-align: center;"><a class="btn btn-primary" href="#">Furniture</a></p>
                 </div>
-                <div class="col-lg-4">
+                <div class="col-lg-4 o_cc pt16 pb16">
                     <a href="">
-                        <img src="/web/image/mass_mailing.s_product_list_default_image_2" alt="" class="img img-fluid"/>
+                        <img src="/web/image/mass_mailing.s_product_list_default_image_2" alt="" class="img img-fluid" style="padding: 15px 0px"/>
                     </a>
-                    <div class="pt16 text-center">
-                        <p>Check out all our clothes</p>
-                        <a class="btn btn-primary o_default_snippet_text" href="">Clothes</a>
-                    </div>
+                    <p style="text-align: center;">Check out all our clothes</p>
+                    <p style="text-align: center;"><a class="btn btn-primary" href="#">Clothes</a></p>
                 </div>
-                <div class="col-lg-4">
+                <div class="col-lg-4 o_cc pt16 pb16">
                     <a href="">
-                        <img src="/web/image/mass_mailing.s_product_list_default_image_3" alt="" class="img img-fluid"/>
+                        <img src="/web/image/mass_mailing.s_product_list_default_image_3" alt="" class="img img-fluid" style="padding: 15px 0px"/>
                     </a>
-                    <div class="pt16 text-center" data-bs-original-title="" title="" aria-describedby="tooltip540733">
-                        <p>Check out all our books</p>
-                        <a class="btn btn-primary o_default_snippet_text" href="">Books</a>
-                    </div>
+                    <p style="text-align: center;">Check out all our books</p>
+                    <p style="text-align: center;"><a class="btn btn-primary" href="#">Books</a></p>
                 </div>
             </div>
         </div>
diff --git a/addons/mass_mailing/views/snippets/s_rating.xml b/addons/mass_mailing/views/snippets/s_rating.xml
index 4a460716d41..1ac48c6fea3 100644
--- a/addons/mass_mailing/views/snippets/s_rating.xml
+++ b/addons/mass_mailing/views/snippets/s_rating.xml
@@ -2,8 +2,8 @@
 <odoo>
 
 <template id="s_rating" name="Rating">
-    <div class="s_rating pt16 pb16 px-3 o_mail_snippet_general" data-vcss="001" data-icon="fa-star" data-snippet="s_rating">
-        <h4 class="s_rating_title">Quality</h4>  
+    <div class="s_rating o_mail_snippet_general pt16 pb16" style="padding-left: 15px; padding-right: 15px;" data-vcss="001" data-icon="fa-star">
+        <h3>Quality</h3>
         <div class="s_rating_icons o_not_editable">
             <span class="s_rating_active_icons">
                 <i class="fa fa-star"></i>
diff --git a/addons/mass_mailing/views/snippets/s_references.xml b/addons/mass_mailing/views/snippets/s_references.xml
index 5dbe7880398..3f6b3b30f87 100644
--- a/addons/mass_mailing/views/snippets/s_references.xml
+++ b/addons/mass_mailing/views/snippets/s_references.xml
@@ -2,22 +2,22 @@
 <odoo>
 
 <template id="s_references" name="References">
-    <div class="s_references pt32 pb32 o_mail_snippet_general" data-snippet="s_references">
+    <div class="s_references o_mail_snippet_general pt32 pb32">
         <div class="container">
-            <h2 class="text-center">Our References</h2>
-            <p class="text-center">We are in good company.</p>
+            <h2 style="text-align: center;">Our References</h2>
+            <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/s_showcase.xml b/addons/mass_mailing/views/snippets/s_showcase.xml
index 07af3e5b621..2c796f78299 100644
--- a/addons/mass_mailing/views/snippets/s_showcase.xml
+++ b/addons/mass_mailing/views/snippets/s_showcase.xml
@@ -2,22 +2,19 @@
 <odoo>
 
 <template id="s_showcase" name="Showcase">
-    <div class="s_showcase pt48 pb48 o_mail_snippet_general" data-snippet="s_showcase">
-        <!-- TODO: (below) issue with height: `fit-content` is not supported, can we calculate it in px in translation ? 
-        empty div height is 0 unless table has defined height (div.col-1 > div.w-50.h100.border-end)-->
+    <div class="s_showcase o_mail_snippet_general pt48 pb48">
+        <!-- TODO: (below) issue with height: `fit-content` is not supported, can we calculate it in px in translation ?
+        empty div height is 0 unless table has defined height (div.col-1 > div.w-50.h100.border-right)-->
         <div class="container" style="height: fit-content;">
-            <div class="row g-0 s_col_no_resize s_col_no_bgcolor s_nb_column_fixed">
-                <div class="col-lg-5 text-end pb24" align="right">
+            <div class="row no-gutters s_col_no_resize s_col_no_bgcolor s_nb_column_fixed">
+                <div class="col-lg-6 pb24" style="text-align: right; padding-right: 70px;" align="right">
                     <div class="mb-2">
                         <h3 class="d-inline-block">First feature</h3>
                         <i class="fa fa-2x fa-desktop text-secondary ms-3"/>
                     </div>
                     <p>A short description of this great feature.</p>
                 </div>
-                <div class="col-lg-2 o_mail_no_resize" align="left">
-                    <div class="w-50 h-100 border-end"/>
-                </div>
-                <div class="col-lg-5 pb24" align="left">
+                <div class="col-lg-6 pb24 border-start" style="padding-left: 70px;" align="left">
                     <div class="mb-2">
                         <i class="fa fa-2x fa-heart text-secondary me-3"/>
                         <h3 class="d-inline-block">Another feature</h3>
@@ -25,18 +22,15 @@
                     <p>A short description of this great feature.</p>
                 </div>
             </div>
-            <div class="row g-0 s_col_no_resize s_col_no_bgcolor s_nb_column_fixed">
-                <div class="col-lg-5 text-end" align="right">
+            <div class="row no-gutters s_col_no_resize s_col_no_bgcolor s_nb_column_fixed">
+                <div class="col-lg-6" style="text-align: right; padding-right: 70px;" align="right">
                     <div class="mb-2">
                         <h3 class="d-inline-block">Second feature</h3>
                         <i class="fa fa-2x fa-paint-brush text-secondary ms-3"/>
                     </div>
                     <p>A short description of this great feature.</p>
                 </div>
-                <div class="col-lg-2 o_mail_no_resize" align="left">
-                    <div class="w-50 h-100 border-end"/>
-                </div>
-                <div class="col-lg-5" align="left">
+                <div class="col-lg-6 border-start" style="padding-left: 70px;" align="left">
                     <div class="mb-2">
                         <i class="fa fa-2x fa-gift text-secondary me-3"/>
                         <h3 class="d-inline-block">Last Feature</h3>
@@ -45,7 +39,7 @@
                 </div>
             </div>
         </div>
-        <div class="container text-center pt32" align="center">
+        <div class="container pt32" style="text-align: center;" align="center">
             <a href="#" class="btn btn-primary">Discover all the features</a>
         </div>
     </div>
diff --git a/addons/mass_mailing/views/snippets/s_text_block.xml b/addons/mass_mailing/views/snippets/s_text_block.xml
index 2eb9a56633f..ce7b81295a1 100644
--- a/addons/mass_mailing/views/snippets/s_text_block.xml
+++ b/addons/mass_mailing/views/snippets/s_text_block.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <template id="s_text_block" name="Text">
-        <div class="s_text_block pt40 pb40 px-3 o_mail_snippet_general" data-snippet="s_text_block">
+        <div class="s_text_block o_mail_snippet_general pt40 pb40" style="padding-left: 15px; padding-right: 15px;">
             <div class="container s_allow_columns">
-                <p class="o_default_snippet_text"> The open source model of Odoo has allowed us to leverage thousands of developers and
+                <p> The open source model of Odoo has allowed us to leverage thousands of developers and
                     business experts to build hundreds of apps in just a few years.</p>
-                <p class="o_default_snippet_text"> With strong technical foundations, Odoo's framework is unique.
+                <p> With strong technical foundations, Odoo's framework is unique.
                     It provides top notch usability that scales across all apps.</p>
-                <p class="o_default_snippet_text"> Usability improvements made on Odoo will automatically apply to all
+                <p> Usability improvements made on Odoo will automatically apply to all
                     of our fully integrated apps.</p>
-                <p class="o_default_snippet_text"> That way, Odoo evolves much faster than any other solution.</p>
+                <p> That way, Odoo evolves much faster than any other solution.</p>
             </div>
         </div>
     </template>
diff --git a/addons/mass_mailing/views/snippets/s_text_highlight.xml b/addons/mass_mailing/views/snippets/s_text_highlight.xml
index d00956be325..8906decfd8f 100644
--- a/addons/mass_mailing/views/snippets/s_text_highlight.xml
+++ b/addons/mass_mailing/views/snippets/s_text_highlight.xml
@@ -2,9 +2,9 @@
 <odoo>
 
 <template id="s_text_highlight" name="Text Highlight">
-    <div class="s_mail_text_highlight o_cc o_cc3 pt32 pb32 w-100 o_mail_snippet_general" data-snippet="s_text_highlight">
-        <h3 class=" text-center">Text Highlight</h3>
-        <p class="o_mail_no_margin text-center">Put the focus on what you have to say!</p>
+    <div class="s_mail_text_highlight o_mail_snippet_general o_cc o_cc3 pt32 pb32 w-100">
+        <h3 style="text-align: center;">Text Highlight</h3>
+        <p style="text-align: center;">Put the focus on what you have to say!</p>
     </div>
 </template>
 
diff --git a/addons/mass_mailing/views/snippets/s_text_image.xml b/addons/mass_mailing/views/snippets/s_text_image.xml
index 1d0c8237fb6..4284f550a3f 100644
--- a/addons/mass_mailing/views/snippets/s_text_image.xml
+++ b/addons/mass_mailing/views/snippets/s_text_image.xml
@@ -2,13 +2,13 @@
 <odoo>
 
 <template id="s_text_image" name="Text - Image">
-    <div class="s_text_image o_mail_snippet_general" data-snippet="s_text_image">
+    <div class="s_text_image o_mail_snippet_general">
         <div class="container">
             <div class="row align-items-center">
-                <div class="col-lg-6 pt16 pb16">
+                <div class="col-lg-6 o_cc pt16 pb16">
                     <h3>A unique value</h3>
-                    <p>The open source model of Odoo has allowed us to leverage thousands of developers and business experts to build hundreds of apps in just a few years.</p>
-                    <div class="text-start">
+                    <p style="text-align: justify;">The open source model of Odoo has allowed us to leverage thousands of developers and business experts to build hundreds of apps in just a few years.</p>
+                    <div style="text-align: left;">
                         <a href="#" class="btn btn-link">Read More</a>
                     </div>
                 </div>
diff --git a/addons/mass_mailing/views/snippets/s_three_columns.xml b/addons/mass_mailing/views/snippets/s_three_columns.xml
index 62d9df2bb7f..e6db121f3e3 100644
--- a/addons/mass_mailing/views/snippets/s_three_columns.xml
+++ b/addons/mass_mailing/views/snippets/s_three_columns.xml
@@ -2,7 +2,7 @@
 <odoo>
 
 <template id="s_three_columns" name="Columns">
-    <div class="s_three_columns o_cc o_cc2 pt32 pb32 o_mail_snippet_general" data-snippet="s_three_columns">
+    <div class="s_three_columns o_mail_snippet_general o_cc o_cc2 pt32 pb32">
         <div class="container">
             <div class="row d-flex align-items-stretch">
                 <div class="col-lg-4 s_col_no_bgcolor pt16 pb16">
diff --git a/addons/mass_mailing/views/snippets/s_title.xml b/addons/mass_mailing/views/snippets/s_title.xml
index 159d8ed486a..f1ebd84ce0f 100644
--- a/addons/mass_mailing/views/snippets/s_title.xml
+++ b/addons/mass_mailing/views/snippets/s_title.xml
@@ -2,9 +2,9 @@
 <odoo>
 
 <template id="s_title" name="Title">
-    <div class="s_title o_mail_snippet_general pt32 pb32" data-snippet="s_title">
+    <div class="s_title o_mail_snippet_general pt32 pb32">
         <div class="container s_allow_columns">
-            <h1 class="text-center"><font style="font-size: 42px;">Your Title</font></h1>
+            <h1 style="text-align:center">Your Title</h1>
         </div>
     </div>
 </template>
diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml
index 0b7367adefe..e5582c16bb4 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,9 +75,9 @@
                     <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_mail_block_event" t-thumbnail="/mass_mailing/static/src/img/blocks/block_event.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"/>
                 </div>
@@ -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>
@@ -108,18 +108,16 @@
 
 <!-- Snippet Templates -->
 <template id="s_mail_block_header_social" name="Left Logo">
-    <div class="o_mail_snippet_general o_mail_block_header_social s_header_social">
-        <div class="o_mail_table_styles container">
+    <div class="s_header_social o_mail_block_header_social o_mail_snippet_general pt16 pb16">
+        <div class="container">
             <div class="row">
-                <div class="col-lg-8 pt16 pb16">
-                    <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;float:none;">
-                         <img t-if="company_id.logo" border="0" t-att-src="image_data_uri(company_id.logo)" style="height:auto;max-width:200px;max-height:48px;" />
+                <div class="col-lg-4 pt16 pb16">
+                    <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;float:none;" target="_blank">
+                         <img t-if="company_id.logo" border="0" t-att-src="image_data_uri(company_id.logo)" style="height:auto;max-width:100%;" />
                     </a>
                 </div>
-                <div class="col-lg-4 text-end o_mail_no_resize">
-                    <div class="o_mail_header_social">
-                        <t t-call="mass_mailing.social_links"/>
-                    </div>
+                <div class="col-lg-8 o_mail_header_social" style="text-align: right;">
+                    <t t-call="mass_mailing.social_links"/>
                 </div>
             </div>
         </div>
@@ -127,20 +125,18 @@
 </template>
 
 <template id="s_mail_block_header_text_social" name="Left Text">
-    <div class="o_mail_snippet_general o_mail_block_header_text_social s_header_text_social">
-        <div class="o_mail_table_styles container">
+    <div class="s_header_text_social o_mail_block_header_text_social o_mail_snippet_general">
+        <div class="container">
             <div class="row">
-                <div class="col-lg-8 pt16 pb16">
-                    <h3>
-                        <a t-att-href="(company_id.website) or '#'">
+                <div class="col-lg-4 pt16 pb16">
+                    <h1>
+                        <a t-att-href="(company_id.website) or '#'" target="_blank">
                             My Company
                         </a>
-                    </h3>
+                    </h1>
                 </div>
-                <div class="col-lg-4 text-end o_mail_no_resize">
-                    <div class="o_mail_header_social">
-                        <t t-call="mass_mailing.social_links"/>
-                    </div>
+                <div class="col-lg-8 o_mail_header_social" style="text-align: right;">
+                    <t t-call="mass_mailing.social_links"/>
                 </div>
             </div>
         </div>
@@ -148,95 +144,43 @@
 </template>
 
 <template id="s_mail_block_header_logo" name="Centered Logo">
-    <div class="o_mail_snippet_general o_mail_block_header_logo s_header_logo">
-        <div class="container o_mail_table_styles">
+    <div class="s_header_logo o_mail_block_header_logo o_mail_snippet_general">
+        <div class="container">
             <div class="row">
-                <div class="col-lg-4"/>
-                <div class="col-lg-4 text-center pt16 pb16">
-                    <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;">
-                        <img t-if="company_id.logo" border="0" t-att-src="image_data_uri(company_id.logo)" style="height:auto;max-width:200px;max-height:48px;width:auto"/>
+                <div class="col-lg-3"/>
+                <div class="col-lg-6" style="text-align: center;">
+                    <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;" target="_blank">
+                        <img t-if="company_id.logo" border="0" t-att-src="image_data_uri(company_id.logo)" style="height:auto;max-width:100%;"/>
                     </a>
                 </div>
-                <div class="col-lg-4 text-end"/>
+                <div class="col-lg-3" style="text-align: right;"/>
             </div>
         </div>
     </div>
 </template>
 
 <template id="s_mail_block_header_view" name="View Online">
-    <div class="o_mail_snippet_general o_snippet_view_in_browser pt16 pb16 px-3 text-center">
+    <div class="o_snippet_view_in_browser o_mail_snippet_general pt16 pb16" style="text-align: center; padding-left: 15px; padding-right: 15px;">
         <a href="/view">
             View Online
         </a>
     </div>
 </template>
 
-<template id="s_mail_block_title_text" name="Title Content">
-    <div class="o_mail_snippet_general o_mail_block_title_text s_title_text pt16 pb16 px-3">
-        <h2 class="mt0">Thank you for joining us!</h2>
-        <p>We want to take this opportunity to welcome you to our ever-growing community!<br/></p>
-        <p>Your platform is ready for work. It will help you reduce the costs of digital signage, attract new customers and increase sales.</p>
-        <p>Enjoy,</p>
-        <img src="/mass_mailing/static/src/img/theme_default/demo/signature.png" style="width:125px; margin-top:8px;margin-bottom:-25px;" alt="Demo Signature"/>
-        <p>
-            <small>
-                <strong>Michael Fletcher</strong><br/>
-                <small>Community Manager</small>
-            </small>
-        </p>
-        <div class="pt16 pb16 text-center">
-            <a role="button" href="#" class="btn btn-primary">LOGIN</a>
-        </div>
-    </div>
-</template>
-
-<template id="s_mail_block_footer_tag_line" name="Tag Line">
-    <div class="o_mail_snippet_general o_mail_block_footer_tag_line s_footer_tag_line pt16 pb16 px-3 o_cc o_cc3">
-        <h3 class="text-center">Apps That Help You Grow Your Business</h3>
-        <br/>
-        <div class="text-center">
-            <a role="button" href="#" class="btn btn-primary">My Account</a>
-        </div>
-    </div>
-</template>
-
 <template id="s_mail_block_discount1" name="Discount Offer">
-    <div class="o_mail_snippet_general o_mail_block_discount1 s_discount1">
-        <div class="container o_mail_table_styles">
-            <div class="row">
-                <div class="col-lg pt16 pb16 text-center">
-                    <h4 class="text-o-color-2 text-center mt0 mb16" style="font-weight:800;">-20%</h4>
-                    <p class="text-center">ON YOUR NEXT ORDER!</p>
-                    <a role="button" href="#" class="btn btn-primary">Redeem Discount!</a>
-                </div>
-                <div class="col-lg pt16 pb16">
-                    <p class="o_mail_no_margin">We are continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button.</p>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<template id="s_mail_block_event" name="Event">
-    <div class="o_mail_snippet_general o_mail_block_event s_event bg-300">
+    <div class="s_discount1 o_mail_block_discount1 o_mail_snippet_general pt0 pb16">
         <div class="container">
-            <div class="row align-items-center">
-                <div class="col-lg-3 px-0 text-center">
-                    <h3 class="o_mail_no_margin">21 Jul</h3>
-                    <p class="o_mail_no_margin">ALL DAY</p>
-                </div>
-                <div class="col-lg-2 px-0">
-                    <img src="/web/image/mass_mailing.s_mail_block_event_default_image" class="img w-100"/>
-                </div>
-                <div class="col-lg-7">
-                    <h4>Cybersecurity</h4>
-                    <p>Cyber-threats continue to increase.
-                        <br/>The discussion will examine how to develop new norms and integrate them into EU
-                    </p>
-                    <div class="text-start">
-                        <a href="#" class="btn btn-primary">Register</a>
+            <div class="row">
+                <div class="col-lg-6 pt16">
+                    <h3 style="text-align: center;"><font class="text-o-color-2"><span style="font-weight:bolder;">-20%</span></font></h3>
+                    <p style="text-align: center;">ON YOUR NEXT ORDER!</p>
+                    <div style="text-align: center;">
+                        <a role="button" href="#" class="btn btn-primary">Redeem Discount!</a>
                     </div>
                 </div>
+                <div class="col-lg-6 pt16">
+                    <p>We are continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button.</p>
+                </div>
             </div>
         </div>
     </div>
@@ -244,20 +188,20 @@
 
 <template id="s_mail_block_footer_social" name="Footer Center">
     <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-200">
-        <div class="container o_mail_table_styles">
+        <div class="container">
             <div class="row">
                 <div class="col-lg o_mail_footer_social">
                     <t t-call="mass_mailing.social_links"/>
                 </div>
             </div>
             <div class="row">
-                <div class="col-lg o_mail_footer_links">
+                <div class="o_mail_footer_links">
                     <a role="button" href="/unsubscribe_from_list" class="btn btn-link">Unsubscribe</a>
                 </div>
             </div>
             <div class="row">
                 <div class="col-lg">
-                    <p class="o_mail_no_margin o_mail_footer_copy">
+                    <p>
                         © <t t-esc="datetime.datetime.now().year"/> All Rights Reserved
                     </p>
                 </div>
@@ -268,10 +212,10 @@
 
 <template id="s_mail_block_footer_social_left" name="Footer Left">
     <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_left o_mail_snippet_general">
-        <div class="container o_mail_table_styles">
+        <div class="container">
             <div class="row">
                 <div class="col-lg o_mail_footer_description">
-                    <p t-if="res_company" class="o_mail_no_margin">
+                    <p t-if="res_company">
                         <strong><t t-esc="res_company.partner_id.name"/></strong>
                     </p>
                     <div class="o_mail_footer_links">
@@ -426,16 +370,7 @@
         <we-button class="fa fa-fw fa-angle-right" data-move-snippet="next" data-no-preview="true" data-name="move_right_opt"/>
     </div>
 
-    <!-- H-ALIGN -->
-    <div id="so_text_align" data-selector=".s_mail_text_highlight">
-        <we-button-group string="Alignment">
-            <we-button class="fa fa-fw fa-align-left" title="Left" data-select-class="text-start"/>
-            <we-button class="fa fa-fw fa-align-center" title="Center" data-select-class="text-center"/>
-            <we-button class="fa fa-fw fa-align-right" title="Right" data-select-class="text-end"/>
-        </we-button-group>
-    </div>
-
-    <div id="so_width" data-selector=".s_mail_alert, .s_mail_blockquote, .s_mail_text_highlight">
+    <div id="so_width" data-selector=".s_mail_alert .s_alert, .s_mail_blockquote, .s_mail_text_highlight">
         <we-select string="Width">
             <we-button data-select-class="w-25">25%</we-button>
             <we-button data-select-class="w-50">50%</we-button>
@@ -444,7 +379,7 @@
         </we-select>
     </div>
 
-    <div id="so_block_align" data-selector=".s_mail_alert, .s_mail_blockquote, .s_mail_text_highlight">
+    <div id="so_block_align" data-selector=".s_mail_alert .s_alert, .s_mail_blockquote, .s_mail_text_highlight">
         <we-button-group string="Alignment" data-dependencies="!so_width_100">
             <we-button class="fa fa-fw fa-align-left" title="Left" data-select-class="me-auto"/>
             <we-button class="fa fa-fw fa-align-center" title="Center" data-select-class="mx-auto"/>
@@ -524,6 +459,13 @@
             data-css-property="background-color"
             data-color-prefix="bg-"/>
     </div>
+    <!-- Allow customised padding-x on snippets -->
+    <div data-selector="[class*='col-lg-'], .s_discount2, .s_text_block, .s_media_list, .s_picture, .s_rating">
+        <we-row string="Padding ⭤">
+            <we-input data-select-style="" data-unit="px" data-css-property="padding-left"/>
+            <we-input data-select-style="" data-unit="px" data-css-property="padding-right"/>
+        </we-row>
+    </div>
 
     <!-- Allow changing background images in Masonry and Cover -->
     <t t-call="web_editor.snippet_options_background_options">
@@ -533,9 +475,9 @@
         <t t-set="with_shapes" t-value="false"/>
     </t>
 
-    <!-- COLOR | .s_three_columns | .s_comparisons -->
+    <!-- COLOR | .s_three_columns | .s_comparisons | .s_event  -->
     <div data-js="Box"
-         data-selector=".s_three_columns .row > div, .s_comparisons .row > div"
+         data-selector=".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div"
          data-target=".card-body">
         <we-colorpicker string="Background Color"
             data-select-style="true"
@@ -543,9 +485,9 @@
             data-css-property="background-color"
             data-color-prefix="bg-"/>
     </div>
-    <!-- BORDER | .s_three_columns | .s_comparisons -->
+    <!-- BORDER | .s_three_columns | .s_comparisons | .s_event  -->
     <div data-js="Box"
-         data-selector=".s_three_columns .row > div, .s_comparisons .row > div"
+         data-selector=".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div"
          data-target=".card">
         <t t-call="mass_mailing.snippet_options_border_widgets">
             <t t-set="so_rounded_no_dependencies" t-value="True"/>
@@ -560,7 +502,7 @@
     </div>
 
     <!--  Vertical Alignment -->
-    <div data-option-name="vAlignment" id="row_valign_snippet_option" data-selector=".s_text_image, .s_image_text, .s_three_columns" data-target=".row">
+    <div data-option-name="vAlignment" id="row_valign_snippet_option" data-selector=".s_text_image, .s_image_text, .s_three_columns, s_mail_block_event" data-target=".row">
         <we-button-group string="Vert. Alignment" title="Vertical Alignment">
             <we-button title="Align Top"
                        data-select-class="align-items-start"
diff --git a/addons/mass_mailing/views/themes_templates.xml b/addons/mass_mailing/views/themes_templates.xml
index 72e942c00d4..e0e36268f07 100644
--- a/addons/mass_mailing/views/themes_templates.xml
+++ b/addons/mass_mailing/views/themes_templates.xml
@@ -18,33 +18,46 @@
     <!-- Default Theme -->
     <template id="theme_default_template">
         <style id="design-element">
-            h1 {
-                font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-            }
             h2 {
-                font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-            }
-            h3 {
-                font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
+                font-weight: bolder;
             }
             p, p > *, li, li > * {
-                font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
+                color: #6c757d;
             }
-            a:not(.btn), a.btn.btn-link {
-                color: #81709b;
-            }
-            a.btn.btn-primary, a.btn.btn-outline-primary, a.btn.btn-fill-primary {
-                background-color: #81709b;
-                border-color: #81709b;
-            }
-            a.btn.btn-secondary, a.btn.btn-outline-secondary, a.btn.btn-fill-secondary {
-                background-color: #72e1d0;
-                border-color: #72e1d0;
+            hr {
+                border-top-color: #ced4da !important;
             }
         </style>
-        <t t-call="mass_mailing.s_mail_block_header_logo" />
-        <t t-call="mass_mailing.s_title" />
-        <t t-call="mass_mailing.s_text_block" />
+        <div class="s_header_logo o_mail_block_header_logo o_mail_snippet_general pt16 pb16">
+            <div class="container">
+                <div class="row">
+                    <div class="col-lg-4"/>
+                    <div class="col-lg-4" style="text-align: center;">
+                        <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;" target="_blank">
+                            <img border="0" src="/mass_mailing/static/src/img/theme_default/s_default_image_header_logo.png" style="height:auto; max-width:100%;" width="180"/>
+                        </a>
+                    </div>
+                    <div class="col-lg-4" style="text-align: right;"/>
+                </div>
+            </div>
+        </div>
+        <div class="s_text_block o_mail_snippet_general pt40 pb16" style="padding-left: 15px; padding-right: 15px;">
+            <div class="container s_allow_columns">
+                <h2>Thank you for joining us!</h2>
+                <p><br/>We want to take this opportunity to welcome you to our ever-growing community!
+                <br/>Your platform is ready for work, it will help you reduce the costs of digital signatures, attract new customers and increase sales.</p>
+                <p><img src="/mass_mailing/static/src/img/theme_default/signature.png" style="width:125px; margin-top:8px;margin-bottom:-25px;" alt="Signature"/></p>
+                <p>Michael Fletcher<br/>
+                   <span style="font-size: 12px; font-weight: bolder;">Customer Service</span>
+                </p>
+                <p style="text-align: center;">
+                    <a role="button" href="#" class="btn btn-primary">LOGIN</a>
+                </p>
+            </div>
+        </div>
+        <div class="s_hr pt16 pb16" data-snippet="s_hr" data-name="Separator">
+            <hr class="s_hr_1px s_hr_solid"/>
+        </div>
         <t t-call="mass_mailing.s_mail_block_footer_social_left"/>
     </template>
 </odoo>
diff --git a/addons/mass_mailing_themes/static/src/img/theme_airmail/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_airmail/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_airmail/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_logo.png b/addons/mass_mailing_themes/static/src/img/theme_bignews/bignews_logo.png
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_logo.png
rename to addons/mass_mailing_themes/static/src/img/theme_bignews/bignews_logo.png
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_event.jpg
deleted file mode 100755
index 91fff96b8b4..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_image.jpg
deleted file mode 100755
index 3ca5ebb5e6c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_image_text.jpg
deleted file mode 100755
index 87251f5f46a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_image_text.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_text_image.jpg
deleted file mode 100755
index 10f6102fd82..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_1.jpg
deleted file mode 100755
index fa939c89aae..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_2.jpg
deleted file mode 100755
index 35a8006b9c1..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_3.jpg
deleted file mode 100755
index e33e667921c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_two_cols_1.jpg
deleted file mode 100755
index 9a55e53533b..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_two_cols_2.jpg
deleted file mode 100755
index 38c77b3c178..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_cover.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_banner.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_cover.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bignews/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bignews/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_banner.jpg
deleted file mode 100644
index e99e8bb3955..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_banner.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_event.jpg
deleted file mode 100644
index 7c8401854f9..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_image.jpg
deleted file mode 100644
index 287abaff0c2..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_image_text.jpg
deleted file mode 100644
index 3c3e283685a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_image_text.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_text_image.jpg
deleted file mode 100644
index 3c3e283685a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_1.jpg
deleted file mode 100644
index 9630851b97d..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_2.jpg
deleted file mode 100644
index 9630851b97d..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_3.jpg
deleted file mode 100644
index 9630851b97d..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_two_cols_1.jpg
deleted file mode 100644
index 935de240199..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_two_cols_2.jpg
deleted file mode 100644
index 935de240199..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_logo.png b/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_logo.png
deleted file mode 100644
index 218cb2715ad..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_blank/s_default_image_logo.png and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_banner.jpg
deleted file mode 100644
index 2b45c74608d..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_banner.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_event.jpg
deleted file mode 100644
index eb323413191..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_image.jpg
deleted file mode 100644
index 0bd60ae63b8..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_text_image.jpg
deleted file mode 100644
index 057dd61a22b..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_1.jpg
deleted file mode 100755
index 837b8c29afc..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_2.jpg
deleted file mode 100755
index 8c1314a2a69..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_3.jpg
deleted file mode 100755
index 929b7a5bb9a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_two_cols_1.jpg
deleted file mode 100644
index fbabcb8bb3d..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_two_cols_2.jpg
deleted file mode 100644
index 794cbed85e2..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_image_text.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_image_text.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_image_text.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_image_text_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_image_text_2.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_bold/s_image_text_2.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_image_text_2.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_logo.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_logo.jpg
deleted file mode 100644
index 746f878d79f..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_logo.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_product_list_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_product_1.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_bold/s_product_list_image_1.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_product_1.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_product_list_image_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_product_2.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_bold/s_product_list_image_2.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_bold/s_default_image_product_2.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_bold/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_bold/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_bold/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/bignews_thumb_large.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/bignews_thumb_large.png
index ae67ddd87f1..41711569b8e 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/bignews_thumb_large.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/bignews_thumb_large.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/bignews_thumb_small.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/bignews_thumb_small.png
index 0f9652119a2..1c2a2fe7504 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/bignews_thumb_small.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/bignews_thumb_small.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/bold_thumb_large.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/bold_thumb_large.png
index fd031593b3d..418086d0947 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/bold_thumb_large.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/bold_thumb_large.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/bold_thumb_small.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/bold_thumb_small.png
index a868e8d038d..88ee9cc6319 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/bold_thumb_small.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/bold_thumb_small.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_large.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_large.png
index b3c6107613e..5c03a038b27 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_large.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_large.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_small.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_small.png
index d4b517b5511..45077ac5e22 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_small.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_small.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/resto_thumb_small.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/resto_thumb_small.png
deleted file mode 100644
index 68c0f3495b2..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/resto_thumb_small.png and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/solar_thumb_large.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/solar_thumb_large.png
index a012ccbd422..4f9adc15153 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/solar_thumb_large.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/solar_thumb_large.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/solar_thumb_small.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/solar_thumb_small.png
index bb54d1526b0..15133d535df 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/solar_thumb_small.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/solar_thumb_small.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/tech_thumb_large.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/tech_thumb_large.png
index 6da6e3c5bd5..0d51dc65f84 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/tech_thumb_large.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/tech_thumb_large.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/tech_thumb_small.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/tech_thumb_small.png
index 31ade20f112..600981c2569 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/tech_thumb_small.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/tech_thumb_small.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/vip_thumb_large.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/vip_thumb_large.png
index 2a57951262a..2c84b580319 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/vip_thumb_large.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/vip_thumb_large.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/vip_thumb_small.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/vip_thumb_small.png
index 03816922f4c..7b072dc836b 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/vip_thumb_small.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/vip_thumb_small.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_banner.jpg
deleted file mode 100644
index 8f837a55b19..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_banner.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_event.jpg
deleted file mode 100644
index 0b11910b534..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_image.jpg
deleted file mode 100644
index 09f4e2f5e8d..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_image_text.jpg
deleted file mode 100644
index cbee8e6dcc0..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_image_text.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_text_image.jpg
deleted file mode 100644
index 32a2c86d1bd..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_1.jpg
deleted file mode 100644
index 2d2c7a07cf5..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_2.jpg
deleted file mode 100644
index 264ff911794..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_3.jpg
deleted file mode 100644
index 6ce7085e354..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_two_cols_1.jpg
deleted file mode 100644
index a8b2283e08f..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_two_cols_2.jpg
deleted file mode 100644
index 461f62d25f2..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_logo.png b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_logo.png
index 024ed8c8862..c7d4f444b2d 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_logo.png and b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_logo.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_1.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_1.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_1.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_2.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_2.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_2.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_3.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_3.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_3.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/customer-service.gif b/addons/mass_mailing_themes/static/src/img/theme_solar/customer-service.gif
deleted file mode 100644
index 4453ee54f31..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/customer-service.gif and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/delivery.gif b/addons/mass_mailing_themes/static/src/img/theme_solar/delivery.gif
deleted file mode 100644
index a3998fc227b..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/delivery.gif and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/returns.gif b/addons/mass_mailing_themes/static/src/img/theme_solar/returns.gif
deleted file mode 100644
index 3b16b11b6ac..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/returns.gif and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_banner.jpg
deleted file mode 100755
index e6a85a38b43..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_banner.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_event.jpg
deleted file mode 100755
index 91fff96b8b4..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_image.jpg
deleted file mode 100755
index 3ca5ebb5e6c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_image_text.jpg
deleted file mode 100755
index 87251f5f46a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_image_text.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_text_image.jpg
deleted file mode 100755
index 10f6102fd82..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_1.jpg
deleted file mode 100755
index fa939c89aae..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_2.jpg
deleted file mode 100755
index 35a8006b9c1..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_3.jpg
deleted file mode 100755
index e33e667921c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_two_cols_1.jpg
deleted file mode 100755
index 9a55e53533b..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_two_cols_2.jpg
deleted file mode 100755
index 38c77b3c178..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_logo.png b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_logo.png
deleted file mode 100755
index 1f5169a218f..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_logo.png and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_product_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_product_1.jpg
new file mode 100644
index 00000000000..5c81d8b2f13
Binary files /dev/null and b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_product_1.jpg differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_product_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_product_2.jpg
new file mode 100644
index 00000000000..cd1f667d2f9
Binary files /dev/null and b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_product_2.jpg differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_product_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_product_3.jpg
new file mode 100644
index 00000000000..9e204c54fc1
Binary files /dev/null and b/addons/mass_mailing_themes/static/src/img/theme_solar/s_default_image_product_3.jpg differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_solar/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_solar/solar_coupon.png b/addons/mass_mailing_themes/static/src/img/theme_solar/solar_coupon.png
deleted file mode 100644
index c35eee4d9c9..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_solar/solar_coupon.png and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_banner.jpg
deleted file mode 100755
index e6a85a38b43..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_banner.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_event.jpg
deleted file mode 100755
index 91fff96b8b4..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_image.jpg
deleted file mode 100755
index 3ca5ebb5e6c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_image_text.jpg
deleted file mode 100755
index 87251f5f46a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_image_text.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_text_image.jpg
deleted file mode 100755
index 10f6102fd82..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_1.jpg
deleted file mode 100755
index fa939c89aae..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_2.jpg
deleted file mode 100755
index 35a8006b9c1..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_3.jpg
deleted file mode 100755
index e33e667921c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_two_cols_1.jpg
deleted file mode 100755
index 9a55e53533b..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_two_cols_2.jpg
deleted file mode 100755
index 38c77b3c178..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_1.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_1.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_1.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_2.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_2.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_2.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_3.jpg
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_3.jpg
rename to addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_3.jpg
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg
index 290c835ce6f..7ba2845d1a0 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg and b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_logo.png b/addons/mass_mailing_themes/static/src/img/theme_tech/tech_logo.png
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_logo.png
rename to addons/mass_mailing_themes/static/src/img/theme_tech/tech_logo.png
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_banner.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_banner.jpg
deleted file mode 100755
index e6a85a38b43..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_banner.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_event.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_event.jpg
deleted file mode 100755
index 91fff96b8b4..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_event.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_image.jpg
deleted file mode 100755
index 3ca5ebb5e6c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_image_text.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_image_text.jpg
deleted file mode 100755
index 87251f5f46a..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_image_text.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_text_image.jpg
deleted file mode 100755
index 10f6102fd82..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_1.jpg
deleted file mode 100755
index fa939c89aae..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_2.jpg
deleted file mode 100755
index 35a8006b9c1..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_3.jpg
deleted file mode 100755
index e33e667921c..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_three_cols_3.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_two_cols_1.jpg
deleted file mode 100755
index 9a55e53533b..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_two_cols_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_two_cols_2.jpg
deleted file mode 100755
index 38c77b3c178..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_block_two_cols_2.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_masonry_block_default_image_1.jpg b/addons/mass_mailing_themes/static/src/img/theme_vip/s_masonry_block_default_image_1.jpg
deleted file mode 100644
index b46aba6ee28..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_vip/s_masonry_block_default_image_1.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_logo.png b/addons/mass_mailing_themes/static/src/img/theme_vip/vip_logo.png
similarity index 100%
rename from addons/mass_mailing_themes/static/src/img/theme_vip/s_default_image_logo.png
rename to addons/mass_mailing_themes/static/src/img/theme_vip/vip_logo.png
diff --git a/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml b/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
index 2e645e3c1ef..a3f8348e00c 100644
--- a/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
+++ b/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
@@ -28,51 +28,52 @@
     <template id="theme_newsletter_template">
         <style id="design-element">
             h3 {
+                color: #2b3b58;
                 font-size: 18px;
                 font-weight: bolder;
             }
         </style>
         <t t-set="now" t-value="datetime.datetime.now()"/>
         <div class="s_header_social o_mail_block_header_social o_mail_snippet_general pt16 pb16" data-snippet="s_mail_block_header_social" style="background-color: rgb(26, 36, 54) !important;" data-name="Header Social">
-            <div class="o_mail_table_styles container">
+            <div class="container">
                 <div class="row">
-                    <div class="col-lg-8 pt16 pb16">
+                    <div class="col-lg-4">
                         <a style="text-decoration:none;float:none;" href="http://www.example.com" target="_blank">
-                             <img border="0" src="/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_logo.png" style="height: auto; max-width: 400px; width: 194px;" alt="Your Logo" />
+                             <img border="0" src="/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_logo.png" style="height: auto; max-width: 100%; width: 194px;"  width="194" alt="Your Logo" />
                         </a>
                     </div>
-                    <div class="col-lg-4 o_mail_no_resize" style="text-align: right;">
-                        <div class="o_mail_header_social" t-translation="off">
-                            <a title="Facebook" href="https://www.facebook.com/Odoo">
-                                <span class="fa fa-facebook rounded-circle text-white" style="background-color: rgb(43, 59, 88) !important;"/>
-                            </a>&amp;nbsp;&amp;nbsp;
-                            <a style="margin-left:10px" title="LinkedIn" href="https://www.linkedin.com/company/odoo">
-                                <span class="fa fa-linkedin rounded-circle text-white" style="background-color: rgb(43, 59, 88) !important;"/>
-                            </a>&amp;nbsp;&amp;nbsp;
-                            <a style="margin-left:10px" title="Twitter" href="https://twitter.com/Odoo">
-                                <span class="fa fa-twitter rounded-circle text-white" style="background-color: rgb(43, 59, 88) !important;"/>​
-                            </a>&amp;nbsp;&amp;nbsp;
-                            <a style="margin-left:10px" title="Instagram" href="https://www.instagram.com/explore/tags/odoo/">
-                                <span class="fa fa-instagram rounded-circle text-white" style="background-color: rgb(43, 59, 88) !important;"/>
-                            </a>
-                        </div>
+                    <div class="col-lg-8 o_mail_header_social" style="text-align: right;" t-translation="off">
+                        <a title="Facebook" href="https://www.facebook.com/Odoo">
+                            <span class="fa fa-facebook rounded-circle text-white" style="background-color: rgb(43, 59, 88) !important;"/>
+                        </a>&amp;nbsp;&amp;nbsp;
+                        <a style="margin-left:10px" title="LinkedIn" href="https://www.linkedin.com/company/odoo">
+                            <span class="fa fa-linkedin rounded-circle text-white" style="background-color: rgb(43, 59, 88) !important;"/>
+                        </a>&amp;nbsp;&amp;nbsp;
+                        <a style="margin-left:10px" title="Twitter" href="https://twitter.com/Odoo">
+                            <span class="fa fa-twitter rounded-circle text-white" style="background-color: rgb(43, 59, 88) !important;"/>​
+                        </a>&amp;nbsp;&amp;nbsp;
+                        <a style="margin-left:10px" title="Instagram" href="https://www.instagram.com/explore/tags/odoo/">
+                            <span class="fa fa-instagram rounded-circle text-white" style="background-color: rgb(43, 59, 88) !important;"/>
+                        </a>
                     </div>
                 </div>
             </div>
         </div>
-        <div class="s_text_block o_mail_snippet_general px-3 pb16 pt32" style="background-color: rgb(43, 59, 88) !important;" data-snippet="s_text_block" data-name="Text">
-            <p><font style="color: rgb(255, 255, 255);">Hi there!</font></p>
-            <p><font style="color: rgb(255, 255, 255);">The next edition of <span style="font-weight: bolder;">Odoo Experience Online</span> is coming soon!
-                <br/>To stir up your curiosity, have a look at all the great talks scheduled and highlighted in our agenda!</font>
-            </p>
+        <div class="s_text_block o_mail_snippet_general pb16 pt32" style="background-color: rgb(43, 59, 88) !important; padding-left: 15px; padding-right: 15px;" data-snippet="s_text_block" data-name="Text">
+            <div class="container s_allow_columns">
+                <p><font style="color: rgb(255, 255, 255);">Hi there!</font></p>
+                <p><font style="color: rgb(255, 255, 255);">The next edition of <span style="font-weight: bolder;">Odoo Experience Online</span> is coming soon!
+                    <br/>To stir up your curiosity, have a look at all the great talks scheduled and highlighted in our agenda!</font>
+                </p>
+            </div>
         </div>
-        <div class="s_media_list o_mail_snippet_general o_cc o_cc2 pb16 pt0" style="background-color: rgb(43, 59, 88) !important;" data-snippet="s_media_list" data-vcss="001" data-name="Media List">
+        <div class="s_media_list o_mail_snippet_general o_cc o_cc2 pb16 pt0" style="background-color: rgb(43, 59, 88) !important; padding-left: 15px; padding-right: 15px;" data-snippet="s_media_list" data-vcss="001" data-name="Media List">
             <div class="container">
-                <div class="row s_nb_column_fixed s_col_no_bgcolor">
+                <div class="row s_nb_column_fixed">
                     <div class="col-lg-12 s_media_list_item pt0 pb0" data-name="Media item">
-                        <div class="row s_col_no_resize s_col_no_bgcolor g-0 align-items-center o_cc o_cc1">
-                            <div class="col-lg-5 s_media_list_img_wrapper align-self-stretch">
-                                <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_1.jpg" class="s_media_list_img h-100 w-100"/>
+                        <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
+                            <div class="col-lg-5 s_media_list_img_wrapper align-self-stretch px-0">
+                                <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_1.jpg" class="s_media_list_img h-100 w-100" style="padding: 10px;"/>
                             </div>
                             <div class="col-lg-7 s_media_list_body">
                                 <h3>Get 6-months' worth of knowledge
@@ -83,9 +84,9 @@
                         </div>
                     </div>
                     <div class="col-lg-12 s_media_list_item pt16 pb0" data-name="Media item">
-                        <div class="row s_col_no_resize s_col_no_bgcolor g-0 align-items-center o_cc o_cc1">
-                            <div class="col-lg-5 s_media_list_img_wrapper align-self-stretch">
-                                <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_2.jpg" class="s_media_list_img h-100 w-100"/>
+                        <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
+                            <div class="col-lg-5 s_media_list_img_wrapper align-self-stretch px-0">
+                                <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_2.jpg" class="s_media_list_img h-100 w-100" style="padding: 10px;"/>
                             </div>
                             <div class="col-lg-7 s_media_list_body">
                                 <h3>Meet (other) awesome members
@@ -96,9 +97,9 @@
                         </div>
                     </div>
                     <div class="col-lg-12 s_media_list_item pt16 pb0" data-name="Media item">
-                        <div class="row s_col_no_resize s_col_no_bgcolor g-0 align-items-center o_cc o_cc1">
-                            <div class="col-lg-5 s_media_list_img_wrapper align-self-stretch">
-                                <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_media_list_3.jpg" class="s_media_list_img h-100 w-100"/>
+                        <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
+                            <div class=" col-lg-5 s_media_list_img_wrapper align-self-stretch px-0">
+                                <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_media_list_3.jpg" class="s_media_list_img h-100 w-100" style="padding: 10px;"/>
                             </div>
                             <div class="col-lg-7 s_media_list_body">
                                 <h3>An interactive, fun
@@ -114,24 +115,26 @@
         <div class="s_call_to_action o_mail_snippet_general o_cc o_cc3 pt40 pb40" style="background-color: rgb(26, 36, 54) !important;" data-snippet="s_call_to_action" data-name="Call to Action">
             <div class="container">
                 <div class="row">
-                    <div class="col-lg-12 pb0 pt0" style="border-color: rgb(56, 62, 69) !important;">
-                        <h2 style="text-align: center;"><font style="color: rgb(255, 255, 255);">And it won't cost you a thing!</font></h2>
+                    <div class="col-lg-12" style="border-color: rgb(56, 62, 69) !important;">
+                        <h3 style="text-align: center;"><font style="color: rgb(255, 255, 255);">And it won't cost you a thing!</font></h3>
                         <p style="text-align: center;"><font style="color: rgb(255, 255, 255);">Zero, zilch, nada! Odoo Experience is free for everyone!</font></p>
-                        <p style="text-align: center;"><a class="btn btn-primary btn-lg rounded-circle" href="http://">Register now!</a></p>
+                    </div>
+                    <div class="col-lg-12" style="text-align: center;">
+                        <a class="btn btn-primary btn-lg rounded-circle" href="http://">Register now!</a>
                     </div>
                 </div>
             </div>
         </div>
-        <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-200" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
-            <div class="container o_mail_table_styles">
+        <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-200 pt16 pb16" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
+            <div class="container">
                 <div class="row">
-                    <div class="col-lg-12 o_mail_footer_links">
+                    <div class="col-lg-12 o_mail_footer_links pt8 pb8" style="text-align: center;">
                         <a role="button" href="/unsubscribe_from_list" class="btn btn-link ">Unsubscribe</a>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12">
-                        <p class="o_mail_footer_copy">
+                        <p style="text-align: center;">
                             © <t t-out="now.strftime('%Y')" /> All Rights Reserved
                         </p>
                     </div>
@@ -173,33 +176,31 @@
             }
         </style>
         <t t-set="now" t-value="datetime.datetime.now()"/>
-        <div class="s_header_social o_mail_block_header_social o_mail_snippet_general" data-snippet="s_mail_block_header_social" data-name="Header Social">
-            <div class="o_mail_table_styles container">
+        <div class="s_header_social o_mail_block_header_social o_mail_snippet_general pt40 pb32" data-snippet="s_mail_block_header_social" data-name="Header Social">
+            <div class="container">
                 <div class="row">
-                    <div class="col-8 o_mail_logo_container pt40 pb32">
-                        <a style="text-decoration:none;float:none;" href="#">
-                            <img width="189" style="height:auto;max-width:400px;" src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_logo.png"/>
+                    <div class="col-lg-4">
+                        <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;float:none;" target="_blank">
+                            <img border="0" width="189" style="height:auto; max-width:100%; width: 189px;" src="/mass_mailing_themes/static/src/img/theme_tech/tech_logo.png"/>
                         </a>
                     </div>
-                    <div class="col-4 o_mail_no_resize" style="text-align:center;">
-                        <div class="o_mail_header_social" t-translation="off">
-                            <a title="Facebook" href="https://www.facebook.com/Odoo">
-                                <span class="fa fa-facebook" style="color: rgb(54, 166, 210) !important; font-size: 18px;"/>​
-                            </a>
-                            <span style="font-size: 18px;">&amp;nbsp; &amp;nbsp;</span>
-                            <a style="margin-left:10px" title="LinkedIn" href="https://www.linkedin.com/company/odoo">
-                                <span class="fa fa-linkedin" style="color: rgb(54, 166, 210) !important; font-size: 18px;"/>​
-                            </a>
-                            <span style="font-size: 18px;">&amp;nbsp; &amp;nbsp;</span>
-                            <a style="margin-left:10px" title="Twitter" href="https://twitter.com/Odoo">
-                                <span class="fa fa-twitter" style="color: rgb(54, 166, 210) !important; font-size: 18px;"/>​
-                            </a>
-                            <span style="font-size: 18px;">&amp;nbsp; &amp;nbsp;</span>
-                            <a style="margin-left:10px" title="Instagram" href="https://www.instagram.com/explore/tags/odoo/">
-                                <span class="fa fa-instagram" style="color: rgb(54, 166, 210) !important; font-size: 18px;"/>
-                            </a>
-                            <span style="font-size: 18px;">&amp;nbsp; &amp;nbsp;</span>
-                        </div>
+                    <div class="col-lg-8 o_mail_header_social" style="text-align:right;">
+                        <a title="Facebook" href="https://www.facebook.com/Odoo">
+                            <span class="fa fa-facebook" style="color: rgb(54, 166, 210) !important; font-size: 18px;"/>​
+                        </a>
+                        &amp;nbsp; &amp;nbsp;
+                        <a style="margin-left:10px" title="LinkedIn" href="https://www.linkedin.com/company/odoo">
+                            <span class="fa fa-linkedin" style="color: rgb(54, 166, 210) !important; font-size: 18px;"/>​
+                        </a>
+                        &amp;nbsp; &amp;nbsp;
+                        <a style="margin-left:10px" title="Twitter" href="https://twitter.com/Odoo">
+                            <span class="fa fa-twitter" style="color: rgb(54, 166, 210) !important; font-size: 18px;"/>​
+                        </a>
+                        &amp;nbsp; &amp;nbsp;
+                        <a style="margin-left:10px" title="Instagram" href="https://www.instagram.com/explore/tags/odoo/">
+                            <span class="fa fa-instagram" style="color: rgb(54, 166, 210) !important; font-size: 18px;"/>
+                        </a>
+                        &amp;nbsp; &amp;nbsp;
                     </div>
                 </div>
             </div>
@@ -213,11 +214,11 @@
                     <div class="col-lg-7 pt16 pb16">
                         <h1>Breaking IT news
                             <br/>and Analysis</h1>
-                        <p>Our roundup of the most popular and latest tech related videos from last week.<br/></p>
-                        <div style="text-align:left;"><a class="btn btn-primary rounded-circle" href="#">VISIT OUR WEBSITE</a></div>
+                        <p style="text-align: left;">Our roundup of the most popular and latest tech related videos from last week.<br/></p>
+                        <p style="text-align:left;"><a class="btn btn-primary rounded-circle" href="#">VISIT OUR WEBSITE</a></p>
                     </div>
                     <div class="col-lg-5 px-0">
-                        <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_tech/text_image-triangle.png" data-original-id="242" data-original-src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/triangle" data-file-name="text_image-triangle.svg" data-shape-colors=";;;;" data-original-mimetype="image/jpeg"/>
+                        <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg" data-original-id="242" data-original-src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/triangle" data-file-name="text_image-triangle.svg" data-shape-colors=";;;;" data-original-mimetype="image/jpeg"/>
                     </div>
                 </div>
             </div>
@@ -225,13 +226,13 @@
         <div class="s_hr o_mail_snippet_general pt0 pb16" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <div class="s_media_list o_mail_snippet_general o_cc o_cc2 pb0 pt0 bg-white" data-snippet="s_media_list" data-vcss="001" data-name="Media List">
+        <div class="s_media_list o_mail_snippet_general o_cc o_cc2 pb0 pt0 bg-white" style="padding-left: 15px; padding-right: 15px;" data-snippet="s_media_list" data-vcss="001" data-name="Media List">
             <div class="container">
                 <div class="row s_nb_column_fixed s_col_no_bgcolor">
                     <div class="col-lg-12 s_media_list_item pb0 pt0" data-name="Media item">
-                        <div class="row s_col_no_resize s_col_no_bgcolor g-0 align-items-center o_cc o_cc1">
-                            <div class="col-lg-4 s_media_list_img_wrapper align-self-stretch">
-                                <img src="/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_1.jpg" class="s_media_list_img h-100 w-100"/>
+                        <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
+                            <div class="col-lg-4 s_media_list_img_wrapper align-self-stretch px-0">
+                                <img src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_1.jpg" class="s_media_list_img h-100 w-100"/>
                             </div>
                             <div class="col-lg-8 s_media_list_body">
                                 <h3>The future of smartphone video production</h3>
@@ -243,8 +244,8 @@
                         </div>
                     </div>
                     <div class="col-lg-12 s_media_list_item pt0 pb0" data-name="Media item">
-                        <div class="row s_col_no_resize s_col_no_bgcolor g-0 align-items-center o_cc o_cc1">
-                            <div class="align-self-stretch s_media_list_img_wrapper col-lg-12">
+                        <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
+                            <div class="col-lg-12 s_media_list_img_wrapper align-self-stretch px-0">
                                 <div class="s_hr o_mail_snippet_general pt16 pb16" data-snippet="s_hr" data-name="Separator">
                                     <hr class="s_hr_1px s_hr_solid"/>
                                 </div>
@@ -252,9 +253,9 @@
                         </div>
                     </div>
                     <div class="col-lg-12 s_media_list_item pb0 pt0" data-name="Media item">
-                        <div class="row s_col_no_resize s_col_no_bgcolor g-0 align-items-center o_cc o_cc1">
-                            <div class="col-lg-4 s_media_list_img_wrapper align-self-stretch">
-                                <img src="/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_2.jpg" class="s_media_list_img h-100 w-100"/>
+                        <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
+                            <div class="col-lg-4 s_media_list_img_wrapper align-self-stretch px-0">
+                                <img src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_2.jpg" class="s_media_list_img h-100 w-100"/>
                             </div>
                             <div class="col-lg-8 s_media_list_body pt16 pb16">
                                 <h3>5 Ways Drones Can Better Your Live Events</h3>
@@ -264,8 +265,8 @@
                         </div>
                     </div>
                     <div class="col-lg-12 s_media_list_item pt0 pb0" data-name="Media item">
-                        <div class="row s_col_no_resize s_col_no_bgcolor g-0 align-items-center o_cc o_cc1">
-                            <div class="col-lg-12 s_media_list_img_wrapper align-self-stretch">
+                        <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
+                            <div class="col-lg-12 s_media_list_img_wrapper align-self-stretch px-0">
                                 <div class="s_hr o_mail_snippet_general pt16 pb16" data-snippet="s_hr" data-name="Separator">
                                     <hr class="s_hr_1px s_hr_solid"/>
                                 </div>
@@ -273,9 +274,9 @@
                         </div>
                     </div>
                     <div class="col-lg-12 s_media_list_item pt0 pb0" data-name="Media item">
-                        <div class="row s_col_no_resize s_col_no_bgcolor g-0 align-items-center o_cc o_cc1">
-                            <div class="col-lg-4 s_media_list_img_wrapper align-self-stretch">
-                                <img src="/mass_mailing_themes/static/src/img/theme_tech/tech_media_list_image_3.jpg" class="s_media_list_img h-100 w-100"/>
+                        <div class="row s_col_no_resize s_col_no_bgcolor align-items-center o_cc o_cc1">
+                            <div class="col-lg-4 s_media_list_img_wrapper align-self-stretch px-0">
+                                <img src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_media_list_3.jpg" class="s_media_list_img h-100 w-100"/>
                             </div>
                             <div class="col-lg-8 s_media_list_body">
                                 <h3>How to Code a Website Without Experience</h3>
@@ -290,16 +291,16 @@
         <div class="s_hr o_mail_snippet_general pt16 pb0" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general" data-snippet="s_mail_block_footer_social" data-name="Footer Social Center">
-            <div class="container o_mail_table_styles">
+        <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general pt16 pb16" data-snippet="s_mail_block_footer_social" data-name="Footer Social Center">
+            <div class="container">
                 <div class="row">
-                    <div class="col-lg-12 o_mail_footer_links">
-                        <a href="/unsubscribe_from_list" class="btn btn-link"><font style="color: rgb(147, 146, 146);">Unsubscribe</font></a>
+                    <div class="col-lg-12 o_mail_footer_links pt8 pb8" style="text-align: center;">
+                        <a href="/unsubscribe_from_list" class="btn btn-link"><font style="color: rgb(173, 173, 173);">Unsubscribe</font></a>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12">
-                        <p class="o_mail_footer_copy">
+                        <p style="text-align: center;">
                             © <t t-out="now.strftime('%Y')" /> All Rights Reserved
                         </p>
                     </div>
@@ -350,26 +351,26 @@
         <t t-set="now" t-value="datetime.datetime.now()"/>
         <t t-set="future_date" t-value="(datetime.date.today() + datetime.timedelta(days=30))"/>
         <div class="s_header_logo o_mail_block_header_logo o_mail_snippet_general" data-snippet="s_mail_block_header_logo" data-name="Centered Logo" style="background-color: rgb(36, 37, 48) !important;">
-            <div class="container o_mail_table_styles">
+            <div class="container">
                 <div class="row">
                     <div class="col-lg-4" style="text-align: center;">
-                        <font style="color: rgb(255, 255, 255);">FREE</font>
-                        <br/><span style="font-weight: bolder"><font style="color: rgb(255, 255, 255);">SHIPPING</font></span>
+                        <p><font style="color: rgb(255, 255, 255);">FREE</font>
+                        <br/><span style="font-weight: bolder"><font style="color: rgb(255, 255, 255);">SHIPPING</font></span></p>
                     </div>
                     <div class="col-lg-4 pt16 pb16" style="text-align: center;">
-                        <a style="text-decoration:none; text-align:center;" href="http://www.example.com">
-                            <img border="0" src="/mass_mailing_themes/static/src/img/theme_vip/s_default_image_logo.png" style="height: auto; max-width: 400px; width: 105px;" />
+                        <a style="text-decoration:none; text-align:center;" t-att-href="(company_id.website) or '#'" target="_blank">
+                            <img border="0" src="/mass_mailing_themes/static/src/img/theme_vip/vip_logo.png" style="height: auto; max-width: 100%; width: 105px;" width="105" />
                         </a>
                     </div>
                     <div class="col-lg-4" style="text-align: center;">
-                        <font style="color: rgb(255, 255, 255);">EXCLUSIVE</font>
-                        <br/><span style="font-weight: bolder"><font style="color: rgb(255, 255, 255);">DEALS</font></span>
+                        <p><font style="color: rgb(255, 255, 255);">EXCLUSIVE</font>
+                        <br/><span style="font-weight: bolder"><font style="color: rgb(255, 255, 255);">DEALS</font></span></p>
                     </div>
                 </div>
             </div>
         </div>
         <div class="s_cover o_mail_snippet_general" data-snippet="s_cover" data-name="Cover" style="background-color: rgb(36, 37, 48) !important;">
-            <img src="/mass_mailing_themes/static/src/img/theme_vip/vip_banner_part1.png" alt="Cover" class="img-fluid w-100"/>
+            <img src="/mass_mailing_themes/static/src/img/theme_vip/vip_banner_part1.png" alt="Cover" class="img-fluid w-100 mx-auto"/>
         </div>
         <div class="s_hr o_mail_snippet_general pt0 pb16" data-snippet="s_hr" data-name="Separator" style="background-color: rgb(36, 37, 48) !important;">
             <hr class="s_hr_1px s_hr_solid"/>
@@ -384,9 +385,9 @@
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
         <div class="s_cover o_mail_snippet_general" data-snippet="s_cover" data-name="Cover" style="background-color: rgb(36, 37, 48) !important;">
-            <img src="/mass_mailing_themes/static/src/img/theme_vip/vip_banner_part2.png" alt="Cover" class="img-fluid w-100"/>
+            <img src="/mass_mailing_themes/static/src/img/theme_vip/vip_banner_part2.png" alt="Cover" class="img-fluid w-100 mx-auto"/>
         </div>
-        <div class="s_discount2 o_mail_block_discount2 o_mail_snippet_general px-3 pt32 pb32" data-snippet="s_coupon_code" data-name="Promo Code" style="background-color: rgb(36, 37, 48) !important; text-align: center;">
+        <div class="s_discount2 o_mail_block_discount2 o_mail_snippet_general pt32 pb32" data-snippet="s_coupon_code" data-name="Promo Code" style="background-color: rgb(36, 37, 48) !important; text-align: center; padding-left: 15px; padding-right: 15px;">
             <p style="text-align: center;">Here's your coupon code* :</p>
             <table border="0" cellpadding="0" cellspacing="0" align="center" class="border" style="background-color: rgb(36, 37, 48) !important; border-collapse: collapse; border-color: rgb(198, 150, 120) !important;">
                 <tr>
@@ -414,10 +415,10 @@
                 </div>
             </div>
         </div>
-        <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general" data-snippet="s_mail_block_footer_social" data-name="Footer Center" style="background-color: rgb(36, 37, 48) !important;">
-            <div class="container o_mail_table_styles">
+        <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general pt16 pb16" data-snippet="s_mail_block_footer_social" data-name="Footer Center" style="background-color: rgb(36, 37, 48) !important;">
+            <div class="container">
                 <div class="row">
-                    <div class="col-lg-12 o_mail_footer_social" t-translation="off">
+                    <div class="col-lg-12" style="text-align: center;" t-translation="off">
                         <a aria-label="Facebook" title="Facebook" href="https://www.facebook.com/Odoo">
                             <span class="fa fa-facebook rounded-circle" style="background-color: rgb(198, 150, 120) !important; color: rgb(36, 37, 48) !important;"></span>
                         </a>&amp;nbsp;&amp;nbsp;
@@ -433,13 +434,13 @@
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col-lg-12 o_mail_footer_links">
+                    <div class="col-lg-12 o_mail_footer_links pt8 pb8" style="text-align: center;">
                         <a role="button" href="/unsubscribe_from_list" class="btn btn-link">Unsubscribe</a>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12">
-                        <p class="o_mail_footer_copy">
+                        <p style="text-align: center;">
                             © <t t-out="now.strftime('%Y')" /> All Rights Reserved
                         </p>
                     </div>
@@ -478,7 +479,7 @@
         </style>
         <t t-set="now" t-value="datetime.datetime.now()"/>
         <div class="s_header_logo o_mail_block_header_logo o_mail_snippet_general bg-white pt32 pb16" data-snippet="s_mail_block_header_logo" data-name="Centered Logo">
-            <div class="container o_mail_table_styles">
+            <div class="container">
                 <div class="row">
                     <div class="col-lg-3">
                         <p style="text-align: center;"><t t-out="now.strftime('%b')" />
@@ -491,7 +492,8 @@
                     </div>
                     <div class="col-lg-3">
                         <p style="text-align: center;">Issue
-                        <br/><span style="font-weight: bolder;">#42</span></p>
+                            <br/><span style="font-weight: bolder;">#42</span>
+                        </p>
                     </div>
                 </div>
             </div>
@@ -499,13 +501,13 @@
         <div class="s_hr o_mail_snippet_general pb32" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <div class="s_text_image o_mail_snippet_general" data-snippet="s_image_text" data-name="Image - Text">
+        <div class="s_text_image o_mail_snippet_general" data-snippet="s_text_image" data-name="Image - Text">
             <div class="container">
                 <div class="row align-items-center">
                     <div class="col-lg-8 px-0">
-                        <img src="/mass_mailing_themes/static/src/img/theme_bold/s_default_image_block_image_text.jpg" class="img w-100" style="width: 533px;"/>
+                        <img src="/mass_mailing_themes/static/src/img/theme_bold/s_default_image_image_text.jpg" class="img w-100" style="width: 533px;"/>
                     </div>
-                    <div class="col-lg-4 pt0 pb0">
+                    <div class="col-lg-4 o_cc pt0 pb0">
                         <h2 style="text-align: center;">IN THIS ISSUE</h2>
                         <div class="s_hr o_mail_snippet_general pt16 pb16" data-snippet="s_hr" data-name="Separator">
                             <hr class="s_hr_1px s_hr_solid"/>
@@ -546,35 +548,31 @@
         <div class="s_mail_product_list o_mail_snippet_general pt0" data-snippet="s_product_list" data-name="Items">
             <div class="container">
                 <div class="row">
-                    <div class="col-lg-6">
-                        <div>
-                            <h3 style="text-align: left;">
-                                <font style="background-color: rgb(231, 148, 57);">TRAVEL</font>
-                            </h3>
-                            <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_bold/s_product_list_image_2.jpg" alt="Man on a rock looking at mountains in the distance" style="width: 100% !important;"/>
-                            <h2 style="text-align: left;">Destinations for an eco-holiday</h2>
-                            <p>Bitten by the travel bug but looking to travel consciously? Eco-travel is the way forward.</p>
-                            <p style="text-align: right;">
-                                <a href="#" class="btn btn-link">
-                                    Find out more&amp;nbsp;<span class="fa fa-angle-right"/>
-                                </a>
-                            </p>
-                        </div>
+                    <div class="col-lg-6 o_cc">
+                        <h3><font style="background-color: rgb(231, 148, 57);">TRAVEL</font></h3>
+                        <a href="#">
+                            <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_bold/s_default_image_product_2.jpg" alt="Man on a rock looking at mountains in the distance" style="width: 100% !important; padding: 15px 0px;"/>
+                        </a>
+                        <h2 style="text-align: left;">Destinations for an eco-holiday</h2>
+                        <p style="text-align: left;">Bitten by the travel bug but looking to travel consciously? Eco-travel is the way forward.</p>
+                        <p style="text-align: right;">
+                            <a href="#" class="btn btn-link">
+                                Find out more&amp;nbsp;<span class="fa fa-angle-right"/>
+                            </a>
+                        </p>
                     </div>
-                    <div class="col-lg-6">
-                        <div>
-                            <h3 style="text-align: left;">
-                                <font style="background-color: rgb(231, 99, 99);">LIFESTYLE</font>
-                            </h3>
-                            <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_bold/s_product_list_image_1.jpg" alt="" style="width: 100% !important;"/>
-                            <h2 style="text-align: left;">Top 5 energy-boosting morning routines</h2>
-                            <p>Imagine waking up with more energy, more flexibility, with less stress and fewer instances of anxiously rushing out the door.</p>
-                            <p style="text-align: right;">
-                                <a href="#" class="btn btn-link">
-                                    Find out more&amp;nbsp;<span class="fa fa-angle-right"/>
-                                </a>
-                            </p>
-                        </div>
+                    <div class="col-lg-6 o_cc">
+                        <h3><font style="background-color: rgb(231, 99, 99);">LIFESTYLE</font></h3>
+                        <a href="#">
+                            <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_bold/s_default_image_product_1.jpg" alt="Woman having breakfast in bed" style="width: 100% !important; padding: 15px 0px;"/>
+                        </a>
+                        <h2 style="text-align: left;">Top 5 energy-boosting morning routines</h2>
+                        <p style="text-align: left;">Imagine waking up with more energy, more flexibility, with less stress and fewer instances of anxiously rushing out the door.</p>
+                        <p style="text-align: right;">
+                            <a href="#" class="btn btn-link">
+                                Find out more&amp;nbsp;<span class="fa fa-angle-right"/>
+                            </a>
+                        </p>
                     </div>
                 </div>
             </div>
@@ -585,10 +583,8 @@
         <div class="s_text_image o_mail_snippet_general" data-snippet="s_text_image" data-name="Text - Image">
             <div class="container">
                 <div class="row align-items-center">
-                    <div class="col-lg-6 pt16 pb16">
-                        <h3 style="text-align: left;">
-                            <font style="background-color: rgb(57, 123, 33);">FOOD</font>
-                        </h3>
+                    <div class="col-lg-6 o_cc pt16 pb16">
+                        <h3 style="text-align: left;"><font style="background-color: rgb(57, 123, 33);">FOOD</font></h3>
                         <h2>Delicious recipes from around the world</h2>
                         <p>Travel without leaving your kitchen with these international recipes. From Canada to Australia, Mexico to Sweden, and everywhere in between.</p>
                         <div style="text-align:right">
@@ -598,7 +594,7 @@
                         </div>
                     </div>
                     <div class="col-lg-6 px-0">
-                        <img src="/mass_mailing_themes/static/src/img/theme_bold/s_image_text_2.jpg" class="img w-100"/>
+                        <img src="/mass_mailing_themes/static/src/img/theme_bold/s_default_image_image_text_2.jpg" class="img w-100"/>
                     </div>
                 </div>
             </div>
@@ -606,10 +602,10 @@
         <div class="s_hr o_mail_snippet_general pt32 pb16" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
-            <div class="container o_mail_table_styles">
+        <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general pt16 pb16" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
+            <div class="container">
                 <div class="row">
-                    <div class="col-lg-12 o_mail_footer_social">
+                    <div class="col-lg-12" style="text-align: center;" t-translation="off">
                         <a aria-label="Facebook" title="Facebook" href="https://www.facebook.com/Odoo">
                             <span class="fa fa-facebook"></span>
                         </a>&amp;nbsp;&amp;nbsp;
@@ -625,13 +621,13 @@
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col-lg-12 o_mail_footer_links">
-                        <a role="button" href="/unsubscribe_from_list" class="btn btn-link ">Unsubscribe</a>
+                    <div class="col-lg-12 o_mail_footer_links pt8 pb8" style="text-align: center;">
+                        <a role="button" href="/unsubscribe_from_list" class="btn btn-link">Unsubscribe</a>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12">
-                        <p class="o_mail_footer_copy">
+                        <p style="text-align: center;">
                             © <t t-out="now.strftime('%Y')" /> All Rights Reserved
                         </p>
                     </div>
@@ -670,48 +666,48 @@
         </style>
         <t t-set="now" t-value="datetime.datetime.now()"/>
         <t t-set="future_date" t-value="(datetime.date.today() + datetime.timedelta(days=30))"/>
-        <div class="s_header_logo o_mail_block_header_logo o_mail_snippet_general bg-200" data-snippet="s_mail_block_header_logo" data-name="Header Logo">
-            <div class="container o_mail_table_styles">
+        <div class="s_header_logo o_mail_block_header_logo o_mail_snippet_general pt16 pb16 bg-200" data-snippet="s_mail_block_header_logo" data-name="Header Logo">
+            <div class="container">
                 <div class="row">
                     <div class="col-lg-4"></div>
                     <div class="col-lg-4 pt16 pb16" style="text-align: center;">
                         <a style="text-decoration:none;" href="http://www.example.com">
-                            <img src="/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_logo.png" width="70" style="height:auto;max-width:400px;width:70px"/>
+                            <img src="/mass_mailing_themes/static/src/img/theme_bignews/bignews_logo.png" width="70" style="height:auto;max-width:100%; width:70px;"/>
                         </a>
                     </div>
                     <div class="col-lg-4" style="text-align:right"></div>
                 </div>
             </div>
         </div>
-        <div class="s_title o_mail_snippet_general pt32 pb32" data-snippet="s_title" data-name="Title">
+        <div class="s_title o_mail_snippet_general pt32 pb16" data-snippet="s_title" data-name="Title">
             <div class="container s_allow_columns">
                 <h1 style="text-align: center;">WE'RE MOVING</h1>
             </div>
         </div>
         <div class="s_cover o_mail_snippet_general pt0" data-snippet="s_cover" data-name="Cover">
-            <img src="/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_block_banner.jpg" alt="Cover image" class="img-fluid mx-auto d-block" style="width: 690px;"/>
+            <img src="/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_cover.jpg" alt="Cover image" class="img-fluid w-100 mx-auto" style="padding: 15px;"/>
         </div>
-        <div class="s_text_block o_mail_snippet_general pt32 pb32 px-3" data-snippet="s_text_block" data-name="Text">
+        <div class="s_text_block o_mail_snippet_general pt32 pb32" data-snippet="s_text_block" data-name="Text" style="padding-left: 15px; padding-right: 15px;">
             <div class="container s_allow_columns">
                 <h2>BEGINNING <t t-out="future_date.strftime('%B %d').upper()" /></h2>
-            <p>We are proud to announce that due to our remarkable growth in the Springfield area, we are moving to a new location on July 1.
-               <br/>We will continue to offer the same friendly service at our new address on <span style="font-weight: bolder">1600 Main Street</span>,
-               <br/>which will allow us to offer an even larger selection of products and services.
-            </p>
-            <p>See you there,</p>
-            <p><img src="/mass_mailing_themes/static/src/img/theme_bignews/signature.png" style="width:125px; margin-top:8px;margin-bottom:-25px;" alt="Signature"/></p>
-            <p>Michael Fletcher<br/>
-               <span style="font-size: 12px; font-weight: bolder;">Customer Service</span>
-            </p>
-            <p style="text-align: center;">
-                <a role="button" href="#" class="btn btn-primary">READ MORE</a>
-            </p>
+                <p>We are proud to announce that due to our remarkable growth in the Springfield area, we are moving to a new location on July 1.
+                   <br/>We will continue to offer the same friendly service at our new address on <span style="font-weight: bolder">1600 Main Street</span>,
+                   <br/>which will allow us to offer an even larger selection of products and services.
+                </p>
+                <p>See you there,</p>
+                <p><img src="/mass_mailing_themes/static/src/img/theme_bignews/signature.png" style="width:125px; margin-top:8px;margin-bottom:-25px;" alt="Signature"/></p>
+                <p>Michael Fletcher<br/>
+                   <span style="font-size: 12px; font-weight: bolder;">Customer Service</span>
+                </p>
+                <p style="text-align: center;">
+                    <a role="button" href="#" class="btn btn-primary">READ MORE</a>
+                </p>
+            </div>
         </div>
-        </div>
-        <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-200" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
-            <div class="container o_mail_table_styles">
+        <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-200 pt16 pb16" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
+            <div class="container">
                 <div class="row">
-                    <div class="col-lg-12 o_mail_footer_social" t-translation="off">
+                    <div class="col-lg-12" style="text-align: center;" t-translation="off">
                         <a aria-label="Facebook" title="Facebook" href="https://www.facebook.com/Odoo">
                             <span class="fa fa-facebook" style="color: rgb(186, 0, 19) !important;"/>​
                         </a>&amp;nbsp;&amp;nbsp;
@@ -727,12 +723,13 @@
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col-lg-12 o_mail_footer_links">
-                        <a role="button" href="/unsubscribe_from_list" class="btn btn-link">Unsubscribe</a></div>
+                    <div class="col-lg-12 o_mail_footer_links pt8 pb8" style="text-align: center;">
+                        <a role="button" href="/unsubscribe_from_list" class="btn btn-link">Unsubscribe</a>
+                    </div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12">
-                        <p class="o_mail_footer_copy">
+                        <p style="text-align: center;">
                             © <t t-out="now.strftime('%Y')" /> All Rights Reserved
                         </p>
                     </div>
@@ -745,7 +742,6 @@
     <template id="theme_solar_template">
         <style id="design-element">
             h1 {
-                font-size: 62px;
                 font-weight: bolder;
             }
             h2 {
@@ -767,23 +763,20 @@
             }
         </style>
         <t t-set="now" t-value="datetime.datetime.now()"/>
-        <div class="s_header_text_social o_mail_block_header_text_social o_mail_snippet_general" data-snippet="s_mail_block_header_text_social" data-name="Left Text">
-            <div class="o_mail_table_styles container">
+        <div class="s_header_text_social o_mail_block_header_text_social o_mail_snippet_general pt16 pb16" data-snippet="s_mail_block_header_text_social" data-name="Left Text">
+            <div class="container">
                 <div class="row">
-                    <div class="col-lg-8 pt16 pb16">
-                        <p>
-                            <a href="http://www.example.com">
-                                <span style="color: rgb(255, 187, 0) !important;" class="fa fa-2x fa-sun-o" />&amp;nbsp;
-                            </a>
-                            <span style="font-size: 24px;"><font style="font-weight: bolder; color: rgb(255, 255, 255); background-color: rgb(255, 187, 0);">SOLAR</font></span>
-                        </p>
+                    <div class="col-lg-4 pt16 pb16">
+                        <h1>
+                            <a t-att-href="(company_id.website) or '#'" target="_blank">
+                                <span style="color: rgb(255, 187, 0) !important; font-size: 32px" class="fa fa-1x fa-sun-o" />
+                            </a><span style="font-size: 32px;"><font style="font-weight: bolder; color: rgb(255, 255, 255); background-color: rgb(255, 187, 0);">SOLAR</font></span>
+                        </h1>
                     </div>
-                    <div class="col-lg-4 o_mail_no_resize" style="text-align:right;">
-                        <div class="o_mail_header_social">
-                            <a href="/view">
-                                <span style="font-weight: bolder;">View online</span>&amp;nbsp;<span class="fa fa-external-link" />
-                            </a>
-                        </div>
+                    <div class="col-lg-8 o_mail_header_social" style="text-align:right;">
+                        <a href="/view">
+                            <span style="font-weight: bolder;">View online</span>&amp;nbsp;<span class="fa fa-external-link" />
+                        </a>
                     </div>
                 </div>
             </div>
@@ -791,13 +784,13 @@
         <div class="s_title o_mail_snippet_general pt72 pb80" data-snippet="s_title" data-name="Title" style="background-color: rgb(255, 187, 0) !important;">
             <div class="container s_allow_columns">
                 <h1 style="text-align:center">
-                        <font style="background-color: rgb(255, 255, 255);">&amp;nbsp;10% OFF&amp;nbsp;</font>
+                        <font style="font-size: 62px; background-color: rgb(255, 255, 255);">&amp;nbsp;10% OFF&amp;nbsp;</font>
                     <br/>
-                        <font style="background-color: rgb(255, 255, 255);">&amp;nbsp;SALES&amp;nbsp;</font>
+                        <font style="font-size: 62px; background-color: rgb(255, 255, 255);">&amp;nbsp;SALES&amp;nbsp;</font>
                 </h1>
             </div>
         </div>
-        <div class="s_discount2 o_mail_block_discount2 o_mail_snippet_general px-3 pt32 pb32" data-name="Promo Code">
+        <div class="s_discount2 o_mail_block_discount2 o_mail_snippet_general pt32 pb32" data-name="Promo Code" style="padding-left: 15px; padding-right: 15px;">
             <h2 style="text-align: center;">GET 10%&amp;nbsp;OFF</h2>
             <p style="text-align: center;">
                 Valid on all sales prices in our webshop.
@@ -808,6 +801,7 @@
                     <td width="200" height="50" align="center" class="o_cc" style="min-width: 150px; width: 200px; text-align: center;"><p class="mb0">ENDOFSUMMER20</p></td>
                 </tr>
             </table>
+            <br/>
             <p style="text-align:center;">
                 <a role="button" class="btn btn-primary btn-lg" href="http://">Visit the website</a>
             </p>
@@ -815,31 +809,31 @@
         <div class="s_hr pt16 pb16" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <div class="s_features pb32 o_mail_snippet_general pt32" data-snippet="s_features" data-name="Features">
+        <div class="s_features o_mail_snippet_general" data-snippet="s_features" data-name="Features">
             <div class="container">
                 <div class="row">
-                    <div class="col-lg-4" style="text-align:center;">
-                        <img alt="Customer Service" src="/mass_mailing_themes/static/src/img/theme_solar/customer-service.gif" class="img-fluid o_we_custom_image mx-auto d-block" style="width: 100px;"/>
+                    <div class="col-lg-4 pt16 pb16" style="text-align:center;">
+                        <img alt="Customer Service" src="/mass_mailing_themes/static/src/img/theme_solar/s_default_image_product_1.jpg" class="img-fluid o_we_custom_image mx-auto d-block" style="width: 100px;"/>
                         <h3>24/7 <br/>Customer Service</h3>
                     </div>
-                    <div class="col-lg-4" style="text-align:center;">
-                        <img alt="Free Delivery" src="/mass_mailing_themes/static/src/img/theme_solar/delivery.gif" class="img-fluid o_we_custom_image mx-auto d-block" style="width: 100px;"/>
+                    <div class="col-lg-4 pt16 pb16" style="text-align:center;">
+                        <img alt="Free Delivery" src="/mass_mailing_themes/static/src/img/theme_solar/s_default_image_product_2.jpg" class="img-fluid o_we_custom_image mx-auto d-block" style="width: 100px;"/>
                         <h3 style="text-align:center;">Free delivery*</h3>
                         <p style="text-align:center;">*For orders over $39.</p>
                     </div>
-                    <div class="col-lg-4" style="text-align:center;">
-                        <img alt="" src="/mass_mailing_themes/static/src/img/theme_solar/returns.gif" class="img-fluid o_we_custom_image mx-auto d-block" style="width: 100px;"/>
+                    <div class="col-lg-4 pt16 pb16" style="text-align:center;">
+                        <img alt="Easy Returns" src="/mass_mailing_themes/static/src/img/theme_solar/s_default_image_product_3.jpg" class="img-fluid o_we_custom_image mx-auto d-block" style="width: 100px;"/>
                         <h3 style="text-align:center;">Easy Returns</h3>
                     </div>
                 </div>
             </div>
         </div>
-        <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_left o_mail_snippet_general" data-snippet="s_mail_block_footer_social_left" data-name="Footer Left" style="background-color: rgb(255, 187, 0) !important;">
-            <div cellspacing="0" cellpadding="0" class="container o_mail_table_styles">
+        <div class="s_footer_social o_mail_block_footer_social o_mail_footer_social_left o_mail_snippet_general pt16 pb16" data-snippet="s_mail_block_footer_social_left" data-name="Footer Left" style="background-color: rgb(255, 187, 0) !important;">
+            <div class="container">
                 <div class="row">
-                    <div class="col-lg o_mail_footer_description">
+                    <div class="col-lg-6">
                         <p>
-                            <span style="font-weight: bolder">
+                            <span style="font-weight: bolder;">
                                 <font style="background-color: rgb(255, 255, 255); color: rgb(255, 187, 0);">SOLAR</font>
                             </span>
                         </p>
@@ -849,8 +843,8 @@
                             </a>
                         </div>
                     </div>
-                    <div class="col-lg" align="right">
-                        <div class="o_mail_footer_social pb16" t-translation="off">
+                    <div class="col-lg-6">
+                        <div class="pb16" style="text-align: right;" t-translation="off">
                             <a aria-label="Facebook" title="Facebook" href="https://www.facebook.com/Odoo">
                                 <span class="fa fa-facebook rounded bg-black" style="color: rgb(255, 187, 0) !important;"/>
                             </a>&amp;nbsp;&amp;nbsp;
@@ -864,8 +858,9 @@
                                 <span class="fa fa-instagram rounded bg-black" style="color: rgb(255, 187, 0) !important;"/>
                             </a>
                         </div>
-                        <p class="o_mail_footer_copy">
-                            <font style="color: rgb(137, 101, 1);">© <t t-out="now.strftime('%Y')" /> All Rights Reserved</font></p>
+                        <p style="text-align: right">
+                            <font style="color: rgb(137, 101, 1);">© <t t-out="now.strftime('%Y')" /> All Rights Reserved</font>
+                        </p>
                     </div>
                 </div>
             </div>