diff --git a/data-model/src/main/java/org/alfresco/repo/content/MimetypeMap.java b/data-model/src/main/java/org/alfresco/repo/content/MimetypeMap.java
index 40daca0556..3e801cfe1e 100644
--- a/data-model/src/main/java/org/alfresco/repo/content/MimetypeMap.java
+++ b/data-model/src/main/java/org/alfresco/repo/content/MimetypeMap.java
@@ -192,6 +192,8 @@ public class MimetypeMap implements MimetypeService
 
     public static final String MIMETYPE_IMAGE_DWT = "image/x-dwt";
 
+    public static final String MIMETYPE_IMAGE_ICNS = "image/icns";
+
     public static final String MIMETYPE_APPLICATION_EPS = "application/eps";
 
     public static final String MIMETYPE_APPLICATION_PS = "application/postscript";
diff --git a/data-model/src/main/resources/alfresco/mimetype/mimetype-map.xml b/data-model/src/main/resources/alfresco/mimetype/mimetype-map.xml
index a2ad28467b..572734ca2e 100644
--- a/data-model/src/main/resources/alfresco/mimetype/mimetype-map.xml
+++ b/data-model/src/main/resources/alfresco/mimetype/mimetype-map.xml
@@ -611,6 +611,10 @@
          <mimetype mimetype="application/vnd.apple.numbers" display="Apple iWork Numbers">
             <extension>numbers</extension>
          </mimetype>
+         <!-- Apple ICNS files -->
+         <mimetype mimetype="image/icns" display="Apple Icon">
+            <extension>icns</extension>
+         </mimetype>
 
          <!-- Markdown  -->
          <mimetype mimetype="text/x-markdown" display="Markdown">
diff --git a/data-model/src/test/java/org/alfresco/repo/content/MimetypeMapTest.java b/data-model/src/test/java/org/alfresco/repo/content/MimetypeMapTest.java
index 5c5f9b0c1e..0258390a55 100644
--- a/data-model/src/test/java/org/alfresco/repo/content/MimetypeMapTest.java
+++ b/data-model/src/test/java/org/alfresco/repo/content/MimetypeMapTest.java
@@ -94,7 +94,8 @@ public class MimetypeMapTest extends TestCase
         // other text forms
         assertEquals("text/csv", mimetypesByExtension.get("csv"));
         assertEquals("text/html", mimetypesByExtension.get("html"));
-        
+        assertEquals("image/icns", mimetypesByExtension.get("icns"));
+
         // JPEG
         assertEquals("jpg", extensionsByMimetype.get("image/jpeg"));
         assertEquals("image/jpeg", mimetypesByExtension.get("jpg"));
diff --git a/repository/src/test/java/org/alfresco/repo/content/MimetypeMapContentTest.java b/repository/src/test/java/org/alfresco/repo/content/MimetypeMapContentTest.java
index 31140447f9..3a9a15bf45 100644
--- a/repository/src/test/java/org/alfresco/repo/content/MimetypeMapContentTest.java
+++ b/repository/src/test/java/org/alfresco/repo/content/MimetypeMapContentTest.java
@@ -72,6 +72,14 @@ public class MimetypeMapContentTest extends TestCase
         );
     }
 
+    public void testGuessAppleIconsMimetype() throws Exception
+    {
+        assertEquals(
+                "image/icns",
+                mimetypeService.guessMimetype("something.icns", openQuickTestFile("quick.icns"))
+        );
+    }
+
     public void testGuessMimetypeForFile() throws Exception
     {
         // Correct ones
diff --git a/repository/src/test/resources/quick/quick.icns b/repository/src/test/resources/quick/quick.icns
new file mode 100644
index 0000000000..4765e5d94d
Binary files /dev/null and b/repository/src/test/resources/quick/quick.icns differ