diff --git a/css/_toolbars.scss b/css/_toolbars.scss
index c09cd3c7e..ae219dd9e 100644
--- a/css/_toolbars.scss
+++ b/css/_toolbars.scss
@@ -42,22 +42,7 @@
     margin-right: auto;
     width: auto;
     border-radius: 3px;
-
-    /**
-     * First button in the toolbar.
-     */
-    .first {
-        border-bottom-left-radius: 3px;
-        border-top-left-radius: 3px;
-    }
-
-    /**
-     * Last button in the toolbar.
-     */
-    .last {
-        border-bottom-right-radius: 3px;
-        border-top-right-radius: 3px;
-    }
+    overflow: hidden;
 
     /**
      * Splitter button in the toolbar.
@@ -75,8 +60,8 @@
     display: flex;
     width: $defaultToolbarSize;
     height: 100%;
-    top: 0px;
-    left: 0px;
+    top: 0;
+    left: 0;
     padding-top: 10px;
     box-sizing: border-box;
     flex-direction: column;
diff --git a/index.html b/index.html
index d52f081fc..9369876b1 100644
--- a/index.html
+++ b/index.html
@@ -107,6 +107,8 @@
         <div id="extendedToolbar" class="toolbar">
             <div id="extendedToolbarButtons"></div>
 
+            <a class="button icon-feedback" id="feedbackButton"></a>
+
             <div id="sideToolbarContainer">
                 <div id="profile_container" class="sideToolbarContainer__inner">
                     <div class="title" data-i18n="profile.title"></div>
diff --git a/modules/UI/toolbars/Toolbar.js b/modules/UI/toolbars/Toolbar.js
index 1536e6692..08147e6cf 100644
--- a/modules/UI/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -219,7 +219,10 @@ const defaultToolbarButtons = {
         id: 'toolbar_contact_list',
         tooltipKey: 'bottomtoolbar.contactlist',
         className: 'button icon-contactList',
-        sideContainerId: 'contacts_container'
+        sideContainerId: 'contacts_container',
+        html: `<span class="badge-round">
+                   <span id="numberOfParticipants"></span>
+               </span>`
     },
     'profile': {
         id: 'toolbar_button_profile',
@@ -295,7 +298,12 @@ const defaultToolbarButtons = {
     'sharedvideo': {
         id: 'toolbar_button_sharedvideo',
         tooltipKey: 'toolbar.sharedvideo',
-        className: 'button icon-shared-video'
+        className: 'button icon-shared-video',
+        html: `<ul id="sharedVideoMutedPopup" 
+                   class="loginmenu extendedToolbarPopup">
+                   <li data-i18n="[html]toolbar.sharedVideoMutedPopup"></li>
+               </ul>
+`
     },
     'sip': {
         id: 'toolbar_button_sip',