diff --git a/Appraisals b/Appraisals
index 26981c0..ea1a1e9 100644
--- a/Appraisals
+++ b/Appraisals
@@ -28,6 +28,11 @@ appraise 'spree-3-7' do
   gem 'rails-controller-testing', '~> 1.0.2'
 end
 
+appraise "spree-4-1" do
+  gem 'spree', '~> 4.1'
+  gem 'rails-controller-testing', '~> 1.0.2'
+end
+
 appraise 'spree-master' do
   gem 'spree', github: 'spree/spree', branch: 'master'
   gem 'rails-controller-testing', '~> 1.0.2'
diff --git a/README.md b/README.md
index ee47b7f..cf572f8 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,10 @@ Try Spree Html Invoice for Spree 3-4 with direct deployment on Heroku:
 
 [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/vinsol-spree-contrib/spree-demo-heroku/tree/spree-html-invoice-3-4)
 
+Try Spree Html Invoice for Spree 4-1 with direct deployment on Heroku:
+
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/vinsol-spree-contrib/spree-demo-heroku/tree/spree-html-invoice-4-1)
+
 Installation
 ------------
 
diff --git a/app/views/spree/admin/invoice/_a4.html.erb b/app/views/spree/admin/invoice/_a4.html.erb
index 05acf74..671d278 100644
--- a/app/views/spree/admin/invoice/_a4.html.erb
+++ b/app/views/spree/admin/invoice/_a4.html.erb
@@ -6,7 +6,7 @@
 <title><%= Spree.t("#{params[:template]}.header") %></title>
 </head>
 
-<body>
+<body onload="window.print()">
   <div class="a4">
     <div id="header">
       <%= render "header" %>
diff --git a/app/views/spree/admin/invoice/_line_items_invoice.html.erb b/app/views/spree/admin/invoice/_line_items_invoice.html.erb
index 0bbb5e3..2d32f96 100644
--- a/app/views/spree/admin/invoice/_line_items_invoice.html.erb
+++ b/app/views/spree/admin/invoice/_line_items_invoice.html.erb
@@ -17,9 +17,11 @@
     <tr >
       <td class="cell" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%=item.variant.sku %></font></td>
       <td class="cell" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%= item.variant.product.fullname rescue item.variant.product.name %></font></td>
-      <td class="cell price" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%=number_to_currency(item.price) unless @receipt%></font></td>
+      <td class="cell price" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%=item.display_amount.to_html unless @receipt%></font></td>
       <td class="cell qty" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%=item.quantity %></font></td>
-      <td align="right" class="cell total" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%=number_to_currency(item.price * item.quantity) %></font></td>
+      <td align="right" class="cell total" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2">
+        <%#= item.display_amount.to_html unless item.quantity.nil? %>
+        <%= item.money.to_html %></font></td>
     </tr>
     <% if item.respond_to? :discount and item.discount > 0 %>
        <tr style="border-bottom:solid 1px #cccccc;">
@@ -31,4 +33,4 @@
       </tr>
     <% end %>
   <% end %>
-</table>
\ No newline at end of file
+</table>
diff --git a/app/views/spree/admin/invoice/receipt.html.erb b/app/views/spree/admin/invoice/receipt.html.erb
index 7ae1feb..a8b8423 100644
--- a/app/views/spree/admin/invoice/receipt.html.erb
+++ b/app/views/spree/admin/invoice/receipt.html.erb
@@ -5,7 +5,7 @@
 <title><%= Spree.t("#{params[:template]}.header") %></title>
 </head>
 
-<body onLoad="self.print()">
+<body onload="window.print()">
   <div class="receipt">
     <div id="header">
       <%= render "spree/admin/invoice/receipt_header" %>
diff --git a/app/views/spree/admin/orders/_html_buttons.html.erb b/app/views/spree/admin/orders/_html_buttons.html.erb
index fda91ab..c080c5c 100644
--- a/app/views/spree/admin/orders/_html_buttons.html.erb
+++ b/app/views/spree/admin/orders/_html_buttons.html.erb
@@ -2,9 +2,11 @@
    buttons = buttons.split(",").collect{|b| b.strip } %>
 <%  buttons.each do |button| %>
   <li>
-    <%= link_to("/admin/invoice/#{@order.number}/#{button}", target:  "_blank") do %>
-      <span class='glyphicon glyphicon-print'></span>
-      <%= Spree.t(button.to_s + ".print") %>
-    <% end %>
+    <%= link_to_with_icon 'report.svg',
+      Spree.t(button.to_s + ".print"),
+      "/admin/invoice/#{@order.number}/#{button}",
+      target: "_blank",
+      class: "nav-link"
+    %>
   </li>
 <%end%>
diff --git a/gemfiles/spree_4_1.gemfile b/gemfiles/spree_4_1.gemfile
new file mode 100644
index 0000000..673cb37
--- /dev/null
+++ b/gemfiles/spree_4_1.gemfile
@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "spree", "~> 4.1"
+gem "rails-controller-testing", "~> 1.0.2"
+
+gemspec path: "../"
diff --git a/lib/spree_html_invoice/engine.rb b/lib/spree_html_invoice/engine.rb
index 3002f18..4296b5a 100644
--- a/lib/spree_html_invoice/engine.rb
+++ b/lib/spree_html_invoice/engine.rb
@@ -9,11 +9,13 @@ class Engine < Rails::Engine
     config.autoload_paths += %W(#{config.root}/lib)
 
     initializer "spree_html_invoice.assets.precompile", :after => "spree.assets.precompile" do |app|
-      app.config.assets.precompile += [ "admin/html-invoice.css", "admin/html-receipt.css" ]
+      app.config.assets.precompile += [ "admin/html-invoice.css", "admin/html-receipt.css", Spree::HtmlInvoice::Config[:html_invoice_logo_path] ]
     end
 
     initializer "spree.spree_html_invoice.preferences", before: :load_config_initializers, :after => "spree.environment" do |app|
       Spree::HtmlInvoice::Config = Spree::HtmlInvoiceConfiguration.new
+      Spree::HtmlInvoice::Config[:html_invoice_logo_path] = Spree::Config[:logo]
+      Spree::HtmlInvoice::Config.set(print_buttons: "invoice,packaging_slip")
     end
 
     def self.activate
diff --git a/spree_html_invoice.gemspec b/spree_html_invoice.gemspec
index c950c8a..931268b 100644
--- a/spree_html_invoice.gemspec
+++ b/spree_html_invoice.gemspec
@@ -1,30 +1,30 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_html_invoice'
-  s.version     = '3.4.0'
+  s.version     = '4.1'
   s.summary     = 'Print invoices from a spree order'
-  s.required_ruby_version = '>= 2.2.7'
+  s.required_ruby_version = '>= 2.5'
   s.authors = ["Torsten Ruger", "Chandramohan Rangaswamy"]
 
   s.files        = Dir['README.markdown', 'lib/**/*', 'app/**/*', 'config/*']
   s.require_path = 'lib'
   s.requirements << 'none'
+  spree_version = '>= 4.1'
 
-  s.has_rdoc = true
-
-  s.add_dependency 'spree_core', '>= 3.2.0', '< 4.0'
+  s.add_dependency 'spree_core'
 
   s.add_development_dependency 'appraisal'
-  s.add_development_dependency 'capybara', '~> 2.6'
-  s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'factory_bot', '~> 4.8.2'
-  s.add_development_dependency 'ffaker'
-  s.add_development_dependency 'rspec-rails', '~> 3.4'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'coffee-rails'
+  s.add_development_dependency 'capybara', '~> 3.32'
+  s.add_development_dependency 'database_cleaner', '~> 1.8.5'
+  s.add_development_dependency 'factory_bot', '~> 5.2'
+  s.add_development_dependency 'ffaker', '~> 2.2'
+  s.add_development_dependency 'rspec-rails', '~> 4.0', '>= 4.0.1'
+  s.add_development_dependency 'simplecov', '~> 0.18.5'
+  s.add_development_dependency 'sqlite3', '~> 1.4'
+  s.add_development_dependency 'coffee-rails', '~> 5.0'
   s.add_development_dependency 'rails-controller-testing'
   s.add_development_dependency 'rspec-activemodel-mocks'
-  s.add_development_dependency 'sass-rails'
-  s.add_development_dependency 'selenium-webdriver'
+  s.add_development_dependency 'sass-rails', '~> 6.0'
+  s.add_development_dependency 'selenium-webdriver', '~> 3.142', '>= 3.142.7'
+  s.add_development_dependency 'shoulda-matchers'
 end
