diff --git a/Gemfile b/Gemfile
index 53fc65d77..eacd2c652 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,7 +61,7 @@ gem "uglifier", "~> 4.2.0"
 gem "uuidtools", "~> 2.2.0"
 gem "view_component", "~> 3.11.0"
 gem "whenever", "~> 1.0.0", require: false
-gem "wicked_pdf", "~> 2.7.0"
+gem "wicked_pdf", "~> 2.8.0"
 gem "wkhtmltopdf-binary", "~> 0.12.6"
 
 source "https://rails-assets.org" do
diff --git a/Gemfile.lock b/Gemfile.lock
index db1fe0a34..703c909b6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -680,7 +680,7 @@ GEM
     websocket-extensions (0.1.5)
     whenever (1.0.0)
       chronic (>= 0.6.3)
-    wicked_pdf (2.7.0)
+    wicked_pdf (2.8.0)
       activesupport
     wkhtmltopdf-binary (0.12.6.6)
     xpath (3.2.0)
@@ -791,7 +791,7 @@ DEPENDENCIES
   view_component (~> 3.11.0)
   web-console (~> 4.2.1)
   whenever (~> 1.0.0)
-  wicked_pdf (~> 2.7.0)
+  wicked_pdf (~> 2.8.0)
   wkhtmltopdf-binary (~> 0.12.6)
 
 BUNDLED WITH
diff --git a/config/initializers/wicked_pdf.rb b/config/initializers/wicked_pdf.rb
index 8a4ead8ee..4e7cb9dbd 100644
--- a/config/initializers/wicked_pdf.rb
+++ b/config/initializers/wicked_pdf.rb
@@ -8,15 +8,23 @@
 #
 # https://github.com/mileszs/wicked_pdf/blob/master/README.md
 
-WickedPdf.config = {
+WickedPdf.configure do |config|
   # Path to the wkhtmltopdf executable: This usually isn't needed if using
   # one of the wkhtmltopdf-binary family of gems.
-  # exe_path: '/usr/local/bin/wkhtmltopdf',
+  # config.exe_path = '/usr/local/bin/wkhtmltopdf',
   #   or
-  # exe_path: Gem.bin_path('wkhtmltopdf-binary', 'wkhtmltopdf')
+  # config.exe_path = Gem.bin_path('wkhtmltopdf-binary', 'wkhtmltopdf')
+
+  # Needed for wkhtmltopdf 0.12.6+ to use many wicked_pdf asset helpers
+  config.enable_local_file_access = true
 
   # Layout file to be used for all PDFs
   # (but can be overridden in `render :pdf` calls)
-  # layout: 'pdf.html',
-  enable_local_file_access: true
-}
+  # config.layout = 'pdf.html',
+
+  # Using wkhtmltopdf without an X server can be achieved by enabling the
+  # 'use_xvfb' flag. This will wrap all wkhtmltopdf commands around the
+  # 'xvfb-run' command, in order to simulate an X server.
+  #
+  # config.use_xvfb = true,
+end