diff --git a/editor/js/main.js b/editor/js/main.js
index f4f42b90d..3cf8ca549 100644
--- a/editor/js/main.js
+++ b/editor/js/main.js
@@ -24,7 +24,25 @@
             url: 'nodes',
             success: function(data) {
                 RED.nodes.setNodeList(data);
-                RED.i18n.loadNodeCatalogs(loadNodes);
+                RED.i18n.loadNodeCatalogs(function() {
+                    loadIconList(loadNodes);
+                });
+            }
+        });
+    }
+
+    function loadIconList(done) {
+        $.ajax({
+            headers: {
+                "Accept":"application/json"
+            },
+            cache: false,
+            url: 'icons',
+            success: function(data) {
+                RED.nodes.setIconSets(data);
+                if (done) {
+                    done();
+                }
             }
         });
     }
@@ -122,6 +140,7 @@
                             typeList = "<ul><li>"+addedTypes.join("</li><li>")+"</li></ul>";
                             RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success");
                         }
+                        loadIconList();
                     } else if (topic == "notification/node/removed") {
                         for (i=0;i<msg.length;i++) {
                             m = msg[i];
@@ -131,6 +150,7 @@
                                 RED.notify(RED._("palette.event.nodeRemoved", {count:m.types.length})+typeList,"success");
                             }
                         }
+                        loadIconList();
                     } else if (topic == "notification/node/enabled") {
                         if (msg.types) {
                             info = RED.nodes.getNodeSet(msg.id);
diff --git a/editor/js/nodes.js b/editor/js/nodes.js
index 2cd2f62fc..2d5060971 100644
--- a/editor/js/nodes.js
+++ b/editor/js/nodes.js
@@ -40,6 +40,7 @@ RED.nodes = (function() {
         var nodeSets = {};
         var typeToId = {};
         var nodeDefinitions = {};
+        var iconSets = {};
 
         nodeDefinitions['tab'] = {
             defaults: {
@@ -170,6 +171,12 @@ RED.nodes = (function() {
             },
             getNodeType: function(nt) {
                 return nodeDefinitions[nt];
+            },
+            setIconSets: function(sets) {
+                iconSets = sets;
+            },
+            getIconSets: function() {
+                return iconSets;
             }
         };
         return exports;
@@ -485,6 +492,12 @@ RED.nodes = (function() {
             if (n.outputs > 0 && n.outputLabels && !/^\s*$/.test(n.outputLabels.join(""))) {
                 node.outputLabels = n.outputLabels.slice();
             }
+            if (n.icon) {
+                var defIcon = RED.utils.getDefaultNodeIcon(n._def, n);
+                if (n.icon !== defIcon.module+"/"+defIcon.file) {
+                    node.icon = n.icon;
+                }
+            }
         }
         return node;
     }
@@ -915,6 +928,7 @@ RED.nodes = (function() {
                         wires:n.wires,
                         inputLabels: n.inputLabels,
                         outputLabels: n.outputLabels,
+                        icon: n.icon,
                         changed:false,
                         _config:{}
                     };
@@ -1272,6 +1286,9 @@ RED.nodes = (function() {
         enableNodeSet: registry.enableNodeSet,
         disableNodeSet: registry.disableNodeSet,
 
+        setIconSets: registry.setIconSets,
+        getIconSets: registry.getIconSets,
+
         registerType: registry.registerNodeType,
         getType: registry.getNodeType,
         convertNode: convertNode,
diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js
index ceea0beff..b91b06a25 100644
--- a/editor/js/ui/editor.js
+++ b/editor/js/ui/editor.js
@@ -108,6 +108,14 @@ RED.editor = (function() {
                 }
             }
         }
+        if (node.icon) {
+            var iconPath = RED.utils.separateIconPath(node.icon);
+            var iconSets = RED.nodes.getIconSets();
+            var iconFileList = iconSets[iconPath.module];
+            if (!iconFileList || iconFileList.indexOf(iconPath.file) === -1) {
+                isValid = false;
+            }
+        }
         return isValid;
     }
 
@@ -159,6 +167,23 @@ RED.editor = (function() {
                 }
             }
         }
+        if (node.icon) {
+            var iconPath = RED.utils.separateIconPath(node.icon);
+            var iconSets = RED.nodes.getIconSets();
+            var iconFileList = iconSets[iconPath.module];
+            var iconModule = $("#node-settings-icon-module");
+            var iconFile = $("#node-settings-icon-file");
+            if (!iconFileList) {
+                iconModule.addClass("input-error");
+                iconFile.removeClass("input-error");
+            } else if (iconFileList.indexOf(iconPath.file) === -1) {
+                iconModule.removeClass("input-error");
+                iconFile.addClass("input-error");
+            } else {
+                iconModule.removeClass("input-error");
+                iconFile.removeClass("input-error");
+            }
+        }
     }
     function validateNodeEditorProperty(node,defaults,property,prefix) {
         var input = $("#"+prefix+"-"+property);
@@ -710,10 +735,76 @@ RED.editor = (function() {
         } else {
             buildLabelRow().appendTo(outputsDiv);
         }
+
+        $('<div class="form-row"><div id="node-settings-icon"></div></div>').appendTo(dialogForm);
+        var iconDiv = $("#node-settings-icon");
+        $('<label data-i18n="editor.settingIcon">').appendTo(iconDiv);
+        var iconForm = $('<div>',{class:"node-label-form-row"});
+        iconForm.appendTo(iconDiv);
+        $('<label>').appendTo(iconForm);
+
+        var selectIconModule = $('<select id="node-settings-icon-module"><option value=""></option></select>').appendTo(iconForm);
+        var iconPath;
+        if (node.icon) {
+            iconPath = RED.utils.separateIconPath(node.icon);
+        } else {
+            iconPath = RED.utils.getDefaultNodeIcon(node._def, node);
+        }
+        var iconSets = RED.nodes.getIconSets();
+        Object.keys(iconSets).forEach(function(moduleName) {
+            selectIconModule.append($("<option></option>").val(moduleName).text(moduleName));
+        });
+        if (iconPath.module && !iconSets[iconPath.module]) {
+            selectIconModule.append($("<option disabled></option>").val(iconPath.module).text(iconPath.module));
+        }
+        selectIconModule.val(iconPath.module);
+        var iconModuleHidden = $('<input type="hidden" id="node-settings-icon-module-hidden"></input>').appendTo(iconForm);
+        iconModuleHidden.val(iconPath.module);
+
+        var selectIconFile = $('<select id="node-settings-icon-file"><option value=""></option></select>').appendTo(iconForm);
+        selectIconModule.change(function() {
+            moduleChange(selectIconModule, selectIconFile, iconModuleHidden, iconFileHidden, iconSets, true);
+        });
+        var iconFileHidden = $('<input type="hidden" id="node-settings-icon-file-hidden"></input>').appendTo(iconForm);
+        iconFileHidden.val(iconPath.file);
+        selectIconFile.change(function() {
+            selectIconFile.removeClass("input-error");
+            var fileName = selectIconFile.val();
+            iconFileHidden.val(fileName);
+        });
+
+        moduleChange(selectIconModule, selectIconFile, iconModuleHidden, iconFileHidden, iconSets, false);
+        var iconFileList = iconSets[selectIconModule.val()];
+        if (!iconFileList || iconFileList.indexOf(iconPath.file) === -1) {
+            selectIconFile.append($("<option disabled></option>").val(iconPath.file).text(iconPath.file));
+        }
+        selectIconFile.val(iconPath.file);
+    }
+
+    function moduleChange(selectIconModule, selectIconFile, iconModuleHidden, iconFileHidden, iconSets, updateIconFile) {
+        selectIconFile.children().remove();
+        var moduleName = selectIconModule.val();
+        if (moduleName !== null) {
+            iconModuleHidden.val(moduleName);
+        }
+        var iconFileList = iconSets[moduleName];
+        if (iconFileList) {
+            iconFileList.forEach(function(fileName) {
+                if (updateIconFile) {
+                    updateIconFile = false;
+                    iconFileHidden.val(fileName);
+                }
+                selectIconFile.append($("<option></option>").val(fileName).text(fileName));
+            });
+        }
+        selectIconFile.prop("disabled", !iconFileList);
+        selectIconModule.removeClass("input-error");
     }
 
     function showEditDialog(node) {
         var editing_node = node;
+        var isDefaultIcon;
+        var defaultIcon;
         editStack.push(node);
         RED.view.state(RED.state.EDITING);
         var type = node.type;
@@ -960,6 +1051,31 @@ RED.editor = (function() {
                             changed = true;
                         }
 
+                        var iconModule = $("#node-settings-icon-module-hidden").val();
+                        var iconFile = $("#node-settings-icon-file-hidden").val();
+                        var icon = (iconModule && iconFile) ? iconModule+"/"+iconFile : "";
+                        if (!isDefaultIcon) {
+                            if (icon !== editing_node.icon) {
+                                changes.icon = editing_node.icon;
+                                editing_node.icon = icon;
+                                changed = true;
+                            }
+                        } else {
+                            if (icon !== defaultIcon) {
+                                changes.icon = editing_node.icon;
+                                editing_node.icon = icon;
+                                changed = true;
+                            } else {
+                                var iconPath = RED.utils.getDefaultNodeIcon(editing_node._def, editing_node);
+                                var currentDefaultIcon = iconPath.module+"/"+iconPath.file;
+                                if (defaultIcon !== currentDefaultIcon) {
+                                    changes.icon = editing_node.icon;
+                                    editing_node.icon = currentDefaultIcon;
+                                    changed = true;
+                                }
+                            }
+                        }
+
                         if (changed) {
                             var wasChanged = editing_node.changed;
                             editing_node.changed = true;
@@ -1051,6 +1167,13 @@ RED.editor = (function() {
                 } else {
                     ns = node._def.set.id;
                 }
+                var iconPath = RED.utils.getDefaultNodeIcon(node._def,node);
+                defaultIcon = iconPath.module+"/"+iconPath.file;
+                if (node.icon && node.icon !== defaultIcon) {
+                    isDefaultIcon = false;
+                } else {
+                    isDefaultIcon = true;
+                }
                 buildEditForm(nodeProperties.content,"dialog-form",type,ns);
                 buildLabelForm(portLabels.content,node);
 
diff --git a/editor/js/ui/utils.js b/editor/js/ui/utils.js
index 25542bfb1..fb51ba016 100644
--- a/editor/js/ui/utils.js
+++ b/editor/js/ui/utils.js
@@ -689,16 +689,21 @@ RED.utils = (function() {
         return result;
     }
 
-    function getNodeIcon(def,node) {
-        if (def.category === 'config') {
-            return "icons/node-red/cog.png"
-        } else if (node && node.type === 'tab') {
-            return "icons/node-red/subflow.png"
-        } else if (node && node.type === 'unknown') {
-            return "icons/node-red/alert.png"
-        } else if (node && node.type === 'subflow') {
-            return "icons/node-red/subflow.png"
+    function separateIconPath(icon) {
+        var result = {module: "", file: ""};
+        if (icon) {
+            var index = icon.indexOf('/');
+            if (index !== -1) {
+                result.module = icon.slice(0, index);
+                result.file = icon.slice(index + 1);
+            } else {
+                result.file = icon;
+            }
         }
+        return result;
+    }
+
+    function getDefaultNodeIcon(def,node) {
         var icon_url;
         if (typeof def.icon === "function") {
             try {
@@ -710,7 +715,34 @@ RED.utils = (function() {
         } else {
             icon_url = def.icon;
         }
-        return "icons/"+def.set.module+"/"+icon_url;
+
+        var iconPath = separateIconPath(icon_url);
+        if (!iconPath.module) {
+            iconPath.module = def.set.module;
+        }
+        return iconPath;
+    }
+
+    function getNodeIcon(def,node) {
+        if (def.category === 'config') {
+            return "icons/node-red/cog.png"
+        } else if (node && node.type === 'tab') {
+            return "icons/node-red/subflow.png"
+        } else if (node && node.type === 'unknown') {
+            return "icons/node-red/alert.png"
+        } else if (node && node.type === 'subflow') {
+            return "icons/node-red/subflow.png"
+        } else if (node && node.icon) {
+            var iconPath = separateIconPath(node.icon);
+            var iconSets = RED.nodes.getIconSets();
+            var iconFileList = iconSets[iconPath.module];
+            if (iconFileList && iconFileList.indexOf(iconPath.file) !== -1) {
+                return "icons/" + node.icon;
+            }
+        }
+
+        var iconPath = getDefaultNodeIcon(def, node);
+        return "icons/"+iconPath.module+"/"+iconPath.file;
     }
 
     function getNodeLabel(node,defaultLabel) {
@@ -735,6 +767,8 @@ RED.utils = (function() {
         getMessageProperty: getMessageProperty,
         normalisePropertyExpression: normalisePropertyExpression,
         validatePropertyExpression: validatePropertyExpression,
+        separateIconPath: separateIconPath,
+        getDefaultNodeIcon: getDefaultNodeIcon,
         getNodeIcon: getNodeIcon,
         getNodeLabel: getNodeLabel,
     }
diff --git a/editor/sass/editor.scss b/editor/sass/editor.scss
index 70f295ae8..b1bcf0c04 100644
--- a/editor/sass/editor.scss
+++ b/editor/sass/editor.scss
@@ -320,6 +320,13 @@
     input {
         width: calc(100% - 100px);
     }
+    #node-settings-icon-module {
+        width: calc(55% - 50px);
+    }
+    #node-settings-icon-file {
+        width: calc(45% - 55px);
+        margin-left: 5px;
+    }
 }
 .node-label-form-none {
     span {
diff --git a/red/api/index.js b/red/api/index.js
index e4b86eb43..d119de21e 100644
--- a/red/api/index.js
+++ b/red/api/index.js
@@ -94,8 +94,9 @@ function init(_server,_runtime) {
                 });
             }
             editorApp.get("/",ensureRuntimeStarted,ui.ensureSlash,ui.editor);
+            editorApp.get("/icons",needsPermission("nodes.read"),nodes.getIcons,errorHandler);
             editorApp.get("/icons/:module/:icon",ui.icon);
-            editorApp.get("/icons/:scope/:module/:icon",ui.icon);            
+            editorApp.get("/icons/:scope/:module/:icon",ui.icon);
             theme.init(runtime);
             editorApp.use("/theme",theme.app());
             editorApp.use("/",ui.editorResources);
diff --git a/red/api/locales/en-US/editor.json b/red/api/locales/en-US/editor.json
index 4fd50f177..346b700f4 100644
--- a/red/api/locales/en-US/editor.json
+++ b/red/api/locales/en-US/editor.json
@@ -210,9 +210,10 @@
         "editConfig": "Edit __type__ config node",
         "addNewType": "Add new __type__...",
         "nodeProperties": "node properties",
-        "portLabels": "port labels",
+        "portLabels": "node settings",
         "labelInputs": "Inputs",
         "labelOutputs": "Outputs",
+        "settingIcon": "Icon",
         "noDefaultLabel": "none",
         "defaultLabel": "use default label",
         "errors": {
diff --git a/red/api/locales/ja/editor.json b/red/api/locales/ja/editor.json
index 41b7fc22d..3e399494b 100644
--- a/red/api/locales/ja/editor.json
+++ b/red/api/locales/ja/editor.json
@@ -208,9 +208,10 @@
         "editConfig": "__type__ ノードの設定を編集",
         "addNewType": "新規に __type__ を追加...",
         "nodeProperties": "プロパティ",
-        "portLabels": "端子名",
+        "portLabels": "設定",
         "labelInputs": "入力",
         "labelOutputs": "出力",
+        "settingIcon": "アイコン",
         "noDefaultLabel": "なし",
         "defaultLabel": "既定の名前を使用",
         "errors": {
diff --git a/red/api/nodes.js b/red/api/nodes.js
index c9f0d6041..c33a6d3f1 100644
--- a/red/api/nodes.js
+++ b/red/api/nodes.js
@@ -229,6 +229,11 @@ module.exports = {
             log.audit({event: "nodes.module.set",module:mod,enabled:body.enabled,error:err.code||"unexpected_error",message:err.toString()},req);
             res.status(400).json({error:err.code||"unexpected_error", message:err.toString()});
         }
+    },
+
+    getIcons: function(req,res) {
+        log.audit({event: "nodes.icons.get"},req);
+        res.json(redNodes.getNodeIcons());
     }
 };
 
diff --git a/red/runtime/nodes/index.js b/red/runtime/nodes/index.js
index df06b81f5..b307695c5 100644
--- a/red/runtime/nodes/index.js
+++ b/red/runtime/nodes/index.js
@@ -148,6 +148,7 @@ module.exports = {
     getNodeConfigs: registry.getNodeConfigs,
     getNodeConfig: registry.getNodeConfig,
     getNodeIconPath: registry.getNodeIconPath,
+    getNodeIcons: registry.getNodeIcons,
     getNodeExampleFlows: library.getExampleFlows,
     getNodeExampleFlowPath: library.getExampleFlowPath,
 
diff --git a/red/runtime/nodes/registry/index.js b/red/runtime/nodes/registry/index.js
index ba845f0e4..3bb718458 100644
--- a/red/runtime/nodes/registry/index.js
+++ b/red/runtime/nodes/registry/index.js
@@ -71,6 +71,7 @@ module.exports = {
     getNodeConfigs: registry.getAllNodeConfigs,
     getNodeConfig: registry.getNodeConfig,
     getNodeIconPath: registry.getNodeIconPath,
+    getNodeIcons: registry.getNodeIcons,
 
     enableNode: enableNodeSet,
     disableNode: registry.disableNodeSet,
diff --git a/red/runtime/nodes/registry/localfilesystem.js b/red/runtime/nodes/registry/localfilesystem.js
index f8ed507a4..4a4581e90 100644
--- a/red/runtime/nodes/registry/localfilesystem.js
+++ b/red/runtime/nodes/registry/localfilesystem.js
@@ -24,6 +24,7 @@ var i18n;
 
 var settings;
 var disableNodePathScan = false;
+var iconFileExtensions = [".png", ".gif"];
 
 function init(runtime) {
     settings = runtime.settings;
@@ -104,7 +105,8 @@ function getLocalNodeFiles(dir) {
             if (!/^(\..*|lib|icons|node_modules|test|locales)$/.test(fn)) {
                 result = result.concat(getLocalNodeFiles(path.join(dir,fn)));
             } else if (fn === "icons") {
-                events.emit("node-icon-dir",{name:'node-red',path:path.join(dir,fn)});
+                var iconList = scanIconDir(path.join(dir,fn));
+                events.emit("node-icon-dir",{name:'node-red',path:path.join(dir,fn),icons:iconList});
             }
         }
     });
@@ -197,7 +199,8 @@ function getModuleNodeFiles(module) {
             if (iconDirs.indexOf(iconDir) == -1) {
                 try {
                     fs.statSync(iconDir);
-                    events.emit("node-icon-dir",{name:pkg.name,path:iconDir});
+                    var iconList = scanIconDir(iconDir);
+                    events.emit("node-icon-dir",{name:pkg.name,path:iconDir,icons:iconList});
                     iconDirs.push(iconDir);
                 } catch(err) {
                 }
@@ -218,6 +221,10 @@ function getNodeFiles(disableNodePathScan) {
     // Find all of the nodes to load
     var nodeFiles = [];
 
+    var dir = path.resolve(__dirname + '/../../../../public/icons');
+    var iconList = scanIconDir(dir);
+    events.emit("node-icon-dir",{name:'node-red',path:dir,icons:iconList});
+
     if (settings.coreNodesDir) {
         nodeFiles = getLocalNodeFiles(path.resolve(settings.coreNodesDir));
         var defaultLocalesPath = path.join(settings.coreNodesDir,"core","locales");
@@ -302,6 +309,20 @@ function getModuleFiles(module) {
     return nodeList;
 }
 
+function scanIconDir(dir) {
+    var iconList = [];
+    try {
+        var files = fs.readdirSync(dir);
+        files.forEach(function(file) {
+            var stats = fs.statSync(path.join(dir, file));
+            if (stats.isFile() && iconFileExtensions.indexOf(path.extname(file)) !== -1) {
+                iconList.push(file);
+            }
+        });
+    } catch(err) {
+    }
+    return iconList;
+}
 
 module.exports = {
     init: init,
diff --git a/red/runtime/nodes/registry/registry.js b/red/runtime/nodes/registry/registry.js
index f55288cb4..469c9830c 100644
--- a/red/runtime/nodes/registry/registry.js
+++ b/red/runtime/nodes/registry/registry.js
@@ -579,6 +579,25 @@ var defaultIcon = path.resolve(__dirname + '/../../../../public/icons/arrow-in.p
 function nodeIconDir(dir) {
     icon_paths[dir.name] = icon_paths[dir.name] || [];
     icon_paths[dir.name].push(path.resolve(dir.path));
+
+    if (dir.icons) {
+        if (!moduleConfigs[dir.name]) {
+            moduleConfigs[dir.name] = {
+                name: dir.name,
+                nodes: {},
+                icons: []
+            };
+        }
+        var module = moduleConfigs[dir.name];
+        if (module.icons === undefined) {
+            module.icons = [];
+        }
+        dir.icons.forEach(function(icon) {
+            if (module.icons.indexOf(icon) === -1) {
+                module.icons.push(icon);
+            }
+        });
+    }
 }
 
 function getNodeIconPath(module,icon) {
@@ -607,6 +626,20 @@ function getNodeIconPath(module,icon) {
     }
 }
 
+function getNodeIcons() {
+    var iconList = {};
+
+    for (var module in moduleConfigs) {
+        if (moduleConfigs.hasOwnProperty(module)) {
+            if (moduleConfigs[module].icons) {
+                iconList[module] = moduleConfigs[module].icons;
+            }
+        }
+    }
+
+    return iconList;
+}
+
 var registry = module.exports = {
     init: init,
     load: load,
@@ -629,6 +662,7 @@ var registry = module.exports = {
     getModuleInfo: getModuleInfo,
 
     getNodeIconPath: getNodeIconPath,
+    getNodeIcons: getNodeIcons,
     /**
      * Gets all of the node template configs
      * @return all of the node templates in a single string
diff --git a/test/red/api/nodes_spec.js b/test/red/api/nodes_spec.js
index 1b91afab4..27d02d8df 100644
--- a/test/red/api/nodes_spec.js
+++ b/test/red/api/nodes_spec.js
@@ -50,6 +50,7 @@ describe("nodes api", function() {
         app.get(/\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,nodes.getSet);
         app.put(/\/nodes\/((@[^\/]+\/)?[^\/]+)$/,nodes.putModule);
         app.put(/\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,nodes.putSet);
+        app.get("/getIcons",nodes.getIcons);
         app.delete("/nodes/:id",nodes.delete);
         sinon.stub(locales,"determineLangFromHeaders", function() {
             return "en-US";
@@ -808,5 +809,29 @@ describe("nodes api", function() {
         });
     });
 
-
+    describe('get icons', function() {
+        it('returns icon list', function(done) {
+            debugger;
+            initNodes({
+                nodes:{
+                    getNodeIcons: function() {
+                        return {"module":["1.png","2.png","3.png"]};
+                    }
+                }
+            });
+            request(app)
+                .get('/getIcons')
+                .expect(200)
+                .end(function(err,res) {
+                    if (err) {
+                        throw err;
+                    }
+                    console.log(res.body);
+                    res.body.should.have.property("module");
+                    res.body.module.should.be.an.Array();
+                    res.body.module.should.have.lengthOf(3);
+                    done();
+                });
+        });
+    });
 });
diff --git a/test/red/runtime/nodes/registry/localfilesystem_spec.js b/test/red/runtime/nodes/registry/localfilesystem_spec.js
index 53477b482..2bdc741f8 100644
--- a/test/red/runtime/nodes/registry/localfilesystem_spec.js
+++ b/test/red/runtime/nodes/registry/localfilesystem_spec.js
@@ -150,7 +150,22 @@ describe("red/nodes/registry/localfilesystem",function() {
         });
         it.skip("finds locales directory");
         it.skip("finds icon path directory");
-
+        it("scans icon files in the resources tree",function(done) {
+            var count = 0;
+            localfilesystem.init({
+                i18n:{registerMessageCatalog:function(){}},
+                events:{emit:function(eventName,dir){
+                    eventName.should.equal("node-icon-dir");
+                    dir.name.should.equal("node-red");
+                    dir.icons.should.be.an.Array();
+                    if (count++ === 1) {
+                        done();
+                    }
+                }},
+                settings:{coreNodesDir:resourcesDir}
+            });
+            localfilesystem.getNodeFiles(true);
+        });
     });
     describe("#getModuleFiles",function() {
         it("gets a nodes module files",function(done) {
@@ -196,5 +211,27 @@ describe("red/nodes/registry/localfilesystem",function() {
         });
         it.skip("finds locales directory");
         it.skip("finds icon path directory");
+        it("scans icon files with a module file",function(done) {
+            var _join = path.join;
+            stubs.push(sinon.stub(path,"join",function() {
+                if (arguments[0] == resourcesDir) {
+                    // This stops the module tree scan from going any higher
+                    // up the tree than resourcesDir.
+                    return arguments[0];
+                }
+                return _join.apply(null,arguments);
+            }));
+            localfilesystem.init({
+                i18n:{registerMessageCatalog:function(){}},
+                events:{emit:function(eventName,dir){
+                    eventName.should.equal("node-icon-dir");
+                    dir.name.should.equal("TestNodeModule");
+                    dir.icons.should.be.an.Array();
+                    done();
+                }},
+                settings:{coreNodesDir:moduleDir}
+            });
+            var nodeModule = localfilesystem.getModuleFiles('TestNodeModule');
+        });
     });
 });
diff --git a/test/red/runtime/nodes/registry/registry_spec.js b/test/red/runtime/nodes/registry/registry_spec.js
index 828609aa7..2fffc9fb3 100644
--- a/test/red/runtime/nodes/registry/registry_spec.js
+++ b/test/red/runtime/nodes/registry/registry_spec.js
@@ -493,7 +493,7 @@ describe("red/nodes/registry/registry",function() {
 
         it('returns a registered icon' , function() {
             var testIcon = path.resolve(__dirname+'/../../../../resources/icons/test_icon.png');
-            events.emit("node-icon-dir",{name:"test-module", path: path.resolve(__dirname+'/../../../../resources/icons')});
+            events.emit("node-icon-dir",{name:"test-module", path: path.resolve(__dirname+'/../../../../resources/icons'), icons:[]});
             var iconPath = typeRegistry.getNodeIconPath('test-module','test_icon.png');
             iconPath.should.eql(testIcon);
         });
@@ -505,4 +505,24 @@ describe("red/nodes/registry/registry",function() {
         });
     });
 
+    describe('#getNodeIcons', function() {
+        it('returns empty icon list when no modules are registered', function() {
+            var iconList = typeRegistry.getNodeIcons();
+            iconList.should.eql({});
+        });
+
+        it('returns an icon list of registered node module', function() {
+            typeRegistry.addNodeSet("test-module/test-name",testNodeSet1,"0.0.1");
+            events.emit("node-icon-dir",{name:"test-module", path:"",icons:["test_icon1.png"]});
+            var iconList = typeRegistry.getNodeIcons();
+            iconList.should.eql({"test-module":["test_icon1.png"]});
+        });
+
+        it('returns an icon list of unregistered node module', function() {
+            events.emit("node-icon-dir",{name:"test-module", path:"", icons:["test_icon1.png", "test_icon2.png"]});
+            var iconList = typeRegistry.getNodeIcons();
+            iconList.should.eql({"test-module":["test_icon1.png","test_icon2.png"]});
+        });
+    });
+
 });