diff --git a/media_entity.install b/media_entity.install
index ca948c4..27d38e3 100644
--- a/media_entity.install
+++ b/media_entity.install
@@ -229,8 +229,23 @@ function media_entity_requirements($phase) {
  */
 function media_entity_install() {
   $source = drupal_get_path('module', 'media_entity') . '/images/icons';
-  $destination = \Drupal::config('media_entity.settings')->get('icon_base');
-  media_entity_copy_icons($source, $destination);
+    // Config has moved from media_entity.settings to media.settings as of 8201
+  $destination = \Drupal::config('media.settings')->get('icon_base_uri');
+
+  file_prepare_directory($destination, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
+
+  $files = file_scan_directory($source, '/.*\.(svg|png|jpg|jpeg|gif)$/');
+  foreach ($files as $file) {
+    // When reinstalling the media module we don't want to copy the icons when
+    // they already exist. The icons could be replaced (by a contrib module or
+    // manually), so we don't want to replace the existing files. Removing the
+    // files when we uninstall could also be a problem if the files are
+    // referenced somewhere else. Since showing an error that it was not
+    // possible to copy the files is also confusing, we silently do nothing.
+    if (!file_exists($destination . DIRECTORY_SEPARATOR . $file->filename)) {
+      file_unmanaged_copy($file->uri, $destination, FILE_EXISTS_RENAME);
+    }
+  }
 }
 
 /**