diff --git a/nodes/core/io/10-mqtt.html b/nodes/core/io/10-mqtt.html
index 32c2c731a..a1fc9f545 100644
--- a/nodes/core/io/10-mqtt.html
+++ b/nodes/core/io/10-mqtt.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013 IBM Corp.
+  Copyright 2013,2014 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -16,15 +16,15 @@
 
 <script type="text/x-red" data-template-name="mqtt in">
     <div class="form-row">
-        <label for="node-input-broker"><i class="icon-tag"></i> Broker</label>
+        <label for="node-input-broker"><i class="fa fa-globe"></i> Broker</label>
         <input type="text" id="node-input-broker">
     </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>
@@ -58,15 +58,15 @@
 
 <script type="text/x-red" data-template-name="mqtt out">
     <div class="form-row">
-        <label for="node-input-broker"><i class="icon-tag"></i> Broker</label>
+        <label for="node-input-broker"><i class="fa fa-globe"></i> Broker</label>
         <input type="text" id="node-input-broker">
     </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>
@@ -101,21 +101,21 @@
 
 <script type="text/x-red" data-template-name="mqtt-broker">
     <div class="form-row node-input-broker">
-        <label for="node-config-input-broker"><i class="icon-bookmark"></i> Broker</label>
+        <label for="node-config-input-broker"><i class="fa fa-globe"></i> Broker</label>
         <input class="input-append-left" type="text" id="node-config-input-broker" 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-clientid"><i class="icon-tag"></i> Client ID</label>
+        <label for="node-config-input-clientid"><i class="fa fa-tag"></i> Client ID</label>
         <input type="text" id="node-config-input-clientid" placeholder="Leave blank for auto generated">
     </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-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">
     </div>
 </script>
diff --git a/nodes/core/io/10-mqtt.js b/nodes/core/io/10-mqtt.js
index 129f1a936..24b601520 100644
--- a/nodes/core/io/10-mqtt.js
+++ b/nodes/core/io/10-mqtt.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 IBM Corp.
+ * Copyright 2013,2014 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 module.exports = function(RED) {
     "use strict";
     var connectionPool = require("./lib/mqttConnectionPool");
-    var util = require("util");
 
     function MQTTBrokerNode(n) {
         RED.nodes.createNode(this,n);
@@ -62,55 +61,48 @@ module.exports = function(RED) {
         } else {
             this.error("missing broker configuration");
         }
+        this.on('close', function() {
+            if (this.client) {
+                this.client.disconnect();
+            }
+        });
     }
-
     RED.nodes.registerType("mqtt in",MQTTInNode);
 
-    MQTTInNode.prototype.close = function() {
-        if (this.client) {
-            this.client.disconnect();
-        }
-    }
-
-
     function MQTTOutNode(n) {
         RED.nodes.createNode(this,n);
 
         this.topic = n.topic;
         this.broker = n.broker;
-
         this.brokerConfig = RED.nodes.getNode(this.broker);
 
         if (this.brokerConfig) {
             this.status({fill:"red",shape:"ring",text:"disconnected"},true);
             this.client = connectionPool.get(this.brokerConfig.broker,this.brokerConfig.port,this.brokerConfig.clientid,this.brokerConfig.username,this.brokerConfig.password);
+            var node = this;
             this.on("input",function(msg) {
                 if (msg != null) {
-                    if (this.topic) {
-                        msg.topic = this.topic;
+                    if (node.topic) {
+                        msg.topic = node.topic;
                     }
                     this.client.publish(msg);
                 }
             });
-            var node = this;
             this.client.on("connectionlost",function() {
                 node.status({fill:"red",shape:"ring",text:"disconnected"});
             });
             this.client.on("connect",function() {
                 node.status({fill:"green",shape:"dot",text:"connected"});
             });
-
             this.client.connect();
         } else {
             this.error("missing broker configuration");
         }
+        this.on('close', function() {
+            if (this.client) {
+                this.client.disconnect();
+            }
+        });
     }
-
     RED.nodes.registerType("mqtt out",MQTTOutNode);
-
-    MQTTOutNode.prototype.close = function() {
-        if (this.client) {
-            this.client.disconnect();
-        }
-    }
 }