diff --git a/core/img/filetypes/location.svg b/core/img/filetypes/location.svg
new file mode 100644
index 0000000000..737b1dd662
--- /dev/null
+++ b/core/img/filetypes/location.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 100 100" xml:space="preserve" height="32" width="32" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 32 32"><path d="m16.274 1c-5.674 0-10.274 4.6006-10.274 10.274 0 5.674 10.274 19.726 10.274 19.726s10.274-14.052 10.274-19.726c0-5.6734-4.601-10.274-10.274-10.274zm0 16.027c-3.1775 0-5.7529-2.5754-5.7529-5.7537 0-3.1775 2.5754-5.7522 5.7529-5.7522 3.1782 0 5.7529 2.5747 5.7529 5.7522 0.00074 3.1783-2.5747 5.7537-5.7529 5.7537z" fill="#969696"/></svg>
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index 89558e2108..07ae0efee0 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -12,6 +12,7 @@ OC.MimeTypeList={
     "application/epub+zip": "text",
     "application/font-sfnt": "image",
     "application/font-woff": "image",
+    "application/gpx+xml": "location",
     "application/illustrator": "image",
     "application/javascript": "text/code",
     "application/json": "text/code",
@@ -25,6 +26,9 @@ OC.MimeTypeList={
     "application/rss+xml": "application/xml",
     "application/vnd.android.package-archive": "package/x-generic",
     "application/vnd.lotus-wordpro": "x-office/document",
+    "application/vnd.garmin.tcx+xml": "location",
+    "application/vnd.google-earth.kml+xml": "location",
+    "application/vnd.google-earth.kmz": "location",
     "application/vnd.ms-excel": "x-office/spreadsheet",
     "application/vnd.ms-excel.addin.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
@@ -104,6 +108,7 @@ OC.MimeTypeList={
     "folder-shared",
     "folder-starred",
     "image",
+    "location",
     "package-x-generic",
     "text",
     "text-calendar",