diff --git a/nodes/core/core/58-debug.js b/nodes/core/core/58-debug.js
index fe84d487d..cfd20b6ea 100644
--- a/nodes/core/core/58-debug.js
+++ b/nodes/core/core/58-debug.js
@@ -19,7 +19,11 @@ module.exports = function(RED) {
         if (this.tosidebar === undefined) { this.tosidebar = true; }
         this.severity = n.severity || 40;
         this.active = (n.active === null || typeof n.active === "undefined") || n.active;
-        this.status({});
+        if (this.tostatus) {
+            this.oldStatus = {fill:"grey", shape:this.active?"dot":"ring"};
+            this.status(this.oldStatus);
+        }
+        else { this.status({}); }
 
         var node = this;
         var levels = {
@@ -122,7 +126,7 @@ module.exports = function(RED) {
             if (state === "enable") {
                 node.active = true;
                 res.sendStatus(200);
-                if (node.tostatus) { node.status({}); }
+                if (node.tostatus) { node.status({fill:"grey", shape:"dot"}); }
             } else if (state === "disable") {
                 node.active = false;
                 res.sendStatus(201);
diff --git a/red/runtime/nodes/registry/localfilesystem.js b/red/runtime/nodes/registry/localfilesystem.js
index b591245d5..527ccce71 100644
--- a/red/runtime/nodes/registry/localfilesystem.js
+++ b/red/runtime/nodes/registry/localfilesystem.js
@@ -23,7 +23,7 @@ var i18n;
 
 var settings;
 var disableNodePathScan = false;
-var iconFileExtensions = [".png", ".gif"];
+var iconFileExtensions = [".png", ".gif", ".svg"];
 
 function init(runtime) {
     settings = runtime.settings;