diff --git a/src/js/main.js b/src/js/main.js
index 7345da0..09bd109 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -258,6 +258,12 @@ $(function() {
 
   $inputMessage.on('input', function() {
     updateTyping();
+    var message = $(this).val().trim();
+    if (message.length) {
+      $('#send-message-btn').addClass('active');
+    } else {
+      $('#send-message-btn').removeClass('active');
+    }
   });
 
   // Focus input when clicking on the message input's border
@@ -481,6 +487,12 @@ $(function() {
 
   $('#settings-modal').on('hide.bs.modal', function (e) {
     cancelSaveKey();
-  });  
+  });
+
+  $('#send-message-btn').click(function() {
+    sendMessage();
+    socket.emit('stop typing');
+    typing = false;
+  });
 
 });
diff --git a/src/public/style.css b/src/public/style.css
index 45aab39..294a01a 100644
--- a/src/public/style.css
+++ b/src/public/style.css
@@ -167,6 +167,27 @@ input {
   border-radius: 0px;
 }
 
+.chat #input-icons {
+  position: absolute;
+  bottom: 0px;
+  right: 0px;
+  padding: 15px;
+  cursor: pointer;
+}
+
+html.no-touchevents .chat #input-icons {
+  display: none;
+}
+
+.chat #input-icons #send-message-btn {
+  font-size: 25px;
+  opacity: 0.3;
+}
+
+.chat #input-icons #send-message-btn.active {
+  opacity: 1.0;
+}
+
 .participants {
   position: relative;
   top: 16px;
diff --git a/src/public/vendor/modernizr-custom.min.js b/src/public/vendor/modernizr-custom.min.js
new file mode 100644
index 0000000..f9ef34a
--- /dev/null
+++ b/src/public/vendor/modernizr-custom.min.js
@@ -0,0 +1,3 @@
+/*! modernizr 3.3.0 (Custom Build) | MIT *
+ * http://modernizr.com/download/?-touchevents-setclasses !*/
+!function(e,n,t){function o(e,n){return typeof e===n}function s(){var e,n,t,s,a,i,r;for(var l in c)if(c.hasOwnProperty(l)){if(e=[],n=c[l],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length))for(t=0;t<n.options.aliases.length;t++)e.push(n.options.aliases[t].toLowerCase());for(s=o(n.fn,"function")?n.fn():n.fn,a=0;a<e.length;a++)i=e[a],r=i.split("."),1===r.length?Modernizr[r[0]]=s:(!Modernizr[r[0]]||Modernizr[r[0]]instanceof Boolean||(Modernizr[r[0]]=new Boolean(Modernizr[r[0]])),Modernizr[r[0]][r[1]]=s),f.push((s?"":"no-")+r.join("-"))}}function a(e){var n=u.className,t=Modernizr._config.classPrefix||"";if(p&&(n=n.baseVal),Modernizr._config.enableJSClass){var o=new RegExp("(^|\\s)"+t+"no-js(\\s|$)");n=n.replace(o,"$1"+t+"js$2")}Modernizr._config.enableClasses&&(n+=" "+t+e.join(" "+t),p?u.className.baseVal=n:u.className=n)}function i(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):p?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function r(){var e=n.body;return e||(e=i(p?"svg":"body"),e.fake=!0),e}function l(e,t,o,s){var a,l,f,c,d="modernizr",p=i("div"),h=r();if(parseInt(o,10))for(;o--;)f=i("div"),f.id=s?s[o]:d+(o+1),p.appendChild(f);return a=i("style"),a.type="text/css",a.id="s"+d,(h.fake?h:p).appendChild(a),h.appendChild(p),a.styleSheet?a.styleSheet.cssText=e:a.appendChild(n.createTextNode(e)),p.id=d,h.fake&&(h.style.background="",h.style.overflow="hidden",c=u.style.overflow,u.style.overflow="hidden",u.appendChild(h)),l=t(p,e),h.fake?(h.parentNode.removeChild(h),u.style.overflow=c,u.offsetHeight):p.parentNode.removeChild(p),!!l}var f=[],c=[],d={_version:"3.3.0",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){c.push({name:e,fn:n,options:t})},addAsyncTest:function(e){c.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=d,Modernizr=new Modernizr;var u=n.documentElement,p="svg"===u.nodeName.toLowerCase(),h=d._config.usePrefixes?" -webkit- -moz- -o- -ms- ".split(" "):[];d._prefixes=h;var m=d.testStyles=l;Modernizr.addTest("touchevents",function(){var t;if("ontouchstart"in e||e.DocumentTouch&&n instanceof DocumentTouch)t=!0;else{var o=["@media (",h.join("touch-enabled),("),"heartz",")","{#modernizr{top:9px;position:absolute}}"].join("");m(o,function(e){t=9===e.offsetTop})}return t}),s(),a(f),delete d.addTest,delete d.addAsyncTest;for(var v=0;v<Modernizr._q.length;v++)Modernizr._q[v]();e.Modernizr=Modernizr}(window,document);
\ No newline at end of file
diff --git a/src/views/index.mustache b/src/views/index.mustache
index 35bdbc0..c9a0740 100644
--- a/src/views/index.mustache
+++ b/src/views/index.mustache
@@ -53,6 +53,9 @@
         </ul>
       </div>
       <input class="inputMessage" placeholder="Type here..."/>
+      <div id="input-icons">
+        <span class="glyphicon glyphicon-send" id="send-message-btn" aria-hidden="true"></span>
+      </div>
     </li>
   </ul>
 
@@ -171,6 +174,7 @@
   <script type="text/javascript" src="vendor/jquery.noty.packaged.min.js"></script>
   <script type="text/javascript" src="vendor/autolinker.min.js"></script>
   <script type="text/javascript" src="vendor/underscore.min.js"></script>
+  <script type="text/javascript" src="vendor/modernizr-custom.min.js"></script>
   <script src="/main.js"></script>
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){