diff --git a/src/accounting-app/App.vue b/src/accounting-app/App.vue
index e5800f2..8fe3aa8 100644
--- a/src/accounting-app/App.vue
+++ b/src/accounting-app/App.vue
@@ -1,29 +1,94 @@
 <script setup lang="ts">
-import { computed } from 'vue'
-import { useRoute } from 'vue-router'
+import { computed, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
-import { PlusCircle, List, Scale, Wallet } from 'lucide-vue-next'
-import AppShell from '@/components/layout/AppShell.vue'
-import type { BottomTab } from '@/components/layout/BottomNav.vue'
+import { Toaster } from '@/components/ui/sonner'
+import LoginDialog from '@/components/auth/LoginDialog.vue'
+import { useTheme } from '@/components/theme-provider'
+import { toast } from 'vue-sonner'
+import { useAuth } from '@/composables/useAuthService'
+import { Button } from '@/components/ui/button'
+import {
+  PlusCircle, List, Scale, Wallet, Settings, LogIn,
+} from 'lucide-vue-next'
 
 const route = useRoute()
+const router = useRouter()
 const { t } = useI18n()
 
-// Settings dropped — theme/lang/currency now live in the shared profile sheet.
-const tabs = computed<BottomTab[]>(() => [
+useTheme()
+const { isAuthenticated } = useAuth()
+
+const showLoginDialog = ref(false)
+
+// Bottom navigation tabs
+const bottomTabs = computed(() => [
   { name: t('libra.nav.record'), icon: PlusCircle, path: '/record' },
   { name: t('libra.nav.transactions'), icon: List, path: '/expenses/transactions' },
   { name: t('libra.nav.balance'), icon: Scale, path: '/balance' },
   { name: t('libra.nav.wallet'), icon: Wallet, path: '/wallet' },
+  { name: t('libra.nav.settings'), icon: Settings, path: '/settings' },
 ])
 
-function isActive(path: string): boolean {
-  if (path === '/record') return route.path === '/record'
-  if (path === '/expenses/transactions') return route.path === '/expenses/transactions'
+const isLoginPage = computed(() => route.path === '/login')
+
+function isActiveTab(path: string): boolean {
+  if (path === '/record') {
+    return route.path === '/record'
+  }
+  if (path === '/expenses/transactions') {
+    return route.path === '/expenses/transactions'
+  }
   return route.path.startsWith(path)
 }
+
+async function handleLoginSuccess() {
+  showLoginDialog.value = false
+  toast.success('Welcome!')
+}
 </script>
 
 <template>
-  <AppShell :tabs="tabs" :is-active="isActive" />
+  <div class="min-h-dvh bg-background font-sans antialiased">
+    <div class="relative flex min-h-dvh flex-col"
+      style="padding-top: env(safe-area-inset-top); padding-bottom: env(safe-area-inset-bottom)">
+
+      <!-- Top bar with login -->
+      <div v-if="!isLoginPage && !isAuthenticated" class="fixed top-0 right-0 z-50 p-3" style="padding-top: env(safe-area-inset-top)">
+        <Button variant="ghost" size="icon" class="h-8 w-8" @click="router.push('/login')">
+          <LogIn class="w-4 h-4" />
+        </Button>
+      </div>
+
+      <!-- Main content (with bottom padding for nav bar) -->
+      <main class="flex-1" :class="{ 'pb-16': !isLoginPage }">
+        <router-view />
+      </main>
+
+      <!-- Bottom navigation bar -->
+      <nav
+        v-if="!isLoginPage"
+        class="fixed bottom-0 left-0 right-0 z-50 border-t bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60"
+        style="padding-bottom: env(safe-area-inset-bottom)"
+      >
+        <div class="flex items-center justify-around h-14 max-w-lg mx-auto">
+          <button
+            v-for="tab in bottomTabs"
+            :key="tab.path"
+            class="flex flex-col items-center justify-center gap-0.5 flex-1 h-full transition-colors"
+            :class="isActiveTab(tab.path)
+              ? 'text-primary'
+              : 'text-muted-foreground hover:text-foreground'"
+            @click="router.push(tab.path)"
+          >
+            <component :is="tab.icon" class="w-5 h-5" />
+            <span class="text-[10px] font-medium">{{ tab.name }}</span>
+          </button>
+        </div>
+      </nav>
+    </div>
+
+    <Toaster />
+    <LoginDialog v-model:is-open="showLoginDialog" @success="handleLoginSuccess" />
+  </div>
 </template>
diff --git a/src/accounting-app/views/BalancePage.vue b/src/accounting-app/views/BalancePage.vue
index 2bb7ec3..0d1ef8d 100644
--- a/src/accounting-app/views/BalancePage.vue
+++ b/src/accounting-app/views/BalancePage.vue
@@ -6,7 +6,8 @@ import { injectService, SERVICE_TOKENS } from '@/core/di-container'
 import { useToast } from '@/core/composables/useToast'
 import type { ExpensesAPI } from '@/modules/expenses/services/ExpensesAPI'
 import type { Transaction } from '@/modules/expenses/types'
-import { ArrowDown, ArrowUp, Clock, Loader2, PieChart } from 'lucide-vue-next'
+import { ArrowDown, ArrowUp, Clock, RefreshCw, Loader2, PieChart } from 'lucide-vue-next'
+import { Button } from '@/components/ui/button'
 import { Badge } from '@/components/ui/badge'
 
 const { t } = useI18n()
@@ -19,6 +20,7 @@ const balance = ref<number | null>(null)
 const balanceCurrency = ref<string>('sats')
 const pendingTransactions = ref<Transaction[]>([])
 const isLoading = ref(true)
+const isRefreshing = ref(false)
 
 const walletKey = computed(() => user.value?.wallets?.[0]?.inkey)
 const budgetsEnabled = computed(() => import.meta.env.VITE_LIBRA_BUDGETS_ENABLED === 'true')
@@ -64,6 +66,12 @@ async function loadData() {
   }
 }
 
+async function refresh() {
+  isRefreshing.value = true
+  await loadData()
+  isRefreshing.value = false
+}
+
 onMounted(async () => {
   isLoading.value = true
   await loadData()
@@ -86,8 +94,18 @@ function formatFiat(amount: number, currency: string): string {
 
 <template>
   <div class="container mx-auto px-4 py-6 max-w-lg">
-    <div class="mb-6">
+    <!-- Header with refresh -->
+    <div class="flex items-center justify-between mb-6">
       <h1 class="text-2xl font-bold text-foreground">{{ t('libra.balance.title') }}</h1>
+      <Button
+        variant="ghost"
+        size="icon"
+        class="h-8 w-8"
+        :disabled="isRefreshing"
+        @click="refresh"
+      >
+        <RefreshCw class="w-4 h-4" :class="{ 'animate-spin': isRefreshing }" />
+      </Button>
     </div>
 
     <!-- Loading state -->
diff --git a/src/activities-app/App.vue b/src/activities-app/App.vue
index b7ff6d6..7214093 100644
--- a/src/activities-app/App.vue
+++ b/src/activities-app/App.vue
@@ -1,38 +1,84 @@
 <script setup lang="ts">
-import { computed } from 'vue'
-import { useRoute } from 'vue-router'
+import { computed, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
-import { CalendarDays, Map, Heart, Search } from 'lucide-vue-next'
-import AppShell from '@/components/layout/AppShell.vue'
-import type { BottomTab } from '@/components/layout/BottomNav.vue'
+import { Toaster } from '@/components/ui/sonner'
+import LoginDialog from '@/components/auth/LoginDialog.vue'
+import { useTheme } from '@/components/theme-provider'
+import { toast } from 'vue-sonner'
+import {
+  CalendarDays, Map, Heart, Settings, Search,
+} from 'lucide-vue-next'
 
 const route = useRoute()
+const router = useRouter()
 const { t } = useI18n()
 
-// Settings dropped — theme/lang/currency now live in the shared profile sheet.
-const tabs = computed<BottomTab[]>(() => [
+useTheme()
+
+const showLoginDialog = ref(false)
+
+// Bottom navigation tabs (p'a semana style)
+const bottomTabs = computed(() => [
   { name: t('activities.nav.feed'), icon: Search, path: '/activities' },
   { name: t('activities.nav.calendar'), icon: CalendarDays, path: '/activities/calendar' },
   { name: t('activities.nav.map'), icon: Map, path: '/activities/map' },
   { name: t('activities.nav.favorites'), icon: Heart, path: '/activities/favorites' },
+  { name: t('activities.nav.settings'), icon: Settings, path: '/settings' },
 ])
 
-// Feed tab is active for the bare /activities route AND all sub-paths that
-// aren't owned by another tab (e.g. /activities/<id> detail pages).
-function isActive(path: string): boolean {
+const isLoginPage = computed(() => route.path === '/login')
+
+function isActiveTab(path: string): boolean {
   if (path === '/activities') {
-    return (
-      route.path === '/activities' ||
-      (route.path.startsWith('/activities/') &&
-        !route.path.startsWith('/activities/calendar') &&
-        !route.path.startsWith('/activities/map') &&
-        !route.path.startsWith('/activities/favorites'))
-    )
+    return route.path === '/activities' || route.path.startsWith('/activities/') &&
+      !route.path.startsWith('/activities/calendar') &&
+      !route.path.startsWith('/activities/map') &&
+      !route.path.startsWith('/activities/favorites')
   }
   return route.path.startsWith(path)
 }
+
+async function handleLoginSuccess() {
+  showLoginDialog.value = false
+  toast.success('Welcome!')
+}
 </script>
 
 <template>
-  <AppShell :tabs="tabs" :is-active="isActive" />
+  <div class="min-h-dvh bg-background font-sans antialiased">
+    <div class="relative flex min-h-dvh flex-col"
+      style="padding-top: env(safe-area-inset-top); padding-bottom: env(safe-area-inset-bottom)">
+
+      <!-- Main content (with bottom padding for nav bar) -->
+      <main class="flex-1" :class="{ 'pb-16': !isLoginPage }">
+        <router-view />
+      </main>
+
+      <!-- Bottom navigation bar (p'a semana style) -->
+      <nav
+        v-if="!isLoginPage"
+        class="fixed bottom-0 left-0 right-0 z-50 border-t bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60"
+        style="padding-bottom: env(safe-area-inset-bottom)"
+      >
+        <div class="flex items-center justify-around h-14 max-w-lg mx-auto">
+          <button
+            v-for="tab in bottomTabs"
+            :key="tab.path"
+            class="flex flex-col items-center justify-center gap-0.5 flex-1 h-full transition-colors"
+            :class="isActiveTab(tab.path)
+              ? 'text-primary'
+              : 'text-muted-foreground hover:text-foreground'"
+            @click="router.push(tab.path)"
+          >
+            <component :is="tab.icon" class="w-5 h-5" />
+            <span class="text-[10px] font-medium">{{ tab.name }}</span>
+          </button>
+        </div>
+      </nav>
+    </div>
+
+    <Toaster />
+    <LoginDialog v-model:is-open="showLoginDialog" @success="handleLoginSuccess" />
+  </div>
 </template>
diff --git a/src/chat-app/App.vue b/src/chat-app/App.vue
index e902645..6e5a91d 100644
--- a/src/chat-app/App.vue
+++ b/src/chat-app/App.vue
@@ -1,16 +1,47 @@
 <script setup lang="ts">
-import AppShell from '@/components/layout/AppShell.vue'
-import type { BottomTab } from '@/components/layout/BottomNav.vue'
+import { computed, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { Toaster } from '@/components/ui/sonner'
+import LoginDialog from '@/components/auth/LoginDialog.vue'
+import { useTheme } from '@/components/theme-provider'
+import { toast } from 'vue-sonner'
+import { useAuth } from '@/composables/useAuthService'
+import { Button } from '@/components/ui/button'
+import { LogIn } from 'lucide-vue-next'
 
-// Chat owns its in-page navigation today; the shell only contributes the
-// always-on Profile entry on the right of the bottom row.
-const tabs: BottomTab[] = []
+const route = useRoute()
+const router = useRouter()
 
-function isActive(_path: string): boolean {
-  return false
+useTheme()
+const { isAuthenticated } = useAuth()
+
+const showLoginDialog = ref(false)
+
+const isLoginPage = computed(() => route.path === '/login')
+
+async function handleLoginSuccess() {
+  showLoginDialog.value = false
+  toast.success('Welcome!')
 }
 </script>
 
 <template>
-  <AppShell :tabs="tabs" :is-active="isActive" />
+  <div class="min-h-dvh bg-background font-sans antialiased">
+    <div class="relative flex min-h-dvh flex-col"
+      style="padding-top: env(safe-area-inset-top); padding-bottom: env(safe-area-inset-bottom)">
+
+      <div v-if="!isLoginPage && !isAuthenticated" class="fixed top-0 right-0 z-50 p-3" style="padding-top: env(safe-area-inset-top)">
+        <Button variant="ghost" size="icon" class="h-8 w-8" @click="router.push('/login')">
+          <LogIn class="w-4 h-4" />
+        </Button>
+      </div>
+
+      <main class="flex-1">
+        <router-view />
+      </main>
+    </div>
+
+    <Toaster />
+    <LoginDialog v-model:is-open="showLoginDialog" @success="handleLoginSuccess" />
+  </div>
 </template>
diff --git a/src/components/layout/BottomNav.vue b/src/components/layout/BottomNav.vue
index f52ba44..e74b67d 100644
--- a/src/components/layout/BottomNav.vue
+++ b/src/components/layout/BottomNav.vue
@@ -8,16 +8,10 @@ export interface BottomTab {
   name: string
   /** lucide-vue-next icon component. */
   icon: Component
-  /** Router path to push on click. Optional — coming-soon entries omit it. */
-  path?: string
+  /** Router path to push on click. */
+  path: string
   /** Optional unread/cart badge count. Falsy values hide the badge. */
   badge?: number | null
-  /** Click override. When provided, replaces the default router.push(path).
-   *  Consumers use this for coming-soon toasts or auth-gated CTAs. */
-  onClick?: () => void
-  /** Render the entry ghosted (opacity-reduced). Used for coming-soon and
-   *  for auth-required tabs when the user is logged out. */
-  disabled?: boolean
 }
 
 interface Props {
@@ -34,14 +28,6 @@ interface Props {
 const props = withDefaults(defineProps<Props>(), { loggedOutOpensSheet: false })
 
 const router = useRouter()
-
-function onTabClick(tab: BottomTab) {
-  if (tab.onClick) {
-    tab.onClick()
-    return
-  }
-  if (tab.path) router.push(tab.path)
-}
 </script>
 
 <template>
@@ -53,16 +39,13 @@ function onTabClick(tab: BottomTab) {
       <!-- App-specific tabs (consumer-provided) -->
       <button
         v-for="tab in props.tabs"
-        :key="tab.name"
+        :key="tab.path"
         class="relative flex flex-col items-center justify-center gap-0.5 flex-1 h-full transition-colors"
-        :class="[
-          tab.path && props.isActive(tab.path)
-            ? 'text-primary'
-            : 'text-muted-foreground hover:text-foreground',
-          tab.disabled ? 'opacity-50' : '',
-        ]"
-        :aria-current="tab.path && props.isActive(tab.path) ? 'page' : undefined"
-        @click="onTabClick(tab)"
+        :class="props.isActive(tab.path)
+          ? 'text-primary'
+          : 'text-muted-foreground hover:text-foreground'"
+        :aria-current="props.isActive(tab.path) ? 'page' : undefined"
+        @click="router.push(tab.path)"
       >
         <component :is="tab.icon" class="w-5 h-5" />
         <span class="text-[10px] font-medium">{{ tab.name }}</span>
diff --git a/src/forum-app/App.vue b/src/forum-app/App.vue
index f7fd1df..cc94140 100644
--- a/src/forum-app/App.vue
+++ b/src/forum-app/App.vue
@@ -1,35 +1,104 @@
 <script setup lang="ts">
-import { computed } from 'vue'
-import { useRoute } from 'vue-router'
+import { computed, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { Toaster } from '@/components/ui/sonner'
+import LoginDialog from '@/components/auth/LoginDialog.vue'
+import { useTheme } from '@/components/theme-provider'
 import { toast } from 'vue-sonner'
-import { Newspaper, Hash, SquarePen, Search, Bell } from 'lucide-vue-next'
-import AppShell from '@/components/layout/AppShell.vue'
-import type { BottomTab } from '@/components/layout/BottomNav.vue'
+import { useAuth } from '@/composables/useAuthService'
+import { Button } from '@/components/ui/button'
+import {
+  LogIn, Newspaper, Hash, SquarePen, Search, Bell,
+} from 'lucide-vue-next'
 
 const route = useRoute()
+const router = useRouter()
 
-function comingSoon(label: string, issue: number) {
-  toast.info(`${label} — coming soon`, {
-    description: `Tracked on issue #${issue}`,
-  })
+useTheme()
+const { isAuthenticated } = useAuth()
+
+const showLoginDialog = ref(false)
+
+interface Tab {
+  name: string
+  icon: any
+  path?: string
+  comingSoon?: { issue: number; label: string }
 }
 
-const tabs = computed<BottomTab[]>(() => [
+const bottomTabs: Tab[] = [
   { name: 'Posts', icon: Newspaper, path: '/forum' },
-  { name: 'Spaces', icon: Hash, disabled: true, onClick: () => comingSoon('Spaces', 31) },
+  { name: 'Spaces', icon: Hash, comingSoon: { issue: 31, label: 'Spaces' } },
   { name: 'Submit', icon: SquarePen, path: '/submit' },
-  { name: 'Search', icon: Search, disabled: true, onClick: () => comingSoon('Search', 15) },
-  { name: 'Alerts', icon: Bell, disabled: true, onClick: () => comingSoon('Notifications', 32) },
-])
+  { name: 'Search', icon: Search, comingSoon: { issue: 15, label: 'Search' } },
+  { name: 'Alerts', icon: Bell, comingSoon: { issue: 32, label: 'Notifications' } },
+]
 
-function isActive(path: string): boolean {
-  if (path === '/forum') {
-    return route.path === '/forum' || route.path.startsWith('/submission/')
+const isLoginPage = computed(() => route.path === '/login')
+
+function isActiveTab(tab: Tab): boolean {
+  if (!tab.path) return false
+  if (tab.path === '/forum') return route.path === '/forum' || route.path.startsWith('/submission/')
+  return route.path.startsWith(tab.path)
+}
+
+function onTabClick(tab: Tab) {
+  if (tab.path) {
+    router.push(tab.path)
+  } else if (tab.comingSoon) {
+    toast.info(`${tab.comingSoon.label} — coming soon`, {
+      description: `Tracked on issue #${tab.comingSoon.issue}`,
+    })
   }
-  return route.path.startsWith(path)
+}
+
+async function handleLoginSuccess() {
+  showLoginDialog.value = false
+  toast.success('Welcome!')
 }
 </script>
 
 <template>
-  <AppShell :tabs="tabs" :is-active="isActive" />
+  <div class="min-h-dvh bg-background font-sans antialiased">
+    <div class="relative flex min-h-dvh flex-col"
+      style="padding-top: env(safe-area-inset-top); padding-bottom: env(safe-area-inset-bottom)">
+
+      <div v-if="!isLoginPage && !isAuthenticated" class="fixed top-0 right-0 z-50 p-3" style="padding-top: env(safe-area-inset-top)">
+        <Button variant="ghost" size="icon" class="h-8 w-8" @click="router.push('/login')">
+          <LogIn class="w-4 h-4" />
+        </Button>
+      </div>
+
+      <main class="flex-1" :class="{ 'pb-16': !isLoginPage }">
+        <router-view />
+      </main>
+
+      <nav
+        v-if="!isLoginPage"
+        class="fixed bottom-0 left-0 right-0 z-50 border-t bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60"
+        style="padding-bottom: env(safe-area-inset-bottom)"
+      >
+        <div class="flex items-center justify-around h-14 max-w-lg mx-auto">
+          <button
+            v-for="tab in bottomTabs"
+            :key="tab.name"
+            class="flex flex-col items-center justify-center gap-0.5 flex-1 h-full transition-colors"
+            :class="[
+              isActiveTab(tab)
+                ? 'text-primary'
+                : 'text-muted-foreground hover:text-foreground',
+              tab.comingSoon ? 'opacity-50' : '',
+            ]"
+            @click="onTabClick(tab)"
+          >
+            <component :is="tab.icon" class="w-5 h-5" />
+            <span class="text-[10px] font-medium">{{ tab.name }}</span>
+          </button>
+        </div>
+      </nav>
+    </div>
+
+    <Toaster />
+    <LoginDialog v-model:is-open="showLoginDialog" @success="handleLoginSuccess" />
+  </div>
 </template>
diff --git a/src/market-app/App.vue b/src/market-app/App.vue
index 4d6c4b6..51dc59f 100644
--- a/src/market-app/App.vue
+++ b/src/market-app/App.vue
@@ -1,55 +1,114 @@
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
+import { Toaster } from '@/components/ui/sonner'
+import LoginDialog from '@/components/auth/LoginDialog.vue'
+import { useTheme } from '@/components/theme-provider'
 import { toast } from 'vue-sonner'
-import { Store, ShoppingCart, Package } from 'lucide-vue-next'
-import AppShell from '@/components/layout/AppShell.vue'
-import type { BottomTab } from '@/components/layout/BottomNav.vue'
 import { useAuth } from '@/composables/useAuthService'
 import { useMarketStore } from '@/modules/market/stores/market'
+import {
+  Store, ShoppingCart, Package, LogIn, User as UserIcon,
+} from 'lucide-vue-next'
 
 const route = useRoute()
 const router = useRouter()
+
+useTheme()
 const { isAuthenticated } = useAuth()
 const marketStore = useMarketStore()
 
-const tabs = computed<BottomTab[]>(() => [
+const showLoginDialog = ref(false)
+
+interface Tab {
+  name: string
+  icon: any
+  path?: string
+  authRequired?: boolean
+  badge?: () => number
+  onClick?: () => void
+}
+
+const bottomTabs = computed<Tab[]>(() => [
   { name: 'Browse', icon: Store, path: '/market' },
-  {
-    name: 'Cart',
-    icon: ShoppingCart,
-    path: '/cart',
-    badge: marketStore.totalCartItems || null,
-  },
-  {
-    name: 'My Store',
-    icon: Package,
-    path: isAuthenticated.value ? '/market/dashboard' : undefined,
-    disabled: !isAuthenticated.value,
-    onClick: !isAuthenticated.value
-      ? () =>
-          toast.info('My Store requires login', {
-            action: { label: 'Log in', onClick: () => router.push('/login') },
-          })
-      : undefined,
-  },
+  { name: 'Cart', icon: ShoppingCart, path: '/cart', badge: () => marketStore.totalCartItems },
+  { name: 'My Store', icon: Package, path: '/market/dashboard', authRequired: true },
+  isAuthenticated.value
+    ? { name: 'Profile', icon: UserIcon, path: '/profile' }
+    : { name: 'Log in', icon: LogIn, path: '/login' },
 ])
 
-function isActive(path: string): boolean {
-  if (path === '/market') {
-    return (
-      route.path === '/market' ||
-      route.path.startsWith('/market/stall/') ||
-      route.path.startsWith('/market/product/')
-    )
+const isLoginPage = computed(() => route.path === '/login')
+
+function isActiveTab(tab: Tab): boolean {
+  if (!tab.path) return false
+  if (tab.path === '/market') {
+    return route.path === '/market' || route.path.startsWith('/market/stall/') || route.path.startsWith('/market/product/')
   }
-  if (path === '/cart') {
-    return route.path === '/cart' || route.path.startsWith('/checkout/')
+  if (tab.path === '/cart') return route.path === '/cart' || route.path.startsWith('/checkout/')
+  return route.path.startsWith(tab.path)
+}
+
+function onTabClick(tab: Tab) {
+  if (tab.authRequired && !isAuthenticated.value) {
+    toast.info(`${tab.name} requires login`, {
+      action: {
+        label: 'Log in',
+        onClick: () => router.push('/login'),
+      },
+    })
+    return
   }
-  return route.path.startsWith(path)
+  if (tab.path) router.push(tab.path)
+}
+
+async function handleLoginSuccess() {
+  showLoginDialog.value = false
+  toast.success('Welcome!')
 }
 </script>
 
 <template>
-  <AppShell :tabs="tabs" :is-active="isActive" />
+  <div class="min-h-dvh bg-background font-sans antialiased">
+    <div class="relative flex min-h-dvh flex-col"
+      style="padding-top: env(safe-area-inset-top); padding-bottom: env(safe-area-inset-bottom)">
+
+      <main class="flex-1" :class="{ 'pb-16': !isLoginPage }">
+        <router-view />
+      </main>
+
+      <nav
+        v-if="!isLoginPage"
+        class="fixed bottom-0 left-0 right-0 z-50 border-t bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60"
+        style="padding-bottom: env(safe-area-inset-bottom)"
+      >
+        <div class="flex items-center justify-around h-14 max-w-lg mx-auto">
+          <button
+            v-for="tab in bottomTabs"
+            :key="tab.name"
+            class="flex flex-col items-center justify-center gap-0.5 flex-1 h-full transition-colors"
+            :class="[
+              isActiveTab(tab)
+                ? 'text-primary'
+                : 'text-muted-foreground hover:text-foreground',
+              tab.authRequired && !isAuthenticated ? 'opacity-50' : '',
+            ]"
+            @click="onTabClick(tab)"
+          >
+            <span class="relative inline-flex">
+              <component :is="tab.icon" class="w-5 h-5" />
+              <span
+                v-if="tab.badge && tab.badge() > 0"
+                class="absolute -top-1.5 -right-2 min-w-[16px] h-4 px-1 rounded-full bg-primary text-primary-foreground text-[10px] font-semibold leading-4 text-center"
+              >{{ tab.badge() }}</span>
+            </span>
+            <span class="text-[10px] font-medium">{{ tab.name }}</span>
+          </button>
+        </div>
+      </nav>
+    </div>
+
+    <Toaster />
+    <LoginDialog v-model:is-open="showLoginDialog" @success="handleLoginSuccess" />
+  </div>
 </template>
diff --git a/src/modules/activities/views/ActivitiesPage.vue b/src/modules/activities/views/ActivitiesPage.vue
index 8afd937..b82d0eb 100644
--- a/src/modules/activities/views/ActivitiesPage.vue
+++ b/src/modules/activities/views/ActivitiesPage.vue
@@ -8,7 +8,7 @@ import {
   CollapsibleContent,
   CollapsibleTrigger,
 } from '@/components/ui/collapsible'
-import { SlidersHorizontal, ChevronDown, Plus } from 'lucide-vue-next'
+import { RefreshCw, SlidersHorizontal, ChevronDown, Plus, LogIn } from 'lucide-vue-next'
 import { useAuth } from '@/composables/useAuthService'
 import { useActivities } from '../composables/useActivities'
 import CreateEventDialog from '../components/CreateEventDialog.vue'
@@ -86,6 +86,18 @@ async function handleCreateEvent(eventData: CreateEventRequest) {
           <Plus class="w-4 h-4 mr-1.5" />
           <span class="hidden sm:inline">{{ t('activities.createNew') }}</span>
         </Button>
+        <Button variant="ghost" size="icon" class="h-8 w-8" @click="handleRefresh" :disabled="isLoading">
+          <RefreshCw class="w-4 h-4" :class="{ 'animate-spin': isLoading }" />
+        </Button>
+        <Button
+          v-if="!isAuthenticated"
+          variant="ghost"
+          size="icon"
+          class="h-8 w-8"
+          @click="$router.push('/login')"
+        >
+          <LogIn class="w-4 h-4" />
+        </Button>
       </div>
     </div>
 
diff --git a/src/modules/activities/views/EventsPage.vue b/src/modules/activities/views/EventsPage.vue
index 0181dc1..b173cf3 100644
--- a/src/modules/activities/views/EventsPage.vue
+++ b/src/modules/activities/views/EventsPage.vue
@@ -10,7 +10,7 @@ import { Badge } from '@/components/ui/badge'
 import { format } from 'date-fns'
 import PurchaseTicketDialog from '../components/PurchaseTicketDialog.vue'
 import CreateEventDialog from '../components/CreateEventDialog.vue'
-import { User, LogIn, Plus } from 'lucide-vue-next'
+import { RefreshCw, User, LogIn, Plus } from 'lucide-vue-next'
 import { formatEventPrice } from '@/lib/utils/formatting'
 import { injectService, SERVICE_TOKENS } from '@/core/di-container'
 import type { TicketApiService } from '../services/TicketApiService'
@@ -84,6 +84,10 @@ function handleEventCreated() {
           <Plus class="w-4 h-4" />
           <span class="ml-2">Create Event</span>
         </Button>
+        <Button variant="secondary" size="sm" @click="refresh" :disabled="isLoading" class="flex-1 sm:flex-none">
+          <RefreshCw class="w-4 h-4" :class="{ 'animate-spin': isLoading }" />
+          <span class="ml-2">Refresh</span>
+        </Button>
       </div>
     </div>
 
diff --git a/src/modules/activities/views/MyTicketsPage.vue b/src/modules/activities/views/MyTicketsPage.vue
index cbf43ea..520f3e4 100644
--- a/src/modules/activities/views/MyTicketsPage.vue
+++ b/src/modules/activities/views/MyTicketsPage.vue
@@ -131,6 +131,10 @@ onMounted(async () => {
           <span>Please log in to view your tickets</span>
         </div>
       </div>
+      <Button variant="secondary" size="sm" @click="refresh" :disabled="isLoading">
+        <span v-if="isLoading" class="animate-spin mr-2">⚡</span>
+        Refresh
+      </Button>
     </div>
 
     <div v-if="!isAuthenticated" class="text-center py-12">
diff --git a/src/modules/chat/components/ChatComponent.vue b/src/modules/chat/components/ChatComponent.vue
index 2803539..82ab49f 100644
--- a/src/modules/chat/components/ChatComponent.vue
+++ b/src/modules/chat/components/ChatComponent.vue
@@ -17,6 +17,11 @@
             {{ totalUnreadCount }} unread
           </Badge>
         </div>
+        <Button @click="refreshPeers" :disabled="isLoading" size="sm">
+          <RefreshCw v-if="isLoading" class="h-4 w-4 animate-spin" />
+          <RefreshCw v-else class="h-4 w-4" />
+          <span class="hidden sm:inline ml-2">Refresh</span>
+        </Button>
       </div>
 
       <!-- Peer List -->
@@ -197,6 +202,11 @@
             {{ totalUnreadCount }} unread
           </Badge>
         </div>
+        <Button @click="refreshPeers" :disabled="isLoading" size="sm">
+          <RefreshCw v-if="isLoading" class="h-4 w-4 animate-spin" />
+          <RefreshCw v-else class="h-4 w-4" />
+          Refresh Peers
+        </Button>
       </div>
 
       <!-- Main Content -->
@@ -359,7 +369,7 @@
 
 <script setup lang="ts">
 import { ref, computed, onMounted, onUnmounted, nextTick, watch } from 'vue'
-import { Send, MessageSquare, ArrowLeft, Search, X } from 'lucide-vue-next'
+import { Send, RefreshCw, MessageSquare, ArrowLeft, Search, X } from 'lucide-vue-next'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Badge } from '@/components/ui/badge'
@@ -381,6 +391,7 @@ const peers = computed(() => chat.peers.value)
 const selectedPeer = ref<ChatPeer | null>(null)
 const messageInput = ref('')
 
+const isLoading = ref(false)
 const showChat = ref(false)
 const messagesScrollArea = ref<HTMLElement | null>(null)
 const messagesContainer = ref<HTMLElement | null>(null)
@@ -453,6 +464,10 @@ const goBackToPeers = () => {
 
 
 
+const refreshPeers = async () => {
+  await chat.refreshPeers()
+}
+
 const selectPeer = async (peer: ChatPeer) => {
   selectedPeer.value = peer
   messageInput.value = ''
diff --git a/src/modules/expenses/views/TransactionsPage.vue b/src/modules/expenses/views/TransactionsPage.vue
index 416c645..03ad5d8 100644
--- a/src/modules/expenses/views/TransactionsPage.vue
+++ b/src/modules/expenses/views/TransactionsPage.vue
@@ -183,8 +183,18 @@ onMounted(() => {
     <!-- Compact Header -->
     <div class="flex flex-col gap-3 p-4 md:p-6 border-b md:bg-card/50 md:backdrop-blur-sm">
       <div class="w-full max-w-3xl mx-auto">
-        <div class="mb-3">
+        <div class="flex items-center justify-between mb-3">
           <h1 class="text-lg md:text-xl font-bold">Transaction History</h1>
+          <Button
+            variant="outline"
+            size="sm"
+            @click="loadTransactions"
+            :disabled="isLoading"
+            class="gap-2 md:h-10 md:px-4 hover:bg-accent transition-colors"
+          >
+            <RefreshCw :class="{ 'animate-spin': isLoading }" class="h-4 w-4" />
+            <span class="hidden md:inline">Refresh</span>
+          </Button>
         </div>
 
         <!-- Date Range Controls -->
diff --git a/src/modules/nostr-feed/components/NostrFeed.vue b/src/modules/nostr-feed/components/NostrFeed.vue
index ca2dfdf..6a66342 100644
--- a/src/modules/nostr-feed/components/NostrFeed.vue
+++ b/src/modules/nostr-feed/components/NostrFeed.vue
@@ -465,6 +465,16 @@ function cancelDelete() {
             <p class="text-xs md:text-sm text-muted-foreground">{{ feedDescription }}</p>
           </div>
         </div>
+        <Button
+          variant="outline"
+          size="sm"
+          @click="refreshFeed"
+          :disabled="isLoading"
+          class="gap-2 md:h-10 md:px-4 hover:bg-accent transition-colors"
+        >
+          <RefreshCw :class="{ 'animate-spin': isLoading }" class="h-4 w-4" />
+          <span class="hidden md:inline">Refresh</span>
+        </Button>
       </div>
     </div>
 
diff --git a/src/modules/wallet/views/WalletPage.vue b/src/modules/wallet/views/WalletPage.vue
index 5dda9a3..3c8622e 100644
--- a/src/modules/wallet/views/WalletPage.vue
+++ b/src/modules/wallet/views/WalletPage.vue
@@ -30,6 +30,7 @@ const copiedField = ref<string | null>(null)
 
 // Computed
 const transactions = computed(() => walletService?.transactions?.value || [])
+const isLoading = computed(() => walletService?.isLoading?.value || false)
 const error = computed(() => walletService?.error?.value)
 // Use PaymentService for centralized balance calculation
 const totalBalance = computed(() => paymentService?.totalBalance || 0)
@@ -175,10 +176,15 @@ onMounted(async () => {
   <div class="container mx-auto py-4 sm:py-8 px-3 sm:px-4 max-w-6xl">
     <!-- Header -->
     <div class="mb-4 sm:mb-6">
-      <h1 class="text-2xl sm:text-3xl font-bold flex items-center gap-2">
-        <Wallet class="h-6 w-6 sm:h-8 sm:w-8" />
-        Wallet
-      </h1>
+      <div class="flex items-center justify-between">
+        <h1 class="text-2xl sm:text-3xl font-bold flex items-center gap-2">
+          <Wallet class="h-6 w-6 sm:h-8 sm:w-8" />
+          Wallet
+        </h1>
+        <Button variant="ghost" size="sm" @click="refresh" :disabled="isLoading">
+          <RefreshCw class="h-4 w-4" :class="{ 'animate-spin': isLoading }" />
+        </Button>
+      </div>
       <p class="text-sm sm:text-base text-muted-foreground mt-1">Manage your Bitcoin transactions</p>
     </div>
 
diff --git a/src/pages/Hub.vue b/src/pages/Hub.vue
index 85eda00..bf54436 100644
--- a/src/pages/Hub.vue
+++ b/src/pages/Hub.vue
@@ -1,17 +1,29 @@
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { useAuth } from '@/composables/useAuthService'
+import { useTheme } from '@/components/theme-provider'
+import { useLocale } from '@/composables/useLocale'
 import { toast } from 'vue-sonner'
 import {
   Scale, ListTodo, Newspaper, MessageCircle, Wallet, CalendarDays,
   Store, UtensilsCrossed,
+  User as UserIcon, LogIn, Sun, Moon, Monitor, Globe, Coins,
 } from 'lucide-vue-next'
-import ProfileSheetTrigger from '@/components/layout/ProfileSheetTrigger.vue'
-import PreferencesRow from '@/components/layout/PreferencesRow.vue'
+import {
+  DropdownMenu, DropdownMenuTrigger, DropdownMenuContent,
+  DropdownMenuRadioGroup, DropdownMenuRadioItem,
+  DropdownMenuLabel, DropdownMenuSeparator,
+} from '@/components/ui/dropdown-menu'
+import {
+  Sheet, SheetContent, SheetHeader, SheetTitle, SheetDescription, SheetTrigger,
+} from '@/components/ui/sheet'
+import ProfileSettings from '@/modules/base/components/ProfileSettings.vue'
 
 const router = useRouter()
 const { isAuthenticated } = useAuth()
+const { theme, setTheme, currentTheme } = useTheme()
+const { currentLocale, locales, setLocale } = useLocale()
 
 interface Module {
   label: string
@@ -73,6 +85,14 @@ function onTileClick(m: Module, event: Event) {
   }
   // "Coming soon" tiles (no envKey, no authRequired) silently do nothing.
 }
+
+const showProfile = ref(false)
+
+function notImplemented() {
+  toast.info('Currency picker — coming soon', {
+    description: 'A preferred-currency setting (sats/USD/EUR) is on the roadmap.',
+  })
+}
 </script>
 
 <template>
@@ -134,17 +154,85 @@ function onTileClick(m: Module, event: Event) {
       </div>
     </div>
 
-    <!-- Bottom bar: profile + user preferences. Profile entry is identical to
-         every standalone (avatar from kind-0, sheet has back-to-hub stub
-         removed since this IS the hub). Logged-out users still get the
-         sheet so they can change theme/lang without signing in. -->
+    <!-- Bottom bar: profile & user preferences -->
     <nav
       class="relative z-10 border-t bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60"
       style="padding-bottom: env(safe-area-inset-bottom)"
     >
       <div class="flex items-center justify-around h-14 max-w-lg mx-auto">
-        <ProfileSheetTrigger :logged-out-opens-sheet="true" />
-        <PreferencesRow layout="row" />
+        <!-- Profile (when logged in) / Log in (when not) -->
+        <Sheet v-if="isAuthenticated" v-model:open="showProfile">
+          <SheetTrigger as-child>
+            <button class="flex flex-col items-center justify-center gap-0.5 flex-1 h-full text-muted-foreground hover:text-foreground transition-colors">
+              <UserIcon class="w-5 h-5" />
+              <span class="text-[10px] font-medium">Profile</span>
+            </button>
+          </SheetTrigger>
+          <SheetContent side="bottom" class="h-[90vh] overflow-y-auto">
+            <SheetHeader>
+              <SheetTitle>Profile</SheetTitle>
+              <SheetDescription>Your Nostr identity and display name.</SheetDescription>
+            </SheetHeader>
+            <div class="mt-4">
+              <ProfileSettings />
+            </div>
+          </SheetContent>
+        </Sheet>
+        <button
+          v-else
+          class="flex flex-col items-center justify-center gap-0.5 flex-1 h-full text-muted-foreground hover:text-foreground transition-colors"
+          @click="router.push('/login')"
+        >
+          <LogIn class="w-5 h-5" />
+          <span class="text-[10px] font-medium">Log in</span>
+        </button>
+
+        <!-- Theme -->
+        <DropdownMenu>
+          <DropdownMenuTrigger as-child>
+            <button class="flex flex-col items-center justify-center gap-0.5 flex-1 h-full text-muted-foreground hover:text-foreground transition-colors">
+              <component :is="currentTheme === 'dark' ? Moon : Sun" class="w-5 h-5" />
+              <span class="text-[10px] font-medium">Theme</span>
+            </button>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent align="center" class="w-40">
+            <DropdownMenuLabel>Theme</DropdownMenuLabel>
+            <DropdownMenuSeparator />
+            <DropdownMenuRadioGroup :model-value="theme" @update:model-value="(v: string) => setTheme(v as 'dark' | 'light' | 'system')">
+              <DropdownMenuRadioItem value="light"><Sun class="w-4 h-4 mr-2" />Light</DropdownMenuRadioItem>
+              <DropdownMenuRadioItem value="dark"><Moon class="w-4 h-4 mr-2" />Dark</DropdownMenuRadioItem>
+              <DropdownMenuRadioItem value="system"><Monitor class="w-4 h-4 mr-2" />System</DropdownMenuRadioItem>
+            </DropdownMenuRadioGroup>
+          </DropdownMenuContent>
+        </DropdownMenu>
+
+        <!-- Language -->
+        <DropdownMenu>
+          <DropdownMenuTrigger as-child>
+            <button class="flex flex-col items-center justify-center gap-0.5 flex-1 h-full text-muted-foreground hover:text-foreground transition-colors">
+              <Globe class="w-5 h-5" />
+              <span class="text-[10px] font-medium">Language</span>
+            </button>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent align="center" class="w-44">
+            <DropdownMenuLabel>Language</DropdownMenuLabel>
+            <DropdownMenuSeparator />
+            <DropdownMenuRadioGroup :model-value="currentLocale" @update:model-value="(v: string) => setLocale(v)">
+              <DropdownMenuRadioItem v-for="l in locales" :key="l.code" :value="l.code">
+                <span class="mr-2">{{ l.flag }}</span>{{ l.name }}
+              </DropdownMenuRadioItem>
+            </DropdownMenuRadioGroup>
+          </DropdownMenuContent>
+        </DropdownMenu>
+
+        <!-- Currency (placeholder) -->
+        <button
+          class="flex flex-col items-center justify-center gap-0.5 flex-1 h-full text-muted-foreground hover:text-foreground transition-colors opacity-50"
+          @click="notImplemented"
+        >
+          <Coins class="w-5 h-5" />
+          <span class="text-[10px] font-medium">Currency</span>
+        </button>
       </div>
     </nav>
   </div>
diff --git a/src/tasks-app/App.vue b/src/tasks-app/App.vue
index f420b6d..6e5a91d 100644
--- a/src/tasks-app/App.vue
+++ b/src/tasks-app/App.vue
@@ -1,16 +1,47 @@
 <script setup lang="ts">
-import AppShell from '@/components/layout/AppShell.vue'
-import type { BottomTab } from '@/components/layout/BottomNav.vue'
+import { computed, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { Toaster } from '@/components/ui/sonner'
+import LoginDialog from '@/components/auth/LoginDialog.vue'
+import { useTheme } from '@/components/theme-provider'
+import { toast } from 'vue-sonner'
+import { useAuth } from '@/composables/useAuthService'
+import { Button } from '@/components/ui/button'
+import { LogIn } from 'lucide-vue-next'
 
-// Tasks owns its in-page navigation; the shell only contributes the
-// always-on Profile entry on the right of the bottom row.
-const tabs: BottomTab[] = []
+const route = useRoute()
+const router = useRouter()
 
-function isActive(_path: string): boolean {
-  return false
+useTheme()
+const { isAuthenticated } = useAuth()
+
+const showLoginDialog = ref(false)
+
+const isLoginPage = computed(() => route.path === '/login')
+
+async function handleLoginSuccess() {
+  showLoginDialog.value = false
+  toast.success('Welcome!')
 }
 </script>
 
 <template>
-  <AppShell :tabs="tabs" :is-active="isActive" />
+  <div class="min-h-dvh bg-background font-sans antialiased">
+    <div class="relative flex min-h-dvh flex-col"
+      style="padding-top: env(safe-area-inset-top); padding-bottom: env(safe-area-inset-bottom)">
+
+      <div v-if="!isLoginPage && !isAuthenticated" class="fixed top-0 right-0 z-50 p-3" style="padding-top: env(safe-area-inset-top)">
+        <Button variant="ghost" size="icon" class="h-8 w-8" @click="router.push('/login')">
+          <LogIn class="w-4 h-4" />
+        </Button>
+      </div>
+
+      <main class="flex-1">
+        <router-view />
+      </main>
+    </div>
+
+    <Toaster />
+    <LoginDialog v-model:is-open="showLoginDialog" @success="handleLoginSuccess" />
+  </div>
 </template>
diff --git a/src/wallet-app/App.vue b/src/wallet-app/App.vue
index b2a0527..b50706d 100644
--- a/src/wallet-app/App.vue
+++ b/src/wallet-app/App.vue
@@ -1,16 +1,48 @@
 <script setup lang="ts">
-import AppShell from '@/components/layout/AppShell.vue'
-import type { BottomTab } from '@/components/layout/BottomNav.vue'
+import { computed, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { Toaster } from '@/components/ui/sonner'
+import LoginDialog from '@/components/auth/LoginDialog.vue'
+import { useTheme } from '@/components/theme-provider'
+import { toast } from 'vue-sonner'
+import { useAuth } from '@/composables/useAuthService'
+import { Button } from '@/components/ui/button'
+import { LogIn } from 'lucide-vue-next'
 
-// Wallet owns its in-page navigation; the shell only contributes the
-// always-on Profile entry on the right of the bottom row.
-const tabs: BottomTab[] = []
+const route = useRoute()
+const router = useRouter()
 
-function isActive(_path: string): boolean {
-  return false
+useTheme()
+const { isAuthenticated } = useAuth()
+
+const showLoginDialog = ref(false)
+
+const isLoginPage = computed(() => route.path === '/login')
+
+async function handleLoginSuccess() {
+  showLoginDialog.value = false
+  toast.success('Welcome!')
 }
 </script>
 
 <template>
-  <AppShell :tabs="tabs" :is-active="isActive" />
+  <div class="min-h-dvh bg-background font-sans antialiased">
+    <div class="relative flex min-h-dvh flex-col"
+      style="padding-top: env(safe-area-inset-top); padding-bottom: env(safe-area-inset-bottom)">
+
+      <!-- Top bar with login -->
+      <div v-if="!isLoginPage && !isAuthenticated" class="fixed top-0 right-0 z-50 p-3" style="padding-top: env(safe-area-inset-top)">
+        <Button variant="ghost" size="icon" class="h-8 w-8" @click="router.push('/login')">
+          <LogIn class="w-4 h-4" />
+        </Button>
+      </div>
+
+      <main class="flex-1">
+        <router-view />
+      </main>
+    </div>
+
+    <Toaster />
+    <LoginDialog v-model:is-open="showLoginDialog" @success="handleLoginSuccess" />
+  </div>
 </template>