reverted:
--- b/core/modules/media/images/icons/generic-file.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-   IHDR   ´   ´   
-ö    tEXtSoftware Adobe ImageReadyqÉe<   PLTEÌÌÍôõõ}^œf   çIDATxÚìØ1
-Aßÿ?ö)-ÃèÃvö<7ÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÿŠž×® g¾Õs-RgK‡ÔáÒuºtD/PçKÔ…ÒûêFéuu¥ô¶ºSzY]*½«n•^U×Joª‹èN¡O^.çÐsýc'Ñý\ü{½»  )yeïù    IEND®B`‚
\ No newline at end of file
diff -u b/core/modules/media_library/config/install/views.view.media_library.yml b/core/modules/media_library/config/install/views.view.media_library.yml
--- b/core/modules/media_library/config/install/views.view.media_library.yml
+++ b/core/modules/media_library/config/install/views.view.media_library.yml
@@ -6,7 +6,6 @@
   module:
     - media
     - media_library
-    - system
     - user
 id: media_library
 label: Media
@@ -389,8 +388,8 @@
         - 'url.query_args:sort_by'
         - user.permissions
       tags:
-        - 'config:core.entity_view_display.media.type_one.default'
-        - 'config:core.entity_view_display.media.type_two.default'
+        - 'config:core.entity_view_display.media.file.default'
+        - 'config:core.entity_view_display.media.image.default'
   bundle_page:
     display_plugin: page
     id: bundle_page
@@ -409,8 +408,8 @@
         - 'url.query_args:sort_by'
         - user.permissions
       tags:
-        - 'config:core.entity_view_display.media.type_one.default'
-        - 'config:core.entity_view_display.media.type_two.default'
+        - 'config:core.entity_view_display.media.file.default'
+        - 'config:core.entity_view_display.media.image.default'
   embed:
     display_plugin: embed
     id: embed
@@ -531,8 +530,8 @@
         - 'url.query_args:sort_by'
         - user.permissions
       tags:
-        - 'config:core.entity_view_display.media.type_one.default'
-        - 'config:core.entity_view_display.media.type_two.default'
+        - 'config:core.entity_view_display.media.file.default'
+        - 'config:core.entity_view_display.media.image.default'
   page:
     display_plugin: page
     id: page
@@ -559,8 +558,8 @@
         - 'url.query_args:sort_by'
         - user.permissions
       tags:
-        - 'config:core.entity_view_display.media.type_one.default'
-        - 'config:core.entity_view_display.media.type_two.default'
+        - 'config:core.entity_view_display.media.file.default'
+        - 'config:core.entity_view_display.media.image.default'
   widget:
     display_plugin: page
     id: widget
@@ -701,2 +700,2 @@
-        - 'config:core.entity_view_display.media.type_one.default'
-        - 'config:core.entity_view_display.media.type_two.default'
+        - 'config:core.entity_view_display.media.file.default'
+        - 'config:core.entity_view_display.media.image.default'
diff -u b/core/modules/media_library/src/Plugin/views/field/SelectMedia.php b/core/modules/media_library/src/Plugin/views/field/SelectMedia.php
--- b/core/modules/media_library/src/Plugin/views/field/SelectMedia.php
+++ b/core/modules/media_library/src/Plugin/views/field/SelectMedia.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\media_library\Plugin\views\field\SelectEntity.
- */
-
 namespace Drupal\media_library\Plugin\views\field;
 
 use Drupal\Core\Ajax\AjaxResponse;
@@ -13,7 +8,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Url;
-use Drupal\system\Plugin\views\field\SelectFormBase;
+use Drupal\views\Plugin\views\field\SelectFormBase;
 
 /**
  * Provides a field for selecting media entities in our media library view.
@@ -84,8 +79,8 @@
 
       $response = new AjaxResponse();
       $library_input = \Drupal::request()->get('media_library_input');
-      $input_selector = '[data-media-library-input-id="' . $library_input  . '"]';
-      $submit_selector = '[data-media-library-submit-id="' . $library_input  . '"]';
+      $input_selector = '[data-media-library-input-id="' . $library_input . '"]';
+      $submit_selector = '[data-media-library-submit-id="' . $library_input . '"]';
       $response->addCommand(new InvokeCommand($input_selector, 'val', [implode(',', $ids)]));
       $response->addCommand(new InvokeCommand($submit_selector, 'trigger', ['mousedown']));
       $response->addCommand(new CloseModalDialogCommand());
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/media_library/config/optional/core.entity_view_display.media.file.media_library.yml
@@ -0,0 +1,36 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.media.media_library
+    - field.field.media.file.field_media_file
+    - image.style.medium
+    - media.type.file
+  module:
+    - image
+id: media.file.media_library
+targetEntityType: media
+bundle: file
+mode: media_library
+content:
+  name:
+    label: hidden
+    type: string
+    weight: 0
+    region: content
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+  thumbnail:
+    type: image
+    weight: 1
+    region: content
+    label: hidden
+    settings:
+      image_style: medium
+      image_link: ''
+    third_party_settings: {  }
+hidden:
+  created: true
+  field_media_file: true
+  uid: true
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/media_library/config/optional/core.entity_view_display.media.image.media_library.yml
@@ -0,0 +1,36 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.media.media_library
+    - field.field.media.image.field_media_image
+    - image.style.medium
+    - media.type.image
+  module:
+    - image
+id: media.image.media_library
+targetEntityType: media
+bundle: image
+mode: media_library
+content:
+  name:
+    label: hidden
+    type: string
+    weight: 0
+    region: content
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+  thumbnail:
+    type: image
+    weight: 1
+    region: content
+    label: hidden
+    settings:
+      image_style: medium
+      image_link: ''
+    third_party_settings: {  }
+hidden:
+  created: true
+  field_media_image: true
+  uid: true