diff --git a/core/modules/image/image.field.inc b/core/modules/image/image.field.inc
index 62f4aca..8e62fc6 100644
--- a/core/modules/image/image.field.inc
+++ b/core/modules/image/image.field.inc
@@ -15,35 +15,29 @@ function image_field_info_alter(&$info) {
 }
 
 /**
- * Returns HTML for an image field widget.
+ * Prepares variables for image widget templates.
+ *
+ * Default template: image-widget.html.twig.
  *
  * @param array $variables
  *   An associative array containing:
  *   - element: A render element representing the image field widget.
- *
- * @ingroup themeable
  */
-function theme_image_widget($variables) {
+function template_preprocess_image_widget(&$variables) {
   $element = $variables['element'];
-  $output = '';
-  $output .= '<div class="image-widget form-managed-file clearfix">';
+  $element['#attributes']['class'] = array('image-widget', 'form-managed-file', 'clearfix');
 
   if (isset($element['preview'])) {
-    $output .= '<div class="image-preview">';
-    $output .= drupal_render($element['preview']);
-    $output .= '</div>';
+    $variables['preview'] = $element['preview'];
   }
 
-  $output .= '<div class="image-widget-data">';
   if (!empty($element['fids']['#value'])) {
     $file = reset($element['#files']);
     $element['file_' . $file->id()]['filename']['#suffix'] = ' <span class="file-size">(' . format_size($file->getSize()) . ')</span> ';
   }
-  $output .= drupal_render_children($element);
-  $output .= '</div>';
-  $output .= '</div>';
 
-  return $output;
+  $variables['data'] = $element;
+  $variables['attributes'] = $element['#attributes'];
 }
 
 /**
diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php
index 1f6fcfe..efb4f1c 100644
--- a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php
+++ b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php
@@ -43,7 +43,6 @@ public function getSummary() {
       '#data' => $this->configuration,
     );
     $summary += parent::getSummary();
-    $summary['#data']['anchor_label'] = static::getAnchorOptions($this->configuration['anchor']);
 
     return $summary;
   }