diff --git a/app/assets/stylesheets/mail/email.scss b/app/assets/stylesheets/mail/email.scss
index bfb0684f9c..844cd3b342 100644
--- a/app/assets/stylesheets/mail/email.scss
+++ b/app/assets/stylesheets/mail/email.scss
@@ -121,6 +121,10 @@ table.order-summary {
   text-align: right;
 }
 
+.middle {
+  vertical-align: middle;
+}
+
 .social .soc-btn {
   padding: 3px 7px;
   font-size: 12px;
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index 12c654b3d1..46b7078516 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -13,11 +13,11 @@
           %td
           %td.header.container
             .content
-              %table{:bgcolor => "#f2f2f2"}
+              %table
                 %tr
                   %td
-                    %img{src: ContentConfig.url_for(:footer_logo), width: "144", height: "50"}/
-                  %td{:align => "right"}
+                    %img.middle{src: ContentConfig.url_for(:logo), style: "max-height: 50px; max-width: 300px;"}
+                  %td.text-right
                     %h6.collapse
                       = Spree::Config[:site_name]
           %td
diff --git a/spec/mailers/order_mailer_spec.rb b/spec/mailers/order_mailer_spec.rb
index 34206213d5..34027d6240 100644
--- a/spec/mailers/order_mailer_spec.rb
+++ b/spec/mailers/order_mailer_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe Spree::OrderMailer do
     end
 
     it "display the OFN header by default" do
-      expect(email.body).to include(ContentConfig.url_for(:footer_logo))
+      expect(email.body).to include(ContentConfig.url_for(:logo))
     end
 
     context 'when hide OFN navigation is enabled for the distributor of the order' do
@@ -55,7 +55,7 @@ RSpec.describe Spree::OrderMailer do
       end
 
       it 'does not display the OFN navigation' do
-        expect(email.body).not_to include(ContentConfig.url_for(:footer_logo))
+        expect(email.body).not_to include(ContentConfig.url_for(:logo))
       end
     end
   end
diff --git a/spec/mailers/subscription_mailer_spec.rb b/spec/mailers/subscription_mailer_spec.rb
index aca63f8f58..9653423b9a 100644
--- a/spec/mailers/subscription_mailer_spec.rb
+++ b/spec/mailers/subscription_mailer_spec.rb
@@ -117,7 +117,7 @@ RSpec.describe SubscriptionMailer, type: :mailer do
     end
 
     it "display the OFN header by default" do
-      expect(email.body).to include(ContentConfig.url_for(:footer_logo))
+      expect(email.body).to include(ContentConfig.url_for(:logo))
     end
 
     describe "linking to order page" do
@@ -162,7 +162,7 @@ RSpec.describe SubscriptionMailer, type: :mailer do
       end
 
       it 'does not display the OFN navigation' do
-        expect(email.body).not_to include(ContentConfig.url_for(:footer_logo))
+        expect(email.body).not_to include(ContentConfig.url_for(:logo))
       end
     end
   end