diff --git a/core/server/config/overrides.json b/core/server/config/overrides.json
index 4f7f54c9d9..191b779325 100644
--- a/core/server/config/overrides.json
+++ b/core/server/config/overrides.json
@@ -33,8 +33,8 @@
             "contentTypes": ["text/csv", "application/csv", "application/octet-stream"]
         },
         "images": {
-            "extensions": [".jpg", ".jpeg", ".gif", ".png", ".svg", ".svgz"],
-            "contentTypes": ["image/jpeg", "image/png", "image/gif", "image/svg+xml"]
+            "extensions": [".jpg", ".jpeg", ".gif", ".png", ".svg", ".svgz", ".ico"],
+            "contentTypes": ["image/jpeg", "image/png", "image/gif", "image/svg+xml", "image/x-icon", "image/vnd.microsoft.icon"]
         },
         "icons": {
             "extensions": [".png", ".ico"],
diff --git a/core/test/unit/data/importer/index_spec.js b/core/test/unit/data/importer/index_spec.js
index 58d15eec71..2857ede99e 100644
--- a/core/test/unit/data/importer/index_spec.js
+++ b/core/test/unit/data/importer/index_spec.js
@@ -37,7 +37,7 @@ describe('Importer', function () {
         });
 
         it('gets the correct extensions', function () {
-            ImportManager.getExtensions().should.be.instanceof(Array).and.have.lengthOf(10);
+            ImportManager.getExtensions().should.be.instanceof(Array).and.have.lengthOf(11);
             ImportManager.getExtensions().should.containEql('.json');
             ImportManager.getExtensions().should.containEql('.zip');
             ImportManager.getExtensions().should.containEql('.jpg');
@@ -45,7 +45,7 @@ describe('Importer', function () {
         });
 
         it('gets the correct types', function () {
-            ImportManager.getContentTypes().should.be.instanceof(Array).and.have.lengthOf(10);
+            ImportManager.getContentTypes().should.be.instanceof(Array).and.have.lengthOf(12);
             ImportManager.getContentTypes().should.containEql('application/octet-stream');
             ImportManager.getContentTypes().should.containEql('application/json');
             ImportManager.getContentTypes().should.containEql('application/zip');
@@ -61,27 +61,27 @@ describe('Importer', function () {
 
         it('globs extensions correctly', function () {
             ImportManager.getGlobPattern(ImportManager.getExtensions())
-                .should.equal('+(.jpg|.jpeg|.gif|.png|.svg|.svgz|.json|.md|.markdown|.zip)');
+                .should.equal('+(.jpg|.jpeg|.gif|.png|.svg|.svgz|.ico|.json|.md|.markdown|.zip)');
             ImportManager.getGlobPattern(ImportManager.getDirectories())
                 .should.equal('+(images|content)');
             ImportManager.getGlobPattern(JSONHandler.extensions)
                 .should.equal('+(.json)');
             ImportManager.getGlobPattern(ImageHandler.extensions)
-                .should.equal('+(.jpg|.jpeg|.gif|.png|.svg|.svgz)');
+                .should.equal('+(.jpg|.jpeg|.gif|.png|.svg|.svgz|.ico)');
             ImportManager.getExtensionGlob(ImportManager.getExtensions())
-                .should.equal('*+(.jpg|.jpeg|.gif|.png|.svg|.svgz|.json|.md|.markdown|.zip)');
+                .should.equal('*+(.jpg|.jpeg|.gif|.png|.svg|.svgz|.ico|.json|.md|.markdown|.zip)');
             ImportManager.getDirectoryGlob(ImportManager.getDirectories())
                 .should.equal('+(images|content)');
             ImportManager.getExtensionGlob(ImportManager.getExtensions(), 0)
-                .should.equal('*+(.jpg|.jpeg|.gif|.png|.svg|.svgz|.json|.md|.markdown|.zip)');
+                .should.equal('*+(.jpg|.jpeg|.gif|.png|.svg|.svgz|.ico|.json|.md|.markdown|.zip)');
             ImportManager.getDirectoryGlob(ImportManager.getDirectories(), 0)
                 .should.equal('+(images|content)');
             ImportManager.getExtensionGlob(ImportManager.getExtensions(), 1)
-                .should.equal('{*/*,*}+(.jpg|.jpeg|.gif|.png|.svg|.svgz|.json|.md|.markdown|.zip)');
+                .should.equal('{*/*,*}+(.jpg|.jpeg|.gif|.png|.svg|.svgz|.ico|.json|.md|.markdown|.zip)');
             ImportManager.getDirectoryGlob(ImportManager.getDirectories(), 1)
                 .should.equal('{*/,}+(images|content)');
             ImportManager.getExtensionGlob(ImportManager.getExtensions(), 2)
-                .should.equal('**/*+(.jpg|.jpeg|.gif|.png|.svg|.svgz|.json|.md|.markdown|.zip)');
+                .should.equal('**/*+(.jpg|.jpeg|.gif|.png|.svg|.svgz|.ico|.json|.md|.markdown|.zip)');
             ImportManager.getDirectoryGlob(ImportManager.getDirectories(), 2)
                 .should.equal('**/+(images|content)');
         });
@@ -342,18 +342,21 @@ describe('Importer', function () {
 
         it('has the correct interface', function () {
             ImageHandler.type.should.eql('images');
-            ImageHandler.extensions.should.be.instanceof(Array).and.have.lengthOf(6);
+            ImageHandler.extensions.should.be.instanceof(Array).and.have.lengthOf(7);
             ImageHandler.extensions.should.containEql('.jpg');
             ImageHandler.extensions.should.containEql('.jpeg');
             ImageHandler.extensions.should.containEql('.gif');
             ImageHandler.extensions.should.containEql('.png');
             ImageHandler.extensions.should.containEql('.svg');
             ImageHandler.extensions.should.containEql('.svgz');
-            ImageHandler.contentTypes.should.be.instanceof(Array).and.have.lengthOf(4);
+            ImageHandler.extensions.should.containEql('.ico');
+            ImageHandler.contentTypes.should.be.instanceof(Array).and.have.lengthOf(6);
             ImageHandler.contentTypes.should.containEql('image/jpeg');
             ImageHandler.contentTypes.should.containEql('image/png');
             ImageHandler.contentTypes.should.containEql('image/gif');
             ImageHandler.contentTypes.should.containEql('image/svg+xml');
+            ImageHandler.contentTypes.should.containEql('image/x-icon');
+            ImageHandler.contentTypes.should.containEql('image/vnd.microsoft.icon');
             ImageHandler.loadFile.should.be.instanceof(Function);
         });