diff --git a/index.html b/index.html
index 12adb8297..3d28b543b 100644
--- a/index.html
+++ b/index.html
@@ -170,7 +170,7 @@
                         <i class="icon-link"></i>
                     </a>
                     <div class="header_button_separator"></div>
-                    <span class="toolbar_span">
+                    <span class="toolbar_span" id="chat_button">
                         <a class="button" id="toolbar_button_chat" data-container="body" data-toggle="popover" shortcut="toggleChatPopover" data-placement="bottom" data-i18n="[content]toolbar.chat" content="Open / close chat">
                             <i id="chatButton" class="icon-chat">
                                 <span id="unreadMessages"></span>
diff --git a/interface_config.js b/interface_config.js
index 0317683e8..7af20b249 100644
--- a/interface_config.js
+++ b/interface_config.js
@@ -5,6 +5,7 @@ var interfaceConfig = {
     INITIAL_TOOLBAR_TIMEOUT: 20000,
     TOOLBAR_TIMEOUT: 4000,
     DEFAULT_REMOTE_DISPLAY_NAME: "Fellow Jitster",
+    TOOLBAR_DISPLAY_MODE: 'full',
     DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME: "speaker",
     DEFAULT_LOCAL_DISPLAY_NAME: "me",
     SHOW_JITSI_WATERMARK: true,
diff --git a/modules/UI/toolbars/Toolbar.js b/modules/UI/toolbars/Toolbar.js
index d3dfddae5..d5a94deb1 100644
--- a/modules/UI/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -255,6 +255,19 @@ function callSipButtonClicked() {
 var Toolbar = (function (my) {
 
     my.init = function (ui) {
+        if (interfaceConfig.TOOLBAR_DISPLAY_MODE === 'minimal') {
+            var btnToHide = ["#toolbar_button_security",
+                "#toolbar_button_link",
+                "#chat_button",
+                "#prezi_button",
+                "#bottom_toolbar_chat",
+                "#bottom_toolbar_contact_list"];
+            $.each(btnToHide, function (idx, btn) {
+                $(btn).hide();
+                $(btn).next('.header_button_separator').hide();
+            });
+        }
+
         for(var k in buttonHandlers)
             $("#" + k).click(buttonHandlers[k]);
         UI = ui;