diff --git a/app/javascript/images/mailer/icon_cached.png b/app/javascript/images/mailer/icon_cached.png
deleted file mode 100644
index 5c993dbe..00000000
Binary files a/app/javascript/images/mailer/icon_cached.png and /dev/null differ
diff --git a/app/javascript/images/mailer/icon_done.png b/app/javascript/images/mailer/icon_done.png
deleted file mode 100644
index f7f95a0e..00000000
Binary files a/app/javascript/images/mailer/icon_done.png and /dev/null differ
diff --git a/app/javascript/images/mailer/icon_email.png b/app/javascript/images/mailer/icon_email.png
deleted file mode 100644
index 13967009..00000000
Binary files a/app/javascript/images/mailer/icon_email.png and /dev/null differ
diff --git a/app/javascript/images/mailer/icon_file_download.png b/app/javascript/images/mailer/icon_file_download.png
deleted file mode 100644
index 3f7ac429..00000000
Binary files a/app/javascript/images/mailer/icon_file_download.png and /dev/null differ
diff --git a/app/javascript/images/mailer/icon_grade.png b/app/javascript/images/mailer/icon_grade.png
deleted file mode 100644
index 8c212b7e..00000000
Binary files a/app/javascript/images/mailer/icon_grade.png and /dev/null differ
diff --git a/app/javascript/images/mailer/icon_lock_open.png b/app/javascript/images/mailer/icon_lock_open.png
deleted file mode 100644
index c854c3bd..00000000
Binary files a/app/javascript/images/mailer/icon_lock_open.png and /dev/null differ
diff --git a/app/javascript/images/mailer/icon_person_add.png b/app/javascript/images/mailer/icon_person_add.png
deleted file mode 100644
index 6290a42a..00000000
Binary files a/app/javascript/images/mailer/icon_person_add.png and /dev/null differ
diff --git a/app/javascript/images/mailer/icon_reply.png b/app/javascript/images/mailer/icon_reply.png
deleted file mode 100644
index a7009335..00000000
Binary files a/app/javascript/images/mailer/icon_reply.png and /dev/null differ
diff --git a/app/javascript/images/mailer/icon_warning.png b/app/javascript/images/mailer/icon_warning.png
deleted file mode 100644
index 7baaac61..00000000
Binary files a/app/javascript/images/mailer/icon_warning.png and /dev/null differ
diff --git a/app/javascript/images/mailer/logo_full.png b/app/javascript/images/mailer/logo_full.png
deleted file mode 100644
index ed7743d9..00000000
Binary files a/app/javascript/images/mailer/logo_full.png and /dev/null differ
diff --git a/app/javascript/images/mailer/logo_sm_brand.svg b/app/javascript/images/mailer/logo_sm_brand.svg
new file mode 100644
index 00000000..39a97879
--- /dev/null
+++ b/app/javascript/images/mailer/logo_sm_brand.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="111px" height="68px" viewBox="0 0 111 68" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,81.960784%,47.058824%);fill-opacity:1;" d="M 26.257812 18.21875 L 36.402344 18.21875 L 36.402344 46.214844 C 36.402344 59.640625 29.113281 66.066406 18.144531 66.066406 C 13.136719 66.066406 8.699219 64.351562 5.972656 61.996094 L 10.03125 54.359375 C 12.375 55.949219 14.59375 56.90625 17.574219 56.90625 C 22.964844 56.90625 26.257812 53.023438 26.257812 47.425781 L 26.257812 45.707031 C 23.976562 48.441406 20.746094 49.78125 17.195312 49.78125 C 8.507812 49.78125 1.917969 42.527344 1.917969 33.492188 C 1.917969 24.457031 8.507812 17.203125 17.195312 17.203125 C 20.746094 17.203125 23.976562 18.539062 26.257812 21.273438 Z M 19.160156 40.617188 C 23.027344 40.617188 26.257812 37.371094 26.257812 33.492188 C 26.257812 29.609375 23.027344 26.363281 19.160156 26.363281 C 15.292969 26.363281 12.058594 29.609375 12.058594 33.492188 C 12.058594 37.371094 15.292969 40.617188 19.160156 40.617188 Z M 69.445312 48.761719 L 59.304688 48.761719 L 59.304688 46.214844 C 57.339844 48.441406 54.613281 49.78125 51.0625 49.78125 C 43.960938 49.78125 40.03125 44.816406 40.03125 39.152344 C 40.03125 30.753906 50.300781 27.636719 59.175781 30.308594 C 58.988281 27.574219 57.273438 25.601562 53.726562 25.601562 C 51.253906 25.601562 48.398438 26.554688 46.625 27.574219 L 43.582031 20.257812 C 45.929688 18.730469 50.238281 17.203125 55.246094 17.203125 C 62.664062 17.203125 69.445312 21.402344 69.445312 32.855469 Z M 59.304688 36.671875 C 54.550781 35.144531 50.175781 35.972656 50.175781 39.34375 C 50.175781 41.316406 51.824219 42.652344 53.789062 42.652344 C 56.132812 42.652344 58.796875 40.746094 59.304688 36.671875 Z M 84.742188 1.933594 L 84.742188 21.273438 C 87.023438 18.539062 90.253906 17.203125 93.804688 17.203125 C 102.492188 17.203125 109.082031 24.457031 109.082031 33.492188 C 109.082031 42.527344 102.492188 49.78125 93.804688 49.78125 C 90.253906 49.78125 87.023438 48.441406 84.742188 45.707031 L 84.742188 48.761719 L 74.597656 48.761719 L 74.597656 1.933594 Z M 91.839844 40.617188 C 95.707031 40.617188 98.941406 37.371094 98.941406 33.492188 C 98.941406 29.609375 95.707031 26.363281 91.839844 26.363281 C 87.972656 26.363281 84.742188 29.609375 84.742188 33.492188 C 84.742188 37.371094 87.972656 40.617188 91.839844 40.617188 Z M 91.839844 40.617188 "/>
+</g>
+</svg>
diff --git a/app/javascript/images/mailer/logo_transparent.png b/app/javascript/images/mailer/logo_transparent.png
deleted file mode 100644
index 73bb4088..00000000
Binary files a/app/javascript/images/mailer/logo_transparent.png and /dev/null differ
diff --git a/app/javascript/packs/mailer.js b/app/javascript/packs/mailer.js
deleted file mode 100644
index e1a2c8c9..00000000
--- a/app/javascript/packs/mailer.js
+++ /dev/null
@@ -1 +0,0 @@
-require('../styles/mailer.css');
diff --git a/app/javascript/styles/mailer.css b/app/javascript/styles/mailer.css
deleted file mode 100644
index d40205f2..00000000
--- a/app/javascript/styles/mailer.css
+++ /dev/null
@@ -1,523 +0,0 @@
-* {
-  font-family: system-ui, -apple-system, BlinkMacSystemFont, Roboto, Ubuntu, "Helvetica Neue", sans-serif;
-}
-
-table,
-td,
-div {
-  box-sizing: border-box;
-}
-
-html,
-body {
-  width: 100% !important;
-  min-width: 100%;
-  margin: 0;
-  padding: 0;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-}
-
-.email-body td,
-.email-body div,
-.email-body a,
-.email-body span {
-  line-height: inherit;
-}
-
-a,
-a:visited,
-a span {
-  text-decoration: none;
-  color: #21cf7a
-}
-
-a #outlook {
-  padding: 0;
-}
-
-img {
-  outline: none;
-  border: 0;
-  text-decoration: none;
-  -ms-interpolation-mode: bicubic;
-  clear: both;
-  line-height: 100%;
-}
-
-table {
-  border-spacing: 0;
-  mso-table-lspace: 0;
-  mso-table-rspace: 0;
-}
-
-td {
-  vertical-align: top;
-}
-
-.email-table,
-.content-section,
-.column,
-.column-cell {
-  width: 100%;
-  min-width: 100%;
-}
-
-.email-body {
-  font-size: 0 !important;
-  line-height: 100%;
-  text-align: center;
-  padding-left: 16px;
-  padding-right: 16px;
-}
-
-.email-start {
-  padding-top: 32px;
-}
-
-.email-end {
-  padding-bottom: 32px;
-}
-
-.email-body,
-html,
-body {
-  background-color: #404040;
-}
-
-.email-container,
-.email-row,
-.col-0,
-.col-1,
-.col-2,
-.col-3,
-.col-4,
-.col-5,
-.col-6 {
-  font-size: 0;
-  display: inline-block;
-  width: 100%;
-  min-width: 100%;
-  min-width: 0 !important;
-  vertical-align: top;
-}
-
-.content-cell {
-  width: 100%;
-  min-width: 100%;
-  min-width: 0 !important;
-  vertical-align: top;
-  padding-top: 16px;
-  padding-bottom: 16px;
-}
-
-.column-cell.button-cell {
-  padding-top: 0;
-}
-
-.email-container {
-  max-width: 632px;
-  margin: 0 auto;
-  text-align: center;
-}
-
-.email-row {
-  display: block;
-  max-width: 600px !important;
-  margin: 0 auto;
-  text-align: center;
-  clear: both;
-}
-
-.col-0 {
-  max-width: 50px;
-}
-
-.col-1 {
-  max-width: 100px;
-}
-
-.col-2 {
-  max-width: 200px;
-}
-
-.col-3 {
-  max-width: 300px;
-}
-
-.col-4 {
-  max-width: 400px;
-}
-
-.col-5 {
-  max-width: 500px;
-}
-
-.col-6 {
-  max-width: 600px;
-}
-
-.email-body .column-cell,
-.column-cell,
-p {
-  font-size: 15px;
-  line-height: 23px;
-  color: #fff;
-  mso-line-height-rule: exactly;
-  text-rendering: optimizelegibility;
-}
-
-p {
-  display: block;
-  margin-bottom: 16px;
-}
-
-p.small {
-  font-size: 13px;
-}
-
-p.lead {
-  font-size: 19px;
-  line-height: 27px;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  color: #666;
-  padding: 0;
-  font-weight: 500;
-  margin-left: 0;
-  margin-right: 0;
-  margin-top: 20px;
-  margin-bottom: 8px;
-}
-
-h1 {
-  font-size: 26px;
-  line-height: 36px;
-}
-
-h2 {
-  font-size: 23px;
-  line-height: 30px;
-}
-
-h3 {
-  font-size: 19px;
-  line-height: 25px;
-}
-
-h5 {
-  color: #7f7f7f;
-  font-size: 16px;
-  font-weight: 700;
-  line-height: 21px;
-}
-
-.input-cell h5 {
-  margin-top: 4px;
-}
-
-.input td {
-  background: #1a1a1a;
-  border-radius: 4px;
-  padding: 16px;
-  mso-line-height-rule: exactly;
-  border-radius: 4px;
-  font-size: 17px;
-  font-weight: 500;
-  line-height: 20px;
-  text-align: center;
-}
-
-.content-cell,
-.blank-cell {
-  width: 100%;
-  font-size: 0;
-  text-align: center;
-  vertical-align: top;
-  padding-left: 16px;
-  padding-right: 16px;
-}
-
-.content-cell {
-  background-color: #262626;
-}
-
-.content-cell.darker {
-  background-color: #1a1a1a;
-}
-
-.hero {
-  background-color: #333;
-  padding-top: 20px;
-}
-
-.hero-with-button {
-  padding-bottom: 16px;
-}
-
-.hero-with-button h1 {
-  margin-bottom: 4px;
-}
-
-.hero-with-button p.lead {
-  margin-bottom: 32px;
-}
-
-.header {
-  border-radius: 5px 5px 0 0;
-  background-color: #1a1a1a;
-}
-
-.header .column-cell {
-  text-align: center;
-  padding-top: 20px;
-  padding-bottom: 8px;
-}
-
-.content-start {
-  padding-top: 32px;
-}
-
-.content-end {
-  border-radius: 0 0 5px 5px;
-  padding-top: 16px;
-}
-
-.footer.column-cell,
-p {
-  color: #7f7f7f;
-}
-
-.footer p {
-  margin-bottom: 0;
-  font-size: 13px;
-}
-
-.footer p.small {
-  margin-bottom: 0;
-}
-
-.footer a {
-  color: #7f7f7f;
-  text-decoration: underline;
-}
-
-.footer img {
-  opacity: 0.3;
-}
-
-.logo {
-  position: relative;
-  left: -4px;
-}
-
-.button {
-  display: table;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.button td {
-  mso-line-height-rule: exactly;
-  border-radius: 4px;
-  padding: 0 !important;
-  font-size: 17px;
-  font-weight: 500;
-  line-height: 20px;
-  text-align: center;
-}
-
-.button td a,
-.button td a span {
-  color: #fff;
-  display: block !important;
-  text-align: center !important;
-  vertical-align: top !important;
-  line-height: inherit !important;
-}
-
-.button td a {
-  padding: 10px 22px !important;
-  line-height: 26px !important;
-  font-weight: 500 !important;
-}
-
-.button.button-small td {
-  border-radius: 4px;
-  font-size: 14px;
-  padding: 8px 16px;
-}
-
-.button.button-small td a {
-  padding: 5px 16px !important;
-  line-height: 26px !important;
-}
-
-.button-default {
-  background-color: #1a1a1a;
-}
-
-.button-primary {
-  background-color: #262626;
-}
-
-.text-center {
-  text-align: center;
-}
-
-.text-right {
-  text-align: right;
-}
-
-.padded {
-  padding-left: 16px;
-  padding-right: 16px;
-}
-
-.padded-bottom {
-  padding-bottom: 32px;
-}
-
-.margin-bottom {
-  margin-bottom: 20px;
-}
-
-.hero-icon {
-  width: 64px;
-}
-
-.hero-icon td {
-  text-align: center;
-  vertical-align: middle;
-  line-height: 100%;
-  mso-line-height-rule: exactly;
-  padding: 16px;
-  border-radius: 80px;
-  background: #79bd9a;
-}
-
-.hero-icon.alert-icon td {
-  background: #df405a;
-}
-
-.hero-icon img {
-  max-width: 32px;
-  display: block;
-  line-height: 100%;
-  width: 32px;
-  height: 32px;
-}
-
-.hr {
-  width: 100%;
-}
-
-.hr td {
-  font-size: 0;
-  line-height: 1px;
-  mso-line-height-rule: exactly;
-  min-height: 1px;
-  overflow: hidden;
-  height: 2px;
-  background-color: transparent !important;
-  border-top: 1px solid #4d4d4d;
-}
-
-.status {
-  padding-bottom: 32px;
-}
-
-.status .status-header td {
-  font-size: 14px;
-  padding-bottom: 15px;
-}
-
-.status .status-header bdi {
-  color: #fff;
-  display: block;
-  font-size: 16px;
-  font-weight: 500;
-}
-
-.status .status-header  td:first-child {
-  padding-right: 10px;
-}
-
-.status .status-header img {
-  border-radius: 4px;
-  width: 48px;
-  height: 48px;
-}
-
-.status p {
-  font-size: 19px;
-  margin-bottom: 20px;
-}
-
-.status p.status-footer {
-  color: #737373;
-  font-size: 14px;
-  margin-bottom: 0;
-}
-
-.status p.status-footer a {
-  color: #737373;
-}
-
-.border-top {
-  border-top: 1px solid #404040;
-}
-
-ul {
-  padding-left: 15px;
-  padding-top: 16px;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-ul li {
-  margin-bottom: 16px;
-  color: #737373;
-}
-
-ul li span {
-  color: #fff;
-}
-
-@media only screen and (min-width: 768px) and (max-width: 1024px) and (orientation: landscape) {
-  body {
-    min-height: 1024px !important;
-  }
-}
-
-@media (max-width: 697px) {
-  .email-container,
-  .col-1,
-  .col-2,
-  .col-3,
-  .col-4,
-  .col-5,
-  .col-6 {
-    width: 100% !important;
-    max-width: none !important;
-  }
-
-  .email-start {
-    padding-top: 16px !important;
-  }
-
-  .email-end {
-    padding-bottom: 16px !important;
-  }
-
-  .padded {
-    padding-left: 0;
-    padding-right: 0;
-  }
-}
\ No newline at end of file
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index 253bef9e..462a110c 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -1,52 +1,96 @@
 !!!
-%html{ lang: I18n.locale }
+%html{ lang: 'en' }
   %head
     %meta{ 'http-equiv' => 'Content-Type', 'content' => 'text/html; charset=utf-8' }/
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1.0, shrink-to-fit=no' }
 
     %title/
 
-    = stylesheet_pack_tag 'mailer'
-  %body{ dir: locale_direction }
-    %table.email-table{ cellspacing: 0, cellpadding: 0 }
+    %style{ type: 'text/css' }
+      :css
+        body {
+          font-family: system-ui, -apple-system, BlinkMacSystemFont, Roboto, Ubuntu, "Helvetica Neue", sans-serif;
+        }
+        a,
+        span,
+        p,
+        div,
+        h1,
+        h2,
+        h3,
+        h4,
+        h5,
+        h6 {
+          font-family: system-ui, -apple-system, BlinkMacSystemFont, Roboto, Ubuntu, "Helvetica Neue", sans-serif;
+        }
+        a:hover,
+        a:active,
+        a:focus {
+          outline: 0;
+        }
+        .in-email-status a {
+          color: #3BCD80;
+          font-weight: 600;
+        }
+        span.MsoHyperlink {
+          mso-style-priority: 99;
+          color: inherit;
+        }
+        span.MsoHyperlinkFollowed {
+          mso-style-priority: 99;
+          color: inherit;
+        }
+
+  %body{ :style => "margin:0;padding:0;background-color:#eee;font-family: system-ui, -apple-system, BlinkMacSystemFont, Roboto, sans-serif;" }
+    %table{:cellspacing => "0", :style => "margin:0 auto;width:100%;border-collapse:collapse;background-color:#eee;"}
       %tbody
         %tr
-          %td.email-body.email-start
-            .email-container
-              %table.content-section{ cellspacing: 0, cellpadding: 0 }
-                %tbody
-                  %tr
-                    %td.content-cell.header
-                      .email-row
-                        .col-6
-                          %table.column{ cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.column-cell
-                                  = link_to root_url do
-                                    = image_tag full_pack_url('media/images/mailer/logo_full.png'), alt: 'Gab Social', height: 34, class: 'logo'
+          %td{:align => "center", :style => "padding:20px 23px 0 23px"}
+            %table{:style => "background-color:#fff;margin:0 auto;border-radius:5px;border-collapse:collapse", :width => "560"}
+              %tbody
+                %tr
+                  %td{:align => "center"}
+                    %table{:style => "margin:0 auto", :width => "500"}
+                      %tbody
+                        %tr
+                          %td{:align => "center", :style => "padding:40px 0 35px 0"}
+                            %a{:href => "https://gab.com", :style => "color:#3ACD80;text-decoration:none;outline:0;", :target => "_blank"}
+                              = image_tag full_pack_url('media/images/mailer/logo_sm_brand.svg'), alt: 'Gab Social', border: "0", height: 38, width: 62, :style => "height:38px;width:62px;"    
 
-    = yield
+                        = yield
 
-    %table.email-table{ cellspacing: 0, cellpadding: 0 }
-      %tbody
         %tr
-          %td.email-body.email-end
-            .email-container
-              %table.content-section{ cellspacing: 0, cellpadding: 0 }
-                %tbody
-                  %tr
-                    %td.content-cell.content-end
-                      != "&nbsp; "
-                  %tr
-                    %td.blank-cell.footer
-                      .email-row
-                        .col-6
-                          %table.column{ cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %td.column-cell
-                                %p= t 'about.hosted_on', domain: site_hostname
-                                %p= link_to t('application_mailer.notification_preferences'), settings_notifications_url
-                              %td.column-cell.text-right
-                                = link_to root_url do
-                                  = image_tag full_pack_url('media/images/mailer/logo_transparent.png'), alt: 'Gab Social', height: 24
+          %td{:align => "center", :style => "padding-top:20px"}
+            %table{:style => "margin:0 auto;border-collapse:collapse;background-color:#fff;border-radius:5px", :width => "560"}
+              %tbody
+                %tr
+                  %td{:colspan => "4", :style => "vertical-align:middle;background-color:#ccc;border-radius:5px;"}
+                    %table{:style => "background-color:#ccc;width:100%;border-radius:5px;border-collapse:collapse"}
+                      %tbody
+                        %tr
+                          %td{:align => "center", :style => "vertical-align:middle;padding:22px 0;"}
+                            %p{:style => "color:#fff;font-size:17px;margin:0;"} Questions? Simply email support@gab.com
+        
+        %tr
+          %td{:align => "center", :style => "padding-top:20px"}
+            %table{:style => "margin:0 auto;border-collapse:collapse;border-radius:5px", :width => "560"}
+              %tbody
+                %tr
+                  %td{:colspan => "4", :style => "vertical-align:middle;"}
+                    %table{:style => "width:100%;border-collapse:collapse"}
+                      %tbody
+                        %tr
+                          %td{:align => "center", :style => "vertical-align:middle;padding:22px 0 0 0;"}
+                            %p{:style => "color:#bbb;font-size:14px;margin:0;"} Gab AI, Inc.
+                        %tr
+                          %td{:align => "center", :style => "vertical-align:middle;padding:0 0 22px 0;"}
+                            %p{:style => "color:#bbb;font-size:14px;margin:0;"} 700 N. State Street, Clarks Summit, PA 18411
+       
+        %tr
+          %td{:align => "center", :style => "padding-top:29px;padding-bottom:50px"}
+            %table{:style => "width:100%"}
+              %tbody
+                %tr
+                  %td{:align => "center", :style => ""}
+                    %a{:href => "https://gab.com", :style => "color:#3ACD80;text-decoration:none;outline:0;", :target => "_blank"}
+                      = image_tag full_pack_url('media/images/mailer/logo_sm_brand.svg'), alt: 'Gab Social', border: "0", height: 28, width: 46, :style => "height:28px;width:46px;opacity:0.2;"
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
index 87b0b292..9cf99164 100644
--- a/app/views/layouts/mailer.text.erb
+++ b/app/views/layouts/mailer.text.erb
@@ -1,4 +1,11 @@
 <%= yield %>
+
+---
+
+Questions? Simply email support@gab.com
+
+Gab.com
+
 ---
 
 <%= t 'about.hosted_on', domain: site_hostname %>
diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml
index 57b5688b..af9e4bf5 100644
--- a/app/views/notification_mailer/_status.html.haml
+++ b/app/views/notification_mailer/_status.html.haml
@@ -1,36 +1,26 @@
 - i ||= 0
 
-%table.email-table{ cellspacing: 0, cellpadding: 0, dir: 'ltr' }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+%td.in-email-status{ class: i.zero? ? 'content-start' : nil }
+  %table{ cellspacing: 0, cellpadding: 0, :style => "margin:15px 0;" }
+    %tbody
+      %tr
+        %td{ :style => "padding:10px 15px;border:1px solid #D3D3D5;border-radius:8px;" }
+          %table{ cellspacing: 0, cellpadding: 0 }
             %tbody
               %tr
-                %td.content-cell{ class: i.zero? ? 'content-start' : nil }
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded.status
-                              %table.status-header{ cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td{ align: 'left', width: 48 }
-                                      = image_tag full_asset_url(status.account.avatar.url), alt:''
-                                    %td{ align: 'left' }
-                                      %bdi= display_name(status.account)
-                                      = "@#{status.account.acct}"
+                %td{ align: 'left', width: 40, height: 40 }
+                  = image_tag full_asset_url(status.account.avatar.url), alt:'', :style => "height:40px;width:40px;border-radius:9999px;overflow:hidden;"
+                %td{ align: 'left', :style => "color:#000;font-size:16px;padding:5px 10px;" }
+                  %bdi= display_name(status.account)
+                  = "@#{status.account.acct}"
 
-                              - if status.spoiler_text?
-                                %div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
-                                  %p
-                                    = Formatter.instance.format_spoiler(status)
+          - if status.spoiler_text?
+            %div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
+              %p
+                = Formatter.instance.format_spoiler(status)
 
-                              %div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
-                                = Formatter.instance.format(status)
+          %div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
+            = Formatter.instance.format(status)
 
-                              %p.status-footer
-                                = link_to l(status.created_at), web_url("statuses/#{status.id}")
+          %p
+            = link_to l(status.created_at), web_url("#{status.account.username}/posts/#{status.id}")
diff --git a/app/views/notification_mailer/_status.text.erb b/app/views/notification_mailer/_status.text.erb
index 8999a1f8..cbe17263 100644
--- a/app/views/notification_mailer/_status.text.erb
+++ b/app/views/notification_mailer/_status.text.erb
@@ -5,4 +5,4 @@
 <% end %>
 <%= raw Formatter.instance.plaintext(status) %>
 
-<%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %>
+<%= raw t('application_mailer.view')%> <%= web_url("#{status.account.username}/posts/#{status.id}") %>
diff --git a/app/views/notification_mailer/digest.html.haml b/app/views/notification_mailer/digest.html.haml
index a94ace22..05f68406 100644
--- a/app/views/notification_mailer/digest.html.haml
+++ b/app/views/notification_mailer/digest.html.haml
@@ -1,44 +1,35 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.darker.hero-with-button
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %h1= t 'notification_mailer.digest.title'
-                              %p.lead= t('notification_mailer.digest.body', since: l((@me.user_current_sign_in_at || @since).to_date, format: :short), instance: site_hostname)
-                              %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td.button-primary
-                                      = link_to web_url do
-                                        %span= t 'notification_mailer.digest.action'
+%tr
+  %td{:align => "center"}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t 'notification_mailer.digest.title'
+
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;font-weight:600;color:#000;margin:15px 0 0;text-align:center;"}= t('notification_mailer.digest.body', since: l((@me.user_current_sign_in_at || @since).to_date, format: :short), instance: site_hostname)
 
 - @notifications.each_with_index do |n, i|
-  = render 'status', status: n.target_status, i: i
+  %tr
+    %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+      %table
+        %tbody
+          %tr
+            = render 'status', status: n.target_status, i: i
 
 - unless @follows_since.zero?
-  %table.email-table{ cellspacing: 0, cellpadding: 0 }
-    %tbody
-      %tr
-        %td.email-body
-          .email-container
-            %table.content-section{ cellspacing: 0, cellpadding: 0 }
-              %tbody
-                %tr
-                  %td.content-cell.content-start.border-top
-                    .email-row
-                      .col-6
-                        %table.column{ cellspacing: 0, cellpadding: 0 }
-                          %tbody
-                            %tr
-                              %td.column-cell.text-center
-                                %p= t('notification_mailer.digest.new_followers_summary', count: @follows_since)
+  %tr
+    %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+      %table
+        %tbody
+          %tr
+            %p{:style => "font-size:16px;font-weight:600;color:#000;margin:15px 0 0;text-align:center;"}= t('notification_mailer.digest.new_followers_summary', count: @follows_since)
+
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle;padding-top:10px;padding-bottom:30px;"}
+    %table{ align: 'center', cellspacing: 0, cellpadding: 0 }
+      %tbody
+        %tr
+          %td{ :style => "background-color:#30CE7D;height:56px;border-radius:9999px;color:#fff;" }
+            = link_to "https://gab.com/notifications", :style => "height:56px;padding:20px 30px;text-decoration:none;color:#fff;font-size:16px;margin:0;" do
+              %span{ :style => "color:#fff;font-size:16px;margin:0;" }= t 'notification_mailer.digest.action'
\ No newline at end of file
diff --git a/app/views/notification_mailer/favourite.html.haml b/app/views/notification_mailer/favourite.html.haml
index a715d615..6e369491 100644
--- a/app/views/notification_mailer/favourite.html.haml
+++ b/app/views/notification_mailer/favourite.html.haml
@@ -1,45 +1,26 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_grade.png'), alt:''
+%tr
+  %td{:align => "center"}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t 'notification_mailer.favourite.title'
 
-                              %h1= t 'notification_mailer.favourite.title'
-                              %p.lead= t('notification_mailer.favourite.body', name: @account.acct)
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;font-weight:600;color:#000;margin:15px 0 0;text-align:center;"}= t('notification_mailer.favourite.body', name: @account.acct)
 
-= render 'status', status: @status
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          = render 'status', status: @status
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start.border-top
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url("statuses/#{@status.id}") do
-                                    %span= t 'application_mailer.view_status'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle;padding-top:10px;padding-bottom:30px;"}
+    %table{ align: 'center', cellspacing: 0, cellpadding: 0 }
+      %tbody
+        %tr
+          %td{ :style => "background-color:#30CE7D;height:56px;border-radius:9999px;color:#fff;" }
+            = link_to web_url("#{@status.account.username}/posts/#{@status.id}"), :style => "height:56px;padding:20px 30px;text-decoration:none;color:#fff;font-size:16px;margin:0;" do
+              %span{ :style => "color:#fff;font-size:16px;margin:0;" }= t 'application_mailer.view_status'
\ No newline at end of file
diff --git a/app/views/notification_mailer/follow.html.haml b/app/views/notification_mailer/follow.html.haml
index cd84f785..45ab2834 100644
--- a/app/views/notification_mailer/follow.html.haml
+++ b/app/views/notification_mailer/follow.html.haml
@@ -1,43 +1,19 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_person_add.png'), alt: ''
+%tr
+  %td{:align => "center"}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t 'notification_mailer.follow.title'
 
-                              %h1= t 'notification_mailer.follow.title'
-                              %p.lead= t('notification_mailer.follow.body', name: @account.acct)
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;font-weight:600;color:#000;margin:15px 0 0;text-align:center;"}= t('notification_mailer.follow.body', name: @account.acct)
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url("accounts/#{@account.id}") do
-                                    %span= t 'application_mailer.view_profile'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle;padding-top:10px;padding-bottom:30px;"}
+    %table{ align: 'center', cellspacing: 0, cellpadding: 0 }
+      %tbody
+        %tr
+          %td{ :style => "background-color:#30CE7D;height:56px;border-radius:9999px;color:#fff;" }
+            = link_to web_url("#{@account.username}"), :style => "height:56px;padding:20px 30px;text-decoration:none;color:#fff;font-size:16px;margin:0;" do
+              %span{ :style => "color:#fff;font-size:16px;margin:0;" }= t 'application_mailer.view_profile'
diff --git a/app/views/notification_mailer/follow_request.html.haml b/app/views/notification_mailer/follow_request.html.haml
index a63e27a9..b6ff4de0 100644
--- a/app/views/notification_mailer/follow_request.html.haml
+++ b/app/views/notification_mailer/follow_request.html.haml
@@ -1,43 +1,19 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_person_add.png'), alt: ''
+%tr
+  %td{:align => "center"}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t 'notification_mailer.follow_request.title'
 
-                              %h1= t 'notification_mailer.follow_request.title'
-                              %p.lead= t('notification_mailer.follow_request.body', name: @account.acct)
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;font-weight:600;color:#000;margin:15px 0 0;text-align:center;"}= t('notification_mailer.follow_request.body', name: @account.acct)
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url("follow_requests") do
-                                    %span= t 'notification_mailer.follow_request.action'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle;padding-top:10px;padding-bottom:30px;"}
+    %table{ align: 'center', cellspacing: 0, cellpadding: 0 }
+      %tbody
+        %tr
+          %td{ :style => "background-color:#30CE7D;height:56px;border-radius:9999px;color:#fff;" }
+            = link_to web_url("follow_requests"), :style => "height:56px;padding:20px 30px;text-decoration:none;color:#fff;font-size:16px;margin:0;" do
+              %span{ :style => "color:#fff;font-size:16px;margin:0;" }= t 'notification_mailer.follow_request.action'
diff --git a/app/views/notification_mailer/mention.html.haml b/app/views/notification_mailer/mention.html.haml
index 619873cf..86788f3c 100644
--- a/app/views/notification_mailer/mention.html.haml
+++ b/app/views/notification_mailer/mention.html.haml
@@ -1,45 +1,26 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_reply.png'), alt: ''
+%tr
+  %td{:align => "center"}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t 'notification_mailer.mention.title'
 
-                              %h1= t 'notification_mailer.mention.title'
-                              %p.lead= t('notification_mailer.mention.body', name: @status.account.acct)
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;font-weight:600;color:#000;margin:15px 0 0;text-align:center;"}= t('notification_mailer.mention.body', name: @status.account.acct)
 
-= render 'status', status: @status
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          = render 'status', status: @status
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start.border-top
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url("statuses/#{@status.id}") do
-                                    %span= t 'notification_mailer.mention.action'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle;padding-top:10px;padding-bottom:30px;"}
+    %table{ align: 'center', cellspacing: 0, cellpadding: 0 }
+      %tbody
+        %tr
+          %td{ :style => "background-color:#30CE7D;height:56px;border-radius:9999px;color:#fff;" }
+            = link_to web_url("#{@status.account.username}/posts/#{@status.id}"), :style => "height:56px;padding:20px 30px;text-decoration:none;color:#fff;font-size:16px;margin:0;" do
+              %span{ :style => "color:#fff;font-size:16px;margin:0;" }= t 'notification_mailer.mention.action'
\ No newline at end of file
diff --git a/app/views/notification_mailer/reblog.html.haml b/app/views/notification_mailer/reblog.html.haml
index a2811be2..b2805fd1 100644
--- a/app/views/notification_mailer/reblog.html.haml
+++ b/app/views/notification_mailer/reblog.html.haml
@@ -1,45 +1,26 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_cached.png'), alt: ''
+%tr
+  %td{:align => "center"}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t 'notification_mailer.reblog.title'
 
-                              %h1= t 'notification_mailer.reblog.title'
-                              %p.lead= t('notification_mailer.reblog.body', name: @account.acct)
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;font-weight:600;color:#000;margin:15px 0 0;text-align:center;"}= t('notification_mailer.reblog.body', name: @account.acct)
 
-= render 'status', status: @status
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          = render 'status', status: @status
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start.border-top
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url("statuses/#{@status.id}") do
-                                    %span= t 'application_mailer.view_status'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle;padding-top:10px;padding-bottom:30px;"}
+    %table{ align: 'center', cellspacing: 0, cellpadding: 0 }
+      %tbody
+        %tr
+          %td{ :style => "background-color:#30CE7D;height:56px;border-radius:9999px;color:#fff;" }
+            = link_to web_url("#{@status.account.username}/posts/#{@status.id}"), :style => "height:56px;padding:20px 30px;text-decoration:none;color:#fff;font-size:16px;margin:0;" do
+              %span{ :style => "color:#fff;font-size:16px;margin:0;" }= t 'application_mailer.view_status'
diff --git a/app/views/user_mailer/backup_ready.html.haml b/app/views/user_mailer/backup_ready.html.haml
index 85140b08..19acd465 100644
--- a/app/views/user_mailer/backup_ready.html.haml
+++ b/app/views/user_mailer/backup_ready.html.haml
@@ -1,59 +1,19 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_file_download.png'), alt: ''
+%tr
+  %td{:align => "center"}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t 'user_mailer.backup_ready.title'
 
-                              %h1= t 'user_mailer.backup_ready.title'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;color:#444;margin:15px 0 0;text-align:center;"}= t 'user_mailer.backup_ready.explanation'
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.backup_ready.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to full_asset_url(@backup.dump.url) do
-                                    %span= t 'exports.archive_takeout.download'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle;padding-top:10px;padding-bottom:15px;"}
+    %table{ align: 'center', cellspacing: 0, cellpadding: 0 }
+      %tbody
+        %tr
+          %td{ :style => "background-color:#30CE7D;height:56px;border-radius:9999px;color:#fff;" }
+            = link_to full_asset_url(@backup.dump.url), :style => "height:56px;padding:20px 30px;text-decoration:none;color:#fff;font-size:16px;margin:0;" do
+              %span{ :style => "color:#fff;font-size:16px;margin:0;" }= t 'exports.archive_takeout.download'
diff --git a/app/views/user_mailer/confirmation_instructions.html.haml b/app/views/user_mailer/confirmation_instructions.html.haml
index e75e707e..50f3e8e1 100644
--- a/app/views/user_mailer/confirmation_instructions.html.haml
+++ b/app/views/user_mailer/confirmation_instructions.html.haml
@@ -1,80 +1,23 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
+%tr
+  %td{:align => "center", :style => ""}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t 'devise.mailer.confirmation_instructions.title'
 
-                              %h1= t 'devise.mailer.confirmation_instructions.title'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;color:#444;margin:15px 0;text-align:center;"}= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  - if @resource.created_by_application
-                                    = link_to confirmation_url(@resource, confirmation_token: @token, redirect_to_app: 'true') do
-                                      %span= t 'devise.mailer.confirmation_instructions.action_with_app', app: @resource.created_by_application.name
-                                  - else
-                                    = link_to confirmation_url(@resource, confirmation_token: @token) do
-                                      %span= t 'devise.mailer.confirmation_instructions.action'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'devise.mailer.confirmation_instructions.extra_html', about_tos_path: about_url, policy_path: about_tos_url
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle;padding-top:10px;padding-bottom:30px;"}
+    %table{ align: 'center', cellspacing: 0, cellpadding: 0 }
+      %tbody
+        %tr
+          %td{ :style => "background-color:#30CE7D;height:56px;border-radius:9999px;color:#fff;" }
+            - if @resource.created_by_application
+              = link_to confirmation_url(@resource, confirmation_token: @token, redirect_to_app: 'true'), { :style => "height:56px;padding:20px 30px;text-decoration:none;" } do
+                %span{ :style => "color:#fff;font-size:16px;margin:0;" }= t 'devise.mailer.confirmation_instructions.action_with_app', app: @resource.created_by_application.name
+            - else
+              = link_to confirmation_url(@resource, confirmation_token: @token), { :style => "height:56px;padding:20px 30px;text-decoration:none;" } do
+                %span{ :style => "color:#fff;font-size:16px;margin:0;" }= t 'devise.mailer.confirmation_instructions.action'
diff --git a/app/views/user_mailer/confirmation_instructions.text.erb b/app/views/user_mailer/confirmation_instructions.text.erb
index 99cf440b..cf4f844f 100644
--- a/app/views/user_mailer/confirmation_instructions.text.erb
+++ b/app/views/user_mailer/confirmation_instructions.text.erb
@@ -4,9 +4,4 @@
 
 <%= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname %>
 
-=> <%= confirmation_url(@resource, confirmation_token: @token, redirect_to_app: @resource.created_by_application ? 'true' : nil) %>
-
-<%= strip_tags(t('devise.mailer.confirmation_instructions.extra_html', about_tos_path: about_url, policy_path: about_tos_url)) %>
-
-=> <%= about_url %>
-=> <%= about_tos_url %>
+=> <%= confirmation_url(@resource, confirmation_token: @token, redirect_to_app: @resource.created_by_application ? 'true' : nil) %>
\ No newline at end of file
diff --git a/app/views/user_mailer/email_changed.html.haml b/app/views/user_mailer/email_changed.html.haml
index 7e91e87a..e8c523c0 100644
--- a/app/views/user_mailer/email_changed.html.haml
+++ b/app/views/user_mailer/email_changed.html.haml
@@ -1,58 +1,25 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
+%tr
+  %td{:align => "center", :style => ""}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t 'devise.mailer.email_changed.title'
 
-                              %h1= t 'devise.mailer.email_changed.title'
-                              %p.lead= t 'devise.mailer.email_changed.explanation'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;color:#444;margin:15px 0 0;text-align:center;"}= t 'devise.mailer.email_changed.explanation'
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.input-cell
-                          %table.input{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td= @resource.try(:unconfirmed_email) ? @resource.unconfirmed_email : @resource.email
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;font-weight:600;color:#000;margin:15px 0 0;text-align:center;"}= @resource.try(:unconfirmed_email) ? @resource.unconfirmed_email : @resource.email
+
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;color:#444;margin:15px 0 30px;text-align:center;"}= t 'devise.mailer.email_changed.extra'
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %p= t 'devise.mailer.email_changed.extra'
diff --git a/app/views/user_mailer/password_change.html.haml b/app/views/user_mailer/password_change.html.haml
index 559abf02..acd7de2d 100644
--- a/app/views/user_mailer/password_change.html.haml
+++ b/app/views/user_mailer/password_change.html.haml
@@ -1,40 +1,17 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
+%tr
+  %td{:align => "center"}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t 'devise.mailer.password_change.title'
 
-                              %h1= t 'devise.mailer.password_change.title'
-                              %p.lead= t 'devise.mailer.password_change.explanation'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;color:#444;margin:15px 0 0;text-align:center;"}= t 'devise.mailer.password_change.explanation'
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %p= t 'devise.mailer.password_change.extra'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;color:#444;margin:15px 0 30px;text-align:center;"}= t 'devise.mailer.password_change.extra'
diff --git a/app/views/user_mailer/reconfirmation_instructions.html.haml b/app/views/user_mailer/reconfirmation_instructions.html.haml
index 7f10ba94..7ac4ee1e 100644
--- a/app/views/user_mailer/reconfirmation_instructions.html.haml
+++ b/app/views/user_mailer/reconfirmation_instructions.html.haml
@@ -1,60 +1,26 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
+%tr
+  %td{:align => "center"}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t 'devise.mailer.reconfirmation_instructions.title'
 
-                              %h1= t 'devise.mailer.reconfirmation_instructions.title'
-                              %p.lead= t 'devise.mailer.reconfirmation_instructions.explanation'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;color:#444;margin:15px 0;text-align:center;"}= t 'devise.mailer.reconfirmation_instructions.explanation'
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to confirmation_url(@resource, confirmation_token: @token) do
-                                    %span= t 'devise.mailer.confirmation_instructions.action'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle;padding-top:10px;padding-bottom:15px;"}
+    %table{ align: 'center', cellspacing: 0, cellpadding: 0 }
+      %tbody
+        %tr
+          %td{ :style => "background-color:#30CE7D;height:56px;border-radius:9999px;color:#fff;" }
+            = link_to confirmation_url(@resource, confirmation_token: @token), :style => "height:56px;padding:20px 30px;text-decoration:none;color:#fff;font-size:16px;margin:0;" do
+              %span{ :style => "color:#fff;font-size:16px;margin:0;" }= t 'devise.mailer.confirmation_instructions.action'
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %p= t 'devise.mailer.reconfirmation_instructions.extra'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;color:#444;margin:15px 0 30px;text-align:center;"}= t 'devise.mailer.reconfirmation_instructions.extra'
\ No newline at end of file
diff --git a/app/views/user_mailer/reset_password_instructions.html.haml b/app/views/user_mailer/reset_password_instructions.html.haml
index eeed38c9..a7b39fd7 100644
--- a/app/views/user_mailer/reset_password_instructions.html.haml
+++ b/app/views/user_mailer/reset_password_instructions.html.haml
@@ -1,60 +1,26 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
+%tr
+  %td{:align => "center"}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t 'devise.mailer.reset_password_instructions.title'
 
-                              %h1= t 'devise.mailer.reset_password_instructions.title'
-                              %p.lead= t 'devise.mailer.reset_password_instructions.explanation'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;color:#444;margin:15px 0;text-align:center;"}= t 'devise.mailer.reset_password_instructions.explanation'
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_password_url(@resource, reset_password_token: @token) do
-                                    %span= t 'devise.mailer.reset_password_instructions.action'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle;padding-top:10px;padding-bottom:15px;"}
+    %table{ align: 'center', cellspacing: 0, cellpadding: 0 }
+      %tbody
+        %tr
+          %td{ :style => "background-color:#30CE7D;height:56px;border-radius:9999px;color:#fff;" }
+            = link_to edit_password_url(@resource, reset_password_token: @token), :style => "height:56px;padding:20px 30px;text-decoration:none;color:#fff;font-size:16px;margin:0;" do
+              %span{ :style => "color:#fff;font-size:16px;margin:0;" }= t 'devise.mailer.reset_password_instructions.action'
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %p= t 'devise.mailer.reset_password_instructions.extra'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;color:#444;margin:15px 0 35px;text-align:center;"}= t 'devise.mailer.reset_password_instructions.extra'
diff --git a/app/views/user_mailer/verification_approved.html.haml b/app/views/user_mailer/verification_approved.html.haml
index 2ac994f3..06b5236b 100644
--- a/app/views/user_mailer/verification_approved.html.haml
+++ b/app/views/user_mailer/verification_approved.html.haml
@@ -1,41 +1,23 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_done.png'), alt: ''
+%tr
+  %td{:align => "center"}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t 'user_mailer.verifications.approved.title'
 
-                              %h1= t 'user_mailer.verifications.approved.title'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{ :style => "margin:20px 0 15px 0;text-align:left;" }
+            %span{ :style => "font-size:16px;color:#444;text-align:left;" } Thanks for your patience. We've reviewed your request and verified your account.
+          %p{ :style => "margin:0 0 15px 0;text-align:left;" }
+            %span{ :style => "font-size:16px;color:#444;text-align:left;" } The proof you sent has been deleted from our servers completely.
+          %p{ :style => "margin:0 0 15px 0;text-align:left;" }
+            %span{ :style => "font-size:16px;color:#444;text-align:left;" } Thank you 🐸
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.verifications.approved.explanation_1'
-                              %p= t 'user_mailer.verifications.approved.explanation_2'
-                              %p= t 'user_mailer.verifications.approved.explanation_3'
\ No newline at end of file
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle;padding-top:10px;padding-bottom:30px;"}
+    %table{ align: 'center', cellspacing: 0, cellpadding: 0 }
+      %tbody
+        %tr
+          %td{ :style => "background-color:#30CE7D;height:56px;border-radius:9999px;color:#fff;" }
+            = link_to "Go to Gab Home", "https://gab.com/home", :style => "height:56px;padding:20px 30px;text-decoration:none;color:#fff;font-size:16px;margin:0;"
diff --git a/app/views/user_mailer/verification_approved.text.erb b/app/views/user_mailer/verification_approved.text.erb
index bed8171d..ba3de003 100644
--- a/app/views/user_mailer/verification_approved.text.erb
+++ b/app/views/user_mailer/verification_approved.text.erb
@@ -2,8 +2,6 @@
 
 ===
 
-<%= t 'user_mailer.verifications.approved.explanation_1' %>
-
-<%= t 'user_mailer.verifications.approved.explanation_2' %>
-
-<%= t 'user_mailer.verifications.approved.explanation_3' %>
\ No newline at end of file
+Thanks for your patience. We've reviewed your request and verified your account.
+The proof you sent has been deleted from our servers completely.
+Thank you 🐸
\ No newline at end of file
diff --git a/app/views/user_mailer/warning.html.haml b/app/views/user_mailer/warning.html.haml
index 881291e6..7fef00e6 100644
--- a/app/views/user_mailer/warning.html.haml
+++ b/app/views/user_mailer/warning.html.haml
@@ -1,63 +1,24 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_warning.png'), alt: ''
+%tr
+  %td{:align => "center"}
+    %h1{:style => "margin:0;font-weight:bold;font-size:30px;color:#444;text-align:center;"}= t "user_mailer.warning.title.#{@warning.action}"
 
-                              %h1= t "user_mailer.warning.title.#{@warning.action}"
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;color:#444;margin:15px 0 0;text-align:center;"}
+            - unless @warning.none_action?
+              %p= t "user_mailer.warning.explanation.#{@warning.action}"
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              - unless @warning.none_action?
-                                %p= t "user_mailer.warning.explanation.#{@warning.action}"
+            - unless @warning.text.blank?
+              = Formatter.instance.linkify(@warning.text)
 
-                              - unless @warning.text.blank?
-                                = Formatter.instance.linkify(@warning.text)
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to about_url do
-                                    %span= t 'user_mailer.warning.review_server_policies'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{ :style => "margin:0 0 15px 0;text-align:left;" }
+            = link_to about_url do
+              %span{:style => "font-size:16px;color:#444;margin:15px 0 30px;"}= t 'user_mailer.warning.review_server_policies'
\ No newline at end of file
diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
index 1f75ff48..484c6023 100644
--- a/app/views/user_mailer/welcome.html.haml
+++ b/app/views/user_mailer/welcome.html.haml
@@ -1,144 +1,34 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_done.png'), alt: ''
+%tr
+  %td{:align => "center", :style => ""}
+    %h1{:style => "margin:0;font-weight:bold;font-size:20px;color:#444;text-align:center;"}= t 'user_mailer.welcome.title', name: @resource.account.username
 
-                              %h1= t 'user_mailer.welcome.title', name: @resource.account.username
-                              %p.lead= t 'user_mailer.welcome.explanation'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{:style => "font-size:16px;color:#444;margin:15px 0;text-align:left;"} We are so happy to have you. Here are a few tips to get you started.
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-3
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.input-cell.text-center.padded-bottom
-                              %h5= t 'user_mailer.welcome.full_handle'
-                              %table.input{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td= "@#{@resource.account.username}@#{@instance}"
-                    .col-3
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell
-                              %p= t 'user_mailer.welcome.full_handle_hint', instance: @instance
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle"}
+    %table
+      %tbody
+        %tr
+          %p{ :style => "margin:0 0 15px 0;text-align:left;" }
+            %span{ :style => "font-size:16px;color:#444;text-align:left;" } 1. You won't find Gab on the Big Tech app stores, but
+            = link_to "click here", "https://help.gab.com/article/gab-mobile-app", :style => "color:#30CE7D;font-size:16px;font-weight:600;text-decoration:underline;"
+            %span{ :style => "font-size:16px;color:#444;text-align:left;" } to learn how to install the Gab mobile app on your phone in just a few clicks.
+          %p{ :style => "margin:0 0 15px 0;text-align:left;" }
+            %span{ :style => "font-size:16px;color:#444;text-align:left;" } 2. Introduce yourself to the Gab community and meet new friends, ask questions and more in our
+            = link_to "'Introduce Yourself'", "https://gab.com/groups/12", :style => "color:#30CE7D;font-size:16px;font-weight:600;text-decoration:underline;"
+            %span{ :style => "font-size:16px;color:#444;text-align:left;" } Gab group.
+          %p{ :style => "margin:0 0 15px 0;text-align:left;" }
+            %span{ :style => "font-size:16px;color:#444;text-align:left;" } 3. Speak freely!
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start.border-top
-                  .email-row
-                    .col-4
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              = t 'user_mailer.welcome.edit_profile_step'
-                    .col-2
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td.button-primary
-                                      = link_to settings_profile_url do
-                                        %span= t 'user_mailer.welcome.edit_profile_action'
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-4
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              = t 'user_mailer.welcome.review_preferences_step'
-                    .col-2
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td.button-primary
-                                      = link_to settings_preferences_url do
-                                        %span= t 'user_mailer.welcome.review_preferences_action'
-              %tr
-                %td.content-cell.padded-bottom
-                  .email-row
-                    .col-4
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              = t 'user_mailer.welcome.final_step'
-                    .col-2
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td.button-primary
-                                      = link_to web_url do
-                                        %span= t 'user_mailer.welcome.final_action'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.border-top
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              %h5= t 'user_mailer.welcome.tips'
-                              %ul
-                                %li
-                                  %span= t 'user_mailer.welcome.tip_mobile_webapp'
-                                %li
-                                  %span= t 'user_mailer.welcome.tip_following'
-                                %li
-                                  %span= t 'user_mailer.welcome.tip_local_timeline', instance: @instance
-                                %li
-                                  %span= t 'user_mailer.welcome.tip_federated_timeline'
+%tr
+  %td{:align => "center", :cellspacing => "0", :style => "vertical-align:middle;padding-top:10px;padding-bottom:30px;"}
+    %table{ align: 'center', cellspacing: 0, cellpadding: 0 }
+      %tbody
+        %tr
+          %td{ :style => "background-color:#30CE7D;height:56px;border-radius:9999px;color:#fff;" }
+            = link_to "Go to Gab Home", "https://gab.com/home", :style => "height:56px;padding:20px 30px;text-decoration:none;color:#fff;font-size:16px;margin:0;"
diff --git a/app/views/user_mailer/welcome.text.erb b/app/views/user_mailer/welcome.text.erb
index e310d7ca..1a74a808 100644
--- a/app/views/user_mailer/welcome.text.erb
+++ b/app/views/user_mailer/welcome.text.erb
@@ -1,29 +1,16 @@
-<%= t 'user_mailer.welcome.title', name: @resource.account.username %> <%= t 'user_mailer.welcome.explanation' %>
+<%= t 'user_mailer.welcome.title', name: @resource.account.username %>
+
+We are so happy to have you. Here are a few tips to get you started.
+
+---
+
+1. You won't find Gab on the Big Tech app stores, but click here: (https://help.gab.com/article/gab-mobile-app) to learn how to install the Gab mobile app on your phone in just a few clicks.
+2. Introduce yourself to the Gab community and meet new friends, ask questions and more in our "Introduce Yourself" (https://gab.com/groups/12) Gab group.
+3. Speak freely!
 
 ===
 
-<%= t 'user_mailer.welcome.full_handle' %> (<%= "@#{@resource.account.local_username_and_domain}" %>)
-<%= t 'user_mailer.welcome.full_handle_hint', instance: @instance %>
+Go to Gab Home
 
----
+https://gab.com/home
 
-<%= t 'user_mailer.welcome.edit_profile_step' %>
-
-=> <%= settings_profile_url %>
-
-<%= t 'user_mailer.welcome.review_preferences_step' %>
-
-=> <%= settings_preferences_url %>
-
-<%= t 'user_mailer.welcome.final_step' %>
-
-=> <%= web_url %>
-
----
-
-<%= t 'user_mailer.welcome.tips' %>
-
-* <%= t 'user_mailer.welcome.tip_mobile_webapp' %>
-* <%= t 'user_mailer.welcome.tip_following' %>
-* <%= t 'user_mailer.welcome.tip_local_timeline', instance: @instance %>
-* <%= t 'user_mailer.welcome.tip_federated_timeline' %>