diff --git a/public/css/Room.css b/public/css/Room.css
index 35f79d0..ab66443 100644
--- a/public/css/Room.css
+++ b/public/css/Room.css
@@ -202,7 +202,7 @@ body {
 --------------------------------------------------------------*/
 .tab {
     overflow: hidden;
-    background-color: rgba(0, 0, 0, 0.4);
+    background-color: #000000;
 }
 
 /* Style the buttons inside the tab */
diff --git a/public/js/Room.js b/public/js/Room.js
index 6c1eb4f..b7f8313 100644
--- a/public/js/Room.js
+++ b/public/js/Room.js
@@ -72,7 +72,6 @@ function getRandomNumber(length) {
 function initClient() {
     if (!DetectRTC.isMobileDevice) {
         setTippy('tabDevicesBtn', 'Devices', 'top');
-        setTippy('tabWhiteboardBtn', 'Whiteboard', 'top');
         setTippy('tabRecordingBtn', 'Recording', 'top');
         setTippy('tabRoomBtn', 'Room', 'top');
         setTippy('tabYoutubeBtn', 'YouTube', 'top');
@@ -440,6 +439,7 @@ function roomIsReady() {
         };
         show(fullScreenButton);
     }
+    show(whiteboardButton);
     show(settingsButton);
     show(raiseHandButton);
     isAudioAllowed ? show(stopAudioButton) : show(startAudioButton);
@@ -552,9 +552,6 @@ function handleButtons() {
     tabDevicesBtn.onclick = (e) => {
         rc.openTab(e, 'tabDevices');
     };
-    tabWhiteboardBtn.onclick = (e) => {
-        rc.openTab(e, 'tabWhiteboard');
-    };
     tabRecordingBtn.onclick = (e) => {
         rc.openTab(e, 'tabRecording');
     };
@@ -652,7 +649,6 @@ function handleButtons() {
         rc.hideFileTransfer();
     };
     whiteboardButton.onclick = () => {
-        rc.toggleMySettings();
         toggleWhiteboard();
     };
     whiteboardPencilBtn.onclick = () => {
@@ -738,9 +734,6 @@ function handleSelects() {
         rc.changeBtnsBarPosition(BtnsBarPosition.value);
     };
     // whiteboard options
-    wbDrawingLineWidthEl.onchange = () => {
-        wbCanvas.freeDrawingBrush.width = parseInt(wbDrawingLineWidthEl.value, 10) || 1;
-    };
     wbDrawingColorEl.onchange = () => {
         wbCanvas.freeDrawingBrush.color = wbDrawingColorEl.value;
         whiteboardIsDrawingMode(true);
diff --git a/public/view/Room.html b/public/view/Room.html
index 88323e1..192bf4f 100644
--- a/public/view/Room.html
+++ b/public/view/Room.html
@@ -106,6 +106,7 @@ access to use this app.
             <button id="chatButton" class="hidden"><i class="fas fa-comments"></i></button>
             <button id="startScreenButton" class="hidden"><i class="fas fa-desktop"></i></button>
             <button id="stopScreenButton" class="hidden"><i class="fas fa-stop-circle"></i></button>
+            <button id="whiteboardButton" class="hidden"><i class="fas fa-chalkboard-teacher"></i></button>
             <button id="settingsButton" class="hidden"><i class="fas fa-cogs"></i></button>
             <button id="exitButton" class="hidden"><i class="fas fa-phone-slash"></i></button>
         </div>
@@ -121,7 +122,6 @@ access to use this app.
                     <button id="tabDevicesBtn" class="fas fa-cog tablinks"></button>
                     <button id="tabRoomBtn" class="fas fa-home tablinks"></button>
                     <button id="tabRecordingBtn" class="fas fa-record-vinyl tablinks"></button>
-                    <button id="tabWhiteboardBtn" class="fas fa-chalkboard-teacher tablinks"></button>
                     <button id="tabYoutubeBtn" class="fab fa-youtube tablinks"></button>
                     <button id="tabStylingBtn" class="fas fa-palette tablinks"></button>
                 </div>
@@ -142,19 +142,6 @@ access to use this app.
                     <br />
                 </div>
 
-                <div id="tabWhiteboard" class="tabcontent">
-                    <br />
-                    <button id="whiteboardButton">
-                        <i class="fas fa-chalkboard-teacher"></i>
-                        <p>Open whiteboard</p>
-                    </button>
-                    <br />
-                    <i class="fas fa-pencil-alt"></i>
-                    <p>Line width:</p>
-                    <input id="wbDrawingLineWidthEl" type="range" value="3" min="1" max="15" />
-                    <br />
-                </div>
-
                 <div id="tabRoom" class="tabcontent">
                     <br />
                     <button id="fullScreenButton" class="hidden">