diff --git a/backend/resources/emails-mjml/password-recovery/en.mjml b/backend/resources/emails-mjml/password-recovery/en.mjml
index d19a7bc12..105c8b68b 100644
--- a/backend/resources/emails-mjml/password-recovery/en.mjml
+++ b/backend/resources/emails-mjml/password-recovery/en.mjml
@@ -3,7 +3,7 @@
   <mj-head>
     <mj-font name="Source Sans Pro" href="{{ public-uri }}/fonts/sourcesanspro-regular.eot" />
     <mj-attributes>
-      <mj-text font-family="Source Sans Pro" font-size="16px" color="#000000" />
+      <mj-text font-family="Source Sans Pro" font-size="16px" color="#000000" line-height="150%" />
       <mj-button background-color="#31EFB8" color="#1F1F1F" font-family="Source Sans Pro" font-size="16px" />
     </mj-attributes>
   </mj-head>
@@ -38,7 +38,7 @@
 
     <mj-section padding="24px 0 0 0">
       <mj-column width="425px">
-        <mj-text align="center" font-size="14px" color="#64666A" line-height="150%">
+        <mj-text align="center" font-size="14px" color="#64666A">
           UXBOX is the first Open Source prototyping platform that will be embraced by multidisciplinary teams.
         </mj-text>
       </mj-column>
@@ -47,11 +47,11 @@
     <mj-section padding="0">
       <mj-column>
         <mj-social icon-size="24px" mode="horizontal">
-          <mj-social-element src="{{ public-uri }}/images/email/logo-uxbox.png" href="https://uxbox.io/" padding="0 16px" />
-          <mj-social-element src="{{ public-uri }}/images/email/logo-twitter.png" href="https://twitter.com/penpot" padding="0 16px" />
-          <mj-social-element src="{{ public-uri }}/images/email/logo-github.png" href="https://github.com/uxbox/" padding="0 16px" />
-          <mj-social-element src="{{ public-uri }}/images/email/logo-instagram.png" href="https://instagram.com/uxbox/" padding="0 16px" />
-          <mj-social-element src="{{ public-uri }}/images/email/logo-taiga.png" href="https://tree.taiga.io/project/uxbox" padding="0 16px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-uxbox.png" href="https://uxbox.io/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-twitter.png" href="https://twitter.com/penpot" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-github.png" href="https://github.com/uxbox/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-instagram.png" href="https://instagram.com/uxbox/" padding="0 8px" />
+          <mj-social-element src="{{ public-uri }}/images/email/logo-taiga.png" href="https://tree.taiga.io/project/uxbox" padding="0 8px" />
         </mj-social>
       </mj-column>
     </mj-section>
diff --git a/backend/resources/emails/password-recovery/en.html b/backend/resources/emails/password-recovery/en.html
index 99b57f493..a588f508d 100644
--- a/backend/resources/emails/password-recovery/en.html
+++ b/backend/resources/emails/password-recovery/en.html
@@ -168,12 +168,12 @@
                 <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                   <tr>
                     <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Source Sans Pro;font-size:24px;font-weight:600;line-height:1;text-align:left;color:#000000;">Hello {{name}}!</div>
+                      <div style="font-family:Source Sans Pro;font-size:24px;font-weight:600;line-height:150%;text-align:left;color:#000000;">Hello {{name}}!</div>
                     </td>
                   </tr>
                   <tr>
                     <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Source Sans Pro;font-size:16px;line-height:1;text-align:left;color:#000000;">We have received a request to reset your password. Click the link below to choose a new one:</div>
+                      <div style="font-family:Source Sans Pro;font-size:16px;line-height:150%;text-align:left;color:#000000;">We have received a request to reset your password. Click the link below to choose a new one:</div>
                     </td>
                   </tr>
                   <tr>
@@ -189,17 +189,17 @@
                   </tr>
                   <tr>
                     <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Source Sans Pro;font-size:16px;line-height:1;text-align:left;color:#000000;">If you received this email by mistake, you can safely ignore it. Your password won't be changed.</div>
+                      <div style="font-family:Source Sans Pro;font-size:16px;line-height:150%;text-align:left;color:#000000;">If you received this email by mistake, you can safely ignore it. Your password won't be changed.</div>
                     </td>
                   </tr>
                   <tr>
                     <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Source Sans Pro;font-size:16px;line-height:1;text-align:left;color:#000000;">Enjoy!</div>
+                      <div style="font-family:Source Sans Pro;font-size:16px;line-height:150%;text-align:left;color:#000000;">Enjoy!</div>
                     </td>
                   </tr>
                   <tr>
                     <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Source Sans Pro;font-size:16px;line-height:1;text-align:left;color:#000000;">The UXBOX team.</div>
+                      <div style="font-family:Source Sans Pro;font-size:16px;line-height:150%;text-align:left;color:#000000;">The UXBOX team.</div>
                     </td>
                   </tr>
                 </table>
@@ -301,7 +301,7 @@
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
                         <tr>
-                          <td style="padding:0 16px;">
+                          <td style="padding:0 8px;">
                             <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
                               <tr>
                                 <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
@@ -321,7 +321,7 @@
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
                         <tr>
-                          <td style="padding:0 16px;">
+                          <td style="padding:0 8px;">
                             <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
                               <tr>
                                 <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
@@ -341,7 +341,7 @@
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
                         <tr>
-                          <td style="padding:0 16px;">
+                          <td style="padding:0 8px;">
                             <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
                               <tr>
                                 <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
@@ -361,7 +361,7 @@
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
                         <tr>
-                          <td style="padding:0 16px;">
+                          <td style="padding:0 8px;">
                             <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
                               <tr>
                                 <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
@@ -381,7 +381,7 @@
             <![endif]-->
                       <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
                         <tr>
-                          <td style="padding:0 16px;">
+                          <td style="padding:0 8px;">
                             <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
                               <tr>
                                 <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">