diff --git a/index.html b/index.html
index a0aecb188..b4422f31b 100644
--- a/index.html
+++ b/index.html
@@ -22,7 +22,7 @@
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
     <script src="interface_config.js?v=5"></script>
-    <script src="libs/app.bundle.js?v=93"></script>
+    <script src="libs/app.bundle.js?v=94"></script>
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
     <link rel="stylesheet" href="css/font.css?v=7"/>
     <link rel="stylesheet" href="css/toastr.css?v=1">
diff --git a/libs/app.bundle.js b/libs/app.bundle.js
index 8a9f18cca..f14f88758 100644
--- a/libs/app.bundle.js
+++ b/libs/app.bundle.js
@@ -8399,10 +8399,10 @@ var VideoLayout = (function (my) {
         // current dominant, focused speaker or prezi playing or update it to
         // the current dominant speaker.
         if ((!focusedVideoResourceJid &&
-            !VideoLayout.getDominantSpeakerResourceJid() &&
+            !currentDominantSpeaker &&
             !require("../prezi/Prezi").isPresentationVisible()) ||
             (resourceJid &&
-                VideoLayout.getDominantSpeakerResourceJid() === resourceJid)) {
+                currentDominantSpeaker === resourceJid)) {
             LargeVideo.updateLargeVideo(resourceJid, true);
         }
     }
@@ -8519,26 +8519,6 @@ var VideoLayout = (function (my) {
         }
     };
 
-    /**
-     * Enables the dominant speaker UI.
-     *
-     * @param resourceJid the jid indicating the video element to
-     * activate/deactivate
-     * @param isEnable indicates if the dominant speaker should be enabled or
-     * disabled
-     */
-    my.enableDominantSpeaker = function(resourceJid, isEnable) {
-
-        if (resourceJid
-                === APP.xmpp.myResource()) {
-            localVideoThumbnail.enableDominantSpeaker(isEnable);
-        }
-        else {
-            remoteVideos[resourceJid].enableDominantSpeaker(isEnable);
-        }
-
-    };
-
     /**
      * Calculates the thumbnail size.
      *
@@ -8572,13 +8552,6 @@ var VideoLayout = (function (my) {
        return [availableWidth, availableHeight];
    };
 
-    /**
-     * Returns the current dominant speaker resource jid.
-     */
-    my.getDominantSpeakerResourceJid = function () {
-        return currentDominantSpeaker;
-    };
-
     /**
      * Returns the corresponding resource jid to the given peer container
      * DOM element.
@@ -8842,7 +8815,7 @@ var VideoLayout = (function (my) {
                     }
                     remoteVideos[resourceJid].waitForRemoteVideo(sel, mediaStream.ssrc, mediaStream.stream);
                 }
-            })
+            });
         }
 
         // The endpoint that was being shown in the large video has dropped out
@@ -8944,11 +8917,11 @@ var VideoLayout = (function (my) {
             console.info("Focused video owner has left the conference");
             focusedVideoResourceJid = null;
         }
-    }
+    };
     
     my.onVideoTypeChanged = function (jid) {
-        LargeVideo.onVideoTypeChanged();
-    }
+        LargeVideo.onVideoTypeChanged(jid);
+    };
 
     my.showMore = function (jid) {
         if(APP.xmpp.myJid = jid)
@@ -8960,11 +8933,11 @@ var VideoLayout = (function (my) {
             remoteVideos[Strophe.getResourceFromJid(jid)].connectionIndicator.showMore();
         }
 
-    }
+    };
 
     my.addPreziContainer = function (id) {
         return RemoteVideo.createContainer(id);
-    }
+    };
 
     my.setLargeVideoVisible = function (isVisible) {
         LargeVideo.setLargeVideoVisible(isVisible);
@@ -8976,7 +8949,7 @@ var VideoLayout = (function (my) {
             smallVideo.showAvatar();
             focusedVideoResourceJid = null;
         }
-    }
+    };
 
 
     /**
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index 2b9a8cd5d..8c70476e9 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -271,10 +271,10 @@ var VideoLayout = (function (my) {
         // current dominant, focused speaker or prezi playing or update it to
         // the current dominant speaker.
         if ((!focusedVideoResourceJid &&
-            !VideoLayout.getDominantSpeakerResourceJid() &&
+            !currentDominantSpeaker &&
             !require("../prezi/Prezi").isPresentationVisible()) ||
             (resourceJid &&
-                VideoLayout.getDominantSpeakerResourceJid() === resourceJid)) {
+                currentDominantSpeaker === resourceJid)) {
             LargeVideo.updateLargeVideo(resourceJid, true);
         }
     }
@@ -391,26 +391,6 @@ var VideoLayout = (function (my) {
         }
     };
 
-    /**
-     * Enables the dominant speaker UI.
-     *
-     * @param resourceJid the jid indicating the video element to
-     * activate/deactivate
-     * @param isEnable indicates if the dominant speaker should be enabled or
-     * disabled
-     */
-    my.enableDominantSpeaker = function(resourceJid, isEnable) {
-
-        if (resourceJid
-                === APP.xmpp.myResource()) {
-            localVideoThumbnail.enableDominantSpeaker(isEnable);
-        }
-        else {
-            remoteVideos[resourceJid].enableDominantSpeaker(isEnable);
-        }
-
-    };
-
     /**
      * Calculates the thumbnail size.
      *
@@ -444,13 +424,6 @@ var VideoLayout = (function (my) {
        return [availableWidth, availableHeight];
    };
 
-    /**
-     * Returns the current dominant speaker resource jid.
-     */
-    my.getDominantSpeakerResourceJid = function () {
-        return currentDominantSpeaker;
-    };
-
     /**
      * Returns the corresponding resource jid to the given peer container
      * DOM element.
@@ -714,7 +687,7 @@ var VideoLayout = (function (my) {
                     }
                     remoteVideos[resourceJid].waitForRemoteVideo(sel, mediaStream.ssrc, mediaStream.stream);
                 }
-            })
+            });
         }
 
         // The endpoint that was being shown in the large video has dropped out
@@ -816,11 +789,11 @@ var VideoLayout = (function (my) {
             console.info("Focused video owner has left the conference");
             focusedVideoResourceJid = null;
         }
-    }
+    };
     
     my.onVideoTypeChanged = function (jid) {
-        LargeVideo.onVideoTypeChanged();
-    }
+        LargeVideo.onVideoTypeChanged(jid);
+    };
 
     my.showMore = function (jid) {
         if(APP.xmpp.myJid = jid)
@@ -832,11 +805,11 @@ var VideoLayout = (function (my) {
             remoteVideos[Strophe.getResourceFromJid(jid)].connectionIndicator.showMore();
         }
 
-    }
+    };
 
     my.addPreziContainer = function (id) {
         return RemoteVideo.createContainer(id);
-    }
+    };
 
     my.setLargeVideoVisible = function (isVisible) {
         LargeVideo.setLargeVideoVisible(isVisible);
@@ -848,7 +821,7 @@ var VideoLayout = (function (my) {
             smallVideo.showAvatar();
             focusedVideoResourceJid = null;
         }
-    }
+    };
 
 
     /**