diff --git a/app/models/spree/product_decorator.rb b/app/models/spree/product_decorator.rb
index 622bef3f43..4b93e0427e 100644
--- a/app/models/spree/product_decorator.rb
+++ b/app/models/spree/product_decorator.rb
@@ -4,7 +4,6 @@ Spree::Product.class_eval do
   # https://github.com/rails/rails/issues/7618
   has_many :option_types, :through => :product_option_types, :dependent => :destroy
 
-
   belongs_to :supplier, :class_name => 'Enterprise'
 
   has_many :product_distributions, :dependent => :destroy
@@ -12,8 +11,9 @@ Spree::Product.class_eval do
 
   accepts_nested_attributes_for :product_distributions, :allow_destroy => true
   delegate_belongs_to :master, :unit_value, :unit_description
+  delegate :images_attributes=, to: :master
 
-  attr_accessible :supplier_id, :distributor_ids, :product_distributions_attributes, :group_buy, :group_buy_unit_size, :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value, :unit_description, :notes
+  attr_accessible :supplier_id, :distributor_ids, :product_distributions_attributes, :group_buy, :group_buy_unit_size, :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value, :unit_description, :notes, :images_attributes
 
   validates_presence_of :supplier
 
diff --git a/app/models/spree/variant_decorator.rb b/app/models/spree/variant_decorator.rb
index 165c2d34f6..42f6efe0ac 100644
--- a/app/models/spree/variant_decorator.rb
+++ b/app/models/spree/variant_decorator.rb
@@ -2,7 +2,8 @@ Spree::Variant.class_eval do
   has_many :exchange_variants, dependent: :destroy
   has_many :exchanges, through: :exchange_variants
 
-  attr_accessible :unit_value, :unit_description
+  attr_accessible :unit_value, :unit_description, :images_attributes
+  accepts_nested_attributes_for :images
 
   validates_presence_of :unit_value,
                         if: -> v { %w(weight volume).include? v.product.variant_unit },
diff --git a/app/overrides/spree/admin/products/new/replace_form.html.haml.deface b/app/overrides/spree/admin/products/new/replace_form.html.haml.deface
index 4421819fb6..efe611e156 100644
--- a/app/overrides/spree/admin/products/new/replace_form.html.haml.deface
+++ b/app/overrides/spree/admin/products/new/replace_form.html.haml.deface
@@ -66,7 +66,8 @@
     .row
       = image_tag "noimage/product.png", class: "four columns alpha"
     .row
-      = button "Select An image"
+      = f.fields_for 'images_attributes[]', f.object.images.build do |image_fields|
+        = image_fields.file_field :attachment
 .sixteen.columns.alpha
   .form-buttons.filter-actions.actions{ 'data-hook' => "buttons" }
     = button t('actions.create'), 'icon-ok', :submit, value: "create"
@@ -78,8 +79,6 @@
     = link_to_with_icon 'icon-remove', t('actions.cancel'), collection_url, :class => 'button'
 
 
-
-
 :javascript
   angular.element(document.getElementById("new_product")).ready(function() {
     angular.bootstrap(document.getElementById("new_product"), ['admin.products']);