diff --git a/app/assets/javascripts/my_modules/image_preview.js b/app/assets/javascripts/my_modules/image_preview.js
index 30538da9a..007ce304e 100644
--- a/app/assets/javascripts/my_modules/image_preview.js
+++ b/app/assets/javascripts/my_modules/image_preview.js
@@ -5,7 +5,7 @@ $(document).ready(function() {
     $('.image-preview-link').click(function(e) {
       e.preventDefault();
       var name = $(this).find('p').text();
-      var url = $(this).find('img').attr('src');
+      var url = $(this).find('img').data('large-url');
       var downloadUrl = $(this).attr('href');
       var description = $(this).data('description');
       openPreviewModal(name, url, downloadUrl, description);
diff --git a/app/assets/stylesheets/my_modules.scss b/app/assets/stylesheets/my_modules.scss
index f2749867b..216f73a63 100644
--- a/app/assets/stylesheets/my_modules.scss
+++ b/app/assets/stylesheets/my_modules.scss
@@ -49,6 +49,7 @@
     -webkit-box-shadow: none;
     box-shadow: none;
     color: $color-white;
+    padding: 0;
   }
 
   .modal-dialog {
@@ -59,17 +60,13 @@
     width: 100%;
   }
 
-  .modal-content {
-    height: 100%;
-  }
-
   .modal-header {
     background: $color-black;
     border: 0;
   }
 
   .modal-body {
-    height: 100%;
+    padding: 0;
     text-align: center;
   }
 
diff --git a/app/models/asset.rb b/app/models/asset.rb
index 04322221f..263f9f8e4 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -7,7 +7,8 @@ class Asset < ActiveRecord::Base
 
   # Paperclip validation
   has_attached_file :file,
-                    styles: { medium: [Constants::MEDIUM_PIC_FORMAT, :jpg] },
+                    styles: { medium: [Constants::MEDIUM_PIC_FORMAT, :jpg],
+                              large: [Constants::LARGE_PIC_FORMAT, :jpg] },
                     convert_options: { medium: '-quality 70 -strip' }
 
   validates_attachment :file,
@@ -28,7 +29,7 @@ class Asset < ActiveRecord::Base
                                            %r{^image/#{ Regexp.union(
                                              Constants::WHITELISTED_IMAGE_TYPES
                                            ) }}
-                                          [:medium]
+                                          [:medium, :large]
                                         else
                                           {}
                                         end
diff --git a/app/views/results/_result_asset.html.erb b/app/views/results/_result_asset.html.erb
index a0243759a..806619231 100644
--- a/app/views/results/_result_asset.html.erb
+++ b/app/views/results/_result_asset.html.erb
@@ -21,7 +21,7 @@
       <%= image_tag 'medium/processing.gif' %>
     </span>
   <% else %>
-    <%= image_tag(preview_asset_path result.asset) if result.asset.is_image? %>
+    <%= image_tag(result.asset.url(:medium), data: {large_url: result.asset.url(:large)}) if result.asset.is_image? %>
     <p><%= result.asset.file_file_name %></p>
   <% end %>
 <% end %>
diff --git a/app/views/steps/_step.html.erb b/app/views/steps/_step.html.erb
index 1d55d407c..e926727cc 100644
--- a/app/views/steps/_step.html.erb
+++ b/app/views/steps/_step.html.erb
@@ -76,7 +76,7 @@
                               <%= image_tag 'medium/processing.gif' %>
                             </span>
                           <% else %>
-                            <%= image_tag preview_asset_path(asset) if asset.is_image? %>
+                            <%= image_tag asset.url(:medium), data: {large_url: asset.url(:large)} if asset.is_image? %>
                           <% end %>
                           <p><%= truncate(asset.file_file_name,
                                           length: Constants::FILENAME_TRUNCATION_LENGTH) %></p>
diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
index c967bdb3e..e784d00b6 100644
--- a/config/initializers/constants.rb
+++ b/config/initializers/constants.rb
@@ -73,6 +73,7 @@ class Constants
 
   # Picture size formats
   MEDIUM_PIC_FORMAT = '300x300>'.freeze
+  LARGE_PIC_FORMAT = '800x600>'.freeze
   THUMB_PIC_FORMAT = '100x100>'.freeze
   ICON_PIC_FORMAT = '40x40>'.freeze
   ICON_SMALL_PIC_FORMAT = '30x30>'.freeze