diff --git a/app/assets/javascripts/templates/admin/modals/bulk_invoice.html.haml b/app/assets/javascripts/templates/admin/modals/bulk_invoice.html.haml
index b77175f7ce..1ed013082d 100644
--- a/app/assets/javascripts/templates/admin/modals/bulk_invoice.html.haml
+++ b/app/assets/javascripts/templates/admin/modals/bulk_invoice.html.haml
@@ -6,7 +6,7 @@
 %p.error{ ng: { show: 'error' } }
   {{error}}
 
-%img.spinner{ src: image_path("spinning-circles.svg"), ng: { show: "loading" } }
+%img.spinner{ src: image_pack_path("spinning-circles.svg"), ng: { show: "loading" } }
 %p{ ng: { show: "loading" } }
   = t('js.admin.orders.index.please_wait')
 
diff --git a/app/assets/javascripts/templates/admin/modals/image_upload.html.haml b/app/assets/javascripts/templates/admin/modals/image_upload.html.haml
index 27234ea444..cfa1122852 100644
--- a/app/assets/javascripts/templates/admin/modals/image_upload.html.haml
+++ b/app/assets/javascripts/templates/admin/modals/image_upload.html.haml
@@ -3,7 +3,7 @@
 
 %form#image_upload{ name: 'form', novalidate: true, enctype: 'multipart/form-data', multipart: true, ng: { controller: "ProductImageCtrl" } }
   %div.image-preview
-    %img.spinner{ src: image_path("spinning-circles.svg"), ng: { hide: "!imageUploader.isUploading" }}
+    %img.spinner{ src: image_pack_path("spinning-circles.svg"), ng: { hide: "!imageUploader.isUploading" }}
     %img.preview{ng: {src: "{{imagePreview}}", class: "{'faded': imageUploader.isUploading}"}}
 
   %label{for: 'image-upload', class: 'button'} {{ 'admin.products.index.upload_an_image' | t }}
diff --git a/app/assets/javascripts/templates/admin/panels/exchange_products_panel_footer.html.haml b/app/assets/javascripts/templates/admin/panels/exchange_products_panel_footer.html.haml
index 469d3b066a..5226e14ca7 100644
--- a/app/assets/javascripts/templates/admin/panels/exchange_products_panel_footer.html.haml
+++ b/app/assets/javascripts/templates/admin/panels/exchange_products_panel_footer.html.haml
@@ -6,6 +6,6 @@
 
 .sixteen.columns.alpha#loading{ 'ng-show' => 'productsLoading()' }
   %br
-  %img.spinner{ src: image_path("spinning-circles.svg")}
+  %img.spinner{ src: image_pack_path("spinning-circles.svg")}
   %h1
     {{ 'js.admin.panels.exchange_products.loading_variants' | t }}
diff --git a/app/views/components/_spinner.html.haml b/app/views/components/_spinner.html.haml
index 8d0a371204..a3dee8a298 100644
--- a/app/views/components/_spinner.html.haml
+++ b/app/views/components/_spinner.html.haml
@@ -1 +1 @@
-%img.spinner{ src: image_path("spinning-circles.svg"), style: "max-width: 100%" }
+%img.spinner{ src: image_pack_path("spinning-circles.svg"), style: "max-width: 100%" }
diff --git a/app/views/home/_tagline.html.haml b/app/views/home/_tagline.html.haml
index b20a3dc799..245d07263a 100644
--- a/app/views/home/_tagline.html.haml
+++ b/app/views/home/_tagline.html.haml
@@ -2,7 +2,7 @@
   .row
     .small-12.text-center.columns
       %h1
-        %img{src: image_path("logo-white-notext.png"), title: Spree::Config.site_name}
+        %img{src: image_pack_path("logo-white-notext.png"), title: Spree::Config.site_name}
         %br/
         %a.button.transparent{href: "/shops"}
           = t :home_shop
diff --git a/app/views/layouts/registration.html.haml b/app/views/layouts/registration.html.haml
index ea49bc4c5f..ad947d5a1f 100644
--- a/app/views/layouts/registration.html.haml
+++ b/app/views/layouts/registration.html.haml
@@ -16,7 +16,7 @@
 
     = csrf_meta_tags
 
-  %body.off-canvas{ style: "background-image: url(#{image_path('tile-wide.png')})", "data-turbo": "false" }
+  %body.off-canvas{ style: "background-image: url(#{image_pack_path('tile-wide.png')})", "data-turbo": "false" }
     / [if lte IE 8]
       = render partial: "shared/ie_warning"
       = javascript_include_tag "iehack"
diff --git a/app/views/registration/steps/_limit_reached.html.haml b/app/views/registration/steps/_limit_reached.html.haml
index ba49d0dac3..7a486e5743 100644
--- a/app/views/registration/steps/_limit_reached.html.haml
+++ b/app/views/registration/steps/_limit_reached.html.haml
@@ -6,7 +6,7 @@
         %h4= t(".message")
   .row
     .small-12.medium-3.large-2.columns.text-right.hide-for-small-only
-      %img{:src => image_path("potatoes.png") }
+      %img{:src => image_pack_path("potatoes.png") }
     .small-12.medium-9.large-10.columns
       %p
         = t(".text")
diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml
index d4b61ccdba..4e7a5d05e1 100644
--- a/app/views/shared/_footer.html.haml
+++ b/app/views/shared/_footer.html.haml
@@ -3,7 +3,7 @@
     .row
       .small-12.columns.text-center
         .logo
-          %img{src: image_path("logo-white-notext.png") }
+          %img{src: image_pack_path("logo-white-notext.png") }
     .row
       .small-12.medium-8.medium-offset-2.columns.text-center
         .alert-box
diff --git a/app/views/shared/_ie_warning.html.haml b/app/views/shared/_ie_warning.html.haml
index 87acc77b4c..2a71f966bc 100644
--- a/app/views/shared/_ie_warning.html.haml
+++ b/app/views/shared/_ie_warning.html.haml
@@ -10,17 +10,17 @@
   .row
     .small-4.columns.browserbtn
       %a.browserlogo{href: "https://www.google.com/intl/en_au/chrome/browser/", target: "_blank"} 
-        %img{src: image_path("browser-logos/chrome.png") }
+        %img{src: image_pack_path("browser-logos/chrome.png") }
       %a{href: "https://www.google.com/intl/en_au/chrome/browser/", target: "_blank"}
         = t :ie_warning_chrome
     .small-4.columns.browserbtn
       %a.browserlogo{href: "http://www.mozilla.org/en-US/firefox/new/", target: "_blank"} 
-        %img{src: image_path("browser-logos/firefox.png") }
+        %img{src: image_pack_path("browser-logos/firefox.png") }
       %a{href: "http://www.mozilla.org/en-US/firefox/new/", target: "_blank"}
         = t :ie_warning_firefox
     .small-4.columns.browserbtn  
       %a.browserlogo{href: "http://windows.microsoft.com/en-AU/internet-explorer/download-ie", target: "_blank"} 
-        %img{src: image_path("browser-logos/internet-explorer.png") }
+        %img{src: image_pack_path("browser-logos/internet-explorer.png") }
       %a{href: "http://windows.microsoft.com/en-AU/internet-explorer/download-ie", target: "_blank"}
         = t :ie_warning_ie
   .row.ie-msg
diff --git a/app/views/shared/menu/_cart.html.haml b/app/views/shared/menu/_cart.html.haml
index 1fd1b06e89..728b0c1daa 100644
--- a/app/views/shared/menu/_cart.html.haml
+++ b/app/views/shared/menu/_cart.html.haml
@@ -3,6 +3,6 @@
     %span
       = t '.cart'
     %span.count
-      %img{ src: image_path("menu/icn-cart.svg") }
+      %img{ src: image_pack_path("menu/icn-cart.svg") }
       %span
         {{ Cart.total_item_count() }}
diff --git a/app/views/shared/menu/_signed_in.html.haml b/app/views/shared/menu/_signed_in.html.haml
index dceb81075a..34b7bcfc06 100644
--- a/app/views/shared/menu/_signed_in.html.haml
+++ b/app/views/shared/menu/_signed_in.html.haml
@@ -7,7 +7,7 @@
 %li.user-menu.has-dropdown.not-click
 
   %a{href: "#", class: "top-bar--menu-item-with-icon"}
-    %img{ src: image_path("menu/icn-profile.svg") }
+    %img{ src: image_pack_path("menu/icn-profile.svg") }
     %span
       = t '.profile'
 
diff --git a/app/views/shared/menu/_signed_out.html.haml b/app/views/shared/menu/_signed_out.html.haml
index 3a886a20e0..a5d527632a 100644
--- a/app/views/shared/menu/_signed_out.html.haml
+++ b/app/views/shared/menu/_signed_out.html.haml
@@ -1,5 +1,5 @@
 %li#login-link
   %a{"auth" => "login"}
-    %img{ src: image_path("menu/icn-login.svg") }
+    %img{ src: image_pack_path("menu/icn-login.svg") }
     %span
       = t 'label_login'