diff --git a/src/web/public/index.html b/src/web/public/index.html
index adb3d8f4..770cffcc 100644
--- a/src/web/public/index.html
+++ b/src/web/public/index.html
@@ -315,23 +315,15 @@
               <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polygon points="5 3 19 12 5 21 5 3"/></svg>
               Run Claude Code
             </button>
-            <button class="welcome-btn welcome-btn-tunnel" id="welcomeTunnelBtn" onclick="app.toggleTunnelFromWelcome()">
-              <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 2L2 7l10 5 10-5-10-5z"/><path d="M2 17l10 5 10-5"/><path d="M2 12l10 5 10-5"/></svg>
-              Cloudflare Tunnel
-            </button>
             <button class="welcome-btn welcome-btn-opencode" onclick="app.setRunMode('opencode'); app.runOpenCode()">
               <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polygon points="5 3 19 12 5 21 5 3"/></svg>
               Run OpenCode
             </button>
-            <button class="welcome-btn welcome-btn-gemini" onclick="app.setRunMode('gemini'); app.runGemini()">
+            <button class="welcome-btn welcome-btn-gemini" id="welcomeGeminiBtn" style="display: none;" onclick="app.setRunMode('gemini'); app.runGemini()">
               <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polygon points="5 3 19 12 5 21 5 3"/></svg>
               Run Gemini
             </button>
           </div>
-          <div class="welcome-qr" id="welcomeQr" onclick="app.toggleWelcomeQrSize()">
-            <div class="welcome-qr-inner" id="welcomeQrInner"></div>
-            <div class="welcome-qr-url" id="welcomeQrUrl"></div>
-          </div>
           <div class="history-sessions" id="historySessions" style="display:none">
             <div class="search-panel" id="searchPanel">
               <div class="search-input-row">
diff --git a/src/web/public/settings-ui.js b/src/web/public/settings-ui.js
index 36d06214..a8eb46fd 100644
--- a/src/web/public/settings-ui.js
+++ b/src/web/public/settings-ui.js
@@ -694,6 +694,19 @@ Object.assign(CodemanApp.prototype, {
     this._updatePollTimer = setInterval(poll, 1500);
   },
 
+  async loadGeminiAvailability() {
+    const btn = document.getElementById('welcomeGeminiBtn');
+    if (!btn) return;
+    try {
+      const res = await fetch('/api/gemini/status');
+      const env = await res.json();
+      const status = env?.success === true ? env.data : env;
+      btn.style.display = status?.available ? 'flex' : 'none';
+    } catch {
+      btn.style.display = 'none';
+    }
+  },
+
   async loadTunnelStatus() {
     try {
       const res = await fetch('/api/tunnel/status');
diff --git a/src/web/public/terminal-ui.js b/src/web/public/terminal-ui.js
index f19f37ee..4fe01c19 100644
--- a/src/web/public/terminal-ui.js
+++ b/src/web/public/terminal-ui.js
@@ -1195,6 +1195,7 @@ Object.assign(CodemanApp.prototype, {
     if (overlay) {
       overlay.classList.add('visible');
       this.loadTunnelStatus();
+      this.loadGeminiAvailability();
       this.loadHistorySessions();
       this.initSearchPanel();
     }