diff --git a/app/assets/stylesheets/mail/email.scss b/app/assets/stylesheets/mail/email.scss
index 96976e1c06..d1908540bd 100644
--- a/app/assets/stylesheets/mail/email.scss
+++ b/app/assets/stylesheets/mail/email.scss
@@ -78,7 +78,7 @@ p.footer, p.footer_icons a {
   color: #999;
 }
 
-p.footer_icons {
+p.signoff_icons, p.footer_icons {
   font-size: 0px;
 
   a {
@@ -87,6 +87,10 @@ p.footer_icons {
   }
 }
 
+p.signoff_icons a:not(.ofn-i_image) {
+  font-size: 24px;
+}
+
 p.footer_icons a:not(.ofn-i_image) {
   font-size: 20px;
 }
@@ -313,7 +317,7 @@ h6 {
   margin: 0 !important;
 }
 
-p, ul {
+p, ul, span.signoff {
   margin-bottom: 10px;
   font-weight: normal;
   font-size: 14px;
diff --git a/app/views/shared/mailers/_greeting_and_intro.html.haml b/app/views/shared/mailers/_greeting_and_intro.html.haml
index 0dc1719444..f39be18a76 100644
--- a/app/views/shared/mailers/_greeting_and_intro.html.haml
+++ b/app/views/shared/mailers/_greeting_and_intro.html.haml
@@ -2,7 +2,7 @@
   - if @enterprise_for_logo
     = image_tag @enterprise_for_logo.logo_url(:medium), class: "float-right"
 
-  %h4
+  %p
     = greeting
   %p
     = intro
diff --git a/app/views/shared/mailers/_signoff_distributor.html.haml b/app/views/shared/mailers/_signoff_distributor.html.haml
index 4d8f062efc..d3142b2f76 100644
--- a/app/views/shared/mailers/_signoff_distributor.html.haml
+++ b/app/views/shared/mailers/_signoff_distributor.html.haml
@@ -2,17 +2,27 @@
 %p
   = t('.signoff')
   %br
-  #{@order.distributor.contact_name}
+  = @order.distributor.contact_name
   %br
   %br
   = @order.distributor.name
   %br
-  = @order.distributor.phone || ""
-  %br
-  %a{:href => "mailto:#{order_reply_email(@order)}", :target => "_blank"}
-    = order_reply_email(@order)
-  %br
-  = @order.distributor.website || ""
-  %br
-  = @order.distributor.instagram || ""
-
+  - if @order.distributor.phone.present?
+    %img{src: image_path("/map_icons/social-logos/phone.png"), style: "width: 24px; position: relative; top: 7px;" }
+    = @order.distributor.phone
+  %p.signoff_icons
+    %a.ofn-i_050-mail-circle{:href => "mailto:#{order_reply_email(@order)}", :target => "_blank"}
+    - if @order.distributor.website.present?
+      %a.ofn-i_049-web{:href => "http://#{@order.distributor.website}", :target => "_blank"}
+    - if @order.distributor.instagram.present?
+      %a.ofn-i_043-instagram{:href => "http://instagram.com/#{@order.distributor.instagram}", :target => "_blank"}
+    - if @order.distributor.facebook.present?
+      %a.ofn-i_044-facebook{:href => "http://#{@order.distributor.facebook}", :target => "_blank"}
+    - if @order.distributor.linkedin.present?
+      %a.ofn-i_042-linkedin{:href => "http://#{@order.distributor.linkedin}", :target => "_blank"}
+    - if @order.distributor.twitter.present?
+      %a.ofn-i_image{:href => "http://x.com/#{@order.distributor.twitter}", :target => "_blank"}
+        %img{src: image_path("/map_icons/social-logos/x.png"), style: "width: 24px; position: relative; top: 1.5px;" }
+    - if @order.distributor.whatsapp_phone.present?
+      %a.ofn-i_image{:href => @order.distributor.whatsapp_url, :target => "_blank" }
+        %img{src: image_path("/map_icons/social-logos/whatsapp.png"), style: "width: 24px; position: relative; top: 1.5px;" }
diff --git a/app/views/shared/mailers/_signoff_enterprise.html.haml b/app/views/shared/mailers/_signoff_enterprise.html.haml
index 97e2710199..68acafedae 100644
--- a/app/views/shared/mailers/_signoff_enterprise.html.haml
+++ b/app/views/shared/mailers/_signoff_enterprise.html.haml
@@ -1,16 +1,26 @@
+%br
 %p
   = t('.signoff')
+  %br
+  = @coordinator.contact_name
+  %br
+  %br
+  = @coordinator.name
   %em
-    %p
-      = @coordinator.name
-    %p
-      %br
-        = @coordinator.address.address1
-      %br
-        = @coordinator.address.city
-      %br
-        = @coordinator.address.zipcode
-    %p
-      = @coordinator.phone
-    %p
-      = @coordinator.contact.email
+    %br
+    = @coordinator.address.address1
+    %br
+    = @coordinator.address.city
+    = @coordinator.address.zipcode
+
+  - if @coordinator.phone.present?
+    %br
+    %img{src: image_path("/map_icons/social-logos/phone.png"), style: "width: 24px; position: relative; top: 7px;" }
+    = @coordinator.phone
+
+  - if @coordinator.contact.email.present?
+    %p.signoff_icons
+      %a.ofn-i_050-mail-circle{:href => "mailto:#{@coordinator.contact.email}", :target => "_blank"}
+      %span.signoff{style: "position: relative; top: -5px;" }
+        = @coordinator.contact.email
+      }
diff --git a/app/views/shared/mailers/_signoff_instance.html.haml b/app/views/shared/mailers/_signoff_instance.html.haml
index 59cb106dc7..0f92afbf55 100644
--- a/app/views/shared/mailers/_signoff_instance.html.haml
+++ b/app/views/shared/mailers/_signoff_instance.html.haml
@@ -1,5 +1,4 @@
-%p  
-
+%br
 %p
   = t('.signoff')
   %br
diff --git a/public/map_icons/social-logos/phone.png b/public/map_icons/social-logos/phone.png
new file mode 100644
index 0000000000..9c709e471f
Binary files /dev/null and b/public/map_icons/social-logos/phone.png differ
diff --git a/public/map_icons/social-logos/whatsapp.png b/public/map_icons/social-logos/whatsapp.png
new file mode 100644
index 0000000000..f5eed4ec12
Binary files /dev/null and b/public/map_icons/social-logos/whatsapp.png differ
diff --git a/public/map_icons/social-logos/x.png b/public/map_icons/social-logos/x.png
new file mode 100644
index 0000000000..45191431b5
Binary files /dev/null and b/public/map_icons/social-logos/x.png differ