diff --git a/skins/common/images/icons/COPYING b/assets/file-type-icons/COPYING
similarity index 100%
rename from skins/common/images/icons/COPYING
rename to assets/file-type-icons/COPYING
diff --git a/skins/common/images/icons/fileicon-c.png b/assets/file-type-icons/fileicon-c.png
similarity index 100%
rename from skins/common/images/icons/fileicon-c.png
rename to assets/file-type-icons/fileicon-c.png
diff --git a/skins/common/images/icons/fileicon-cpp.png b/assets/file-type-icons/fileicon-cpp.png
similarity index 100%
rename from skins/common/images/icons/fileicon-cpp.png
rename to assets/file-type-icons/fileicon-cpp.png
diff --git a/skins/common/images/icons/fileicon-deb.png b/assets/file-type-icons/fileicon-deb.png
similarity index 100%
rename from skins/common/images/icons/fileicon-deb.png
rename to assets/file-type-icons/fileicon-deb.png
diff --git a/skins/common/images/icons/fileicon-djvu.png b/assets/file-type-icons/fileicon-djvu.png
similarity index 100%
rename from skins/common/images/icons/fileicon-djvu.png
rename to assets/file-type-icons/fileicon-djvu.png
diff --git a/skins/common/images/icons/fileicon-djvu.xcf b/assets/file-type-icons/fileicon-djvu.xcf
similarity index 100%
rename from skins/common/images/icons/fileicon-djvu.xcf
rename to assets/file-type-icons/fileicon-djvu.xcf
diff --git a/skins/common/images/icons/fileicon-dvi.png b/assets/file-type-icons/fileicon-dvi.png
similarity index 100%
rename from skins/common/images/icons/fileicon-dvi.png
rename to assets/file-type-icons/fileicon-dvi.png
diff --git a/skins/common/images/icons/fileicon-exe.png b/assets/file-type-icons/fileicon-exe.png
similarity index 100%
rename from skins/common/images/icons/fileicon-exe.png
rename to assets/file-type-icons/fileicon-exe.png
diff --git a/skins/common/images/icons/fileicon-h.png b/assets/file-type-icons/fileicon-h.png
similarity index 100%
rename from skins/common/images/icons/fileicon-h.png
rename to assets/file-type-icons/fileicon-h.png
diff --git a/skins/common/images/icons/fileicon-html.png b/assets/file-type-icons/fileicon-html.png
similarity index 100%
rename from skins/common/images/icons/fileicon-html.png
rename to assets/file-type-icons/fileicon-html.png
diff --git a/skins/common/images/icons/fileicon-iso.png b/assets/file-type-icons/fileicon-iso.png
similarity index 100%
rename from skins/common/images/icons/fileicon-iso.png
rename to assets/file-type-icons/fileicon-iso.png
diff --git a/skins/common/images/icons/fileicon-java.png b/assets/file-type-icons/fileicon-java.png
similarity index 100%
rename from skins/common/images/icons/fileicon-java.png
rename to assets/file-type-icons/fileicon-java.png
diff --git a/skins/common/images/icons/fileicon-mid.png b/assets/file-type-icons/fileicon-mid.png
similarity index 100%
rename from skins/common/images/icons/fileicon-mid.png
rename to assets/file-type-icons/fileicon-mid.png
diff --git a/skins/common/images/icons/fileicon-mov.png b/assets/file-type-icons/fileicon-mov.png
similarity index 100%
rename from skins/common/images/icons/fileicon-mov.png
rename to assets/file-type-icons/fileicon-mov.png
diff --git a/skins/common/images/icons/fileicon-o.png b/assets/file-type-icons/fileicon-o.png
similarity index 100%
rename from skins/common/images/icons/fileicon-o.png
rename to assets/file-type-icons/fileicon-o.png
diff --git a/skins/common/images/icons/fileicon-ogg.png b/assets/file-type-icons/fileicon-ogg.png
similarity index 100%
rename from skins/common/images/icons/fileicon-ogg.png
rename to assets/file-type-icons/fileicon-ogg.png
diff --git a/skins/common/images/icons/fileicon-ogg.xcf b/assets/file-type-icons/fileicon-ogg.xcf
similarity index 100%
rename from skins/common/images/icons/fileicon-ogg.xcf
rename to assets/file-type-icons/fileicon-ogg.xcf
diff --git a/skins/common/images/icons/fileicon-pdf.png b/assets/file-type-icons/fileicon-pdf.png
similarity index 100%
rename from skins/common/images/icons/fileicon-pdf.png
rename to assets/file-type-icons/fileicon-pdf.png
diff --git a/skins/common/images/icons/fileicon-ps.png b/assets/file-type-icons/fileicon-ps.png
similarity index 100%
rename from skins/common/images/icons/fileicon-ps.png
rename to assets/file-type-icons/fileicon-ps.png
diff --git a/skins/common/images/icons/fileicon-psd.png b/assets/file-type-icons/fileicon-psd.png
similarity index 100%
rename from skins/common/images/icons/fileicon-psd.png
rename to assets/file-type-icons/fileicon-psd.png
diff --git a/skins/common/images/icons/fileicon-rm.png b/assets/file-type-icons/fileicon-rm.png
similarity index 100%
rename from skins/common/images/icons/fileicon-rm.png
rename to assets/file-type-icons/fileicon-rm.png
diff --git a/skins/common/images/icons/fileicon-rpm.png b/assets/file-type-icons/fileicon-rpm.png
similarity index 100%
rename from skins/common/images/icons/fileicon-rpm.png
rename to assets/file-type-icons/fileicon-rpm.png
diff --git a/skins/common/images/icons/fileicon-svg.png b/assets/file-type-icons/fileicon-svg.png
similarity index 100%
rename from skins/common/images/icons/fileicon-svg.png
rename to assets/file-type-icons/fileicon-svg.png
diff --git a/skins/common/images/icons/fileicon-tar.png b/assets/file-type-icons/fileicon-tar.png
similarity index 100%
rename from skins/common/images/icons/fileicon-tar.png
rename to assets/file-type-icons/fileicon-tar.png
diff --git a/skins/common/images/icons/fileicon-tex.png b/assets/file-type-icons/fileicon-tex.png
similarity index 100%
rename from skins/common/images/icons/fileicon-tex.png
rename to assets/file-type-icons/fileicon-tex.png
diff --git a/skins/common/images/icons/fileicon-ttf.png b/assets/file-type-icons/fileicon-ttf.png
similarity index 100%
rename from skins/common/images/icons/fileicon-ttf.png
rename to assets/file-type-icons/fileicon-ttf.png
diff --git a/skins/common/images/icons/fileicon-txt.png b/assets/file-type-icons/fileicon-txt.png
similarity index 100%
rename from skins/common/images/icons/fileicon-txt.png
rename to assets/file-type-icons/fileicon-txt.png
diff --git a/skins/common/images/icons/fileicon-xcf.png b/assets/file-type-icons/fileicon-xcf.png
similarity index 100%
rename from skins/common/images/icons/fileicon-xcf.png
rename to assets/file-type-icons/fileicon-xcf.png
diff --git a/skins/common/images/icons/fileicon.png b/assets/file-type-icons/fileicon.png
similarity index 100%
rename from skins/common/images/icons/fileicon.png
rename to assets/file-type-icons/fileicon.png
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index ba2d4ac895b..f9e0a2dc93f 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -1312,16 +1312,16 @@ abstract class File {
 	 * @return ThumbnailImage
 	 */
 	function iconThumb() {
-		global $wgStylePath, $wgStyleDirectory;
+		global $wgScriptPath, $IP;
+		$assetsPath = "$wgScriptPath/assets/file-type-icons/";
+		$assetsDirectory = "$IP/assets/file-type-icons/";
 
 		$try = array( 'fileicon-' . $this->getExtension() . '.png', 'fileicon.png' );
 		foreach ( $try as $icon ) {
-			$path = '/common/images/icons/' . $icon;
-			$filepath = $wgStyleDirectory . $path;
-			if ( file_exists( $filepath ) ) { // always FS
+			if ( file_exists( $assetsDirectory . $icon ) ) { // always FS
 				$params = array( 'width' => 120, 'height' => 120 );
 
-				return new ThumbnailImage( $this, $wgStylePath . $path, false, $params );
+				return new ThumbnailImage( $this, $assetsPath . $icon, false, $params );
 			}
 		}