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 dec3bcd5890..88c81529851 100644
--- a/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
+++ b/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
@@ -59,19 +59,19 @@
                     </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;"/>
+                            <span class="fa fa-facebook 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;"/>
+                            <span class="fa fa-linkedin 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;"/>​
+                            <span class="fa fa-twitter 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;"/>
+                            <span class="fa fa-instagram text-white" style="background-color: rgb(43, 59, 88) !important;"/>
                         </a>&amp;nbsp;&amp;nbsp;
                         <a style="margin-left:10px" title="TikTok" href="https://www.tiktok.com/@odoo">
-                            <span class="fa fa-tiktok rounded-circle text-white" style="background-color: rgb(43, 59, 88) !important;"/>
+                            <span class="fa fa-tiktok text-white" style="background-color: rgb(43, 59, 88) !important;"/>
                         </a>
                     </div>
                 </div>
@@ -100,7 +100,7 @@
                                     </div>
                                 </div>
                                 <p>Learn through workshops, product demos, and inspiring talks from Odoo Experts and Partners.</p>
-                                <a class="btn btn-primary rounded-circle" href="http://">See what we've got planned</a>
+                                <a class="btn btn-primary" href="http://">See what we've got planned</a>
                             </div>
                         </div>
                     </div>
@@ -116,7 +116,7 @@
                                     </div>
                                 </div>
                                 <p>Create your very own chat room or join an existing one that sparks your interest.</p>
-                                <a class="btn btn-primary rounded-circle" href="http://">Go to the chatrooms</a>
+                                <a class="btn btn-primary" href="http://">Go to the chatrooms</a>
                             </div>
                         </div>
                     </div>
@@ -132,7 +132,7 @@
                                     </div>
                                 </div>
                                 <p>Experience everything from a virtual exhibitor's hall to multiple interactive presentations and demos.</p>
-                                <a class="btn btn-primary rounded-circle" href="http://">Find out more</a>
+                                <a class="btn btn-primary" href="http://">Find out more</a>
                             </div>
                         </div>
                     </div>
@@ -147,7 +147,7 @@
                         <p style="text-align: center;"><font style="color: rgb(255, 255, 255);">Zero, zilch, nada! Odoo Experience is free for everyone!</font></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>
+                        <a class="btn btn-primary btn-lg" href="http://">Register now!</a>
                     </div>
                 </div>
             </div>
@@ -246,7 +246,7 @@
                         <h1>Breaking IT news
                             <br/>and Analysis</h1>
                         <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>
+                        <p style="text-align:left;"><a class="btn btn-primary" href="#">VISIT OUR WEBSITE</a></p>
                     </div>
                     <div class="col-lg-5 px-0">
                         <img class="img-fluid o_we_custom_image" src="/web_editor/image_shape/mass_mailing_themes.s_tech_default_image/web_editor/geometric/geo_cornered_triangle.svg" data-shape="web_editor/geometric/geo_cornered_triangle" data-file-name="text_image-cornered_triangle.svg" data-shape-colors=";;;;" data-original-mimetype="image/jpeg"/>
@@ -268,7 +268,7 @@
                             <div class="col-lg-8 s_media_list_body">
                                 <h3>The future of smartphone video production</h3>
                                 <p>Modern smartphones have all the built-in tech equal to a majority of the current professional cameras.</p>
-                                <a class="btn btn-primary rounded-circle" href="http://"><span class="fa fa-play" />&amp;nbsp;&amp;nbsp;WATCH VIDEO</a>
+                                <a class="btn btn-primary" href="http://"><span class="fa fa-play" />&amp;nbsp;&amp;nbsp;WATCH VIDEO</a>
                                 &amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;
                                 <a class="btn btn-link" href="#">READ MORE</a>
                             </div>
@@ -291,7 +291,7 @@
                             <div class="col-lg-8 s_media_list_body pt16 pb16">
                                 <h3>5 Ways Drones Can Better Your Live Events</h3>
                                 <p>One clever use of drones is for delivering gifts — but another that's becoming popular for event safety purposes.</p>
-                                <a class="btn btn-primary rounded-circle" href="http://">READ MORE</a>
+                                <a class="btn btn-primary" href="http://">READ MORE</a>
                             </div>
                         </div>
                     </div>
@@ -312,7 +312,7 @@
                             <div class="col-lg-8 s_media_list_body">
                                 <h3>How to Code a Website Without Experience</h3>
                                 <p>Anyone with an ounce of business acumen knows that any business that wants to succeed needs a website.</p>
-                                <a class="btn btn-primary rounded-circle" href="http://">READ MORE</a>
+                                <a class="btn btn-primary" href="http://">READ MORE</a>
                             </div>
                         </div>
                     </div>
@@ -451,19 +451,19 @@
                 <div class="row">
                     <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>
+                            <span class="fa fa-facebook" style="background-color: rgb(198, 150, 120) !important; color: rgb(36, 37, 48) !important;"></span>
                         </a>&amp;nbsp;&amp;nbsp;
                         <a style="margin-left:10px" aria-label="LinkedIn" title="LinkedIn" href="https://www.linkedin.com/company/odoo">
-                            <span class="fa fa-linkedin rounded-circle" style="background-color: rgb(198, 150, 120) !important; color: rgb(36, 37, 48) !important;"></span>
+                            <span class="fa fa-linkedin" style="background-color: rgb(198, 150, 120) !important; color: rgb(36, 37, 48) !important;"></span>
                         </a>&amp;nbsp;&amp;nbsp;
                         <a style="margin-left:10px" aria-label="Twitter" title="Twitter" href="https://twitter.com/Odoo">
-                            <span class="fa fa-twitter rounded-circle" style="background-color: rgb(198, 150, 120) !important; color: rgb(36, 37, 48) !important;"></span>
+                            <span class="fa fa-twitter" style="background-color: rgb(198, 150, 120) !important; color: rgb(36, 37, 48) !important;"></span>
                         </a>&amp;nbsp;&amp;nbsp;
                         <a style="margin-left:10px" aria-label="Instagram" title="Instagram" href="https://www.instagram.com/explore/tags/odoo/">
-                            <span class="fa fa-instagram rounded-circle" style="background-color: rgb(198, 150, 120) !important; color: rgb(36, 37, 48) !important;"></span>
+                            <span class="fa fa-instagram" style="background-color: rgb(198, 150, 120) !important; color: rgb(36, 37, 48) !important;"></span>
                         </a>&amp;nbsp;&amp;nbsp;
                         <a style="margin-left:10px" aria-label="TikTok" title="TikTok" href="https://www.tiktok.com/@odoo">
-                            <span class="fa fa-tiktok rounded-circle" style="background-color: rgb(198, 150, 120) !important; color: rgb(36, 37, 48) !important;"></span>
+                            <span class="fa fa-tiktok" style="background-color: rgb(198, 150, 120) !important; color: rgb(36, 37, 48) !important;"></span>
                         </a>
                     </div>
                 </div>
@@ -886,19 +886,19 @@
                     <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;"/>
+                                <span class="fa fa-facebook bg-black" style="color: rgb(255, 187, 0) !important;"/>
                             </a>&amp;nbsp;&amp;nbsp;
                             <a style="margin-left:10px" aria-label="LinkedIn" title="LinkedIn" href="https://www.linkedin.com/company/odoo">
-                                <span class="fa fa-linkedin rounded bg-black" style="color: rgb(255, 187, 0) !important;"/>
+                                <span class="fa fa-linkedin bg-black" style="color: rgb(255, 187, 0) !important;"/>
                             </a>&amp;nbsp;&amp;nbsp;
                             <a style="margin-left:10px" aria-label="Twitter" title="Twitter" href="https://twitter.com/Odoo">
-                                <span class="fa fa-twitter rounded bg-black" style="color: rgb(255, 187, 0) !important;"/>​
+                                <span class="fa fa-twitter bg-black" style="color: rgb(255, 187, 0) !important;"/>​
                             </a>&amp;nbsp;&amp;nbsp;
                             <a aria-label="Instagram" title="Instagram" href="https://www.instagram.com/explore/tags/odoo/">
-                                <span class="fa fa-instagram rounded bg-black" style="color: rgb(255, 187, 0) !important;"/>
+                                <span class="fa fa-instagram bg-black" style="color: rgb(255, 187, 0) !important;"/>
                             </a>&amp;nbsp;&amp;nbsp;
                             <a aria-label="TikTok" title="TikTok" href="https://www.tiktok.com/@odoo">
-                                <span class="fa fa-tiktok rounded bg-black" style="color: rgb(255, 187, 0) !important;"/>
+                                <span class="fa fa-tiktok bg-black" style="color: rgb(255, 187, 0) !important;"/>
                             </a>
                         </div>
                         <p style="text-align: right">
@@ -956,13 +956,13 @@
                     </div>
                     <div class="col-lg-4 o_mail_header_social" style="text-align: right">
                             <a aria-label="Facebook" title="Facebook" target="_blank" href="https://www.facebook.com/Odoo">
-                                <span class="fa fa-facebook rounded rounded-circle" style="color: rgb(84, 52, 39) !important; background-color: rgb(211, 197, 177) !important;">​</span>
+                                <span class="fa fa-facebook" style="color: rgb(84, 52, 39) !important; background-color: rgb(211, 197, 177) !important;">​</span>
                             </a>&amp;nbsp;&amp;nbsp;
                             <a style="margin-left:10px" aria-label="Twitter" title="Twitter" target="_blank" href="https://twitter.com/Odoo">
-                                <span class="fa fa-twitter rounded rounded-circle" style="color: rgb(84, 52, 39) !important; background-color: rgb(211, 197, 177) !important;">​</span>
+                                <span class="fa fa-twitter" style="color: rgb(84, 52, 39) !important; background-color: rgb(211, 197, 177) !important;">​</span>
                             </a>&amp;nbsp;&amp;nbsp;
                             <a style="margin-left:10px" aria-label="Instagram" title="Instagram" target="_blank" href="https://www.instagram.com/explore/tags/odoo/" contenteditable="true">
-                                <span class="fa fa-instagram rounded rounded-circle" style="color: rgb(84, 52, 39) !important; background-color: rgb(211, 197, 177) !important;">​</span>
+                                <span class="fa fa-instagram" style="color: rgb(84, 52, 39) !important; background-color: rgb(211, 197, 177) !important;">​</span>
                             </a>
                     </div>
                 </div>
@@ -1561,7 +1561,7 @@
             <div class="container">
                 <div class="row align-items-center">
                     <div class="s_col_no_bgcolor pt32 offset-lg-1 col-lg-10 pb0" style="padding-left: 0px; padding-right: 0px;">
-                        <div class="card bg-white h-100 rounded border" style="border-radius: 5px !important; border-color: rgb(233, 236, 239) !important; border-width: 0px !important;">
+                        <div class="card bg-white h-100 border" style="border-radius: 5px !important; border-color: rgb(233, 236, 239) !important; border-width: 0px !important;">
                             <div class="card-body">
                                 <div class="s_title o_mail_snippet_general pb0 pt0" data-snippet="s_title" data-name="Title">
                                     <div class="container s_allow_columns">