diff --git a/interface_config.js b/interface_config.js
index 8187486e3..6eeaf1725 100644
--- a/interface_config.js
+++ b/interface_config.js
@@ -27,6 +27,7 @@ var interfaceConfig = {
     // screen, 'width' would fit the original video width to the width of the
     // screen respecting ratio.
     VIDEO_LAYOUT_FIT: 'both',
+    SHOW_CONTACTLIST_AVATARS: false,
     /**
      * Whether to only show the filmstrip (and hide the toolbar).
      */
diff --git a/modules/UI/side_pannels/contactlist/ContactList.js b/modules/UI/side_pannels/contactlist/ContactList.js
index a1f5298fc..c59a3445f 100644
--- a/modules/UI/side_pannels/contactlist/ContactList.js
+++ b/modules/UI/side_pannels/contactlist/ContactList.js
@@ -1,4 +1,4 @@
-/* global $, APP */
+/* global $, APP, interfaceConfig */
 import Avatar from '../../avatar/Avatar';
 import UIEvents from '../../../../service/UI/UIEvents';
 import UIUtil from '../../util/UIUtil';
@@ -110,7 +110,8 @@ var ContactList = {
             }
         };
 
-        newContact.appendChild(createAvatar(id));
+        if (interfaceConfig.SHOW_CONTACTLIST_AVATARS)
+            newContact.appendChild(createAvatar(id));
         newContact.appendChild(createDisplayNameParagraph("participant"));
 
         if (APP.conference.isLocalId(id)) {
diff --git a/modules/UI/toolbars/ToolbarToggler.js b/modules/UI/toolbars/ToolbarToggler.js
index f1230e6b0..e8641a150 100644
--- a/modules/UI/toolbars/ToolbarToggler.js
+++ b/modules/UI/toolbars/ToolbarToggler.js
@@ -50,7 +50,8 @@ const ToolbarToggler = {
     init() {
         alwaysVisibleToolbar = (config.alwaysVisibleToolbar === true);
 
-        this._registerWindowClickListeners();
+        // disabled
+        //this._registerWindowClickListeners();
     },
 
     /**