diff --git a/nodes/core/logic/10-switch.html b/nodes/core/logic/10-switch.html
index 668b6e763..b0c928ad9 100644
--- a/nodes/core/logic/10-switch.html
+++ b/nodes/core/logic/10-switch.html
@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="switch">
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-row" style="padding-top:10px;">
@@ -27,7 +27,7 @@
         <ol id="node-input-rule-container" style=" list-style-type:none; margin: 0;">
         </ol>
         </div>
-        <a href="#" class="btn btn-mini" id="node-input-add-rule" style="margin-top: 4px;"><i class="icon-plus"></i> Add</a>
+        <a href="#" class="btn btn-mini" id="node-input-add-rule" style="margin-top: 4px;"><i class="fa fa-plus"></i> Add</a>
     </div>
     <div>
         <select id="node-input-checkall" style="width:100%; margin-right:5px;">
diff --git a/nodes/core/logic/15-change.html b/nodes/core/logic/15-change.html
index 76f0d2736..702dd8072 100644
--- a/nodes/core/logic/15-change.html
+++ b/nodes/core/logic/15-change.html
@@ -41,7 +41,7 @@
     <div class="form-tips" id="node-tip"></div>
     <br/>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
 </script>
diff --git a/nodes/core/logic/15-change.js b/nodes/core/logic/15-change.js
index 3669de36e..b7ef62e15 100644
--- a/nodes/core/logic/15-change.js
+++ b/nodes/core/logic/15-change.js
@@ -56,7 +56,7 @@ module.exports = function(RED) {
                 //}
             //}
             else if (node.action == "replace") {
-                if (node.to.indexOf("msg.") == 0) {
+                if (node.to.indexOf("msg.") === 0) {
                     makeNew( msg, node.property.split("."), eval(node.to) );
                 }
                 else {
diff --git a/nodes/core/logic/16-range.html b/nodes/core/logic/16-range.html
index d7f323776..aa6ae4683 100644
--- a/nodes/core/logic/16-range.html
+++ b/nodes/core/logic/16-range.html
@@ -43,7 +43,7 @@
     </div>
     <br/>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-tips" id="node-tip">Tip: This node ONLY works with numbers.</div>