diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml
index 4699c2fdd7a..1df21118285 100644
--- a/addons/mass_mailing/views/snippets_themes.xml
+++ b/addons/mass_mailing/views/snippets_themes.xml
@@ -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="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="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,23 +144,23 @@
 </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="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 px-3" style="text-align: center;">
         <a href="/view">
             View Online
         </a>