diff --git a/app.js b/app.js
index a8f114d0c..a00dfbda4 100644
--- a/app.js
+++ b/app.js
@@ -1119,13 +1119,12 @@ function scrollChatToBottom() {
 function toggleFullScreen() {    
     var fsElement = document.documentElement;
 
-    if (!document.mozFullScreen && !document.webkitFullScreen){
+    if (!document.mozFullScreen && !document.webkitIsFullScreen){
 
         //Enter Full Screen
         if (fsElement.mozRequestFullScreen) {
 
             fsElement.mozRequestFullScreen();
-
         } 
         else {
             fsElement.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT);
@@ -1138,6 +1137,7 @@ function toggleFullScreen() {
             document.mozCancelFullScreen();
         } else {
             document.webkitCancelFullScreen();
+            document.webkitCancelFullScreen();
         }
     }
 }
diff --git a/index.html b/index.html
index e7a9f36d4..2ed1979fc 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
     <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
     <script src="muc.js?v=4"></script><!-- simple MUC library -->
     <script src="estos_log.js?v=2"></script><!-- simple stanza logger -->
-    <script src="app.js?v=16"></script><!-- application logic -->
+    <script src="app.js?v=17"></script><!-- application logic -->
     <script src="smileys.js?v=1"></script><!-- smiley images -->
     <script src="replacement.js?v=5"></script><!-- link and smiley replacement -->
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
@@ -36,7 +36,7 @@
             <div class="header_button_separator"></div>
             <a class="button" onclick='openPreziDialog();'><i title="Share prezi" class="fa fa-desktop fa-lg"></i></a>
             <div class="header_button_separator"></div>
-            <a class="button" onclick='toggleFullScreen();'><i title="Enter / Exit Full Screen" class="icon-fullscreen"></i></a>
+            <a class="button" onclick='toggleFullScreen();'><i title="Enter / Exit Full Screen" class="fa fa-arrows-alt"></i></a>
             <!--span id="settingsButton">
                 <div class="header_button_separator"></div>
                 <a class="button" onclick='openSettingsDialog();'><i title="Settings" class="fa fa-cog fa-lg"></i></a>