diff --git a/core/modules/editor/src/Form/EditorImageDialog.php b/core/modules/editor/src/Form/EditorImageDialog.php
index de27556..25f1cb0 100644
--- a/core/modules/editor/src/Form/EditorImageDialog.php
+++ b/core/modules/editor/src/Form/EditorImageDialog.php
@@ -211,7 +211,9 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       // Transform absolute image URLs to relative image URLs: prevent problems
       // on multisite set-ups and prevent mixed content errors.
       $file_url = file_url_transform_relative($file_url);
-      $form_state->setValue(array('attributes', 'src'), $file_url);
+      if (!$form_state->getValue(array('attributes', 'src'))) {
+        $form_state->setValue(array('attributes', 'src'), $file_url);
+      }
       $form_state->setValue(array('attributes', 'data-entity-uuid'), $file->uuid());
       $form_state->setValue(array('attributes', 'data-entity-type'), 'file');
     }
diff --git a/core/modules/image/css/image.admin.css b/core/modules/image/css/image.admin.css
index 1acb185..2983d74 100644
--- a/core/modules/image/css/image.admin.css
+++ b/core/modules/image/css/image.admin.css
@@ -13,8 +13,13 @@
   top: 50%;
   width: 48%;
 }
+
+.image-style-preview .preview-image-wrapper div {
+  display: block;
+}
+
 .image-style-preview .preview-image {
-  margin: auto;
+  margin: 5px auto auto;
   position: relative;
   display: block;
 }
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 3b6eca4..79d1757 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -546,7 +546,7 @@ function image_form_editor_image_dialog_alter(&$form, FormStateInterface $form_s
         ),
       );
     }
-    $form['#attached']['css'][drupal_get_path('module', 'image') . '/css/image.admin.css'] = array();
+    $form['#attached']['library'][] = 'image/admin';
 
     $form['actions']['save_modal']['#validate'][] = 'image_form_editor_image_dialog_validate';
   }
@@ -562,7 +562,7 @@ function image_form_editor_image_dialog_alter(&$form, FormStateInterface $form_s
  * @see image_form_editor_image_dialog_alter()
  */
 function image_form_editor_image_dialog_validate(array &$form, FormStateInterface &$form_state) {
-  $attributes = $form_state->getValue('attributes');
+  $attributes =& $form_state->getValue('attributes');
   if (!empty($form_state->getValue('fid')[0])) {
     $image_style = entity_load('image_style', $attributes['data-image-style']);
     $file = file_load($form_state->getValue('fid')[0]);
@@ -581,7 +581,7 @@ function image_form_editor_image_dialog_validate(array &$form, FormStateInterfac
         'width' => $image->getWidth(),
         'height' => $image->getHeight()
       );
-      $image_style->transformDimensions($dimensions);
+      $image_style->transformDimensions($dimensions, $attributes['src']);
       $attributes['width'] = $dimensions['width'];
       $attributes['height'] = $dimensions['height'];
     }
diff --git a/core/modules/image/templates/image-style-preview.html.twig b/core/modules/image/templates/image-style-preview.html.twig
index d6e715c..64f87aa 100644
--- a/core/modules/image/templates/image-style-preview.html.twig
+++ b/core/modules/image/templates/image-style-preview.html.twig
@@ -33,7 +33,7 @@
 <div class="image-style-preview preview clearfix">
   {# Preview of the original image. #}
   <div class="preview-image-wrapper">
-      {{ 'original'|t }} (<a href="{{ original.url }}">{{ 'view actual size'|t }}</a>)
+      {{ 'original'|t }} <br >(<a href="{{ original.url }}">{{ 'view actual size'|t }}</a>)
       <div class="preview-image original-image" style="width: {{ preview.original.width }}px; height: {{ preview.original.height }}px;">
         <a href="{{ original.url }}">
           {{ original.rendered }}
@@ -45,7 +45,7 @@
 
   {# Derivative of the image style. #}
   <div class="preview-image-wrapper">
-    {{ style_name }} (<a href="{{ derivative.url }}?{{ cache_bypass }}">{{ 'view actual size'|t }}</a>)
+    {{ style_name }} <br >(<a href="{{ derivative.url }}?{{ cache_bypass }}">{{ 'view actual size'|t }}</a>)
     <div class="preview-image modified-image" style="width: {{ preview.derivative.width }}px; height: {{ preview.derivative.height }}px;">
       <a href="{{ derivative.url }}?{{ cache_bypass }}">
         {{ derivative.rendered }}