diff --git a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
index 5a2d225a561..1407152cd17 100644
--- a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
@@ -1,10 +1,17 @@
+import computed from 'ember-addons/ember-computed-decorators';
 import { getToken } from 'wizard/lib/ajax';
 
 export default Ember.Component.extend({
   classNames: ['wizard-image-row'],
-
   uploading: false,
 
+  @computed('field.id')
+  previewComponent(id) {
+    const componentName = `image-preview-${Ember.String.dasherize(id)}`;
+    const exists = this.container.lookup(`component:${componentName}`);
+    return exists ? componentName : 'wizard-image-preview';
+  },
+
   didInsertElement() {
     this._super();
 
diff --git a/app/assets/javascripts/wizard/components/wizard-image-preview.js.es6 b/app/assets/javascripts/wizard/components/wizard-image-preview.js.es6
new file mode 100644
index 00000000000..0a171c6dff2
--- /dev/null
+++ b/app/assets/javascripts/wizard/components/wizard-image-preview.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  classNameBindings: [':wizard-image-preview', 'fieldClass']
+});
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
index 6e798194bb4..356ce943383 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
@@ -1,3 +1,7 @@
+{{#if field.value}}
+  {{component previewComponent field=field fieldClass=fieldClass}}
+{{/if}}
+
 <label class="wizard-btn wizard-btn-upload {{if uploading 'disabled'}}">
   {{#if uploading}}
     {{i18n "wizard.uploading"}}
@@ -8,9 +12,3 @@
 
   <input disabled={{uploading}} type="file" accept="image/*" style="visibility: hidden; position: absolute;" />
 </label>
-
-{{#if field.value}}
-  <div class='wizard-image-preview {{fieldClass}}'>
-    <img src={{field.value}} class={{fieldClass}}>
-  </div>
-{{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-image-preview.hbs b/app/assets/javascripts/wizard/templates/components/wizard-image-preview.hbs
new file mode 100644
index 00000000000..c046ed5795c
--- /dev/null
+++ b/app/assets/javascripts/wizard/templates/components/wizard-image-preview.hbs
@@ -0,0 +1 @@
+<img src={{field.value}} class={{fieldClass}}>