diff --git a/public/js/vroom.js b/public/js/vroom.js
index cf386af..cf6a2f3 100644
--- a/public/js/vroom.js
+++ b/public/js/vroom.js
@@ -1783,7 +1783,7 @@ function initVroom(room) {
   });
 
   // Handle hangup/close window
-  $('#logoutButton').click(function(){
+  $('.btn-logout').click(function(){
     $('#quitModal').modal('show');
     if (!$('#muteMicButton').is(':checked')){
       muteMic();
@@ -1795,7 +1795,7 @@ function initVroom(room) {
   // Remove the active class on the logout button if
   // the modal is closed
   $('#quitModal').on('hide.bs.modal',function(){
-    $('#logoutButton').removeClass('active');
+    $('.btn-logout').removeClass('active');
     if (!$('#muteMicButton').is(':checked')){
       unmuteMic();
     }
diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep
index 2f5f7a0..1bee3b6 100644
--- a/templates/default/join.html.ep
+++ b/templates/default/join.html.ep
@@ -3,8 +3,18 @@
   <div class="container-fluid">
     <nav id="toolbar" class="navbar navbar-default" role="toolbar">
       <div class="navbar-header">
-        <div id="timeCounterXs" class="btn btn-default navbar-btn disabled hidden-sm hidden-md hidden-lg col-xs-offset-1">
-          00:00
+        <div class="btn-group visible-xs-block col-xs-offset-1">
+          <div class="btn btn-default navbar-btn disabled">
+            <span class="glyphicon glyphicon glyphicon-hourglass">
+            </span>
+          </div>
+          <div id="timeCounter" class="btn btn-default navbar-btn disabled">
+            00:00
+          </div>
+          <button class="btn btn-default help btn-logout navbar-btn" data-toggle="tooltip" data-placement="bottom" title="<%=l 'LOGOUT' %>">
+            <span class="glyphicon glyphicon-log-out">
+            </span>
+          </button>
         </div>
         <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#roomToolBar">
           <span class="sr-only">
@@ -121,10 +131,16 @@
               <span class="glyphicon glyphicon-question-sign">
               </span>
             </button>
-            <div id="timeCounter" class="btn btn-default disabled hidden-xs">
+          </div>
+          <div class="btn-group hidden-xs">
+            <div class="btn btn-default disabled">
+              <span class="glyphicon glyphicon glyphicon-hourglass">
+              </span>
+            </div>
+            <div id="timeCounter" class="btn btn-default disabled">
               00:00
             </div>
-            <button class="btn btn-default help" id="logoutButton" data-toggle="tooltip" data-placement="bottom" title="<%=l 'LOGOUT' %>">
+            <button class="btn btn-default help btn-logout" data-toggle="tooltip" data-placement="bottom" title="<%=l 'LOGOUT' %>">
               <span class="glyphicon glyphicon-log-out">
               </span>
             </button>