diff --git a/nodes/core/io/22-websocket.html b/nodes/core/io/22-websocket.html
index 7fdb3757f..d6daff2f8 100644
--- a/nodes/core/io/22-websocket.html
+++ b/nodes/core/io/22-websocket.html
@@ -17,11 +17,11 @@
 <!-- WebSocket Input Node -->
 <script type="text/x-red" data-template-name="websocket in">
     <div class="form-row">
-        <label for="node-input-server"><i class="icon-bookmark"></i> Path</label>
+        <label for="node-input-server"><i class="fa fa-bookmark"></i> Path</label>
         <input type="text" id="node-input-server">
     </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>
@@ -57,11 +57,11 @@
 <!-- WebSocket out Node -->
 <script type="text/x-red" data-template-name="websocket out">
     <div class="form-row">
-        <label for="node-input-server"><i class="icon-bookmark"></i> Path</label>
+        <label for="node-input-server"><i class="fa fa-bookmark"></i> Path</label>
         <input type="text" id="node-input-server">
     </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>
@@ -71,11 +71,11 @@
     <p>By default, <b>msg.payload</b> will be sent over the WebSocket. The listener
     can be configured to encode the entire message object as a JSON string and send that
     over the WebSocket.</p>
-    
+
     <p>If the message arriving at this node started at a WebSocket In node, the message
     will be sent back to the client that triggered the flow. Otherwise, the message
     will be broadcast to all connected clients.</p>
-    <p>If you want to broadcast a message that started at a WebSocket In node, you 
+    <p>If you want to broadcast a message that started at a WebSocket In node, you
     should delete the <b>msg._session</b> property within the flow</p>.
 </script>
 
@@ -104,7 +104,7 @@
 <!-- WebSocket Server configuration node -->
 <script type="text/x-red" data-template-name="websocket-listener">
     <div class="form-row">
-        <label for="node-config-input-path"><i class="icon-bookmark"></i> Path</label>
+        <label for="node-config-input-path"><i class="fa fa-bookmark"></i> Path</label>
         <input type="text" id="node-config-input-path" placeholder="/ws/example">
     </div>
     <div class="form-row">
diff --git a/nodes/core/io/22-websocket.js b/nodes/core/io/22-websocket.js
index bcdf5f0fd..6e26a1395 100644
--- a/nodes/core/io/22-websocket.js
+++ b/nodes/core/io/22-websocket.js
@@ -106,13 +106,13 @@ module.exports = function(RED) {
 
         for (var i = 0; i < this._inputNodes.length; i++) {
             this._inputNodes[i].send(msg);
-        };
+        }
     }
 
     WebSocketListenerNode.prototype.broadcast = function(data){
         for(var i in this.server.clients){
             this.server.clients[i].send(data);
-        };
+        }
     }
 
     WebSocketListenerNode.prototype.send = function(id,data){