diff --git a/api/templates/email_change_body.html b/api/templates/email_change_body.html
index f8f3845e78..439fffd5b0 100644
--- a/api/templates/email_change_body.html
+++ b/api/templates/email_change_body.html
@@ -8,7 +8,7 @@
                     <td style="border: 1px solid #ddd;">
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
-                                <td style="padding: 20px 30px 10px; text-align:left;">
+                                <td style="padding: 20px 20px 10px; text-align:left;">
                                     <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
@@ -32,7 +32,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
+                                <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
                                         <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
diff --git a/api/templates/find_teams_body.html b/api/templates/find_teams_body.html
index 6eaaf56e07..a73ed0ad4a 100644
--- a/api/templates/find_teams_body.html
+++ b/api/templates/find_teams_body.html
@@ -8,7 +8,7 @@
                     <td style="border: 1px solid #ddd;">
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
-                                <td style="padding: 20px 30px 10px; text-align:left;">
+                                <td style="padding: 20px 20px 10px; text-align:left;">
                                     <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
@@ -40,7 +40,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
+                                <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
                                         <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
diff --git a/api/templates/invite_body.html b/api/templates/invite_body.html
index 46189fae57..ad0658e3d1 100644
--- a/api/templates/invite_body.html
+++ b/api/templates/invite_body.html
@@ -8,7 +8,7 @@
                     <td style="border: 1px solid #ddd;">
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
-                                <td style="padding: 20px 30px 10px; text-align:left;">
+                                <td style="padding: 20px 20px 10px; text-align:left;">
                                     <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
@@ -35,7 +35,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
+                                <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
                                         <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
diff --git a/api/templates/password_change_body.html b/api/templates/password_change_body.html
index 515c0a7d9d..1d4a6e1c86 100644
--- a/api/templates/password_change_body.html
+++ b/api/templates/password_change_body.html
@@ -8,7 +8,7 @@
                     <td style="border: 1px solid #ddd;">
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
-                                <td style="padding: 20px 30px 10px; text-align:left;">
+                                <td style="padding: 20px 20px 10px; text-align:left;">
                                     <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
@@ -32,7 +32,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
+                                <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
                                         <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
diff --git a/api/templates/post_body.html b/api/templates/post_body.html
index c0f4375d8e..0aa913db56 100644
--- a/api/templates/post_body.html
+++ b/api/templates/post_body.html
@@ -8,7 +8,7 @@
                     <td style="border: 1px solid #ddd;">
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
-                                <td style="padding: 20px 30px 10px; text-align:left;">
+                                <td style="padding: 20px 20px 10px; text-align:left;">
                                     <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
@@ -35,7 +35,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
+                                <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
                                         <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
diff --git a/api/templates/reset_body.html b/api/templates/reset_body.html
index af9f6b4e8b..4c2fec1e74 100644
--- a/api/templates/reset_body.html
+++ b/api/templates/reset_body.html
@@ -8,7 +8,7 @@
                     <td style="border: 1px solid #ddd;">
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
-                                <td style="padding: 20px 30px 10px; text-align:left;">
+                                <td style="padding: 20px 20px 10px; text-align:left;">
                                     <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
@@ -35,7 +35,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
+                                <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
                                         <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
diff --git a/api/templates/signup_team_body.html b/api/templates/signup_team_body.html
index 5a5ae4d477..5e60a042bc 100644
--- a/api/templates/signup_team_body.html
+++ b/api/templates/signup_team_body.html
@@ -8,7 +8,7 @@
                     <td style="border: 1px solid #ddd;">
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
-                                <td style="padding: 20px 30px 10px; text-align:left;">
+                                <td style="padding: 20px 20px 10px; text-align:left;">
                                     <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
@@ -38,7 +38,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
+                                <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
                                         <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
diff --git a/api/templates/verify_body.html b/api/templates/verify_body.html
index 67ded9c20e..1a68c16f50 100644
--- a/api/templates/verify_body.html
+++ b/api/templates/verify_body.html
@@ -8,7 +8,7 @@
                     <td style="border: 1px solid #ddd;">
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
-                                <td style="padding: 20px 30px 10px; text-align:left;">
+                                <td style="padding: 20px 20px 10px; text-align:left;">
                                     <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
@@ -35,7 +35,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
+                                <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
                                         <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
diff --git a/api/templates/welcome_body.html b/api/templates/welcome_body.html
index 7107bc2e06..cc4d95fb11 100644
--- a/api/templates/welcome_body.html
+++ b/api/templates/welcome_body.html
@@ -8,7 +8,7 @@
                     <td style="border: 1px solid #ddd;">
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
-                                <td style="padding: 20px 30px 10px; text-align:left;">
+                                <td style="padding: 20px 20px 10px; text-align:left;">
                                     <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
@@ -32,7 +32,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
+                                <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
                                         <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
diff --git a/web/static/images/Bladekick-logodark.png b/web/static/images/Bladekick-logodark.png
index 8f1268fddd..c16978ba89 100644
Binary files a/web/static/images/Bladekick-logodark.png and b/web/static/images/Bladekick-logodark.png differ
diff --git a/web/static/images/Mattermost-logodark.png b/web/static/images/Mattermost-logodark.png
index 8f1268fddd..c16978ba89 100644
Binary files a/web/static/images/Mattermost-logodark.png and b/web/static/images/Mattermost-logodark.png differ