diff --git a/.env.template b/.env.template
index 071d1176..8907fb17 100644
--- a/.env.template
+++ b/.env.template
@@ -1,5 +1,5 @@
 # ====================================================
-# MiroTalk P2P v.1.6.78 - Environment Configuration
+# MiroTalk P2P v.1.6.80 - Environment Configuration
 # ====================================================
 
 # App environment
diff --git a/app/src/config.template.js b/app/src/config.template.js
index c05fc6aa..0fad808b 100644
--- a/app/src/config.template.js
+++ b/app/src/config.template.js
@@ -2,7 +2,7 @@
 
 /**
  * ==============================================
- * MiroTalk P2P v.1.6.78 - Configuration File
+ * MiroTalk P2P v.1.6.80 - Configuration File
  * ==============================================
  *
  * Branding and customizations require a license:
diff --git a/app/src/server.js b/app/src/server.js
index 6dbb9b79..f72236b2 100755
--- a/app/src/server.js
+++ b/app/src/server.js
@@ -45,7 +45,7 @@ dependencies: {
  * @license For commercial use or closed source, contact us at license.mirotalk@gmail.com or purchase directly from CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-p2p-webrtc-realtime-video-conferences/38376661
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.6.78
+ * @version 1.6.80
  *
  */
 
diff --git a/package-lock.json b/package-lock.json
index 715e7d6c..74a543a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "mirotalk",
-    "version": "1.6.78",
+    "version": "1.6.80",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "mirotalk",
-            "version": "1.6.78",
+            "version": "1.6.80",
             "license": "AGPL-3.0",
             "dependencies": {
                 "@mattermost/client": "11.1.0",
diff --git a/package.json b/package.json
index b4f42130..da869184 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mirotalk",
-    "version": "1.6.78",
+    "version": "1.6.80",
     "description": "A free WebRTC browser-based video call",
     "main": "server.js",
     "scripts": {
diff --git a/public/css/client.css b/public/css/client.css
index 818c77a7..bcd1f344 100755
--- a/public/css/client.css
+++ b/public/css/client.css
@@ -315,6 +315,7 @@ body {
 
 #bottomButtons button {
     width: 50px;
+    height: 50px;
     padding: 10px;
     font-size: 1.6rem;
     color: var(--btn-bar-bg-color);
@@ -324,6 +325,68 @@ body {
     transition: all 0.3s ease-in-out;
 }
 
+/* Quick device picker (Start Audio/Video) */
+#bottomButtons .device-dropdown-toggle {
+    width: 25px;
+    height: 50px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    line-height: 1;
+}
+
+#bottomButtons .device-dropdown-toggle i {
+    font-size: 0.9rem;
+}
+
+#bottomButtons .dropdown-menu button {
+    width: auto;
+    font-size: 0.8em;
+    padding: 8px 16px;
+    border-radius: 0;
+    background: none;
+    transition: background 0.2s;
+}
+
+#bottomButtons .dropdown {
+    position: relative;
+}
+
+#bottomButtons .dropup .dropdown-menu {
+    z-index: 9999;
+    position: absolute;
+    left: 0;
+    padding: 10px 5px;
+    bottom: calc(100% + 6px);
+    border: var(--border);
+    background: var(--body-bg);
+    box-shadow: var(--box-shadow);
+}
+
+.dropdown-menu.show {
+    display: block;
+}
+
+#bottomButtons #audioMenu,
+#bottomButtons #videoMenu {
+    min-width: 280px;
+    max-width: calc(100vw - 24px);
+    text-align: left;
+}
+
+#bottomButtons #audioMenu button,
+#bottomButtons #videoMenu button {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    text-align: left;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 100%;
+    transform: none !important;
+}
+
 #bottomButtons button:hover {
     background: var(--body-bg);
     transform: var(--btns-hover-scale);
@@ -1465,17 +1528,24 @@ button {
     #mySettings {
         width: 90%;
     }
-
     #bottomButtons {
         gap: 0.3rem;
         padding: 3px;
     }
     #bottomButtons button {
         width: 38px;
+        height: 38px;
         font-size: 0.95rem;
         padding: 8px;
         margin: 0 1px;
     }
+    #bottomButtons .device-dropdown-toggle {
+        width: 19px;
+        height: 38px;
+    }
+    #bottomButtons .device-dropdown-toggle i {
+        font-size: 0.8rem;
+    }
 }
 
 @media screen and (max-width: 360px) {
@@ -1489,6 +1559,13 @@ button {
         padding: 6px;
         margin: 0 1px;
     }
+    #bottomButtons .device-dropdown-toggle {
+        width: 14px;
+        height: 24px;
+    }
+    #bottomButtons .device-dropdown-toggle i {
+        font-size: 0.7rem;
+    }
 }
 
 #mySettingsHeader {
diff --git a/public/js/brand.js b/public/js/brand.js
index 0effefec..b8c415d0 100644
--- a/public/js/brand.js
+++ b/public/js/brand.js
@@ -77,7 +77,7 @@ let brand = {
     },
     about: {
         imageUrl: '../images/mirotalk-logo.gif',
-        title: 'WebRTC P2P v1.6.78',
+        title: 'WebRTC P2P v1.6.80',
         html: `
             <button 
                 id="support-button" 
diff --git a/public/js/client.js b/public/js/client.js
index f26adf4a..4a636919 100644
--- a/public/js/client.js
+++ b/public/js/client.js
@@ -15,7 +15,7 @@
  * @license For commercial use or closed source, contact us at license.mirotalk@gmail.com or purchase directly from CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-p2p-webrtc-realtime-video-conferences/38376661
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.6.78
+ * @version 1.6.80
  *
  */
 
@@ -202,6 +202,12 @@ const bottomButtons = getId('bottomButtons');
 const toggleExtraBtn = getId('toggleExtraBtn');
 const audioBtn = getId('audioBtn');
 const videoBtn = getId('videoBtn');
+const videoDropdown = getId('videoDropdown');
+const audioDropdown = getId('audioDropdown');
+const videoToggle = getId('videoToggle');
+const audioToggle = getId('audioToggle');
+const videoMenu = getId('videoMenu');
+const audioMenu = getId('audioMenu');
 const swapCameraBtn = getId('swapCameraBtn');
 const hideMeBtn = getId('hideMeBtn');
 const screenShareBtn = getId('screenShareBtn');
@@ -1329,6 +1335,7 @@ async function handleConnect() {
         loadSettingsFromLocalStorage();
         setupVideoUrlPlayer();
         handleDropdownHover();
+        setupQuickDeviceSwitchDropdowns();
         startSessionTime();
         await whoAreYou();
     }
@@ -1656,6 +1663,7 @@ async function whoAreYou() {
         }
         // Disable camera settings, keep screen available
         displayElements([
+            { element: getId('videoDropdown'), display: false },
             { element: getId('videoSourceDiv'), display: false },
             { element: getId('videoFitDiv'), display: false },
             { element: getId('videoFpsDiv'), display: false },
@@ -1667,6 +1675,7 @@ async function whoAreYou() {
             { element: getId('initMicrophoneSelect'), display: false },
             { element: getId('initSpeakerSelect'), display: false },
             { element: getId('tabAudioBtn'), display: false },
+            { element: getId('audioDropdown'), display: false },
         ]);
     }
     if (!buttons.main.showScreenBtn) {
@@ -13308,7 +13317,7 @@ function showAbout() {
     Swal.fire({
         background: swBg,
         position: 'center',
-        title: brand.about?.title && brand.about.title.trim() !== '' ? brand.about.title : 'WebRTC P2P v1.6.78',
+        title: brand.about?.title && brand.about.title.trim() !== '' ? brand.about.title : 'WebRTC P2P v1.6.80',
         imageUrl: brand.about?.imageUrl && brand.about.imageUrl.trim() !== '' ? brand.about.imageUrl : images.about,
         customClass: { image: 'img-about' },
         html: `
@@ -13876,6 +13885,193 @@ function disable(elem, disabled) {
     elem.disabled = disabled;
 }
 
+/**
+ * Setup Quick audio/video device switch dropdowns
+ */
+function setupQuickDeviceSwitchDropdowns() {
+    // For now keep this feature only for desktop devices
+    if (!isDesktopDevice) return;
+
+    if (!videoBtn || !audioBtn || !videoDropdown || !audioDropdown || !videoToggle || !audioToggle) {
+        return;
+    }
+
+    function syncVisibility() {
+        // Keep dropdown visible while the corresponding button is visible
+        const showVideo = !!videoBtn && window.getComputedStyle(videoBtn).display !== 'none';
+        const showAudio = !!audioBtn && window.getComputedStyle(audioBtn).display !== 'none';
+        videoDropdown.classList.toggle('hidden', !showVideo);
+        audioDropdown.classList.toggle('hidden', !showAudio);
+    }
+
+    function isMenuOpen(menuEl) {
+        return !!menuEl && menuEl.classList.contains('show');
+    }
+
+    function closeMenu(toggleEl, menuEl) {
+        if (!toggleEl || !menuEl) return;
+        menuEl.classList.remove('show');
+        toggleEl.setAttribute('aria-expanded', 'false');
+    }
+
+    function openMenu(toggleEl, menuEl, rebuildFn) {
+        if (!toggleEl || !menuEl) return;
+        if (typeof rebuildFn === 'function') rebuildFn();
+        menuEl.classList.add('show');
+        toggleEl.setAttribute('aria-expanded', 'true');
+    }
+
+    function toggleMenu(toggleEl, menuEl, rebuildFn) {
+        const open = isMenuOpen(menuEl);
+        // only one open at a time
+        closeMenu(videoToggle, videoMenu);
+        closeMenu(audioToggle, audioMenu);
+        if (!open) openMenu(toggleEl, menuEl, rebuildFn);
+    }
+
+    function buildMenu(menuEl, selectEl, emptyLabel) {
+        if (!menuEl || !selectEl) return;
+
+        menuEl.innerHTML = '';
+        const options = Array.from(selectEl.options || []).filter((o) => o && o.value);
+
+        if (options.length === 0) {
+            const btn = document.createElement('button');
+            btn.type = 'button';
+            btn.disabled = true;
+            btn.textContent = emptyLabel;
+            menuEl.appendChild(btn);
+            return;
+        }
+
+        options.forEach((opt) => {
+            const btn = document.createElement('button');
+            btn.type = 'button';
+
+            const isSelected = opt.value === selectEl.value;
+            const label = opt.textContent || opt.label || opt.value;
+
+            btn.replaceChildren();
+            if (isSelected) {
+                const icon = document.createElement('i');
+                icon.className = 'fas fa-check';
+                icon.style.marginRight = '0.5em';
+                btn.appendChild(icon);
+                btn.appendChild(document.createTextNode(` ${label}`));
+            } else {
+                const spacer = document.createElement('span');
+                spacer.style.display = 'inline-block';
+                spacer.style.width = '1.25em';
+                btn.appendChild(spacer);
+                btn.appendChild(document.createTextNode(label));
+            }
+
+            btn.addEventListener('click', () => {
+                if (selectEl.value === opt.value) return;
+                selectEl.value = opt.value;
+                selectEl.dispatchEvent(new Event('change'));
+                buildMenu(menuEl, selectEl, emptyLabel);
+            });
+
+            menuEl.appendChild(btn);
+        });
+    }
+
+    function rebuildVideoMenu() {
+        buildMenu(videoMenu, videoSelect, 'No cameras found');
+    }
+
+    function rebuildAudioMenu() {
+        buildMenu(audioMenu, audioInputSelect, 'No microphones found');
+    }
+
+    // Hover behavior (desktop only). Note: rebuilding alone is invisible if the menu isn't opened.
+    const supportsHover = window.matchMedia('(hover: hover) and (pointer: fine)').matches;
+    if (supportsHover) {
+        const attachHoverDropdown = (toggleEl, menuEl, rebuildFn, closeOtherFn) => {
+            if (!toggleEl || !menuEl) return;
+
+            let closeTimeout;
+            const cancelClose = () => {
+                if (!closeTimeout) return;
+                clearTimeout(closeTimeout);
+                closeTimeout = null;
+            };
+            const scheduleClose = () => {
+                cancelClose();
+                closeTimeout = setTimeout(() => closeMenu(toggleEl, menuEl), 180);
+            };
+
+            toggleEl.addEventListener('mouseenter', () => {
+                cancelClose();
+                if (typeof closeOtherFn === 'function') closeOtherFn();
+                openMenu(toggleEl, menuEl, rebuildFn);
+            });
+            toggleEl.addEventListener('mouseleave', scheduleClose);
+            menuEl.addEventListener('mouseenter', cancelClose);
+            menuEl.addEventListener('mouseleave', scheduleClose);
+        };
+
+        attachHoverDropdown(videoToggle, videoMenu, rebuildVideoMenu, () => closeMenu(audioToggle, audioMenu));
+        attachHoverDropdown(audioToggle, audioMenu, rebuildAudioMenu, () => closeMenu(videoToggle, videoMenu));
+    }
+
+    videoToggle.addEventListener('click', (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        toggleMenu(videoToggle, videoMenu, rebuildVideoMenu);
+    });
+
+    audioToggle.addEventListener('click', (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        toggleMenu(audioToggle, audioMenu, rebuildAudioMenu);
+    });
+
+    // Close on outside click
+    document.addEventListener('click', (e) => {
+        const t = e.target;
+        const inVideo = videoDropdown && (videoDropdown === t || videoDropdown.contains(t));
+        const inAudio = audioDropdown && (audioDropdown === t || audioDropdown.contains(t));
+        if (!inVideo) closeMenu(videoToggle, videoMenu);
+        if (!inAudio) closeMenu(audioToggle, audioMenu);
+    });
+
+    // Close on Escape
+    document.addEventListener('keydown', (e) => {
+        if (e.key !== 'Escape') return;
+        closeMenu(videoToggle, videoMenu);
+        closeMenu(audioToggle, audioMenu);
+    });
+
+    // Close after selecting an item
+    if (videoMenu) videoMenu.addEventListener('click', () => closeMenu(videoToggle, videoMenu));
+    if (audioMenu) audioMenu.addEventListener('click', () => closeMenu(audioToggle, audioMenu));
+
+    // Keep UI synced when settings panel changes device
+    if (videoSelect) videoSelect.addEventListener('change', rebuildVideoMenu);
+    if (audioInputSelect) audioInputSelect.addEventListener('change', rebuildAudioMenu);
+
+    // Keep arrow buttons visible only when Start buttons are visible
+    syncVisibility();
+    const observer = new MutationObserver(syncVisibility);
+    observer.observe(videoBtn, { attributes: true, attributeFilter: ['class', 'style'] });
+    observer.observe(audioBtn, { attributes: true, attributeFilter: ['class', 'style'] });
+
+    // Re-enumerate & refresh lists on hardware changes
+    if (navigator.mediaDevices && typeof navigator.mediaDevices.addEventListener === 'function') {
+        let deviceChangeFrame;
+        navigator.mediaDevices.addEventListener('devicechange', () => {
+            if (deviceChangeFrame) cancelAnimationFrame(deviceChangeFrame);
+            deviceChangeFrame = requestAnimationFrame(async () => {
+                // TODO refreshMyAudioVideoDevices from settings ...
+                rebuildVideoMenu();
+                rebuildAudioMenu();
+            });
+        });
+    }
+}
+
 /**
  * Handle dropdown menus on hover (for non-touch devices)
  */
diff --git a/public/views/client.html b/public/views/client.html
index 33380bfa..44ffef8f 100755
--- a/public/views/client.html
+++ b/public/views/client.html
@@ -151,7 +151,33 @@ access to use this app.
         <div id="bottomButtons" class="fadein">
             <button id="toggleExtraBtn" class="fas fa-chevron-down"></button>
             <button id="audioBtn" class="fas fa-microphone"></button>
+            <div id="audioDropdown" class="dropdown dropup hidden">
+                <button
+                    id="audioToggle"
+                    class="dropdown-toggle device-dropdown-toggle"
+                    type="button"
+                    data-bs-toggle="dropdown"
+                    aria-expanded="false"
+                    aria-label="Select microphone"
+                >
+                    <i class="fas fa-chevron-up"></i>
+                </button>
+                <div id="audioMenu" class="dropdown-menu text-start" aria-labelledby="audioToggle"></div>
+            </div>
             <button id="videoBtn" class="fas fa-video"></button>
+            <div id="videoDropdown" class="dropdown dropup hidden">
+                <button
+                    id="videoToggle"
+                    class="dropdown-toggle device-dropdown-toggle"
+                    type="button"
+                    data-bs-toggle="dropdown"
+                    aria-expanded="false"
+                    aria-label="Select camera"
+                >
+                    <i class="fas fa-chevron-up"></i>
+                </button>
+                <div id="videoMenu" class="dropdown-menu text-start" aria-labelledby="videoToggle"></div>
+            </div>
             <button id="swapCameraBtn" class="fas fa-camera-rotate"></button>
             <button id="screenShareBtn" class="fas fa-desktop"></button>
             <button id="myHandBtn" class="fas fa-hand-paper"></button>