diff --git a/src/editor/ImageViewer.js b/src/editor/ImageViewer.js
index cdac4b6e90d..a60caaf7f39 100644
--- a/src/editor/ImageViewer.js
+++ b/src/editor/ImageViewer.js
@@ -34,7 +34,8 @@ define(function (require, exports, module) {
         ProjectManager      = require("project/ProjectManager"),
         Strings             = require("strings"),
         StringUtils         = require("utils/StringUtils"),
-        FileSystem          = require("filesystem/FileSystem");
+        FileSystem          = require("filesystem/FileSystem"),
+        FileUtils           = require("file/FileUtils");
     
     var _naturalWidth = 0,
         _scale = 100,
@@ -312,7 +313,11 @@ define(function (require, exports, module) {
         $("#img-preview").on("load", function () {
             // add dimensions and size
             _naturalWidth = this.naturalWidth;
+            var ext = FileUtils.getFileExtension(fullPath);
             var dimensionString = _naturalWidth + " × " + this.naturalHeight + " " + Strings.UNIT_PIXELS;
+            if (ext === "ico") {
+                dimensionString += " (" + Strings.IMAGE_VIEWER_LARGEST_ICON + ")";
+            }
             // get image size
             var file = FileSystem.getFileForPath(fullPath);
             var minimumPixels = 20;     // for showing crosshair cursor
diff --git a/src/language/languages.json b/src/language/languages.json
index bb3eab20296..792801ea850 100644
--- a/src/language/languages.json
+++ b/src/language/languages.json
@@ -233,7 +233,7 @@
   
     "image": {
         "name": "Image",
-        "fileExtensions": ["gif", "png", "jpe", "jpeg", "jpg"],
+        "fileExtensions": ["gif", "png", "jpe", "jpeg", "jpg", "ico"],
         "isBinary": true
     },
     
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
index ef6d3213d29..d0084d062ba 100644
--- a/src/nls/root/strings.js
+++ b/src/nls/root/strings.js
@@ -458,6 +458,9 @@ define({
     "INLINE_EDITOR_NO_MATCHES"             : "No matches available.",
     "CSS_QUICK_EDIT_NO_MATCHES"            : "There are no existing CSS rules that match your selection.<br> Click \"New Rule\" to create one.",
     "CSS_QUICK_EDIT_NO_STYLESHEETS"        : "There are no stylesheets in your project.<br>Create one to add CSS rules.",
+
+    // Custom Viewers
+    "IMAGE_VIEWER_LARGEST_ICON"            : "largest",
     
     /**
      * Unit names