diff --git a/system/config/media.yaml b/system/config/media.yaml
index 68ee565e8..0e8b592fa 100644
--- a/system/config/media.yaml
+++ b/system/config/media.yaml
@@ -1,58 +1,58 @@
 jpg:
   type: image
-  thumb: thumb-jpg.png
+  thumb: media/thumb-jpg.png
   mime: image/jpeg
 jpeg:
   type: image
-  thumb: thumb-jpeg.png
+  thumb: media/thumb-jpeg.png
   mime: image/jpeg
 png:
   type: image
-  thumb: thumb-png.png
+  thumb: media/thumb-png.png
   mime: image/png
 gif:
   type: image
-  thumb: thumb-gif.png
+  thumb: media/thumb-gif.png
   mime: image/gif
 
 mp4:
   type: video
-  thumb: thumb-mp4.png
+  thumb: media/thumb-mp4.png
   mime: video/mp4
 mov:
   type: video
-  thumb: thumb-mov.png
+  thumb: media/thumb-mov.png
   mime: video/quicktime
 m4v:
   type: video
-  thumb: thumb-m4v.png
+  thumb: media/thumb-m4v.png
   mime: video/x-m4v
 swf:
   type: video
-  thumb: thumb-swf.png
+  thumb: media/thumb-swf.png
   mime: video/x-flv
 
 txt:
   type: file
-  thumb: thumb-txt.png
+  thumb: media/thumb-txt.png
   mime: text/plain
 doc:
   type: file
-  thumb: thumb-doc.png
+  thumb: media/thumb-doc.png
   mime: application/msword
 html:
   type: file
-  thumb: thumb-html.png
+  thumb: media/thumb-html.png
   mime: text/html
 pdf:
   type: file
-  thumb: thumb-pdf.png
+  thumb: media/thumb-pdf.png
   mime: application/pdf
 zip:
   type: file
-  thumb: thumb-zip.png
+  thumb: media/thumb-zip.png
   mime: application/zip
 gz:
   type: file
-  thumb: thumb-gz.png
+  thumb: media/thumb-gz.png
   mime: application/gzip
diff --git a/system/images/assets/thumb-doc.png b/system/images/media/thumb-doc.png
similarity index 100%
rename from system/images/assets/thumb-doc.png
rename to system/images/media/thumb-doc.png
diff --git a/system/images/assets/thumb-gif.png b/system/images/media/thumb-gif.png
similarity index 100%
rename from system/images/assets/thumb-gif.png
rename to system/images/media/thumb-gif.png
diff --git a/system/images/assets/thumb-gz.png b/system/images/media/thumb-gz.png
similarity index 100%
rename from system/images/assets/thumb-gz.png
rename to system/images/media/thumb-gz.png
diff --git a/system/images/assets/thumb-html.png b/system/images/media/thumb-html.png
similarity index 100%
rename from system/images/assets/thumb-html.png
rename to system/images/media/thumb-html.png
diff --git a/system/images/assets/thumb-jpeg.png b/system/images/media/thumb-jpeg.png
similarity index 100%
rename from system/images/assets/thumb-jpeg.png
rename to system/images/media/thumb-jpeg.png
diff --git a/system/images/assets/thumb-jpg.png b/system/images/media/thumb-jpg.png
similarity index 100%
rename from system/images/assets/thumb-jpg.png
rename to system/images/media/thumb-jpg.png
diff --git a/system/images/assets/thumb-m4v.png b/system/images/media/thumb-m4v.png
similarity index 100%
rename from system/images/assets/thumb-m4v.png
rename to system/images/media/thumb-m4v.png
diff --git a/system/images/assets/thumb-mov.png b/system/images/media/thumb-mov.png
similarity index 100%
rename from system/images/assets/thumb-mov.png
rename to system/images/media/thumb-mov.png
diff --git a/system/images/assets/thumb-mp4.png b/system/images/media/thumb-mp4.png
similarity index 100%
rename from system/images/assets/thumb-mp4.png
rename to system/images/media/thumb-mp4.png
diff --git a/system/images/assets/thumb-pdf.png b/system/images/media/thumb-pdf.png
similarity index 100%
rename from system/images/assets/thumb-pdf.png
rename to system/images/media/thumb-pdf.png
diff --git a/system/images/assets/thumb-png.png b/system/images/media/thumb-png.png
similarity index 100%
rename from system/images/assets/thumb-png.png
rename to system/images/media/thumb-png.png
diff --git a/system/images/assets/thumb-swf.png b/system/images/media/thumb-swf.png
similarity index 100%
rename from system/images/assets/thumb-swf.png
rename to system/images/media/thumb-swf.png
diff --git a/system/images/assets/thumb-txt.png b/system/images/media/thumb-txt.png
similarity index 100%
rename from system/images/assets/thumb-txt.png
rename to system/images/media/thumb-txt.png
diff --git a/system/images/assets/thumb-zip.png b/system/images/media/thumb-zip.png
similarity index 100%
rename from system/images/assets/thumb-zip.png
rename to system/images/media/thumb-zip.png