diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
index c11931bfb..d26ed4a4c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
@@ -866,17 +866,32 @@ RED.utils = (function() {
             } else {
                 return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
             }
-        } else {
-            // This could be a non-core node trying to use a core icon.
-            iconPath.module = 'node-red';
+        }
+
+        if (/.png$/i.test(iconPath.file)) {
+            var originalFile = iconPath.file;
+            iconPath.file = iconPath.file.replace(/.png$/,".svg");
+            if (isIconExists(iconPath)) {
+                return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
+            }
+            iconPath.file = originalFile;
+        }
+
+        // This could be a non-core node trying to use a core icon.
+        iconPath.module = 'node-red';
+        if (isIconExists(iconPath)) {
+            return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
+        }
+        if (/.png$/i.test(iconPath.file)) {
+            iconPath.file = iconPath.file.replace(/.png$/,".svg");
             if (isIconExists(iconPath)) {
                 return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
-            } else if (def.category === 'subflows') {
-                return RED.settings.apiRootUrl+"icons/node-red/subflow.svg";
-            } else {
-                return RED.settings.apiRootUrl+"icons/node-red/arrow-in.svg";
             }
         }
+        if (def.category === 'subflows') {
+            return RED.settings.apiRootUrl+"icons/node-red/subflow.svg";
+        }
+        return RED.settings.apiRootUrl+"icons/node-red/arrow-in.svg";
     }
 
     function getNodeLabel(node,defaultLabel) {
diff --git a/packages/node_modules/@node-red/nodes/icons/alert.png b/packages/node_modules/@node-red/nodes/icons/alert.png
deleted file mode 100644
index a86311109..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/alert.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/arrow-in.png b/packages/node_modules/@node-red/nodes/icons/arrow-in.png
deleted file mode 100644
index e38f39146..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/arrow-in.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/batch.png b/packages/node_modules/@node-red/nodes/icons/batch.png
deleted file mode 100644
index 44803d185..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/batch.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/bridge-dash.png b/packages/node_modules/@node-red/nodes/icons/bridge-dash.png
deleted file mode 100644
index 3914cb7a5..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/bridge-dash.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/bridge.png b/packages/node_modules/@node-red/nodes/icons/bridge.png
deleted file mode 100644
index 2011292d6..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/bridge.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/cog.png b/packages/node_modules/@node-red/nodes/icons/cog.png
deleted file mode 100644
index e84cb16b2..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/cog.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/comment.png b/packages/node_modules/@node-red/nodes/icons/comment.png
deleted file mode 100644
index d64d12a7f..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/comment.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/db.png b/packages/node_modules/@node-red/nodes/icons/db.png
deleted file mode 100644
index 5e74f7480..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/db.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/debug.png b/packages/node_modules/@node-red/nodes/icons/debug.png
deleted file mode 100644
index 05691562d..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/debug.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/envelope.png b/packages/node_modules/@node-red/nodes/icons/envelope.png
deleted file mode 100644
index fb0d36b95..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/envelope.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/feed.png b/packages/node_modules/@node-red/nodes/icons/feed.png
deleted file mode 100644
index 9f2671c53..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/feed.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/file-in.png b/packages/node_modules/@node-red/nodes/icons/file-in.png
deleted file mode 100644
index d3e5cd7fe..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/file-in.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/file-out.png b/packages/node_modules/@node-red/nodes/icons/file-out.png
deleted file mode 100644
index 051f819c8..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/file-out.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/file.png b/packages/node_modules/@node-red/nodes/icons/file.png
deleted file mode 100644
index 78ee09f79..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/file.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/function.png b/packages/node_modules/@node-red/nodes/icons/function.png
deleted file mode 100644
index 909505000..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/function.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/hash.png b/packages/node_modules/@node-red/nodes/icons/hash.png
deleted file mode 100644
index e68e45df1..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/hash.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/inject.png b/packages/node_modules/@node-red/nodes/icons/inject.png
deleted file mode 100644
index dbf4711a3..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/inject.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/join.png b/packages/node_modules/@node-red/nodes/icons/join.png
deleted file mode 100644
index d4a2cffb4..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/join.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/light.png b/packages/node_modules/@node-red/nodes/icons/light.png
deleted file mode 100644
index ce21542bb..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/light.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/link-out.png b/packages/node_modules/@node-red/nodes/icons/link-out.png
deleted file mode 100644
index f39ba0453..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/link-out.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/parser-csv.png b/packages/node_modules/@node-red/nodes/icons/parser-csv.png
deleted file mode 100644
index 5b1c42c48..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/parser-csv.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/parser-html.png b/packages/node_modules/@node-red/nodes/icons/parser-html.png
deleted file mode 100644
index fa5373713..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/parser-html.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/parser-json.png b/packages/node_modules/@node-red/nodes/icons/parser-json.png
deleted file mode 100644
index 839d60dcb..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/parser-json.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/parser-xml.png b/packages/node_modules/@node-red/nodes/icons/parser-xml.png
deleted file mode 100644
index fa5373713..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/parser-xml.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/parser-yaml.png b/packages/node_modules/@node-red/nodes/icons/parser-yaml.png
deleted file mode 100644
index e4cb2f20b..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/parser-yaml.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/range.png b/packages/node_modules/@node-red/nodes/icons/range.png
deleted file mode 100644
index 2e7183ce8..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/range.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/rpi.png b/packages/node_modules/@node-red/nodes/icons/rpi.png
deleted file mode 100644
index 162b99dc1..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/rpi.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/rpi.svg b/packages/node_modules/@node-red/nodes/icons/rpi.svg
new file mode 100644
index 000000000..99185f9b0
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/icons/rpi.svg
@@ -0,0 +1 @@
+<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" stroke-width=".138"><path d="M20.21 20.98c2.096-.023 4.694 1.562 4.683 3.058-.01 1.32-1.824 2.39-4.667 2.37-2.784-.034-4.656-1.344-4.65-2.623.005-1.053 2.271-2.866 4.634-2.805zM13.07 21.87c.469-.009.954.028 1.449.111 1.458.245-6.99 7.623-7.12 5.977-.116-3.756 2.39-6.027 5.671-6.088zM26.91 21.99c3.28.061 5.787 2.33 5.67 6.086-.13 1.645-8.577-5.73-7.119-5.975a7.83 7.83 0 0 1 1.449-.111zM25.76 26.59c1.56.143 3.143 1.08 4.175 2.643 1.652 2.5 1.27 5.656-.855 7.048-2.125 1.392-5.185.492-6.837-2.008-1.652-2.5-1.269-5.656.855-7.048.797-.522 1.725-.72 2.662-.635zM14.7 26.84c.937-.086 1.865.113 2.661.635 2.125 1.392 2.508 4.548.856 7.048-1.652 2.5-4.712 3.397-6.837 2.005-2.124-1.392-2.507-4.545-.855-7.045 1.032-1.563 2.614-2.5 4.175-2.643zM33.05 29.6a.728.728 0 0 1 .204.026c3.806 2.173 3.145 7.01 1.092 8.66-1.808.804-3.29-8.653-1.296-8.686zM6.95 29.73c1.994.033.512 9.49-1.296 8.687-2.053-1.651-2.714-6.486 1.092-8.66a.738.738 0 0 1 .204-.027zM20.3 36.23c2.832-.014 5.141 2.093 5.156 4.704v.049c.015 2.61-2.269 4.738-5.1 4.752-2.832.014-5.141-2.09-5.156-4.701a2.996 2.996 0 0 1 0-.051c-.015-2.611 2.268-4.74 5.1-4.753zM31.66 38.02c.4-.011.777.102 1.115.364.91.907 1.443 4.32-.15 6.366-2.195 3.045-5.165 3.164-6.272 2.316-1.157-1.092-.274-4.482 1.313-6.34 1.361-1.538 2.793-2.675 3.994-2.706zM8.65 38.74c1.29.055 2.836 1.076 4.099 2.54 1.466 1.768 2.135 4.872.91 5.788-1.157.698-3.968.409-5.967-2.463-1.347-2.409-1.175-4.86-.229-5.58a2.07 2.07 0 0 1 1.187-.285zM20.35 47.21c2.06-.09 4.824.663 4.83 1.662.033.97-2.508 3.163-4.967 3.12-2.547.11-5.045-2.085-5.012-2.846-.038-1.116 3.102-1.987 5.149-1.936zM35.13 11.03c-.569 7.356-7.409 14.128-11.629 6.971 1.363-1.52 3.853-3.306 8.133-5.513-3.33 1.132-6.335 2.64-8.85 4.716-5.838-4.296 4.734-9.675 12.346-6.174z"/><path d="M5.42 11.03c.569 7.356 7.409 14.128 11.629 6.971-1.363-1.52-3.853-3.306-8.133-5.513 3.33 1.132 6.335 2.64 8.85 4.716 5.838-4.296-4.734-9.675-12.346-6.174z"/></g></svg>
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/icons/serial.png b/packages/node_modules/@node-red/nodes/icons/serial.png
deleted file mode 100644
index f4bcedc3b..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/serial.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/sort.png b/packages/node_modules/@node-red/nodes/icons/sort.png
deleted file mode 100644
index f0fb7ead2..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/sort.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/split.png b/packages/node_modules/@node-red/nodes/icons/split.png
deleted file mode 100644
index bda78484f..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/split.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/subflow.png b/packages/node_modules/@node-red/nodes/icons/subflow.png
deleted file mode 100644
index 7c1c14f38..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/subflow.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/swap.png b/packages/node_modules/@node-red/nodes/icons/swap.png
deleted file mode 100644
index e9e70efbd..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/swap.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/switch.png b/packages/node_modules/@node-red/nodes/icons/switch.png
deleted file mode 100644
index 4d172de66..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/switch.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/template.png b/packages/node_modules/@node-red/nodes/icons/template.png
deleted file mode 100644
index 1db6f273d..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/template.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/timer.png b/packages/node_modules/@node-red/nodes/icons/timer.png
deleted file mode 100644
index 4f02f4656..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/timer.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/trigger.png b/packages/node_modules/@node-red/nodes/icons/trigger.png
deleted file mode 100644
index 37b60f118..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/trigger.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/twitter.png b/packages/node_modules/@node-red/nodes/icons/twitter.png
deleted file mode 100644
index d06059453..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/twitter.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/watch.png b/packages/node_modules/@node-red/nodes/icons/watch.png
deleted file mode 100644
index a6c1b9451..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/watch.png and /dev/null differ
diff --git a/packages/node_modules/@node-red/nodes/icons/white-globe.png b/packages/node_modules/@node-red/nodes/icons/white-globe.png
deleted file mode 100644
index 8a19079bf..000000000
Binary files a/packages/node_modules/@node-red/nodes/icons/white-globe.png and /dev/null differ