diff --git a/app/helpers/spree/admin/images_helper.rb b/app/helpers/spree/admin/images_helper.rb
new file mode 100644
index 0000000000..875790438b
--- /dev/null
+++ b/app/helpers/spree/admin/images_helper.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    module ImagesHelper
+      def options_text_for(image)
+        if image.viewable.is_a?(Spree::Variant)
+          if image.viewable.is_master?
+            I18n.t(:all)
+          else
+            image.viewable.options_text
+          end
+        else
+          I18n.t(:all)
+        end
+      end
+    end
+  end
+end
diff --git a/app/models/spree/asset.rb b/app/models/spree/asset.rb
new file mode 100644
index 0000000000..d5eb00d506
--- /dev/null
+++ b/app/models/spree/asset.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Spree
+  class Asset < ActiveRecord::Base
+    belongs_to :viewable, polymorphic: true, touch: true
+    acts_as_list scope: :viewable
+  end
+end
diff --git a/app/models/spree/image.rb b/app/models/spree/image.rb
new file mode 100644
index 0000000000..3ece2769aa
--- /dev/null
+++ b/app/models/spree/image.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Spree
+  class Image < Asset
+    validates_attachment_presence :attachment
+    validate :no_attachment_errors
+
+    has_attached_file :attachment,
+                      styles: { mini: '48x48>', small: '100x100>',
+                                product: '240x240>', large: '600x600>' },
+                      default_style: :product,
+                      url: '/spree/products/:id/:style/:basename.:extension',
+                      path: ':rails_root/public/spree/products/:id/:style/:basename.:extension',
+                      convert_options: { all: '-strip -auto-orient -colorspace RGB' }
+
+    # save the w,h of the original image (from which others can be calculated)
+    # we need to look at the write-queue for images which have not been saved yet
+    after_post_process :find_dimensions
+
+    include Spree::Core::S3Support
+    supports_s3 :attachment
+
+    Spree::Image.attachment_definitions[:attachment][:styles] =
+      ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys!
+    Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
+    Spree::Image.attachment_definitions[:attachment][:url] = Spree::Config[:attachment_url]
+    Spree::Image.attachment_definitions[:attachment][:default_url] =
+      Spree::Config[:attachment_default_url]
+    Spree::Image.attachment_definitions[:attachment][:default_style] =
+      Spree::Config[:attachment_default_style]
+
+    # used by admin products autocomplete
+    def mini_url
+      attachment.url(:mini, false)
+    end
+
+    def find_dimensions
+      temporary = attachment.queued_for_write[:original]
+      filename = temporary.path unless temporary.nil?
+      filename = attachment.path if filename.blank?
+      geometry = Paperclip::Geometry.from_file(filename)
+      self.attachment_width  = geometry.width
+      self.attachment_height = geometry.height
+    end
+
+    # if there are errors from the plugin, then add a more meaningful message
+    def no_attachment_errors
+      return if attachment.errors.empty?
+
+      errors.add :attachment, "Paperclip returned errors for file '#{attachment_file_name}' - check ImageMagick installation or image source file."
+      false
+    end
+
+    # Spree stores attachent definitions in JSON. This converts the style name and format to
+    # strings. However, when paperclip encounters these, it doesn't recognise the format.
+    # Here we solve that problem by converting format and style name to symbols.
+    # See also: ImageSettingsController decorator.
+    #
+    # eg. {'mini' => ['48x48>', 'png']} is converted to {mini: ['48x48>', :png]}
+    def self.format_styles(styles)
+      styles_a = styles.map do |name, style|
+        style[1] = style[1].to_sym if style.is_a? Array
+        [name.to_sym, style]
+      end
+
+      Hash[styles_a]
+    end
+
+    def self.reformat_styles
+      Spree::Image.attachment_definitions[:attachment][:styles] =
+        format_styles(Spree::Image.attachment_definitions[:attachment][:styles])
+    end
+
+    reformat_styles
+  end
+end
diff --git a/app/models/spree/image_decorator.rb b/app/models/spree/image_decorator.rb
deleted file mode 100644
index 7d86aae3a6..0000000000
--- a/app/models/spree/image_decorator.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-Spree::Image.class_eval do
-  # Spree stores attachent definitions in JSON. This converts the style name and format to
-  # strings. However, when paperclip encounters these, it doesn't recognise the format.
-  # Here we solve that problem by converting format and style name to symbols.
-  # See also: ImageSettingsController decorator.
-  #
-  # eg. {'mini' => ['48x48>', 'png']} is converted to {mini: ['48x48>', :png]}
-  def self.format_styles(styles)
-    styles_a = styles.map do |name, style|
-      style[1] = style[1].to_sym if style.is_a? Array
-      [name.to_sym, style]
-    end
-
-    Hash[styles_a]
-  end
-
-  def self.reformat_styles
-    Spree::Image.attachment_definitions[:attachment][:styles] =
-      format_styles(Spree::Image.attachment_definitions[:attachment][:styles])
-  end
-
-  reformat_styles
-end
diff --git a/spec/models/spree/asset_spec.rb b/spec/models/spree/asset_spec.rb
new file mode 100644
index 0000000000..649c1e5691
--- /dev/null
+++ b/spec/models/spree/asset_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Spree::Asset do
+  describe "#viewable" do
+    it "touches association" do
+      product = create(:product)
+      asset = Spree::Asset.create! { |a| a.viewable = product.master }
+
+      product.update_column(:updated_at, 1.day.ago)
+
+      expect do
+        asset.touch
+      end.to change { product.reload.updated_at }
+    end
+  end
+end