diff --git a/nodes/99-sample.html.demo b/nodes/99-sample.html.demo
index 2a9617c70..6a9f7e839 100644
--- a/nodes/99-sample.html.demo
+++ b/nodes/99-sample.html.demo
@@ -30,7 +30,7 @@
    <!-- (with the 'node-input-' prefix).                                     -->
    <!-- The available icon classes are defined Twitter Bootstrap glyphicons  -->
     <div class="form-row">
-        <label for="node-input-topic"><i class="icon-tasks"></i> Topic</label>
+        <label for="node-input-topic"><i class="fa fa-tasks"></i> Topic</label>
         <input type="text" id="node-input-topic" placeholder="Topic">
     </div>
 
@@ -38,7 +38,7 @@
     <!-- By convention, most nodes have a 'name' property. The following div -->
     <!-- provides the necessary field. Should always be the last option      -->
     <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/core/20-inject.html b/nodes/core/core/20-inject.html
index 88b41ebbc..b6f2f4daf 100644
--- a/nodes/core/core/20-inject.html
+++ b/nodes/core/core/20-inject.html
@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="inject">
     <div class="form-row node-input-payload">
-        <label for="node-input-payloadType"><i class="icon-envelope"></i> Payload</label>
+        <label for="node-input-payloadType"><i class="fa fa-envelope"></i> Payload</label>
         <select id="node-input-payloadType" style="width:125px !important">
           <option value="date">timestamp</option>
           <option value="none">blank</option>
@@ -30,12 +30,12 @@
     </div>
 
     <div class="form-row">
-        <label for="node-input-topic"><i class="icon-tasks"></i> Topic</label>
+        <label for="node-input-topic"><i class="fa fa-tasks"></i> Topic</label>
         <input type="text" id="node-input-topic" placeholder="topic">
     </div>
 
     <div class="form-row">
-        <label for=""><i class="icon-repeat"></i> Repeat</label>
+        <label for=""><i class="fa fa-repeat"></i> Repeat</label>
         <select id="inject-time-type-select"  style="width: 288px"><option value="none">none</option><option value="interval">interval</option><option value="interval-time">interval between times</option><option value="time">at a specific time</option></select>
         <input type="hidden" id="node-input-repeat" placeholder="payload">
         <input type="hidden" id="node-input-crontab" placeholder="payload">
@@ -78,7 +78,7 @@
     </div>
 
     <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>
 
diff --git a/nodes/core/core/58-debug.html b/nodes/core/core/58-debug.html
index 7f68c6563..87843e32f 100644
--- a/nodes/core/core/58-debug.html
+++ b/nodes/core/core/58-debug.html
@@ -16,21 +16,21 @@
 
 <script type="text/x-red" data-template-name="debug">
     <div class="form-row">
-        <label for="node-input-complete"><i class="icon-list"></i> Output</label>
+        <label for="node-input-complete"><i class="fa fa-list"></i> Output</label>
         <select type="text" id="node-input-complete" style="display: inline-block; width: 250px; vertical-align: top;">
             <option value="false">payload only</option>
             <option value="true">complete msg object</option>
         </select>
     </div>
     <div class="form-row">
-        <label for="node-input-console"><i class="icon-random"></i> to</label>
+        <label for="node-input-console"><i class="fa fa-random"></i> to</label>
         <select type="text" id="node-input-console" style="display: inline-block; width: 250px; vertical-align: top;">
             <option value="false">debug tab</option>
             <option value="true">debug tab and console</option>
         </select>
     </div>
     <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>
@@ -99,7 +99,7 @@
         toolbar.id = "debug-toolbar";
         content.appendChild(toolbar);
 
-        toolbar.innerHTML = '<div class="btn-group pull-right"><a id="debug-tab-clear" title="clear log" class="btn btn-mini" href="#"><i class="icon-trash"></i></a></div> ';
+        toolbar.innerHTML = '<div class="btn-group pull-right"><a id="debug-tab-clear" title="clear log" class="btn btn-mini" href="#"><i class="fa fa-trash"></i></a></div> ';
 
         var messages = document.createElement("div");
         messages.id = "debug-content";
diff --git a/nodes/core/core/75-exec.html b/nodes/core/core/75-exec.html
index 56fb44ae8..567a34c19 100644
--- a/nodes/core/core/75-exec.html
+++ b/nodes/core/core/75-exec.html
@@ -16,11 +16,11 @@
 
 <script type="text/x-red" data-template-name="exec">
     <div class="form-row">
-        <label for="node-input-command"><i class="icon-file"></i> Command</label>
+        <label for="node-input-command"><i class="fa fa-file"></i> Command</label>
         <input type="text" id="node-input-command" placeholder="command">
     </div>
     <div class="form-row">
-        <label for="node-input-append"><i class="icon-list"></i> Append</label>
+        <label for="node-input-append"><i class="fa fa-list"></i> Append</label>
         <input type="text" id="node-input-append" placeholder="extra input">
     </div>
     <div class="form-row">
@@ -29,7 +29,7 @@
         <label for="node-input-useSpawn" style="width: 70%;">Use spawn() instead of exec() ?</label>
     </div>
     <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">Tip: <i>spawn</i> expects only one command word - and appended args to be comma separated.</div>
diff --git a/nodes/core/core/80-function.html b/nodes/core/core/80-function.html
index 0385d8423..442c391dc 100644
--- a/nodes/core/core/80-function.html
+++ b/nodes/core/core/80-function.html
@@ -16,16 +16,16 @@
 
 <script type="text/x-red" data-template-name="function">
     <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">
-        <label for="node-input-func"><i class="icon-wrench"></i> Function</label>
+        <label for="node-input-func"><i class="fa fa-wrench"></i> Function</label>
         <input type="hidden" id="node-input-func" autofocus="autofocus">
         <div style="height: 250px;" class="node-text-editor" id="node-input-func-editor" ></div>
     </div>
     <div class="form-row">
-        <label for="node-input-outputs"><i class="icon-random"></i> Outputs</label>
+        <label for="node-input-outputs"><i class="fa fa-random"></i> Outputs</label>
         <input id="node-input-outputs" style="width: 60px; height: 1.7em;" value="1">
     </div>
     <div class="form-tips">See the Info tab for help writing functions.</div>
diff --git a/nodes/core/core/89-delay.html b/nodes/core/core/89-delay.html
index a427bbccb..dcb0a5b9b 100644
--- a/nodes/core/core/89-delay.html
+++ b/nodes/core/core/89-delay.html
@@ -18,7 +18,7 @@
 <script type="text/x-red" data-template-name="delay">
 
     <div class="form-row">
-        <label for="node-input-pauseType"><i class="icon-tasks"></i> Action</label>
+        <label for="node-input-pauseType"><i class="fa fa-tasks"></i> Action</label>
         <select id="node-input-pauseType" style="width:270px !important">
           <option value="delay">Delay message</option>
           <option value="rate">Limit rate to</option>
@@ -26,7 +26,7 @@
         </select>
     </div>
     <div id="delay-details" class="form-row">
-        <label for="node-input-timeout"><i class="icon-time"></i> For</label>
+        <label for="node-input-timeout"><i class="fa fa-clock-o"></i> For</label>
         <input type="text" id="node-input-timeout" placeholder="Time" style="direction:rtl; width:50px !important">
         <select id="node-input-timeoutUnits" style="width:200px !important">
           <option value="milliseconds">Milliseconds</option>
@@ -38,7 +38,7 @@
     </div>
 
     <div id="rate-details" class="form-row">
-        <label for="node-input-rate"><i class="icon-time"></i> To</label>
+        <label for="node-input-rate"><i class="fa fa-clock-o"></i> To</label>
         <input type="text" id="node-input-rate" placeholder="1" style="direction:rtl; width:30px !important">
         <label for="node-input-reateUnits">msg(s) per</label>
         <select id="node-input-rateUnits" style="width:140px !important">
@@ -52,7 +52,7 @@
     </div>
 
     <div id="random-details" class="form-row">
-        <label for="node-input-randomFirst"><i class="icon-time"></i> Between</label>
+        <label for="node-input-randomFirst"><i class="fa fa-clock-o"></i> Between</label>
         <input type="text" id="node-input-randomFirst" placeholder="" style="directon:rtl; width:30px !important">
         <label for="node-input-randomLast" style="width:20px"> &amp; </label>
         <input type="text" id="node-input-randomLast" placeholder="" style="directon:rtl; width:30px !important">
@@ -66,7 +66,7 @@
     </div>
 
     <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>
 
diff --git a/nodes/core/deprecated/61-imap.html b/nodes/core/deprecated/61-imap.html
index 0a2783ae2..9702cd644 100644
--- a/nodes/core/deprecated/61-imap.html
+++ b/nodes/core/deprecated/61-imap.html
@@ -16,11 +16,11 @@
 
 <script type="text/x-red" data-template-name="imap">
     <div class="form-row node-input-repeat">
-        <label for="node-input-repeat"><i class="icon-repeat"></i>Repeat (S)</label>
+        <label for="node-input-repeat"><i class="fa fa-repeat"></i>Repeat (S)</label>
         <input type="text" id="node-input-repeat" placeholder="300">
     </div>
     <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/deprecated/73-parsexml.html b/nodes/core/deprecated/73-parsexml.html
index a479ff2e8..b6fc16fec 100644
--- a/nodes/core/deprecated/73-parsexml.html
+++ b/nodes/core/deprecated/73-parsexml.html
@@ -21,7 +21,7 @@
         <label for="node-input-useEyes" style="width: 70%;">Debug output in console ?</label>
     </div> -->
     <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">Uses xml2js to process xml into javascript object.</div> -->
diff --git a/nodes/core/deprecated/74-js2xml.html b/nodes/core/deprecated/74-js2xml.html
index 72594fa24..f614579b2 100644
--- a/nodes/core/deprecated/74-js2xml.html
+++ b/nodes/core/deprecated/74-js2xml.html
@@ -16,11 +16,11 @@
 
 <script type="text/x-red" data-template-name="json2xml">
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-list"></i> XML Root</label>
+        <label for="node-input-name"><i class="fa fa-list"></i> XML Root</label>
         <input type="text" id="node-input-root" placeholder="object"></input>
     </div>
     <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"></input>
     </div>
 </script>
diff --git a/nodes/core/deprecated/90-httpget.html b/nodes/core/deprecated/90-httpget.html
index 01beae1f6..b1f2e080c 100644
--- a/nodes/core/deprecated/90-httpget.html
+++ b/nodes/core/deprecated/90-httpget.html
@@ -18,15 +18,15 @@
     <div class="form-tips"><b>Deprecated</b>: please use the <i>http request</i> node.</div>
     <br>
     <div class="form-row">
-        <label for="node-input-baseurl"><i class="icon-tasks"></i> Base URL</label>
+        <label for="node-input-baseurl"><i class="fa fa-tasks"></i> Base URL</label>
         <input type="text" id="node-input-baseurl" placeholder="http(s)://url">
     </div>
     <div class="form-row">
-        <label for="node-input-append"><i class="icon-tasks"></i> Append</label>
+        <label for="node-input-append"><i class="fa fa-tasks"></i> Append</label>
         <input type="text" id="node-input-append" placeholder="">
     </div>
     <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">The <b>Base URL</b> gets prepended to whatever payload is passed in. Leave blank if you pass in a full url.<br/>The append gets added to the end after any payload.<br/>The output Topic is the same as the input Topic.</div>
diff --git a/nodes/core/hardware/35-arduino.html b/nodes/core/hardware/35-arduino.html
index 33b51054e..fb81ecd61 100644
--- a/nodes/core/hardware/35-arduino.html
+++ b/nodes/core/hardware/35-arduino.html
@@ -145,12 +145,12 @@
                 $("#node-config-input-device").autocomplete( "destroy" );
             } catch(err) { }
             $("#node-config-lookup-serial").click(function() {
-                $("#node-config-lookup-serial-icon").removeClass('icon-search');
+                $("#node-config-lookup-serial-icon").removeClass('fa-search');
                 $("#node-config-lookup-serial-icon").addClass('spinner');
                 $("#node-config-lookup-serial").addClass('disabled');
 
                 $.getJSON('arduinoports',function(data) {
-                    $("#node-config-lookup-serial-icon").addClass('icon-search');
+                    $("#node-config-lookup-serial-icon").addClass('fa-search');
                     $("#node-config-lookup-serial-icon").removeClass('spinner');
                     $("#node-config-lookup-serial").removeClass('disabled');
                     var ports = [];
diff --git a/nodes/core/io/32-udp.html b/nodes/core/io/32-udp.html
index 36ff25a56..1c2eed575 100644
--- a/nodes/core/io/32-udp.html
+++ b/nodes/core/io/32-udp.html
@@ -127,7 +127,7 @@
         <label for="node-input-base64" style="width: 70%;">Decode Base64 encoded payload ?</label>
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icfa faon-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">Tip: leave address and port blank if you want to set using <b>msg.ip</b> and <b>msg.port</b>.</div>
diff --git a/nodes/core/social/27-twitter.html b/nodes/core/social/27-twitter.html
index 704ef0b57..44417b598 100644
--- a/nodes/core/social/27-twitter.html
+++ b/nodes/core/social/27-twitter.html
@@ -38,7 +38,7 @@
     }
     function updateTwitterScreenName(sn) {
         $("#node-config-input-screen_name").val(sn);
-        $("#node-config-twitter-row").html('<label><i class="icon-user"></i> Twitter ID</label><span class="input-xlarge uneditable-input">'+sn+'</span>');
+        $("#node-config-twitter-row").html('<label><i class="fa fa-user"></i> Twitter ID</label><span class="input-xlarge uneditable-input">'+sn+'</span>');
     }
     function pollTwitterCredentials(e) {
         $.getJSON('credentials/twitter-credentials/'+twitterConfigNodeId,function(data) {
@@ -93,11 +93,11 @@
 
 <script type="text/x-red" data-template-name="twitter in">
     <div class="form-row">
-        <label for="node-input-twitter"><i class="icon-user"></i> Log in as</label>
+        <label for="node-input-twitter"><i class="fa fa-user"></i> Log in as</label>
         <input type="text" id="node-input-twitter">
     </div>
     <div class="form-row">
-        <label for="node-input-user"><i class="icon-search"></i> Search</label>
+        <label for="node-input-user"><i class="fa fa-search"></i> Search</label>
         <select type="text" id="node-input-user" style="display: inline-block; vertical-align: middle; width:60%;">
             <option value="false">all public tweets</option>
             <option value="true">the tweets of who you follow</option>
@@ -106,11 +106,11 @@
         </select>
     </div>
     <div class="form-row" id="node-input-tags-row">
-        <label for="node-input-tags"><i class="icon-tags"></i> <span id="node-input-tags-label">for</span></label>
+        <label for="node-input-tags"><i class="fa fa-tags"></i> <span id="node-input-tags-label">for</span></label>
         <input type="text" id="node-input-tags" placeholder="comma-separated words, @ids, #tags">
     </div>
     <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">Tip: Use commas without spaces between multiple search terms. Comma = OR, Space = AND.
@@ -188,11 +188,11 @@
 
 <script type="text/x-red" data-template-name="twitter out">
     <div class="form-row">
-        <label for="node-input-twitter"><i class="icon-user"></i> Twitter</label>
+        <label for="node-input-twitter"><i class="fa fa-user"></i> Twitter</label>
         <input type="text" id="node-input-twitter">
     </div>
     <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/social/32-feedparse.html b/nodes/core/social/32-feedparse.html
index 2bd4206e3..a79542776 100644
--- a/nodes/core/social/32-feedparse.html
+++ b/nodes/core/social/32-feedparse.html
@@ -16,15 +16,15 @@
 
 <script type="text/x-red" data-template-name="feedparse">
     <div class="form-row">
-        <label for="node-input-url"><i class="icon-globe"></i> Feed url</label>
+        <label for="node-input-url"><i class="fa fa-globe"></i> Feed url</label>
         <input type="text" id="node-input-url">
     </div>
     <div class="form-row">
-        <label for="node-input-interval"><i class="icon-repeat"></i> Repeat <span style="font-size: 0.9em;">(M)</span></label>
+        <label for="node-input-interval"><i class="fa fa-repeat"></i> Repeat <span style="font-size: 0.9em;">(M)</span></label>
         <input type="text" id="node-input-interval" placeholder="minutes">
     </div>
     <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"></div> -->
diff --git a/nodes/core/social/61-email.html b/nodes/core/social/61-email.html
index 73d7b9f79..37397083d 100644
--- a/nodes/core/social/61-email.html
+++ b/nodes/core/social/61-email.html
@@ -20,7 +20,7 @@
         <input type="text" id="node-input-name" placeholder="email@address.com">
     </div>
     <!-- <div class="form-row">
-        <label for="node-input-pin"><i class="icon-asterisk"></i> Service</label>
+        <label for="node-input-pin"><i class="fa fa-asterisk"></i> Service</label>
         <select type="text" id="node-input-pin" style="width: 150px;">
             <option value="-" disabled> </option>
             <option value="DynectEmail">DynectEmail</option>