diff --git a/public/badge-96x96.png b/public/badge-96x96.png
new file mode 100644
index 0000000..946eccc
Binary files /dev/null and b/public/badge-96x96.png differ
diff --git a/src/App.tsx b/src/App.tsx
index d3a0536..8fb82ef 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -231,47 +231,62 @@ export function App() {
 
   const isOffline = !deviceOnline || serverOnline === false;
 
+  const updateBanner = swUpdateAvailable && (
+    <div className="fixed bottom-6 left-4 right-4 bg-surface border border-accent/30 rounded-md px-4 py-3 flex items-center justify-between z-50 shadow-lg safe-bottom">
+      <span className="text-sm text-text font-mono">New version available</span>
+      <div className="flex gap-2">
+        <button onClick={() => window.location.reload()} className="text-sm font-medium text-accent hover:text-accent-light cursor-pointer">Refresh</button>
+        <button onClick={() => setSwUpdateAvailable(false)} className="text-sm text-text-dim hover:text-text cursor-pointer">Later</button>
+      </div>
+    </div>
+  );
+
   // Splash screen while first health check is pending
   if (serverOnline === null) {
     return (
-      <div className="min-h-screen bg-bg flex items-center justify-center">
-        <LoadingAnimation size="lg" label="Connecting..." />
-      </div>
+      <>
+        <div className="min-h-screen bg-bg flex items-center justify-center">
+          <LoadingAnimation size="lg" label="Connecting..." />
+        </div>
+        {updateBanner}
+      </>
     );
   }
 
   // Offline screen
   if (isOffline) {
-    return <OfflineView onRetry={checkHealth} />;
+    return <><OfflineView onRetry={checkHealth} />{updateBanner}</>;
   }
 
   if (!authed) {
-    return <LoginView onLogin={handleLogin} />;
+    return <><LoginView onLogin={handleLogin} />{updateBanner}</>;
   }
 
   if (view.name === 'newchat') {
     return (
-      <NewChatView
-        cwd={view.cwd}
-        onStartChat={startChat}
-        onBack={backToSessions}
-      />
+      <>
+        <NewChatView cwd={view.cwd} onStartChat={startChat} onBack={backToSessions} />
+        {updateBanner}
+      </>
     );
   }
 
   if (view.name === 'settings') {
-    return <SettingsView onBack={() => setView({ name: 'sessions' })} />;
+    return <><SettingsView onBack={() => setView({ name: 'sessions' })} />{updateBanner}</>;
   }
 
   if (view.name === 'chat') {
     return (
-      <ChatView
-        sessionId={view.sessionId}
-        cwd={view.cwd}
-        initialPrompt={view.initialPrompt}
-        adapter={view.adapter}
-        onBack={backToSessions}
-      />
+      <>
+        <ChatView
+          sessionId={view.sessionId}
+          cwd={view.cwd}
+          initialPrompt={view.initialPrompt}
+          adapter={view.adapter}
+          onBack={backToSessions}
+        />
+        {updateBanner}
+      </>
     );
   }
 
@@ -285,15 +300,7 @@ export function App() {
         onInstall={handleInstall}
         onDismissInstall={dismissInstall}
       />
-      {swUpdateAvailable && (
-        <div className="fixed bottom-6 left-4 right-4 bg-surface border border-accent/30 rounded-md px-4 py-3 flex items-center justify-between z-50 shadow-lg">
-          <span className="text-sm text-text font-mono">New version available</span>
-          <div className="flex gap-2">
-            <button onClick={() => window.location.reload()} className="text-sm font-medium text-accent hover:text-accent-light cursor-pointer">Refresh</button>
-            <button onClick={() => setSwUpdateAvailable(false)} className="text-sm text-text-dim hover:text-text cursor-pointer">Later</button>
-          </div>
-        </div>
-      )}
+      {updateBanner}
     </>
   );
 }
diff --git a/src/components/ChatView.tsx b/src/components/ChatView.tsx
index 576270d..44cd8ca 100644
--- a/src/components/ChatView.tsx
+++ b/src/components/ChatView.tsx
@@ -27,7 +27,7 @@ function PlanViewer({ plan }: { plan: string }) {
   if (expanded) {
     return (
       <div className="fixed inset-0 bg-bg z-50 flex flex-col">
-        <div className="flex items-center justify-between px-4 py-3 border-b border-border shrink-0">
+        <div className="flex items-center justify-between px-4 py-3 border-b border-border shrink-0 safe-top">
           <Badge>PLAN</Badge>
           <Button variant="ghost" size="icon" onClick={() => setExpanded(false)}>
             <X className="w-5 h-5" />
@@ -567,7 +567,7 @@ export function ChatView({
 
       {/* Save-as-instruction toast */}
       {saveToast && (
-        <div className="fixed bottom-20 left-4 right-4 bg-surface border border-border rounded-xl p-3 flex items-center justify-between z-30">
+        <div className="fixed bottom-20 left-4 right-4 bg-surface border border-border rounded-xl p-3 flex items-center justify-between z-30 safe-bottom">
           <span className="text-sm text-text-dim">存成常用？</span>
           <button
             className="text-sm text-accent font-medium px-3 py-1 rounded-md hover:bg-accent/10"
diff --git a/src/components/DiffViewer.tsx b/src/components/DiffViewer.tsx
index 071d090..ca92549 100644
--- a/src/components/DiffViewer.tsx
+++ b/src/components/DiffViewer.tsx
@@ -8,7 +8,7 @@ export function DiffViewer({ filePath, oldString, newString, onClose }: {
   const newLines = newString.split('\n');
   return (
     <div className="fixed inset-0 bg-bg z-50 flex flex-col">
-      <div className="flex items-center justify-between px-4 py-3 border-b border-border shrink-0">
+      <div className="flex items-center justify-between px-4 py-3 border-b border-border shrink-0 safe-top">
         <div className="flex items-center gap-3 overflow-hidden">
           <Button variant="ghost" size="icon" onClick={onClose}>
             <X className="size-4" />
diff --git a/src/components/PlanMode.tsx b/src/components/PlanMode.tsx
index a636de8..5d76739 100644
--- a/src/components/PlanMode.tsx
+++ b/src/components/PlanMode.tsx
@@ -55,7 +55,7 @@ export function PlanMode({ input, onApprove, onApproveYolo, onReject, onSendFeed
   if (showFull) {
     return (
       <div className="fixed inset-0 bg-bg z-50 flex flex-col">
-        <div className="flex items-center justify-between px-4 py-3 border-b border-border shrink-0">
+        <div className="flex items-center justify-between px-4 py-3 border-b border-border shrink-0 safe-top">
           <Badge className="font-mono">PLAN</Badge>
           <Button variant="ghost" size="icon" onClick={() => setShowFull(false)}>
             <X className="size-4" />
diff --git a/src/components/SessionsView.tsx b/src/components/SessionsView.tsx
index d345450..d68a318 100644
--- a/src/components/SessionsView.tsx
+++ b/src/components/SessionsView.tsx
@@ -132,7 +132,7 @@ export function SessionsView({
   if (selectedProjectDir) {
     return (
       <div className="min-h-screen bg-bg flex flex-col">
-        <div className="flex items-center justify-between px-4 py-3 border-b border-border shrink-0">
+        <div className="flex items-center justify-between px-4 py-3 border-b border-border shrink-0 safe-top">
           <div className="flex items-center gap-2 min-w-0">
             <Button
               variant="ghost"
diff --git a/src/hooks/useSessions.ts b/src/hooks/useSessions.ts
index 3fe657c..8fc9989 100644
--- a/src/hooks/useSessions.ts
+++ b/src/hooks/useSessions.ts
@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback, useMemo } from 'react';
+import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import { api } from '../lib/api';
 import { STORAGE } from '../lib/storage-keys';
 
@@ -39,7 +39,7 @@ export function useSessions() {
     }
   }, []);
 
-  // Poll every 10s when Active tab is selected
+  // Poll every 3s when Active tab is selected
   useEffect(() => {
     if (activeTab !== 'active') return;
     fetchActiveSessions();
@@ -86,11 +86,28 @@ export function useSessions() {
     setSelectedProjectDir(dir);
     if (dir) {
       localStorage.setItem(STORAGE.PROJECT_DIR, dir);
+      // Push history so back navigation (swipe-back, back button) returns to project list
+      window.history.pushState({ selectProject: dir }, '', '/');
     } else {
       localStorage.removeItem(STORAGE.PROJECT_DIR);
     }
   }, []);
 
+  // Clear project selection on back navigation (swipe-back, back button)
+  const selectedProjectDirRef = useRef(selectedProjectDir);
+  selectedProjectDirRef.current = selectedProjectDir;
+
+  useEffect(() => {
+    const handlePopState = (e: PopStateEvent) => {
+      if (!e.state?.selectProject && selectedProjectDirRef.current) {
+        setSelectedProjectDir(null);
+        localStorage.removeItem(STORAGE.PROJECT_DIR);
+      }
+    };
+    window.addEventListener('popstate', handlePopState);
+    return () => window.removeEventListener('popstate', handlePopState);
+  }, []);
+
   return {
     sessions: filteredSessions,
     projects,
diff --git a/src/index.css b/src/index.css
index e982baa..258dc06 100644
--- a/src/index.css
+++ b/src/index.css
@@ -28,6 +28,7 @@ body {
   font-family: var(--font-mono);
   font-size: 14px;
   -webkit-font-smoothing: antialiased;
+  -webkit-tap-highlight-color: transparent;
   overscroll-behavior: none;
 }
 
diff --git a/src/sw.ts b/src/sw.ts
index d9934e6..ba486e8 100644
--- a/src/sw.ts
+++ b/src/sw.ts
@@ -8,6 +8,12 @@ declare const self: ServiceWorkerGlobalScope;
 // Precache static assets (injected by vite-plugin-pwa at build time)
 precacheAndRoute(self.__WB_MANIFEST);
 
+// Skip waiting + claim so updates take effect immediately
+self.addEventListener('install', () => self.skipWaiting());
+self.addEventListener('activate', (event) => {
+  event.waitUntil(self.clients.claim());
+});
+
 // Cache stable API responses — show last-known data when offline.
 // Exclude volatile real-time endpoints (messages, active sessions, reviews).
 registerRoute(
@@ -52,7 +58,7 @@ self.addEventListener('push', (event) => {
     return self.registration.showNotification(payload.title, {
       body: payload.body,
       icon: '/pwa-192x192.png',
-      badge: '/pwa-192x192.png',
+      badge: '/badge-96x96.png',
       tag: payload.tag || payload.data?.sessionId || 'default',
       data: payload.data,
     });
diff --git a/vite.config.ts b/vite.config.ts
index 2af6a16..dee71df 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -39,7 +39,7 @@ export default defineConfig({
         categories: ['developer-tools', 'productivity'],
       },
       injectManifest: {
-        globPatterns: ['**/*.{js,css,html,ico,svg,woff2}', '*.png', 'mascot/*.png'],
+        globPatterns: ['**/*.{js,css,html,ico,svg,woff2}', 'favicon-*.png', 'apple-touch-icon.png', 'badge-*.png', 'mascot/*.png'],
       },
     }),
   ],