diff --git a/core/modules/media_entity/config/schema/media_entity.schema.yml b/core/modules/media_entity/config/schema/media_entity.schema.yml
index bff9c1e..ca58bc2 100644
--- a/core/modules/media_entity/config/schema/media_entity.schema.yml
+++ b/core/modules/media_entity/config/schema/media_entity.schema.yml
@@ -36,6 +36,17 @@ media_entity.bundle.*:
       sequence:
         type: string
 
+media_entity.bundle.type.image:
+  type: mapping
+  label: 'Media Image type configuration'
+  mapping:
+    source_field:
+      type: string
+      label: 'Field with embed code/URL'
+    gather_exif:
+      type: boolean
+      label: 'Gather EXIF metadata'
+
 action.configuration.media_delete_action:
   type: action_configuration_default
   label: 'Delete media configuration'
diff --git a/core/modules/media_entity/images/icons/no-thumbnail.png b/core/modules/media_entity/images/icons/no-thumbnail.png
new file mode 100644
index 0000000..c50e3c7
--- /dev/null
+++ b/core/modules/media_entity/images/icons/no-thumbnail.png
@@ -0,0 +1,6 @@
+‰PNG
+
+   IHDR   ´   ´   ²¯‘e   tEXtSoftware Adobe ImageReadyqÉe<  0IDATxÚìÝ1O"[€áÝ›b6TRQYA¥4RaåðŸñì¬¬´Ñ
+o…‘Š
+£Õ=+·2,sÈ²ä{Þz4ŸÌwf<3~ïõzß¤eýã#‚CpÁ!8‡à‚C‚CpÁ!8‡à‚CpHpÁ!8‡à‚Cp	Á!8‡à‚CpÁ!8$8‡à‚CpÁ!8‡‡à‚Cµ[òsÔjµv»½ÁoØï÷§ÓéŠö÷÷ÏÎÎööö¶íWRø“‡ÃQ.—7ø»Ýîõõõûûû¯x}}}~~Þ¬ÈM}ÆÊŸ­Z­¯>f8¾¼¼×­V«ðlôðð°âìÇ.×étJ¥ÒŠæóùÓÓq¤á’Î†ËK+t)d¸ÀñËá²ú Ã%.Žtæpå‡á‡á‡á‡áÇ×.ý~ŸŒˆ8r†Ëh4ÇpDÜÏa¸Àñ[Ã%ÉH>àˆXÎpGÄ8888888¾v§§§†Ë«×ëÍfÓpcy'''•JÅpcy…"†.püßt:½ººÊy‚9ÎpãgƒÁ`õS×Ÿ
+²•ðGp	D¿ßFk]÷ÞãË7›Íîîîò_†Q*•:N£ÑòùÄÅ‘FC’‘?JjµZ’Qx¯Ž/ß¿åŸÎ…ìÃ±‹Œt-ºÖåF³ÙÜÂ Á±ùëÕ$c­EFbqttóüG:[¬u³R©œŸŸ‡ZdÅ‘®W‡ÃaþñÉÄÅÅE´EF8éTq{{;™Lò¿$Í‘Â@pìÂ"#É˜Ïçù_’X„]dÄÂ±–Œ4DÒ(‰¼ÈøÔŽÿm%­(ó———dÂ±¸­™sd·Û¾ü‡c±º,Üâ•ZëV:»S»Ý.|•qZºz-GD‹ÅGáÀÑh4˜‡#­'’ÂUÅãã£×¶„Ã‘¿8]ë/pìNF£p×âŽªÅé·€{HŽÂ­\óù<ù€#âãœ]“ÉÄkŸ"âHËÒœ[^£àWµZM>,NáX^½^/|x:uss3›ÍàW«Õ*üë|ºl	{g=úo9‹ÓÅÎS8"–³p<¯õ(»sñ’ã#áˆvñÇÏ2ÿYúöü#q8þj9Û>Ò²4]¼xyKÄr¶},|À±œ§˜â\¼ÀñyqšóÀtmAp,Yœælûˆ°-h[ž[y{{[ë¡´?Z¹\NëÓÂ×ûûû´L988ØøG±%ŸÃ÷^¯çl!cEpÁ!8‡à‚CpHpÁ!8‡à‚Cp	Á!8‡à‚CpÁ!8$8‡à‚CpÁ!8‡‡à‚CpÁ!8‡àà‚CpmAÿ	0 {Éb~×a    IEND®B`‚
\ No newline at end of file
diff --git a/core/modules/media_entity/src/Plugin/MediaEntity/Type/Image.php b/core/modules/media_entity/src/Plugin/MediaEntity/Type/Image.php
new file mode 100644
index 0000000..fd4f1f1
--- /dev/null
+++ b/core/modules/media_entity/src/Plugin/MediaEntity/Type/Image.php
@@ -0,0 +1,284 @@
+<?php
+
+namespace Drupal\media_entity\Plugin\MediaEntity\Type;
+
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Datetime\DrupalDateTime;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Image\ImageFactory;
+use Drupal\media_entity\MediaInterface;
+use Drupal\media_entity\MediaTypeBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides media type plugin for Image.
+ *
+ * @MediaType(
+ *   id = "image",
+ *   label = @Translation("Image"),
+ *   description = @Translation("Provides business logic and metadata for local images.")
+ * )
+ */
+class Image extends MediaTypeBase {
+
+  /**
+   * The image factory service.
+   *
+   * @var \Drupal\Core\Image\ImageFactory
+   */
+  protected $imageFactory;
+
+  /**
+   * The EXIF data.
+   *
+   * @var array
+   */
+  protected $exif;
+
+  /**
+   * Constructs a new class instance.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   Entity type manager service.
+   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
+   *   Entity field manager service.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
+   *   Media entity config object.
+   * @param \Drupal\Core\Image\ImageFactory $image_factory
+   *   The image factory.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, ConfigFactoryInterface $config, ImageFactory $image_factory) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $entity_field_manager, $config);
+
+    $this->imageFactory = $image_factory;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity_type.manager'),
+      $container->get('entity_field.manager'),
+      $container->get('config.factory'),
+      $container->get('image.factory')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providedFields() {
+    $fields = array(
+      'mime' => $this->t('Image MIME'),
+      'width' => $this->t('Width'),
+      'height' => $this->t('Height'),
+    );
+
+    if (!empty($this->configuration['gather_exif'])) {
+      $fields += array(
+        'model' => $this->t('Camera model'),
+        'created' => $this->t('Image creation datetime'),
+        'iso' => $this->t('Iso'),
+        'exposure' => $this->t('Exposure time'),
+        'aperture' => $this->t('Aperture value'),
+        'focal_length' => $this->t('Focal length'),
+      );
+    }
+
+    return $fields;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getField(MediaInterface $media, $name) {
+    $source_field = $this->configuration['source_field'];
+
+    // Get the file, image and EXIF data.
+    /** @var \Drupal\file\FileInterface $file */
+    $file = $media->{$source_field}->entity;
+    $image = $this->imageFactory->get($file->getFileUri());
+    $uri = $file->getFileUri();
+
+    // Return the field.
+    switch ($name) {
+      case 'mime':
+        return $file->getMimeType();
+
+      case 'width':
+        return $image->getWidth();
+
+      case 'height':
+        return $image->getHeight();
+
+      case 'size':
+        return $file->getSize();
+    }
+
+    if (!empty($this->configuration['gather_exif']) && $this->canReadExifData()) {
+      switch ($name) {
+        case 'created':
+          /** @var \DateTime $date */
+          $date = new DrupalDateTime($this->getExifField($uri, 'DateTimeOriginal'));
+          return $date->getTimestamp();
+
+        case 'model':
+          return $this->getExifField($uri, 'Model');
+
+        case 'iso':
+          return $this->getExifField($uri, 'ISOSpeedRatings');
+
+        case 'exposure':
+          return $this->getExifField($uri, 'ExposureTime');
+
+        case 'aperture':
+          return $this->getExifField($uri, 'FNumber');
+
+        case 'focal_length':
+          return $this->getExifField($uri, 'FocalLength');
+      }
+    }
+
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+    $allowed_field_types = ['file', 'image'];
+    $options = [];
+
+    /** @var \Drupal\media_entity\MediaBundleInterface $bundle */
+    $bundle = $form_state->getFormObject()->getEntity();
+    foreach ($this->entityFieldManager->getFieldDefinitions('media', $bundle->id()) as $field_name => $field) {
+      if (
+        in_array($field->getType(), $allowed_field_types)
+        && !$field->getFieldStorageDefinition()->isBaseField()
+      ) {
+        $options[$field_name] = $field->getLabel();
+      }
+    }
+
+    $form['source_field'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Field with source information'),
+      '#description' => $this->t('Field on media entity that stores Image file. You can create a bundle without selecting a value for this dropdown initially. This dropdown can be populated after adding fields to the bundle.'),
+      '#default_value' => empty($this->configuration['source_field']) ? NULL : $this->configuration['source_field'],
+      '#options' => $options,
+    ];
+
+    $form['gather_exif'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Whether to gather EXIF data.'),
+      '#description' => $this->t('Gather EXIF data, if that functionality is provided.'),
+      '#default_value' => empty($this->configuration['gather_exif']) || $this->canReadExifData() ? $this->configuration['gather_exif'] : 0,
+      '#options' => [
+        0 => $this->t('No'),
+        1 => $this->t('Yes'),
+      ],
+      '#ajax' => [
+        'callback' => '::ajaxTypeProviderData',
+      ],
+      '#disabled' => !$this->canReadExifData(),
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefaultThumbnail() {
+    return $this->configFactory->get('media_entity.settings')
+      ->get('icon_base') . '/no-thumbnail.png';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function thumbnail(MediaInterface $media) {
+    $source_field = $this->configuration['source_field'];
+
+    /** @var \Drupal\file\FileInterface $file */
+    if ($file = $media->{$source_field}->entity) {
+      return $file->getFileUri();
+    }
+
+    return $this->getDefaultThumbnail();
+  }
+
+  /**
+   * Check does functionality for reading EXIF data exist.
+   *
+   * @return bool
+   *   Returns TRUE if functionality for reading of EXIF data is provided.
+   */
+  protected function canReadExifData() {
+    return function_exists('exif_read_data');
+  }
+
+  /**
+   * Get EXIF field value.
+   *
+   * @param string $uri
+   *   The uri for the file that we are getting the EXIF.
+   * @param string $field
+   *   The name of the EXIF field.
+   *
+   * @return string|bool
+   *   The value for the requested field or FALSE if is not set.
+   */
+  protected function getExifField($uri, $field) {
+    if (empty($this->exif)) {
+      $this->exif = $this->getExifData($uri);
+    }
+
+    return !empty($this->exif[$field]) ? $this->exif[$field] : FALSE;
+  }
+
+  /**
+   * Read EXIF.
+   *
+   * @param string $uri
+   *   The uri for the file that we are getting the Exif.
+   *
+   * @return array|bool
+   *   An associative array where the array indexes are the header names and
+   *   the array values are the values associated with those headers or FALSE
+   *   if the data can't be read.
+   */
+  protected function getExifData($uri) {
+    return exif_read_data($uri, 'EXIF');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefaultName(MediaInterface $media) {
+    // The default name will be the filename of the source_field, if present,
+    // or the parent's defaultName implementation if it was not possible to
+    // retrieve the filename.
+    $source_field = $this->configuration['source_field'];
+
+    /** @var \Drupal\file\FileInterface $file */
+    if (!empty($source_field) && ($file = $media->{$source_field}->entity)) {
+      return $file->getFilename();
+    }
+
+    return parent::getDefaultName($media);
+  }
+
+}