From f19ae71fb77b085769801de1cad1472eac848fa9 Mon Sep 17 00:00:00 2001
From: Mark Hindess <mark.hindess@gmail.com>
Date: Wed, 3 Sep 2014 16:12:26 +0100
Subject: [PATCH] Migrate icons.

---
 99-sample.html.demo                       |  4 +--
 analysis/swearfilter/74-swearfilter.html  |  2 +-
 analysis/wordpos/72-wordpos.html          |  2 +-
 hardware/BBB/145-BBB-hardware.html        | 34 +++++++++++------------
 hardware/LEDborg/78-ledborg.html          |  2 +-
 hardware/PiFace/37-rpi-piface.html        |  8 +++---
 hardware/Pibrella/38-rpi-pibrella.html    |  8 +++---
 hardware/blink1/77-blink1.html            |  4 +--
 hardware/blinkstick/76-blinkstick.html    |  2 +-
 hardware/digiRGB/78-digiRGB.html          |  2 +-
 hardware/heatmiser/100-heatmiser-in.html  |  6 ++--
 hardware/heatmiser/101-heatmiser-out.html |  8 +++---
 hardware/hue/103-hue_discover.html        |  4 +--
 hardware/hue/104-hue_manage.html          | 12 ++++----
 hardware/scanBLE/101-scanBLE.html         |  6 ++--
 hardware/sensorTag/79-sensorTag.html      | 20 ++++++-------
 hardware/wemo/60-wemo.html                |  8 +++---
 io/emoncms/88-emoncms.html                | 12 ++++----
 io/ping/88-ping.html                      |  6 ++--
 io/stomp/18-stomp.html                    | 20 ++++++-------
 io/wol/39-wol.html                        |  4 +--
 social/dweetio/55-dweetio.html            |  8 +++---
 social/music/69-mpd.html                  |  4 +--
 social/nma/57-nma.html                    |  6 ++--
 social/notify/57-notify.html              |  4 +--
 social/prowl/57-prowl.html                |  8 +++---
 social/pushbullet/57-pushbullet.html      |  8 +++---
 social/pusher/114-pusher.html             | 20 ++++++-------
 social/pushover/57-pushover.html          | 10 +++----
 social/snapchat/79-snapchat.html          | 10 +++----
 social/twilio/56-twilio.html              | 14 +++++-----
 social/xmpp/92-xmpp.html                  | 20 ++++++-------
 storage/ddb/69-ddbout.html                |  8 +++---
 storage/ddb/aws.html                      |  4 +--
 storage/leveldb/67-leveldb.html           | 12 ++++----
 storage/postgres/110-postgres.html        | 12 ++++----
 storage/sqlite/nodes/sqlite.html          |  6 ++--
 37 files changed, 164 insertions(+), 164 deletions(-)

diff --git a/99-sample.html.demo b/99-sample.html.demo
index c946ad11..fbc733d2 100644
--- a/99-sample.html.demo
+++ b/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/analysis/swearfilter/74-swearfilter.html b/analysis/swearfilter/74-swearfilter.html
index 34379f9b..e67933eb 100644
--- a/analysis/swearfilter/74-swearfilter.html
+++ b/analysis/swearfilter/74-swearfilter.html
@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="badwords">
     <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/analysis/wordpos/72-wordpos.html b/analysis/wordpos/72-wordpos.html
index 6b098990..7e940aff 100644
--- a/analysis/wordpos/72-wordpos.html
+++ b/analysis/wordpos/72-wordpos.html
@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="wordpos">
     <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">Adds <b>msg.pos</b> as the anaylsis result.
diff --git a/hardware/BBB/145-BBB-hardware.html b/hardware/BBB/145-BBB-hardware.html
index 2af86449..bfd0b003 100644
--- a/hardware/BBB/145-BBB-hardware.html
+++ b/hardware/BBB/145-BBB-hardware.html
@@ -17,7 +17,7 @@
 <!-- Edit dialog for bbb-analogue-in -->
 <script type="text/x-red" data-template-name="bbb-analogue-in">
    <div class="form-row">
-       <label for="node-input-pin"><i class="icon-asterisk"></i>Input pin</label>
+       <label for="node-input-pin"><i class="fa fa-asterisk"></i>Input pin</label>
        <select type="text" id="node-input-pin" style="width: 150px;">
            <option value="">select pin</option>
            <option value="P9_39">AIN0 (P9 pin 39)</option>
@@ -30,7 +30,7 @@
        </select>
    </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">
@@ -43,13 +43,13 @@
         </div>
     </div>
     <div class="form-row">
-        <a href="#" class="btn btn-mini" id="node-input-add-breakpoint" style="margin-top: 4px;"><i class="icon-plus"></i> Add Breakpoint</a>
+        <a href="#" class="btn btn-mini" id="node-input-add-breakpoint" style="margin-top: 4px;"><i class="fa fa-plus"></i> Add Breakpoint</a>
         <span style="float:right; margin-top:4px">
             <input type="checkbox" id="node-input-averaging" style="display:inline-block; width:auto; vertical-align:top;"> Averaging&nbsp;
         </span> 
     </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>
@@ -186,7 +186,7 @@ voltage ten times in rapid succession for each input message and output the mean
 <!-- Edit dialog for bbb-discrete-in -->
 <script type="text/x-red" data-template-name="bbb-discrete-in">
    <div class="form-row">
-       <label for="node-input-pin"><i class="icon-asterisk"></i>Input pin</label>
+       <label for="node-input-pin"><i class="fa fa-asterisk"></i>Input pin</label>
        <select type="text" id="node-input-pin" style="width: 200px;">
            <option value="">select pin</option>
            <option value="P8_7">GPIO2_2 (P8 pin 7)</option>
@@ -239,16 +239,16 @@ voltage ten times in rapid succession for each input message and output the mean
         </select>
     </div>
     <div class="form-row">
-        <label for="node-input-updateInterval"><i class="icon-repeat"></i> Update at</label>
+        <label for="node-input-updateInterval"><i class="fa fa-repeat"></i> Update at</label>
         <input id="node-input-updateInterval" type="text" style="width: 65px">
         <label>sec intervals</label>
     </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="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>
@@ -305,7 +305,7 @@ press. When using buttons or switches, enable debouncing to improve reliability.
 <!-- Edit dialog for bbb-pulse-in -->
 <script type="text/x-red" data-template-name="bbb-pulse-in">
    <div class="form-row">
-       <label for="node-input-pin"><i class="icon-asterisk"></i>Input pin</label>
+       <label for="node-input-pin"><i class="fa fa-asterisk"></i>Input pin</label>
        <select type="text" id="node-input-pin" style="width: 200px;">
            <option value="">select pin</option>
            <option value="P8_7">GPIO2_2 (P8 pin 7)</option>
@@ -359,16 +359,16 @@ press. When using buttons or switches, enable debouncing to improve reliability.
         <label style="width: 60%"> units per count/second</label>
     </div>
     <div class="form-row">
-        <label for="node-input-updateInterval"><i class="icon-repeat"></i> Update at</label>
+        <label for="node-input-updateInterval"><i class="fa fa-repeat"></i> Update at</label>
         <input id="node-input-updateInterval" type="text" style="width: 65px">
         <label>sec intervals</label>
     </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="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>
@@ -416,7 +416,7 @@ any other input message will reset it to zero.
 <!-- Edit dialog for bbb-discrete-out -->
 <script type="text/x-red" data-template-name="bbb-discrete-out">
    <div class="form-row">
-       <label for="node-input-pin"><i class="icon-asterisk"></i>Output pin</label>
+       <label for="node-input-pin"><i class="fa fa-asterisk"></i>Output pin</label>
        <select type="text" id="node-input-pin" style="width: 200px;">
            <option value="">select pin</option>
            <option value="P8_7">GPIO2_2 (P8 pin 7)</option>
@@ -472,7 +472,7 @@ any other input message will reset it to zero.
         </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>
@@ -526,7 +526,7 @@ the Inverting property is not applied to this value.
 <!-- Edit dialog for bbb-pulse-out -->
 <script type="text/x-red" data-template-name="bbb-pulse-out">
    <div class="form-row">
-       <label for="node-input-pin"><i class="icon-asterisk"></i>Output pin</label>
+       <label for="node-input-pin"><i class="fa fa-asterisk"></i>Output pin</label>
        <select type="text" id="node-input-pin" style="width: 200px;">
            <option value="">select pin</option>
            <option value="P8_7">GPIO2_2 (P8 pin 7)</option>
@@ -567,7 +567,7 @@ the Inverting property is not applied to this value.
         </select>
     </div>
     <div class="form-row">
-        <label for="node-input-pulseTime"><i class="icon-repeat"></i> Pulse time</label>
+        <label for="node-input-pulseTime"><i class="fa fa-repeat"></i> Pulse time</label>
         <input id="node-input-pulseTime" type="text" style="width: 65px">
         <label> seconds</label>
     </div>
@@ -583,7 +583,7 @@ the Inverting property is not applied to this value.
         </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>
diff --git a/hardware/LEDborg/78-ledborg.html b/hardware/LEDborg/78-ledborg.html
index 86ce75e4..338e77d5 100644
--- a/hardware/LEDborg/78-ledborg.html
+++ b/hardware/LEDborg/78-ledborg.html
@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="ledborg">
     <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">Expects a msg.payload with PiBorg three digit rgb colour string. 000 -> 222</div>
diff --git a/hardware/PiFace/37-rpi-piface.html b/hardware/PiFace/37-rpi-piface.html
index fcb0a966..21f6b8e3 100644
--- a/hardware/PiFace/37-rpi-piface.html
+++ b/hardware/PiFace/37-rpi-piface.html
@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="rpi-piface in">
     <div class="form-row">
-        <label for="node-input-pin"><i class="icon-asterisk"></i> GPIO Pin</label>
+        <label for="node-input-pin"><i class="fa fa-asterisk"></i> GPIO Pin</label>
         <select type="text" id="node-input-pin" style="width: 150px;">
             <option value="-" disabled>select pin</option>
             <option value="Button S1">Button S1</option>
@@ -45,7 +45,7 @@
         </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>
     <div class="form-tips">Tip: Only Digital I/O is supported - input must be 0 or 1.</div>
@@ -83,7 +83,7 @@
 
 <script type="text/x-red" data-template-name="rpi-piface out">
     <div class="form-row">
-        <label for="node-input-pin"><i class="icon-asterisk"></i> GPIO Pin</label>
+        <label for="node-input-pin"><i class="fa fa-asterisk"></i> GPIO Pin</label>
         <select type="text" id="node-input-pin" style="width: 150px;">
             <option value="-" disabled>select pin</option>
             <option value="LED 0 / Relay 0">LED 0 / Relay 0</option>
@@ -97,7 +97,7 @@
          </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>
     <div class="form-tips">Tip: Only Digital I/O is supported - input must be 0 or 1.</div>
diff --git a/hardware/Pibrella/38-rpi-pibrella.html b/hardware/Pibrella/38-rpi-pibrella.html
index ffbe3ac8..f0f05ba8 100644
--- a/hardware/Pibrella/38-rpi-pibrella.html
+++ b/hardware/Pibrella/38-rpi-pibrella.html
@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="rpi-pibrella in">
     <div class="form-row">
-        <label for="node-input-pin"><i class="icon-asterisk"></i> Input</label>
+        <label for="node-input-pin"><i class="fa fa-asterisk"></i> Input</label>
         <select type="text" id="node-input-pin" style="width: 150px;">
             <option value="-">select input</option>
             <option value="Red Button">Red Button</option>
@@ -27,7 +27,7 @@
          </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>
@@ -62,7 +62,7 @@
 
 <script type="text/x-red" data-template-name="rpi-pibrella out">
     <div class="form-row">
-        <label for="node-input-pin"><i class="icon-asterisk"></i> Output</label>
+        <label for="node-input-pin"><i class="fa fa-asterisk"></i> Output</label>
         <select type="text" id="node-input-pin" style="width: 150px;">
             <option value="-">select output</option>
             <option value="Red LED">Red LED</option>
@@ -76,7 +76,7 @@
          </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>
     <div class="form-tips">Buzzer takes <b>msg.payload</b> between 2 (high) and 512 (low), or 0 for off.</div>
diff --git a/hardware/blink1/77-blink1.html b/hardware/blink1/77-blink1.html
index 14efa87a..b7d90cf3 100644
--- a/hardware/blink1/77-blink1.html
+++ b/hardware/blink1/77-blink1.html
@@ -16,11 +16,11 @@
 
 <script type="text/x-red" data-template-name="blink1">
     <div class="form-row">
-        <label for="node-input-fade"><i class="icon-signal"></i> Fade (mS)</label>
+        <label for="node-input-fade"><i class="fa fa-signal"></i> Fade (mS)</label>
         <input type="text" id="node-input-fade" placeholder="0">
     </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/hardware/blinkstick/76-blinkstick.html b/hardware/blinkstick/76-blinkstick.html
index 1bef4306..90b941a1 100644
--- a/hardware/blinkstick/76-blinkstick.html
+++ b/hardware/blinkstick/76-blinkstick.html
@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="blinkstick">
     <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">Expects a msg.payload with either hex #rrggbb or decimal red,green,blue.</div>
diff --git a/hardware/digiRGB/78-digiRGB.html b/hardware/digiRGB/78-digiRGB.html
index bbb2a128..2f811d90 100644
--- a/hardware/digiRGB/78-digiRGB.html
+++ b/hardware/digiRGB/78-digiRGB.html
@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="digiRGB">
     <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="DigiSpark">
     </div>
     <div class="form-tips">Expects a msg.payload with three part csv string of r,g,b.</div>
diff --git a/hardware/heatmiser/100-heatmiser-in.html b/hardware/heatmiser/100-heatmiser-in.html
index 76b2f73b..e5bf5009 100644
--- a/hardware/heatmiser/100-heatmiser-in.html
+++ b/hardware/heatmiser/100-heatmiser-in.html
@@ -16,15 +16,15 @@
 
 <script type="text/x-red" data-template-name="heatmiser-in">
     <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-uuid"><i class="icon-tag"></i> IP Address</label>
+        <label for="node-input-uuid"><i class="fa fa-tag"></i> IP Address</label>
         <input type="text" id="node-input-ip" placeholder="192.168.0.1">
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> PIN</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> PIN</label>
         <input type="text" id="node-input-pin" placeholder="1234">
     </div>
     <div class="form-tips">Expects a msg.payload with a JSON object that contains settings for the Heatmiser thermostat</div>
diff --git a/hardware/heatmiser/101-heatmiser-out.html b/hardware/heatmiser/101-heatmiser-out.html
index 9f00948b..fea925c2 100644
--- a/hardware/heatmiser/101-heatmiser-out.html
+++ b/hardware/heatmiser/101-heatmiser-out.html
@@ -16,19 +16,19 @@
 
 <script type="text/x-red" data-template-name="heatmiser-out">
     <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-uuid"><i class="icon-tag"></i> IP Address</label>
+        <label for="node-input-uuid"><i class="fa fa-tag"></i> IP Address</label>
         <input type="text" id="node-input-ip" placeholder="192.168.0.1">
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> PIN</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> PIN</label>
         <input type="text" id="node-input-pin" placeholder="1234">
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Poll time (in minutes)</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Poll time (in minutes)</label>
         <input type="text" id="node-input-pollTime" placeholder="30">
     </div>
     <div class="form-tips">Expects a msg.payload with a JSON object that contains settings for the Heatmiser thermostat</div>
diff --git a/hardware/hue/103-hue_discover.html b/hardware/hue/103-hue_discover.html
index ac6c1d39..4d375d8a 100644
--- a/hardware/hue/103-hue_discover.html
+++ b/hardware/hue/103-hue_discover.html
@@ -18,11 +18,11 @@
 
 <script type="text/x-red" data-template-name="Discover">
 <div class="form-row">
-    <label for="node-input-username"><i class="icon-tag"></i> Username:</label>
+    <label for="node-input-username"><i class="fa fa-tag"></i> Username:</label>
     <input type="text" id="node-input-username" placeholder="username">
   </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/hardware/hue/104-hue_manage.html b/hardware/hue/104-hue_manage.html
index d23f3973..99950970 100644
--- a/hardware/hue/104-hue_manage.html
+++ b/hardware/hue/104-hue_manage.html
@@ -18,17 +18,17 @@
 
 <script type="text/x-red" data-template-name="HueNode">
   <div class="form-row">
-     <label for="node-input-topic"><i class="icon-tasks"></i>Hue App Username:</label>
+     <label for="node-input-topic"><i class="fa fa-tasks"></i>Hue App Username:</label>
      <input type="text" id="node-input-username" placeholder="username">
   </div>
 
   <div class="form-row">
-    <label for="node-input-name"><i class="icon-tag"></i>Lamp ID:</label>
+    <label for="node-input-name"><i class="fa fa-tag"></i>Lamp ID:</label>
     <input type="text" id="node-input-lamp_id" placeholder="lamp_id">
   </div>
 
   <div class="form-row">
-    <label for="node-input-name"><i class="icon-tag"></i>Lamp Status:</label>
+    <label for="node-input-name"><i class="fa fa-tag"></i>Lamp Status:</label>
     <select id="node-input-lamp_status" placeholder="lamp_status">
     <option value="AUTO">AUTO</option>
     <option value="ON">ON</option>
@@ -37,17 +37,17 @@
   </div>
 
   <div class="form-row">
-    <label for="node-input-brightness"><i class="icon-tag"></i>Change Brightness (0->100):</label>
+    <label for="node-input-brightness"><i class="fa fa-tag"></i>Change Brightness (0->100):</label>
     <input type="text" id="node-input-brightness" placeholder="brightness">
   </div>
 
   <div class="form-row">
-    <label for="node-input-color"><i class="icon-tag"></i>Select color:</label>
+    <label for="node-input-color"><i class="fa fa-tag"></i>Select color:</label>
     <input type="text" id="node-input-color" placeholder="color">
   </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/hardware/scanBLE/101-scanBLE.html b/hardware/scanBLE/101-scanBLE.html
index 329d142c..8a718460 100644
--- a/hardware/scanBLE/101-scanBLE.html
+++ b/hardware/scanBLE/101-scanBLE.html
@@ -18,17 +18,17 @@
 
 <script type="text/x-red" data-template-name="scanBLE">
   <div class="form-row">
-     <label for="node-input-topic"><i class="icon-tasks"></i> BLE Device name</label>
+     <label for="node-input-topic"><i class="fa fa-tasks"></i> BLE Device name</label>
     <input type="text" id="node-input-ble_name" placeholder="XXX">
   </div>
 
   <div class="form-row">
-     <label for="node-input-topic"><i class="icon-tasks"></i> UUID</label>
+     <label for="node-input-topic"><i class="fa fa-tasks"></i> UUID</label>
     <input type="text" id="node-input-ble_uuid" placeholder="UUID">
   </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/hardware/sensorTag/79-sensorTag.html b/hardware/sensorTag/79-sensorTag.html
index 6e065d94..6f5db727 100644
--- a/hardware/sensorTag/79-sensorTag.html
+++ b/hardware/sensorTag/79-sensorTag.html
@@ -29,43 +29,43 @@
     <!-- By convention, most nodes have a 'name' property. The following div -->
     <!-- provides the necessary field.                                       -->
     <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-topic"><i class="icon-tag"></i> Topic</label>
+        <label for="node-input-topic"><i class="fa fa-tag"></i> Topic</label>
         <input type="text" id="node-input-topic" >
     </div>
     <div class="form-row">
-        <label for="node-input-uuid"><i class="icon-tag"></i> UUID</label>
+        <label for="node-input-uuid"><i class="fa fa-tag"></i> UUID</label>
         <input type="text" id="node-input-uuid" >
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Temperature</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Temperature</label>
         <input type="checkbox" id="node-input-temperature" placeholder="">
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Humidity</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Humidity</label>
         <input type="checkbox" id="node-input-humidity" >
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Pressure</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Pressure</label>
         <input type="checkbox" id="node-input-pressure" >
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Magnetometer</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Magnetometer</label>
         <input type="checkbox" id="node-input-magnetometer" >
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Accelerometer</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Accelerometer</label>
         <input type="checkbox" id="node-input-accelerometer" >
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Gyroscope</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Gyroscope</label>
         <input type="checkbox" id="node-input-gyroscope" >
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Keys</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Keys</label>
         <input type="checkbox" id="node-input-keys" >
     </div>
 </script>
diff --git a/hardware/wemo/60-wemo.html b/hardware/wemo/60-wemo.html
index b282ea73..b75c3ab1 100644
--- a/hardware/wemo/60-wemo.html
+++ b/hardware/wemo/60-wemo.html
@@ -16,11 +16,11 @@
 
 <script type="text/x-red" data-template-name="wemo out">
     <div class="form-row">
-        <label for="node-input-ipaddr"><i class="icon-globe"></i> IP Address</label>
+        <label for="node-input-ipaddr"><i class="fa fa-globe"></i> IP Address</label>
         <input type="text" id="node-input-ipaddr" placeholder="192.168.1.100">
     </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">Expects a msg.payload with either 1/0, on/off, or true/false</div>
@@ -54,11 +54,11 @@
 
 <script type="text/x-red" data-template-name="wemo in">
     <div class="form-row">
-        <label for="node-input-ipaddr"><i class="icon-globe"></i> IP Address</label>
+        <label for="node-input-ipaddr"><i class="fa fa-globe"></i> IP Address</label>
         <input type="text" id="node-input-ipaddr" placeholder="192.168.1.100">
     </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">Creates a msg.payload with either 1, 0, nc or na.</div>
diff --git a/io/emoncms/88-emoncms.html b/io/emoncms/88-emoncms.html
index 22cd2e27..1d37ee4e 100644
--- a/io/emoncms/88-emoncms.html
+++ b/io/emoncms/88-emoncms.html
@@ -16,15 +16,15 @@
 
 <script type="text/x-red" data-template-name="emoncms">
     <div class="form-row">
-        <label for="node-input-emonServer"><i class="icon-globe"></i> Emoncms server</label>
+        <label for="node-input-emonServer"><i class="fa fa-globe"></i> Emoncms server</label>
         <input type="text" id="node-input-emonServer">
     </div>
     <div class="form-row">
-        <label for="node-input-nodegroup"><i class="icon-tag"></i> Node</label>
+        <label for="node-input-nodegroup"><i class="fa fa-tag"></i> Node</label>
         <input type="text" id="node-input-nodegroup" 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="Emoncms">
     </div>
 </script>
@@ -60,15 +60,15 @@
 
 <script type="text/x-red" data-template-name="emoncms-server">
     <div class="form-row">
-        <label for="node-config-input-server"><i class="icon-globe"></i> Base URL</label>
+        <label for="node-config-input-server"><i class="fa fa-globe"></i> Base URL</label>
         <input type="text" id="node-config-input-server">
     </div>
     <div class="form-row">
-        <label for="node-config-input-apikey"><i class="icon-tasks"></i> API key</label>
+        <label for="node-config-input-apikey"><i class="fa fa-tasks"></i> API key</label>
         <input type="text" id="node-config-input-apikey">
     </div>
     <div class="form-row">
-        <label for="node-config-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-config-input-name">
     </div>
 <div class="form-tips">The <b>Base URL</b> is the URL to the Emoncms root directory.</div>
diff --git a/io/ping/88-ping.html b/io/ping/88-ping.html
index 06e3028f..9c963eb0 100644
--- a/io/ping/88-ping.html
+++ b/io/ping/88-ping.html
@@ -16,15 +16,15 @@
 
 <script type="text/x-red" data-template-name="ping">
     <div class="form-row">
-        <label for="node-input-host"><i class="icon-tasks"></i> Target</label>
+        <label for="node-input-host"><i class="fa fa-tasks"></i> Target</label>
         <input type="text" id="node-input-host" placeholder="www.google.com">
     </div>
     <div class="form-row">
-        <label for="node-input-timer"><i class="icon-tasks"></i> Ping (S)</label>
+        <label for="node-input-timer"><i class="fa fa-tasks"></i> Ping (S)</label>
         <input type="text" id="node-input-timer" placeholder="20">
     </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/io/stomp/18-stomp.html b/io/stomp/18-stomp.html
index 86ba6337..8a99a143 100644
--- a/io/stomp/18-stomp.html
+++ b/io/stomp/18-stomp.html
@@ -16,15 +16,15 @@
 
 <script type="text/x-red" data-template-name="stomp in">
     <div class="form-row">
-        <label for="node-input-server" style="width: 110px;"><i class="icon-bookmark"></i> Server</label>
+        <label for="node-input-server" style="width: 110px;"><i class="fa fa-bookmark"></i> Server</label>
         <input type="text" id="node-input-server">
     </div>
     <div class="form-row">
-        <label for="node-input-topic" style="width: 110px;"><i class="icon-envelope"></i> Destination</label>
+        <label for="node-input-topic" style="width: 110px;"><i class="fa fa-envelope"></i> Destination</label>
         <input type="text" id="node-input-topic" placeholder="topic or queue">
     </div>
     <div class="form-row">
-        <label for="node-input-name" style="width: 110px;"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name" style="width: 110px;"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
 </script>
@@ -56,15 +56,15 @@
 
 <script type="text/x-red" data-template-name="stomp out">
     <div class="form-row">
-        <label for="node-input-server" style="width: 110px;"><i class="icon-bookmark"></i> Server</label>
+        <label for="node-input-server" style="width: 110px;"><i class="fa fa-bookmark"></i> Server</label>
         <input type="text" id="node-input-server">
     </div>
     <div class="form-row">
-        <label for="node-input-topic" style="width: 110px;"><i class="icon-envelope"></i> Destination</label>
+        <label for="node-input-topic" style="width: 110px;"><i class="fa fa-envelope"></i> Destination</label>
         <input type="text" id="node-input-topic" placeholder="topic or queue">
     </div>
     <div class="form-row">
-        <label for="node-input-name" style="width: 110px;"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name" style="width: 110px;"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-tips">The <b>Destination</b> field is optional. If not set uses the <b>msg.topic</b> property of the message.</div>
@@ -99,21 +99,21 @@
 
 <script type="text/x-red" data-template-name="stomp-server">
     <div class="form-row node-input-server">
-        <label for="node-config-input-server"><i class="icon-bookmark"></i> Server</label>
+        <label for="node-config-input-server"><i class="fa fa-bookmark"></i> Server</label>
         <input class="input-append-left" type="text" id="node-config-input-server" placeholder="localhost" style="width: 45%;" >
         <label for="node-config-input-port" style="margin-left: 10px; width: 35px; "> Port</label>
         <input type="text" id="node-config-input-port" placeholder="Port" style="width:45px">
     </div>
     <div class="form-row">
-        <label for="node-config-input-user"><i class="icon-user"></i> Username</label>
+        <label for="node-config-input-user"><i class="fa fa-user"></i> Username</label>
         <input type="text" id="node-config-input-user">
     </div>
     <div class="form-row">
-        <label for="node-config-input-pass"><i class="icon-lock"></i> Password</label>
+        <label for="node-config-input-pass"><i class="fa fa-lock"></i> Password</label>
         <input type="password" id="node-config-input-pass">
     </div>
     <div class="form-row">
-        <label for="node-config-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-config-input-name" placeholder="Name">
     </div>
 </script>
diff --git a/io/wol/39-wol.html b/io/wol/39-wol.html
index ffcdfb7b..27f3b7fe 100644
--- a/io/wol/39-wol.html
+++ b/io/wol/39-wol.html
@@ -16,11 +16,11 @@
 
 <script type="text/x-red" data-template-name="wake on lan">
     <div class="form-row">
-        <label for="node-input-mac"><i class="icon-globe"></i> MAC Address</label>
+        <label for="node-input-mac"><i class="fa fa-globe"></i> MAC Address</label>
         <input type="text" id="node-input-mac" placeholder="DE:AD:BE:EF:FE:ED">
     </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: leave blank if you want to use <b>msg.mac</b> to dynamically set target mac address.</div>
diff --git a/social/dweetio/55-dweetio.html b/social/dweetio/55-dweetio.html
index e9efe0b5..a70fd841 100644
--- a/social/dweetio/55-dweetio.html
+++ b/social/dweetio/55-dweetio.html
@@ -16,12 +16,12 @@
 
 <script type="text/x-red" data-template-name="dweetio out">
     <div class="form-row">
-        <label for="node-input-thing"><i class="icon-flag"></i> Thing</label>
+        <label for="node-input-thing"><i class="fa fa-flag"></i> Thing</label>
         <input type="text" id="node-input-thing" placeholder="my-globally-unique-device-id">
     </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>
@@ -57,12 +57,12 @@
 
 <script type="text/x-red" data-template-name="dweetio in">
     <div class="form-row">
-        <label for="node-input-thing"><i class="icon-flag"></i> Thing</label>
+        <label for="node-input-thing"><i class="fa fa-flag"></i> Thing</label>
         <input type="text" id="node-input-thing" placeholder="my-globally-unique-device-id">
     </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/social/music/69-mpd.html b/social/music/69-mpd.html
index b06bd5e7..bfa11854 100644
--- a/social/music/69-mpd.html
+++ b/social/music/69-mpd.html
@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="mpd out">
     <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">Expects a msg.payload with a valid mpc command.</div>
@@ -49,7 +49,7 @@
 
 <script type="text/x-red" data-template-name="mpd in">
     <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">Creates a msg.payload object with Artist, Album, Title, Genre and Date.</div>
diff --git a/social/nma/57-nma.html b/social/nma/57-nma.html
index c6f88d7b..1d2962fb 100644
--- a/social/nma/57-nma.html
+++ b/social/nma/57-nma.html
@@ -16,16 +16,16 @@
 
 <script type="text/x-red" data-template-name="nma">
     <div class="form-row">
-        <label for="node-input-title"><i class="icon-flag"></i> Title</label>
+        <label for="node-input-title"><i class="fa fa-flag"></i> Title</label>
         <input type="text" id="node-input-title" placeholder="Node-RED">
     </div>
     <div class="form-row">
-        <label for="node-config-input-pushkey"><i class="icon-lock"></i> API Key</label>
+        <label for="node-config-input-pushkey"><i class="fa fa-lock"></i> API Key</label>
         <input type="password" id="node-config-input-pushkey">
     </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/social/notify/57-notify.html b/social/notify/57-notify.html
index fa820d31..96859100 100644
--- a/social/notify/57-notify.html
+++ b/social/notify/57-notify.html
@@ -16,11 +16,11 @@
 
 <script type="text/x-red" data-template-name="notify">
     <div class="form-row">
-        <label for="node-input-title"><i class="icon-flag"></i> Title</label>
+        <label for="node-input-title"><i class="fa fa-flag"></i> Title</label>
         <input type="text" id="node-input-title" placeholder="Node-RED">
     </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/social/prowl/57-prowl.html b/social/prowl/57-prowl.html
index 8c9229ff..8e48d415 100644
--- a/social/prowl/57-prowl.html
+++ b/social/prowl/57-prowl.html
@@ -16,20 +16,20 @@
 
 <script type="text/x-red" data-template-name="prowl">
     <div class="form-row">
-        <label for="node-input-title"><i class="icon-tag"></i> Title</label>
+        <label for="node-input-title"><i class="fa fa-tag"></i> Title</label>
         <input type="text" id="node-input-title" placeholder="Node-RED">
     </div>
     <div class="form-row">
-        <label for="node-input-priority"><i class="icon-tag"></i> Priority</label>
+        <label for="node-input-priority"><i class="fa fa-tag"></i> Priority</label>
         <input type="text" id="node-input-priority" placeholder="0">
     </div>
     <div class="form-row">
-        <label for="node-config-input-pushkey"><i class="icon-lock"></i> API Key</label>
+        <label for="node-config-input-pushkey"><i class="fa fa-lock"></i> API Key</label>
         <input type="password" id="node-config-input-pushkey">
     </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"><b>Note:</b> Using credentials from global pushkey.js file.</div>
diff --git a/social/pushbullet/57-pushbullet.html b/social/pushbullet/57-pushbullet.html
index 1689349f..37a21943 100644
--- a/social/pushbullet/57-pushbullet.html
+++ b/social/pushbullet/57-pushbullet.html
@@ -16,20 +16,20 @@
 
 <script type="text/x-red" data-template-name="pushbullet">
     <div class="form-row">
-        <label for="node-input-title"><i class="icon-flag"></i> Title</label>
+        <label for="node-input-title"><i class="fa fa-flag"></i> Title</label>
         <input type="text" id="node-input-title" placeholder="Node-RED">
     </div>
     <div class="form-row">
-        <label for="node-config-input-deviceid"><i class="icon-user"></i> Device ID</label>
+        <label for="node-config-input-deviceid"><i class="fa fa-user"></i> Device ID</label>
         <input type="text" id="node-config-input-deviceid">
     </div>
     <div class="form-row">
-        <label for="node-config-input-pushkey"><i class="icon-lock"></i> API Key</label>
+        <label for="node-config-input-pushkey"><i class="fa fa-lock"></i> API Key</label>
         <input type="password" id="node-config-input-pushkey">
     </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"><b>Note:</b> Using credentials from global pushkey.js file.</div>
diff --git a/social/pusher/114-pusher.html b/social/pusher/114-pusher.html
index 17e8297c..086a681d 100644
--- a/social/pusher/114-pusher.html
+++ b/social/pusher/114-pusher.html
@@ -18,20 +18,20 @@
 
 <script type="text/x-red" data-template-name="pusher in">
   <div class="form-row">
-     <label for="node-input-channel"><i class="icon-random"></i> Channel</label>
+     <label for="node-input-channel"><i class="fa fa-random"></i> Channel</label>
      <input type="text" id="node-input-channel" placeholder="my_channel">
   </div>
   <div class="form-row">
-     <label for="node-input-eventname"><i class="icon-tasks"></i> Event</label>
+     <label for="node-input-eventname"><i class="fa fa-tasks"></i> Event</label>
      <input type="text" id="node-input-eventname" placeholder="test_event_name">
   </div>
   <div class="form-row">
-     <label for="node-input-appkey_sub"><i class="icon-lock"></i> App Key</label>
+     <label for="node-input-appkey_sub"><i class="fa fa-lock"></i> App Key</label>
      <input type="text" id="node-input-appkey_sub" placeholder="key">
   </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>
@@ -90,32 +90,32 @@
 
 <script type="text/x-red" data-template-name="pusher out">
   <div class="form-row">
-     <label for="node-input-channel"><i class="icon-random"></i> Channel</label>
+     <label for="node-input-channel"><i class="fa fa-random"></i> Channel</label>
      <input type="text" id="node-input-channel" placeholder="my_channel">
   </div>
 
   <div class="form-row">
-     <label for="node-input-eventname"><i class="icon-tasks"></i> Event</label>
+     <label for="node-input-eventname"><i class="fa fa-tasks"></i> Event</label>
      <input type="text" id="node-input-eventname" placeholder="test_event_name">
   </div>
 
   <div class="form-row">
-     <label for="node-input-appid"><i class="icon-tag"></i> App ID</label>
+     <label for="node-input-appid"><i class="fa fa-tag"></i> App ID</label>
      <input type="text" id="node-input-appid" placeholder="app_id">
   </div>
 
   <div class="form-row">
-     <label for="node-input-appkey"><i class="icon-lock"></i> App Key</label>
+     <label for="node-input-appkey"><i class="fa fa-lock"></i> App Key</label>
      <input type="text" id="node-input-appkey" placeholder="key">
   </div>
 
   <div class="form-row">
-     <label for="node-input-topic"><i class="icon-asterisk"></i> App Secret</label>
+     <label for="node-input-topic"><i class="fa fa-asterisk"></i> App Secret</label>
      <input type="password" id="node-input-appsecret" placeholder="secret">
   </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/social/pushover/57-pushover.html b/social/pushover/57-pushover.html
index aa020122..0f575899 100644
--- a/social/pushover/57-pushover.html
+++ b/social/pushover/57-pushover.html
@@ -16,24 +16,24 @@
 
 <script type="text/x-red" data-template-name="pushover">
     <div class="form-row">
-        <label for="node-input-title"><i class="icon-flag"></i> Title</label>
+        <label for="node-input-title"><i class="fa fa-flag"></i> Title</label>
         <input type="text" id="node-input-title" placeholder="Node-RED">
     </div>
     <div class="form-row">
-        <label for="node-input-priority"><i class="icon-bell"></i> Priority</label>
+        <label for="node-input-priority"><i class="fa fa-bell"></i> Priority</label>
         <input type="text" id="node-input-priority" placeholder="0" style="width:50px;">
     </div>
     <div class="form-row">
-        <label for="node-config-input-deviceid"><i class="icon-user"></i> User key</label>
+        <label for="node-config-input-deviceid"><i class="fa fa-user"></i> User key</label>
         <input type="text" id="node-config-input-deviceid">
     </div>
     <div class="form-row">
-        <label for="node-config-input-pushkey"><i class="icon-lock"></i> API token</label>
+        <label for="node-config-input-pushkey"><i class="fa fa-lock"></i> API token</label>
         <input type="password" id="node-config-input-pushkey">
     </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: Leave title blank to set using <b>msg.topic</b> and <b>msg.priority</b>.<br/>
diff --git a/social/snapchat/79-snapchat.html b/social/snapchat/79-snapchat.html
index f1fb9a74..62ba94a9 100644
--- a/social/snapchat/79-snapchat.html
+++ b/social/snapchat/79-snapchat.html
@@ -1,12 +1,12 @@
 <script type="text/x-red" data-template-name="Snap Chat">
     <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-account"><i class="icon-tasks"></i> Account</label>
+        <label for="node-input-account"><i class="fa fa-tasks"></i> Account</label>
         <input type="text" id="node-input-account">
     </div> <div class="form-row">
-        <label for="node-input-path"><i class="icon-tag"></i> Save Path</label>
+        <label for="node-input-path"><i class="fa fa-tag"></i> Save Path</label>
         <input type="text" id="node-input-path" placeholder="./snapchat_images"> </div> </script>
  <script type="text/x-red" data-help-name="Snap Chat">
     <p>Downloads SnapChat images from the account specified to the path specified. <b>msg.payload</b> contains the count of images downloaded. <b>msg.snaps</b>
@@ -32,11 +32,11 @@ contains information on the snap downloaded such as path, sent from and id of th
     });
 </script> <script type="text/x-red" data-template-name="snapchat-account">
     <div class="form-row">
-        <label for="node-config-input-username"><i class="icon-tasks"></i> Username</label>
+        <label for="node-config-input-username"><i class="fa fa-tasks"></i> Username</label>
         <input type="text" id="node-config-input-username" placeholder="billy-bob">
     </div>
     <div class="form-row">
-        <label for="node-config-input-password"><i class="icon-tasks"></i> Password</label>
+        <label for="node-config-input-password"><i class="fa fa-tasks"></i> Password</label>
         <input type="password" id="node-config-input-password" placeholder="">
     </div> </script>
 <script type="text/javascript">
diff --git a/social/twilio/56-twilio.html b/social/twilio/56-twilio.html
index ec9f84ef..97f18f6a 100644
--- a/social/twilio/56-twilio.html
+++ b/social/twilio/56-twilio.html
@@ -17,22 +17,22 @@
 
 <script type="text/x-red" data-template-name="twilio out">
     <div class="form-row" id="node-input-credentials-row">
-        <label for="node-input-creds"><i class="icon-folder-close"></i> Credentials</label>
+        <label for="node-input-creds"><i class="fa fa-folder"></i> Credentials</label>
         <select id="node-input-creds">
             <option value="global">Use global credentials</option>
             <option value="local">Use local credentials</option>
         </select>
     </div>
     <div class="form-row" id="node-input-twilio-row">
-        <label for="node-input-twilio"><i class="icon-user"></i> Twilio</label>
+        <label for="node-input-twilio"><i class="fa fa-user"></i> Twilio</label>
         <input type="text" id="node-input-twilio">
     </div>
     <div class="form-row">
-        <label for="node-input-number"><i class="icon-envelope"></i> SMS to</label>
+        <label for="node-input-number"><i class="fa fa-envelope"></i> SMS to</label>
         <input type="text" id="node-input-number" placeholder="01234 5678901">
     </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>
@@ -56,15 +56,15 @@
         <input type="text" id="node-config-input-sid">
     </div>
     <div class="form-row">
-        <label for="node-config-input-from"><i class="icon-envelope"></i> From</label>
+        <label for="node-config-input-from"><i class="fa fa-envelope"></i> From</label>
         <input type="text" id="node-config-input-from" placeholder="01234 5678901">
     </div>
     <div class="form-row">
-        <label for="node-config-input-token"><i class="icon-lock"></i> Token</label>
+        <label for="node-config-input-token"><i class="fa fa-lock"></i> Token</label>
         <input type="password" id="node-config-input-token">
     </div>
     <div class="form-row">
-        <label for="node-config-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-config-input-name" placeholder="Name">
     </div>
 </script>
diff --git a/social/xmpp/92-xmpp.html b/social/xmpp/92-xmpp.html
index 0c0bb387..5b9b8c9c 100644
--- a/social/xmpp/92-xmpp.html
+++ b/social/xmpp/92-xmpp.html
@@ -16,11 +16,11 @@
 
 <script type="text/x-red" data-template-name="xmpp in">
     <div class="form-row">
-        <label for="node-input-server"><i class="icon-bookmark"></i> Server</label>
+        <label for="node-input-server"><i class="fa fa-bookmark"></i> Server</label>
         <input type="text" id="node-input-server">
     </div>
     <div class="form-row">
-        <label for="node-input-to"><i class="icon-envelope"></i> Buddy</label>
+        <label for="node-input-to"><i class="fa fa-envelope"></i> Buddy</label>
         <input type="text" id="node-input-to" placeholder="joe@gmail.com">
     </div>
     <div class="form-row">
@@ -29,7 +29,7 @@
         <label for="node-input-join" style="width: 70%;">Is a Chat Room ?</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>
 </script>
@@ -65,7 +65,7 @@
 
 <script type="text/x-red" data-template-name="xmpp out">
     <div class="form-row">
-        <label for="node-input-server"><i class="icon-bookmark"></i> Server</label>
+        <label for="node-input-server"><i class="fa fa-bookmark"></i> Server</label>
         <input type="text" id="node-input-server">
     </div>
     <div class="form-row">
@@ -74,7 +74,7 @@
         <label for="node-input-sendObject" style="width: 70%;">Send complete msg object ?</label>
     </div>
     <div class="form-row">
-        <label for="node-input-to"><i class="icon-envelope"></i> To</label>
+        <label for="node-input-to"><i class="fa fa-envelope"></i> To</label>
         <input type="text" id="node-input-to" placeholder="joe@gmail.com">
     </div>
     <div class="form-row">
@@ -83,7 +83,7 @@
         <label for="node-input-join" style="width: 70%;">Is a Chat Room ?</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">The <b>To</b> field is optional. If not set uses the <b>msg.topic</b> property of the message.</div>
@@ -123,21 +123,21 @@
 
 <script type="text/x-red" data-template-name="xmpp-server">
     <div class="form-row node-input-server">
-        <label for="node-config-input-server"><i class="icon-bookmark"></i> Server</label>
+        <label for="node-config-input-server"><i class="fa fa-bookmark"></i> Server</label>
         <input class="input-append-left" type="text" id="node-config-input-server" placeholder="localhost" style="width: 40%;" >
         <label for="node-config-input-port" style="margin-left: 10px; width: 35px; "> Port</label>
         <input type="text" id="node-config-input-port" placeholder="Port" style="width:45px">
     </div>
     <div class="form-row">
-        <label for="node-config-input-nickname"><i class="icon-user"></i> Nickname</label>
+        <label for="node-config-input-nickname"><i class="fa fa-user"></i> Nickname</label>
         <input type="text" id="node-config-input-nickname" placeholder="Joe">
     </div>
     <div class="form-row">
-        <label for="node-config-input-user"><i class="icon-user"></i> Username</label>
+        <label for="node-config-input-user"><i class="fa fa-user"></i> Username</label>
         <input type="text" id="node-config-input-user">
     </div>
     <div class="form-row">
-        <label for="node-config-input-pass"><i class="icon-lock"></i> Password</label>
+        <label for="node-config-input-pass"><i class="fa fa-lock"></i> Password</label>
         <input type="password" id="node-config-input-pass">
     </div>
     <div class="form-tips" id="node-config-cred-tip"><b>Note:</b> Using credentials from global xmppkey.js file.</div>
diff --git a/storage/ddb/69-ddbout.html b/storage/ddb/69-ddbout.html
index 3f0859bd..e8db2edd 100644
--- a/storage/ddb/69-ddbout.html
+++ b/storage/ddb/69-ddbout.html
@@ -16,19 +16,19 @@
 
 <script type="text/x-red" data-template-name="ddb out">
     <div class="form-row">
-        <label for="node-input-credentials"><i class="icon-tag"></i> Credentials</label>
+        <label for="node-input-credentials"><i class="fa fa-tag"></i> Credentials</label>
         <input type="text" id="node-input-credentials">
     </div>
     <div class="form-row">
-        <label for="node-input-region"><i class="icon-th"></i> Region</label>
+        <label for="node-input-region"><i class="fa fa-th"></i> Region</label>
         <input type="text" id="node-input-region">
     </div>
     <div class="form-row">
-        <label for="node-input-table"><i class="icon-tasks"></i> Table</label>
+        <label for="node-input-table"><i class="fa fa-tasks"></i> Table</label>
         <input type="text" id="node-input-table" placeholder="Table">
     </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/storage/ddb/aws.html b/storage/ddb/aws.html
index 5c26c904..8d6aeb87 100644
--- a/storage/ddb/aws.html
+++ b/storage/ddb/aws.html
@@ -16,11 +16,11 @@
 
 <script type="text/x-red" data-template-name="aws credentials">
     <div class="form-row">
-        <label for="node-config-input-accessKey"><i class="icon-briefcase"></i> Access Key</label>
+        <label for="node-config-input-accessKey"><i class="fa fa-briefcase"></i> Access Key</label>
         <input type="text" id="node-config-input-accessKey" placeholder="Access Key">
     </div>
     <div class="form-row">
-        <label for="node-config-input-secretAccessKey"><i class="icon-briefcase"></i> Secret Access Key</label>
+        <label for="node-config-input-secretAccessKey"><i class="fa fa-briefcase"></i> Secret Access Key</label>
         <input type="text" id="node-config-input-secretAccessKey" placeholder="Secret Access Key">
     </div>
 </script>
diff --git a/storage/leveldb/67-leveldb.html b/storage/leveldb/67-leveldb.html
index 72ead707..e889a15a 100644
--- a/storage/leveldb/67-leveldb.html
+++ b/storage/leveldb/67-leveldb.html
@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="leveldbase">
     <div class="form-row">
-        <label for="node-config-input-db"><i class="icon-briefcase"></i> Database</label>
+        <label for="node-config-input-db"><i class="fa fa-briefcase"></i> Database</label>
         <input type="text" id="node-config-input-db" placeholder="database path/name">
     </div>
 </script>
@@ -35,11 +35,11 @@
 
 <script type="text/x-red" data-template-name="leveldb in">
     <div class="form-row node-input-level">
-        <label for="node-input-level"><i class="icon-briefcase"></i> Database</label>
+        <label for="node-input-level"><i class="fa fa-briefcase"></i> Database</label>
         <input type="text" id="node-input-level">
     </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>
@@ -75,18 +75,18 @@
 
 <script type="text/x-red" data-template-name="leveldb out">
     <div class="form-row node-input-level">
-        <label for="node-input-level"><i class="icon-briefcase"></i> Database</label>
+        <label for="node-input-level"><i class="fa fa-briefcase"></i> Database</label>
         <input type="text" id="node-input-level">
     </div>
     <div class="form-row">
-        <label for="node-input-operation"><i class="icon-wrench"></i> Operation</label>
+        <label for="node-input-operation"><i class="fa fa-wrench"></i> Operation</label>
         <select type="text" id="node-input-operation" style="display: inline-block; vertical-align: top;">
             <option value="store">Store</option>
             <option value="delete">Delete</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>
diff --git a/storage/postgres/110-postgres.html b/storage/postgres/110-postgres.html
index 6fae6ac1..399a574d 100644
--- a/storage/postgres/110-postgres.html
+++ b/storage/postgres/110-postgres.html
@@ -16,19 +16,19 @@
 
 <script type="text/x-red" data-template-name="postgresdb">
     <div class="form-row">
-        <label for="node-config-input-hostname"><i class="icon-bookmark"></i> Host</label>
+        <label for="node-config-input-hostname"><i class="fa fa-bookmark"></i> Host</label>
         <input class="input-append-left" type="text" id="node-config-input-hostname" placeholder="localhost" style="width: 40%;" >
         <label for="node-config-input-port" style="margin-left: 10px; width: 35px; "> Port</label>
         <input type="text" id="node-config-input-port" placeholder="5432" style="width:45px">
     </div>
     <div class="form-row">
-        <label for="node-config-input-db"><i class="icon-briefcase"></i> Database</label>
+        <label for="node-config-input-db"><i class="fa fa-briefcase"></i> Database</label>
         <input type="text" id="node-config-input-db" placeholder="test">
     </div>
     <div class="form-row">
-        <label for="node-config-input-name"><i class="icon-user"></i> Username</label>
+        <label for="node-config-input-name"><i class="fa fa-user"></i> Username</label>
         <input type="text" id="node-config-input-user" placeholder="postgres">
-        <label for="node-config-input-password"><i class="icon-lock"></i> Password</label>
+        <label for="node-config-input-password"><i class="fa fa-lock"></i> Password</label>
         <input type="password" id="node-config-input-password" placeholder="postgres">
     </div>
 </script>
@@ -86,11 +86,11 @@
 
 <script type="text/x-red" data-template-name="postgres">
 	 <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-postgresdb"><i class="icon-tag"></i> Server</label>
+        <label for="node-input-postgresdb"><i class="fa fa-tag"></i> Server</label>
         <input type="text" id="node-input-postgresdb">
     </div>
     <div class="form-row">
diff --git a/storage/sqlite/nodes/sqlite.html b/storage/sqlite/nodes/sqlite.html
index a928ce0b..f5b5cae8 100644
--- a/storage/sqlite/nodes/sqlite.html
+++ b/storage/sqlite/nodes/sqlite.html
@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="sqlitedb">
     <div class="form-row">
-        <label for="node-config-input-db"><i class="icon-briefcase"></i> Database</label>
+        <label for="node-config-input-db"><i class="fa fa-briefcase"></i> Database</label>
         <input type="text" id="node-config-input-db" placeholder="/tmp/sqlite">
     </div>
 </script>
@@ -36,11 +36,11 @@
 
 <script type="text/x-red" data-template-name="sqlite">
     <div class="form-row">
-        <label for="node-input-mydb"><i class="icon-briefcase"></i> Database</label>
+        <label for="node-input-mydb"><i class="fa fa-briefcase"></i> Database</label>
         <input type="text" id="node-input-mydb">
     </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>