diff --git a/.env.template b/.env.template
index 15d54f1f..73cfea37 100644
--- a/.env.template
+++ b/.env.template
@@ -282,6 +282,7 @@ COPYRIGHT_TEXT=MiroTalk SFU, all rights reserved  # Copyright text
 SHOW_SHARE_QR=true                                # Show share room QR popup (true|false)
 SHOW_SHARE_BUTTON=true                            # Show share button (true|false)
 SHOW_HIDE_ME=true                                 # Show hide me button (true|false)
+SHOW_FULLSCREEN_BUTTON=true                       # Show fullscreen button (true|false)
 SHOW_AUDIO_BUTTON=true                            # Show audio button (true|false)
 SHOW_VIDEO_BUTTON=true                            # Show video button (true|false)
 SHOW_SCREEN_BUTTON=true                           # Show screen share button (true|false)
@@ -298,6 +299,7 @@ SHOW_EMOJI=true                                   # Show emoji button (true|fals
 SHOW_SETTINGS=true                                # Show settings button (true|false)
 SHOW_ABOUT=true                                   # Show about button (true|false)
 SHOW_EXIT_BUTTON=true                             # Show exit button (true|false)
+SHOW_EXTRA_BUTTONS=true                           # Show extra buttons (true|false)
 
 # Settings Panel
 ENABLE_FILE_SHARING=true                          # Enable file sharing (true|false)
diff --git a/app/src/Server.js b/app/src/Server.js
index 85ff5c99..4d94d8b0 100644
--- a/app/src/Server.js
+++ b/app/src/Server.js
@@ -64,7 +64,7 @@ dev dependencies: {
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.9.12
+ * @version 1.9.13
  *
  */
 
diff --git a/app/src/config.template.js b/app/src/config.template.js
index 4f4515c3..4fc8c281 100644
--- a/app/src/config.template.js
+++ b/app/src/config.template.js
@@ -1107,6 +1107,7 @@ module.exports = {
                 shareQr: process.env.SHOW_SHARE_QR !== 'false',
                 shareButton: process.env.SHOW_SHARE_BUTTON !== 'false',
                 hideMeButton: process.env.SHOW_HIDE_ME !== 'false',
+                fullScreenButton: process.env.SHOW_FULLSCREEN_BUTTON !== 'false',
                 startAudioButton: process.env.SHOW_AUDIO_BUTTON !== 'false',
                 startVideoButton: process.env.SHOW_VIDEO_BUTTON !== 'false',
                 startScreenButton: process.env.SHOW_SCREEN_BUTTON !== 'false',
@@ -1123,6 +1124,7 @@ module.exports = {
                 settingsButton: process.env.SHOW_SETTINGS !== 'false',
                 aboutButton: process.env.SHOW_ABOUT !== 'false',
                 exitButton: process.env.SHOW_EXIT_BUTTON !== 'false',
+                extraButton: process.env.SHOW_EXTRA_BUTTONS !== 'false',
             },
 
             // Settings panel buttons and options
diff --git a/package-lock.json b/package-lock.json
index 9197c85b..191d2a22 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "mirotalksfu",
-    "version": "1.9.12",
+    "version": "1.9.13",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "mirotalksfu",
-            "version": "1.9.12",
+            "version": "1.9.13",
             "license": "AGPL-3.0",
             "dependencies": {
                 "@aws-sdk/client-s3": "^3.850.0",
diff --git a/package.json b/package.json
index de8e626a..0b6f3a5d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mirotalksfu",
-    "version": "1.9.12",
+    "version": "1.9.13",
     "description": "WebRTC SFU browser-based video calls",
     "main": "Server.js",
     "scripts": {
diff --git a/public/js/Brand.js b/public/js/Brand.js
index b50c4d50..085f508b 100644
--- a/public/js/Brand.js
+++ b/public/js/Brand.js
@@ -76,7 +76,7 @@ let BRAND = {
     },
     about: {
         imageUrl: '../images/mirotalk-logo.gif',
-        title: '<strong>WebRTC SFU v1.9.12</strong>',
+        title: '<strong>WebRTC SFU v1.9.13</strong>',
         html: `
             <button 
                 id="support-button" 
diff --git a/public/js/Room.js b/public/js/Room.js
index 1def5b46..85a3c092 100644
--- a/public/js/Room.js
+++ b/public/js/Room.js
@@ -11,7 +11,7 @@ if (location.href.substr(0, 5) !== 'https') location.href = 'https' + location.h
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.9.12
+ * @version 1.9.13
  *
  */
 
@@ -1559,7 +1559,12 @@ function roomIsReady() {
         myProfileAvatar.setAttribute('src', rc.genAvatarSvg(peer_name, 64));
     }
 
-    show(toggleExtraButton); //*
+    const controlDiv = getId('control');
+    const visibleButtons = Array.from(controlDiv.children).filter(
+        (el) => el.style.display !== 'none' && !el.classList.contains('hidden')
+    );
+    BUTTONS.main.extraButton || visibleButtons.length > 0 ? show(toggleExtraButton) : hide(toggleExtraButton);
+
     BUTTONS.main.exitButton && show(exitButton);
     BUTTONS.main.shareButton && show(shareButton);
     BUTTONS.main.hideMeButton && show(hideMeButton);
@@ -1643,11 +1648,13 @@ function roomIsReady() {
             show(startRtmpURLButton) &&
             show(streamerRtmpButton);
     }
-    if (!parserResult.browser.name.toLowerCase().includes('safari')) {
+    if (BUTTONS.main.fullScreenButton && !parserResult.browser.name.toLowerCase().includes('safari')) {
         document.onfullscreenchange = () => {
             if (!document.fullscreenElement) rc.isDocumentOnFullScreen = false;
         };
         show(fullScreenButton);
+    } else {
+        hide(fullScreenButton);
     }
     BUTTONS.main.whiteboardButton && show(whiteboardButton);
     if (BUTTONS.main.documentPiPButton && showDocumentPipBtn) show(documentPiPButton);
@@ -5514,7 +5521,7 @@ function showAbout() {
         position: 'center',
         imageUrl: BRAND.about?.imageUrl && BRAND.about.imageUrl.trim() !== '' ? BRAND.about.imageUrl : image.about,
         customClass: { image: 'img-about' },
-        title: BRAND.about?.title && BRAND.about.title.trim() !== '' ? BRAND.about.title : 'WebRTC SFU v1.9.12',
+        title: BRAND.about?.title && BRAND.about.title.trim() !== '' ? BRAND.about.title : 'WebRTC SFU v1.9.13',
         html: `
             <br />
             <div id="about">
diff --git a/public/js/RoomClient.js b/public/js/RoomClient.js
index df84a59a..9d996cd8 100644
--- a/public/js/RoomClient.js
+++ b/public/js/RoomClient.js
@@ -9,7 +9,7 @@
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.9.12
+ * @version 1.9.13
  *
  */
 
diff --git a/public/js/Rules.js b/public/js/Rules.js
index eb7362ff..1a45a29a 100644
--- a/public/js/Rules.js
+++ b/public/js/Rules.js
@@ -18,6 +18,7 @@ let BUTTONS = {
         shareQr: true,
         shareButton: true, // for quest, presenter default true
         hideMeButton: true,
+        fullScreenButton: true,
         startAudioButton: true,
         startVideoButton: true,
         startScreenButton: true,
@@ -34,6 +35,7 @@ let BUTTONS = {
         settingsButton: true,
         aboutButton: true, // Please keep me always visible, thank you!
         exitButton: true,
+        extraButton: true,
     },
     settings: {
         fileSharing: true,