diff --git a/core/img/filetypes/font.svg b/core/img/filetypes/font.svg
new file mode 100644
index 0000000000000..feea601caf283
--- /dev/null
+++ b/core/img/filetypes/font.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg viewBox="0 0 16 16" version="1.1" width="16" height="16" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"><path d="m 12.166667,4.6666667 h 2.499999 V 14.666666 H 15.5 V 15.5 H 12.166667 V 14.666666 H 13 V 12.166667 H 9.666667 L 8.4166668,14.666666 H 9.666667 V 15.5 H 6.3333333 V 14.666666 H 7.1666666 L 12.166667,4.6666667 M 13,5.5 10.083333,11.333333 H 13 V 5.5 M 2.1666667,0.5 H 6.3333333 C 7.2583334,0.5 8,1.2416666 8,2.1666667 V 11.333333 H 5.5 V 7.1666666 H 3 V 11.333333 H 0.5 V 2.1666667 C 0.5,1.2416666 1.2416666,0.5 2.1666667,0.5 M 3,2.1666667 V 5.5 H 5.5 V 2.1666667 Z" fill="#969696" /></svg>
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index d861695c0ac6d..a2ca2c23d0708 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -10,8 +10,8 @@ OC.MimeTypeList={
 	aliases: {
     "application/coreldraw": "image",
     "application/epub+zip": "text",
-    "application/font-sfnt": "image",
-    "application/font-woff": "image",
+    "application/font-sfnt": "font",
+    "application/font-woff": "font",
     "application/gpx+xml": "location",
     "application/illustrator": "image",
     "application/javascript": "text/code",
@@ -34,7 +34,7 @@ OC.MimeTypeList={
     "application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.sheet.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.template.macroEnabled.12": "x-office/spreadsheet",
-    "application/vnd.ms-fontobject": "image",
+    "application/vnd.ms-fontobject": "font",
     "application/vnd.ms-powerpoint": "x-office/presentation",
     "application/vnd.ms-powerpoint.addin.macroEnabled.12": "x-office/presentation",
     "application/vnd.ms-powerpoint.presentation.macroEnabled.12": "x-office/presentation",
@@ -78,7 +78,7 @@ OC.MimeTypeList={
     "application/x-dcraw": "image",
     "application/x-deb": "package/x-generic",
     "application/x-fictionbook+xml": "text",
-    "application/x-font": "image",
+    "application/x-font": "font",
     "application/x-gimp": "image",
     "application/x-gzip": "package/x-generic",
     "application/x-iwork-keynote-sffkey": "x-office/presentation",
@@ -127,6 +127,7 @@ OC.MimeTypeList={
     "folder-public",
     "folder-shared",
     "folder-starred",
+    "font",
     "image",
     "link",
     "location",
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
index 68d39650ad9cb..67e79a522830b 100644
--- a/resources/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -10,8 +10,8 @@
 
 	"application/coreldraw": "image",
 	"application/epub+zip": "text",
-	"application/font-sfnt": "image",
-	"application/font-woff": "image",
+	"application/font-sfnt": "font",
+	"application/font-woff": "font",
 	"application/gpx+xml": "location",
 	"application/gzip": "package/x-generic",
 	"application/illustrator": "image",
@@ -35,7 +35,7 @@
 	"application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
 	"application/vnd.ms-excel.sheet.macroEnabled.12": "x-office/spreadsheet",
 	"application/vnd.ms-excel.template.macroEnabled.12": "x-office/spreadsheet",
-	"application/vnd.ms-fontobject": "image",
+	"application/vnd.ms-fontobject": "font",
 	"application/vnd.ms-powerpoint": "x-office/presentation",
 	"application/vnd.ms-powerpoint.addin.macroEnabled.12": "x-office/presentation",
 	"application/vnd.ms-powerpoint.presentation.macroEnabled.12": "x-office/presentation",
@@ -79,7 +79,7 @@
 	"application/x-dcraw": "image",
 	"application/x-deb": "package/x-generic",
 	"application/x-fictionbook+xml": "text",
-	"application/x-font": "image",
+	"application/x-font": "font",
 	"application/x-gimp": "image",
 	"application/x-gzip": "application/gzip",
 	"application/x-iwork-keynote-sffkey": "x-office/presentation",