diff --git a/static/js/directives/page.js b/static/js/directives/page.js
index 763a5fad..946c212f 100644
--- a/static/js/directives/page.js
+++ b/static/js/directives/page.js
@@ -42,8 +42,12 @@ define(['text!partials/page.html', 'text!partials/page/welcome.html'], function(
 				scope.refresh();
 			});
 
+			scope.$watch("status", function(event) {
+				scope.refresh();
+			});
+
 			scope.refresh = function() {
-				if (scope.room) {
+				if (scope.room || scope.status !== "waiting") {
 					scope.page = null;
 				} else {
 					scope.page = "page/welcome.html";
diff --git a/static/partials/roombar.html b/static/partials/roombar.html
index af2a81c5..f65a9b97 100644
--- a/static/partials/roombar.html
+++ b/static/partials/roombar.html
@@ -1,5 +1,5 @@
 <div class="roombar form-horizontal" ng-class="{notvisible: hideRoomBar}">
-	<a class="roombarbutton" ng-model="hideRoomBar" btn-checkbox btn-checkbox-true="0" btn-checkbox-false="1" title="{{_('Change room')}}"><i class="fa fa-th"></i></a>
+	<a class="roombarbutton" ng-model="hideRoomBar" btn-checkbox btn-checkbox-true="0" btn-checkbox-false="1" title="{{_('Change room')}}"><i class="fa fa-th-list"></i></a>
 	<form name="roombarform" class="roombarcontent form-group">
 		<label class="pull-left control-label hidden-xs">{{_('Room')}}</label>
 		<div class="pull-left">