diff --git a/src/wp-includes/images/media/archive.png b/src/wp-includes/images/media/archive.png
new file mode 100644
index 0000000000..4b1962ed3f
Binary files /dev/null and b/src/wp-includes/images/media/archive.png differ
diff --git a/src/wp-includes/images/media/audio.png b/src/wp-includes/images/media/audio.png
new file mode 100644
index 0000000000..bfcd396bec
Binary files /dev/null and b/src/wp-includes/images/media/audio.png differ
diff --git a/src/wp-includes/images/media/code.png b/src/wp-includes/images/media/code.png
new file mode 100644
index 0000000000..2b1b919927
Binary files /dev/null and b/src/wp-includes/images/media/code.png differ
diff --git a/src/wp-includes/images/media/default.png b/src/wp-includes/images/media/default.png
new file mode 100644
index 0000000000..fd80a9e449
Binary files /dev/null and b/src/wp-includes/images/media/default.png differ
diff --git a/src/wp-includes/images/media/document.png b/src/wp-includes/images/media/document.png
new file mode 100644
index 0000000000..4f04cca50a
Binary files /dev/null and b/src/wp-includes/images/media/document.png differ
diff --git a/src/wp-includes/images/media/interactive.png b/src/wp-includes/images/media/interactive.png
new file mode 100644
index 0000000000..a09b413efe
Binary files /dev/null and b/src/wp-includes/images/media/interactive.png differ
diff --git a/src/wp-includes/images/media/spreadsheet.png b/src/wp-includes/images/media/spreadsheet.png
new file mode 100644
index 0000000000..db60df2484
Binary files /dev/null and b/src/wp-includes/images/media/spreadsheet.png differ
diff --git a/src/wp-includes/images/media/text.png b/src/wp-includes/images/media/text.png
new file mode 100644
index 0000000000..d1bc26538c
Binary files /dev/null and b/src/wp-includes/images/media/text.png differ
diff --git a/src/wp-includes/images/media/video.png b/src/wp-includes/images/media/video.png
new file mode 100644
index 0000000000..01441cc483
Binary files /dev/null and b/src/wp-includes/images/media/video.png differ
diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php
index fcaf89cc6d..67c7a32ffa 100644
--- a/src/wp-includes/media.php
+++ b/src/wp-includes/media.php
@@ -602,7 +602,7 @@ function wp_get_attachment_image_src($attachment_id, $size='thumbnail', $icon =
 	$src = false;
 
 	if ( $icon && $src = wp_mime_type_icon($attachment_id) ) {
-		$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/crystal' );
+		$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
 		$src_file = $icon_dir . '/' . wp_basename($src);
 		@list($width, $height) = getimagesize($src_file);
 	}
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index b3566fbfac..3f7232976f 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -4479,8 +4479,8 @@ function wp_mime_type_icon( $mime = 0 ) {
 		$icon_files = wp_cache_get('icon_files');
 
 		if ( !is_array($icon_files) ) {
-			$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/crystal' );
-			$icon_dir_uri = apply_filters( 'icon_dir_uri', includes_url('images/crystal') );
+			$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
+			$icon_dir_uri = apply_filters( 'icon_dir_uri', includes_url('images/media') );
 			$dirs = apply_filters( 'icon_dirs', array($icon_dir => $icon_dir_uri) );
 			$icon_files = array();
 			while ( $dirs ) {
diff --git a/tests/phpunit/tests/media.php b/tests/phpunit/tests/media.php
index 87e19da8db..50b082913e 100644
--- a/tests/phpunit/tests/media.php
+++ b/tests/phpunit/tests/media.php
@@ -149,7 +149,7 @@ CAP;
 		$this->assertEquals( '', $prepped['type'] );
 		$this->assertEquals( '', $prepped['subtype'] );
 		$this->assertEquals( '', $prepped['url'] );
-		$this->assertEquals( site_url( 'wp-includes/images/crystal/default.png' ), $prepped['icon'] );
+		$this->assertEquals( site_url( 'wp-includes/images/media/default.png' ), $prepped['icon'] );
 
 		// Fake a mime
 		$post->post_mime_type = 'image/jpeg';