diff --git a/src/assets/img/files/archive-64.png b/src/assets/img/files/archive-64.png
deleted file mode 100644
index ba7111a02..000000000
Binary files a/src/assets/img/files/archive-64.png and /dev/null differ
diff --git a/src/assets/img/files/archive.png b/src/assets/img/files/archive.png
new file mode 100644
index 000000000..20aab03e1
Binary files /dev/null and b/src/assets/img/files/archive.png differ
diff --git a/src/assets/img/files/audio-64.png b/src/assets/img/files/audio-64.png
deleted file mode 100644
index e98c78dd7..000000000
Binary files a/src/assets/img/files/audio-64.png and /dev/null differ
diff --git a/src/assets/img/files/audio.png b/src/assets/img/files/audio.png
new file mode 100644
index 000000000..7d8a7824e
Binary files /dev/null and b/src/assets/img/files/audio.png differ
diff --git a/src/assets/img/files/avi-64.png b/src/assets/img/files/avi-64.png
deleted file mode 100644
index ec1a942cd..000000000
Binary files a/src/assets/img/files/avi-64.png and /dev/null differ
diff --git a/src/assets/img/files/avi.png b/src/assets/img/files/avi.png
new file mode 100644
index 000000000..700f9ce62
Binary files /dev/null and b/src/assets/img/files/avi.png differ
diff --git a/src/assets/img/files/base-64.png b/src/assets/img/files/base-64.png
deleted file mode 100644
index cf698f525..000000000
Binary files a/src/assets/img/files/base-64.png and /dev/null differ
diff --git a/src/assets/img/files/base.png b/src/assets/img/files/base.png
new file mode 100644
index 000000000..c75e01f12
Binary files /dev/null and b/src/assets/img/files/base.png differ
diff --git a/src/assets/img/files/bmp-64.png b/src/assets/img/files/bmp-64.png
deleted file mode 100644
index 562e7bbab..000000000
Binary files a/src/assets/img/files/bmp-64.png and /dev/null differ
diff --git a/src/assets/img/files/bmp.png b/src/assets/img/files/bmp.png
new file mode 100644
index 000000000..6b6dc8f37
Binary files /dev/null and b/src/assets/img/files/bmp.png differ
diff --git a/src/assets/img/files/calc-64.png b/src/assets/img/files/calc-64.png
deleted file mode 100644
index b813dd2cb..000000000
Binary files a/src/assets/img/files/calc-64.png and /dev/null differ
diff --git a/src/assets/img/files/calc.png b/src/assets/img/files/calc.png
new file mode 100644
index 000000000..ec76dceac
Binary files /dev/null and b/src/assets/img/files/calc.png differ
diff --git a/src/assets/img/files/chart-64.png b/src/assets/img/files/chart-64.png
deleted file mode 100644
index 4b8f85bd6..000000000
Binary files a/src/assets/img/files/chart-64.png and /dev/null differ
diff --git a/src/assets/img/files/chart.png b/src/assets/img/files/chart.png
new file mode 100644
index 000000000..8e04b2bc8
Binary files /dev/null and b/src/assets/img/files/chart.png differ
diff --git a/src/assets/img/files/database-64.png b/src/assets/img/files/database-64.png
deleted file mode 100644
index 33d5043c1..000000000
Binary files a/src/assets/img/files/database-64.png and /dev/null differ
diff --git a/src/assets/img/files/database.png b/src/assets/img/files/database.png
new file mode 100644
index 000000000..5e9fd837e
Binary files /dev/null and b/src/assets/img/files/database.png differ
diff --git a/src/assets/img/files/document-64.png b/src/assets/img/files/document-64.png
deleted file mode 100644
index 0888ebbbd..000000000
Binary files a/src/assets/img/files/document-64.png and /dev/null differ
diff --git a/src/assets/img/files/document.png b/src/assets/img/files/document.png
new file mode 100644
index 000000000..6a4bb8ba5
Binary files /dev/null and b/src/assets/img/files/document.png differ
diff --git a/src/assets/img/files/draw-64.png b/src/assets/img/files/draw-64.png
deleted file mode 100644
index 1b827c7c6..000000000
Binary files a/src/assets/img/files/draw-64.png and /dev/null differ
diff --git a/src/assets/img/files/draw.png b/src/assets/img/files/draw.png
new file mode 100644
index 000000000..f9f2da1ea
Binary files /dev/null and b/src/assets/img/files/draw.png differ
diff --git a/src/assets/img/files/eps-64.png b/src/assets/img/files/eps-64.png
deleted file mode 100644
index c42492441..000000000
Binary files a/src/assets/img/files/eps-64.png and /dev/null differ
diff --git a/src/assets/img/files/eps.png b/src/assets/img/files/eps.png
new file mode 100644
index 000000000..99b23525c
Binary files /dev/null and b/src/assets/img/files/eps.png differ
diff --git a/src/assets/img/files/epub-64.png b/src/assets/img/files/epub-64.png
deleted file mode 100644
index 298d5dcd9..000000000
Binary files a/src/assets/img/files/epub-64.png and /dev/null differ
diff --git a/src/assets/img/files/epub.png b/src/assets/img/files/epub.png
new file mode 100644
index 000000000..9a59fdc02
Binary files /dev/null and b/src/assets/img/files/epub.png differ
diff --git a/src/assets/img/files/flash-64.png b/src/assets/img/files/flash-64.png
deleted file mode 100644
index 01d28e03e..000000000
Binary files a/src/assets/img/files/flash-64.png and /dev/null differ
diff --git a/src/assets/img/files/flash.png b/src/assets/img/files/flash.png
new file mode 100644
index 000000000..11c557051
Binary files /dev/null and b/src/assets/img/files/flash.png differ
diff --git a/src/assets/img/files/folder-64.png b/src/assets/img/files/folder-64.png
deleted file mode 100644
index 2508ab252..000000000
Binary files a/src/assets/img/files/folder-64.png and /dev/null differ
diff --git a/src/assets/img/files/folder-open-64.png b/src/assets/img/files/folder-open-64.png
deleted file mode 100644
index 27f7271bd..000000000
Binary files a/src/assets/img/files/folder-open-64.png and /dev/null differ
diff --git a/src/assets/img/files/folder-open.png b/src/assets/img/files/folder-open.png
new file mode 100644
index 000000000..bcca6f434
Binary files /dev/null and b/src/assets/img/files/folder-open.png differ
diff --git a/src/assets/img/files/folder.png b/src/assets/img/files/folder.png
new file mode 100644
index 000000000..8479747ef
Binary files /dev/null and b/src/assets/img/files/folder.png differ
diff --git a/src/assets/img/files/gif-64.png b/src/assets/img/files/gif-64.png
deleted file mode 100644
index 2373292b7..000000000
Binary files a/src/assets/img/files/gif-64.png and /dev/null differ
diff --git a/src/assets/img/files/gif.png b/src/assets/img/files/gif.png
new file mode 100644
index 000000000..303cfd9ef
Binary files /dev/null and b/src/assets/img/files/gif.png differ
diff --git a/src/assets/img/files/h5p-64.png b/src/assets/img/files/h5p-64.png
deleted file mode 100644
index cdd1c9b1b..000000000
Binary files a/src/assets/img/files/h5p-64.png and /dev/null differ
diff --git a/src/assets/img/files/h5p.png b/src/assets/img/files/h5p.png
new file mode 100644
index 000000000..b3554abbf
Binary files /dev/null and b/src/assets/img/files/h5p.png differ
diff --git a/src/assets/img/files/html-64.png b/src/assets/img/files/html-64.png
deleted file mode 100644
index 7f703bb83..000000000
Binary files a/src/assets/img/files/html-64.png and /dev/null differ
diff --git a/src/assets/img/files/html.png b/src/assets/img/files/html.png
new file mode 100644
index 000000000..5d36c2227
Binary files /dev/null and b/src/assets/img/files/html.png differ
diff --git a/src/assets/img/files/image-64.png b/src/assets/img/files/image-64.png
deleted file mode 100644
index 2d8f9e4fa..000000000
Binary files a/src/assets/img/files/image-64.png and /dev/null differ
diff --git a/src/assets/img/files/image.png b/src/assets/img/files/image.png
new file mode 100644
index 000000000..52d7060dc
Binary files /dev/null and b/src/assets/img/files/image.png differ
diff --git a/src/assets/img/files/impress-64.png b/src/assets/img/files/impress-64.png
deleted file mode 100644
index c279c62ef..000000000
Binary files a/src/assets/img/files/impress-64.png and /dev/null differ
diff --git a/src/assets/img/files/impress.png b/src/assets/img/files/impress.png
new file mode 100644
index 000000000..8b9723919
Binary files /dev/null and b/src/assets/img/files/impress.png differ
diff --git a/src/assets/img/files/isf-64.png b/src/assets/img/files/isf-64.png
deleted file mode 100644
index ad5a18867..000000000
Binary files a/src/assets/img/files/isf-64.png and /dev/null differ
diff --git a/src/assets/img/files/isf.png b/src/assets/img/files/isf.png
new file mode 100644
index 000000000..30466983f
Binary files /dev/null and b/src/assets/img/files/isf.png differ
diff --git a/src/assets/img/files/jpeg-64.png b/src/assets/img/files/jpeg-64.png
deleted file mode 100644
index b4fc0c998..000000000
Binary files a/src/assets/img/files/jpeg-64.png and /dev/null differ
diff --git a/src/assets/img/files/jpeg.png b/src/assets/img/files/jpeg.png
new file mode 100644
index 000000000..03e2302aa
Binary files /dev/null and b/src/assets/img/files/jpeg.png differ
diff --git a/src/assets/img/files/markup-64.png b/src/assets/img/files/markup-64.png
deleted file mode 100644
index b89072713..000000000
Binary files a/src/assets/img/files/markup-64.png and /dev/null differ
diff --git a/src/assets/img/files/markup.png b/src/assets/img/files/markup.png
new file mode 100644
index 000000000..350b1d5ef
Binary files /dev/null and b/src/assets/img/files/markup.png differ
diff --git a/src/assets/img/files/math-64.png b/src/assets/img/files/math-64.png
deleted file mode 100644
index d98beea61..000000000
Binary files a/src/assets/img/files/math-64.png and /dev/null differ
diff --git a/src/assets/img/files/math.png b/src/assets/img/files/math.png
new file mode 100644
index 000000000..70509ac82
Binary files /dev/null and b/src/assets/img/files/math.png differ
diff --git a/src/assets/img/files/moodle-64.png b/src/assets/img/files/moodle-64.png
deleted file mode 100644
index 44ad3a37d..000000000
Binary files a/src/assets/img/files/moodle-64.png and /dev/null differ
diff --git a/src/assets/img/files/moodle.png b/src/assets/img/files/moodle.png
new file mode 100644
index 000000000..e98223567
Binary files /dev/null and b/src/assets/img/files/moodle.png differ
diff --git a/src/assets/img/files/mp3-64.png b/src/assets/img/files/mp3-64.png
deleted file mode 100644
index 13b8da0b8..000000000
Binary files a/src/assets/img/files/mp3-64.png and /dev/null differ
diff --git a/src/assets/img/files/mp3.png b/src/assets/img/files/mp3.png
new file mode 100644
index 000000000..83ce89b9c
Binary files /dev/null and b/src/assets/img/files/mp3.png differ
diff --git a/src/assets/img/files/mpeg-64.png b/src/assets/img/files/mpeg-64.png
deleted file mode 100644
index 05d77fa7b..000000000
Binary files a/src/assets/img/files/mpeg-64.png and /dev/null differ
diff --git a/src/assets/img/files/mpeg.png b/src/assets/img/files/mpeg.png
new file mode 100644
index 000000000..6047ef219
Binary files /dev/null and b/src/assets/img/files/mpeg.png differ
diff --git a/src/assets/img/files/oth-64.png b/src/assets/img/files/oth-64.png
deleted file mode 100644
index 8ffa8b466..000000000
Binary files a/src/assets/img/files/oth-64.png and /dev/null differ
diff --git a/src/assets/img/files/oth.png b/src/assets/img/files/oth.png
new file mode 100644
index 000000000..97fa3eeeb
Binary files /dev/null and b/src/assets/img/files/oth.png differ
diff --git a/src/assets/img/files/pdf-64.png b/src/assets/img/files/pdf-64.png
deleted file mode 100644
index b7cdae7e9..000000000
Binary files a/src/assets/img/files/pdf-64.png and /dev/null differ
diff --git a/src/assets/img/files/pdf.png b/src/assets/img/files/pdf.png
new file mode 100644
index 000000000..cb98c99a8
Binary files /dev/null and b/src/assets/img/files/pdf.png differ
diff --git a/src/assets/img/files/png-64.png b/src/assets/img/files/png-64.png
deleted file mode 100644
index 3ecf3e5df..000000000
Binary files a/src/assets/img/files/png-64.png and /dev/null differ
diff --git a/src/assets/img/files/png.png b/src/assets/img/files/png.png
new file mode 100644
index 000000000..33b4acac4
Binary files /dev/null and b/src/assets/img/files/png.png differ
diff --git a/src/assets/img/files/powerpoint-64.png b/src/assets/img/files/powerpoint-64.png
deleted file mode 100644
index 4d44c7d2b..000000000
Binary files a/src/assets/img/files/powerpoint-64.png and /dev/null differ
diff --git a/src/assets/img/files/powerpoint.png b/src/assets/img/files/powerpoint.png
new file mode 100644
index 000000000..d8a830780
Binary files /dev/null and b/src/assets/img/files/powerpoint.png differ
diff --git a/src/assets/img/files/psd-64.png b/src/assets/img/files/psd-64.png
deleted file mode 100644
index 0b800dffa..000000000
Binary files a/src/assets/img/files/psd-64.png and /dev/null differ
diff --git a/src/assets/img/files/psd.png b/src/assets/img/files/psd.png
new file mode 100644
index 000000000..3433fbc84
Binary files /dev/null and b/src/assets/img/files/psd.png differ
diff --git a/src/assets/img/files/publisher-64.png b/src/assets/img/files/publisher-64.png
deleted file mode 100644
index 9633ef3dd..000000000
Binary files a/src/assets/img/files/publisher-64.png and /dev/null differ
diff --git a/src/assets/img/files/publisher.png b/src/assets/img/files/publisher.png
new file mode 100644
index 000000000..8a51d4701
Binary files /dev/null and b/src/assets/img/files/publisher.png differ
diff --git a/src/assets/img/files/quicktime-64.png b/src/assets/img/files/quicktime-64.png
deleted file mode 100644
index 90f2fbc0d..000000000
Binary files a/src/assets/img/files/quicktime-64.png and /dev/null differ
diff --git a/src/assets/img/files/quicktime.png b/src/assets/img/files/quicktime.png
new file mode 100644
index 000000000..4a56a9676
Binary files /dev/null and b/src/assets/img/files/quicktime.png differ
diff --git a/src/assets/img/files/sourcecode-64.png b/src/assets/img/files/sourcecode-64.png
deleted file mode 100644
index ad25537e4..000000000
Binary files a/src/assets/img/files/sourcecode-64.png and /dev/null differ
diff --git a/src/assets/img/files/sourcecode.png b/src/assets/img/files/sourcecode.png
new file mode 100644
index 000000000..5c8863480
Binary files /dev/null and b/src/assets/img/files/sourcecode.png differ
diff --git a/src/assets/img/files/spreadsheet-64.png b/src/assets/img/files/spreadsheet-64.png
deleted file mode 100644
index 00427c0e7..000000000
Binary files a/src/assets/img/files/spreadsheet-64.png and /dev/null differ
diff --git a/src/assets/img/files/spreadsheet.png b/src/assets/img/files/spreadsheet.png
new file mode 100644
index 000000000..23d94f272
Binary files /dev/null and b/src/assets/img/files/spreadsheet.png differ
diff --git a/src/assets/img/files/text-64.png b/src/assets/img/files/text-64.png
deleted file mode 100644
index 7b397cea5..000000000
Binary files a/src/assets/img/files/text-64.png and /dev/null differ
diff --git a/src/assets/img/files/text.png b/src/assets/img/files/text.png
new file mode 100644
index 000000000..9eb4b197e
Binary files /dev/null and b/src/assets/img/files/text.png differ
diff --git a/src/assets/img/files/tiff-64.png b/src/assets/img/files/tiff-64.png
deleted file mode 100644
index c11a85e28..000000000
Binary files a/src/assets/img/files/tiff-64.png and /dev/null differ
diff --git a/src/assets/img/files/tiff.png b/src/assets/img/files/tiff.png
new file mode 100644
index 000000000..dd17d28dd
Binary files /dev/null and b/src/assets/img/files/tiff.png differ
diff --git a/src/assets/img/files/unknown-64.png b/src/assets/img/files/unknown-64.png
deleted file mode 100644
index 7f703bb83..000000000
Binary files a/src/assets/img/files/unknown-64.png and /dev/null differ
diff --git a/src/assets/img/files/unknown.png b/src/assets/img/files/unknown.png
new file mode 100644
index 000000000..5d36c2227
Binary files /dev/null and b/src/assets/img/files/unknown.png differ
diff --git a/src/assets/img/files/video-64.png b/src/assets/img/files/video-64.png
deleted file mode 100644
index 570c4b2b3..000000000
Binary files a/src/assets/img/files/video-64.png and /dev/null differ
diff --git a/src/assets/img/files/video.png b/src/assets/img/files/video.png
new file mode 100644
index 000000000..8ac140c8b
Binary files /dev/null and b/src/assets/img/files/video.png differ
diff --git a/src/assets/img/files/wav-64.png b/src/assets/img/files/wav-64.png
deleted file mode 100644
index 819781a9b..000000000
Binary files a/src/assets/img/files/wav-64.png and /dev/null differ
diff --git a/src/assets/img/files/wav.png b/src/assets/img/files/wav.png
new file mode 100644
index 000000000..b12df5d4c
Binary files /dev/null and b/src/assets/img/files/wav.png differ
diff --git a/src/assets/img/files/wmv-64.png b/src/assets/img/files/wmv-64.png
deleted file mode 100644
index 570c4b2b3..000000000
Binary files a/src/assets/img/files/wmv-64.png and /dev/null differ
diff --git a/src/assets/img/files/wmv.png b/src/assets/img/files/wmv.png
new file mode 100644
index 000000000..8ac140c8b
Binary files /dev/null and b/src/assets/img/files/wmv.png differ
diff --git a/src/assets/img/files/writer-64.png b/src/assets/img/files/writer-64.png
deleted file mode 100644
index 6285b6ffa..000000000
Binary files a/src/assets/img/files/writer-64.png and /dev/null differ
diff --git a/src/assets/img/files/writer.png b/src/assets/img/files/writer.png
new file mode 100644
index 000000000..eb8e7cf1a
Binary files /dev/null and b/src/assets/img/files/writer.png differ
diff --git a/src/core/services/utils/mimetype.ts b/src/core/services/utils/mimetype.ts
index d8e4610ed..386a6f267 100644
--- a/src/core/services/utils/mimetype.ts
+++ b/src/core/services/utils/mimetype.ts
@@ -280,7 +280,7 @@ export class CoreMimetypeUtilsProvider {
      * @return The path to a folder icon.
      */
     getFolderIcon(): string {
-        return 'assets/img/files/folder-64.png';
+        return 'assets/img/files/folder.png';
     }
 
     /**
@@ -290,7 +290,7 @@ export class CoreMimetypeUtilsProvider {
      * @return The icon path.
      */
     getFileIconForType(type: string): string {
-        return 'assets/img/files/' + type + '-64.png';
+        return `assets/img/files/${type}.png`;
     }
 
     /**