diff --git a/CLAUDE.md b/CLAUDE.md
index 1951c3b..ef005ec 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -252,5 +252,9 @@ Claude, so they carry the same middleware chain.
   resource merge).
 - **Always device-verify Compose changes** (`installDebug` + screenshot), not just `assembleDebug` —
   a green build can still crash at runtime (e.g. the empty-font bug).
+- **Never start the Android emulator** unless the user asked for it, or said yes when asked. It is
+  slow to boot and device checks belong on the connected phone. If the phone can't take the build
+  (a debug build can't replace a Play-installed one: the signatures differ, and uninstalling wipes
+  the app's data), stop and ask how to verify instead of reaching for the emulator.
 - A few inline strings remain (Premium feature descriptions, quick-action labels, Tibetan
   placeholders) — externalize if expanding i18n.
diff --git a/app/build.gradle b/app/build.gradle
index 2c737c9..6455cc0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,10 +31,10 @@ android {
         // installed devices on API 23 (0.03%).
         minSdkVersion 24
         targetSdkVersion 36
-        versionCode project.hasProperty('versionCode') ? project.property('versionCode').toInteger() : 57
+        versionCode project.hasProperty('versionCode') ? project.property('versionCode').toInteger() : 58
 
         // RevenueCat targeting rules match on this (App version >= 2.3.0).
-        versionName "2.3.0"
+        versionName "2.3.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c85e175..a79782b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,7 +28,8 @@
         </service>
         <activity
             android:name=".ui.login.LoginActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:theme="@style/Theme.TibetanKeyboard.Sheet" />
         <activity
             android:name=".ui.chat.ChatActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/analytics/AppAnalytics.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/analytics/AppAnalytics.kt
index 9e79bcd..937c6d8 100644
--- a/app/src/main/java/com/kharagedition/tibetankeyboard/analytics/AppAnalytics.kt
+++ b/app/src/main/java/com/kharagedition/tibetankeyboard/analytics/AppAnalytics.kt
@@ -443,6 +443,8 @@ object AppAnalytics {
         const val ABOUT = "about"
         const val UPGRADE = "upgrade"
         const val JOURNEY = "journey"
+        const val SIGN_IN = "sign_in"
+        const val ACCOUNT = "account"
     }
 
     /** Stable source labels for [logJourneyOpened] (where the Journey screen was opened from). */
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/auth/AuthManager.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/auth/AuthManager.kt
index aeddbb5..345ae47 100644
--- a/app/src/main/java/com/kharagedition/tibetankeyboard/auth/AuthManager.kt
+++ b/app/src/main/java/com/kharagedition/tibetankeyboard/auth/AuthManager.kt
@@ -13,6 +13,7 @@ import com.google.firebase.auth.ktx.auth
 import com.google.firebase.ktx.Firebase
 import com.kharagedition.tibetankeyboard.R
 import com.kharagedition.tibetankeyboard.analytics.AppAnalytics
+import com.kharagedition.tibetankeyboard.ui.home.HomeActivity
 import com.kharagedition.tibetankeyboard.ui.login.LoginActivity
 import com.kharagedition.tibetankeyboard.ui.subscription.KeyboardPremiumActivity
 import com.kharagedition.tibetankeyboard.ui.subscription.PremiumActivity
@@ -42,6 +43,8 @@ class AuthManager(private val context: Context) {
         return userPreferences.getUserName().takeIf { it.isNotEmpty() } ?: "User"
     }
 
+    fun getCurrentUserEmail(): String = userPreferences.getUserEmail()
+
     /**
      * Get current user photo URL
      */
@@ -120,6 +123,22 @@ class AuthManager(private val context: Context) {
         if (finishCaller) (context as? Activity)?.finish()
     }
 
+    /**
+     * Back to Home, closing the screens above it. Where a sign-out lands: Home needs no account
+     * and its header offers "Sign in" again, while a login screen would read as a demand.
+     */
+    fun redirectToHome() {
+        val intent = Intent(context, HomeActivity::class.java)
+            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+
+        if (context !is Activity) {
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+
+        context.startActivity(intent)
+        (context as? Activity)?.finish()
+    }
+
     /**
      * Open the paywall. Safe from a non-Activity context such as the IME service. [source] is the
      * [AppAnalytics.UpgradeSource] that triggered it, carried through every purchase event.
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/chat/ChatActivity.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/chat/ChatActivity.kt
index a29f9b3..3e8b3b1 100644
--- a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/chat/ChatActivity.kt
@@ -97,8 +97,8 @@ class ChatActivity : AppCompatActivity() {
 
     private fun signOut() {
         authManager.signOut {
-            authManager.redirectToLogin()
             showToast(getString(R.string.signed_out))
+            authManager.redirectToHome()
         }
     }
 
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/compose/components/AppIcons.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/compose/components/AppIcons.kt
index 1ff2949..76cac3c 100644
--- a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/compose/components/AppIcons.kt
+++ b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/compose/components/AppIcons.kt
@@ -18,6 +18,7 @@ import androidx.compose.material.icons.rounded.Lock
 import androidx.compose.material.icons.rounded.MoreHoriz
 import androidx.compose.material.icons.rounded.Notifications
 import androidx.compose.material.icons.rounded.Palette
+import androidx.compose.material.icons.rounded.Person
 import androidx.compose.material.icons.rounded.SwapHoriz
 import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material.icons.rounded.Share
@@ -56,6 +57,7 @@ object AppIcons {
     val Sound: ImageVector = Icons.Rounded.VolumeUp
     val Bell: ImageVector = Icons.Rounded.Notifications
     val Logout: ImageVector = Icons.AutoMirrored.Rounded.Logout
+    val Person: ImageVector = Icons.Rounded.Person
     val Copy: ImageVector = Icons.Rounded.ContentCopy
     val Send: ImageVector = Icons.AutoMirrored.Rounded.Send
     val Globe: ImageVector = Icons.Rounded.Language
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/compose/components/Components.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/compose/components/Components.kt
index 5170608..f44337f 100644
--- a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/compose/components/Components.kt
+++ b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/compose/components/Components.kt
@@ -25,12 +25,14 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import coil.compose.AsyncImage
 import com.kharagedition.tibetankeyboard.ui.compose.theme.LocalTibetanFont
 import com.kharagedition.tibetankeyboard.ui.compose.theme.TibetanColors
 import com.kharagedition.tibetankeyboard.ui.compose.theme.TibetanTokens
@@ -152,6 +154,42 @@ fun CharCounter(
     )
 }
 
+/**
+ * The signed-in user's picture in a gold ring. Their initial sits underneath, so it shows while
+ * the picture loads and stays if there is none.
+ */
+@Composable
+fun AccountAvatar(
+    name: String,
+    photoUrl: String?,
+    modifier: Modifier = Modifier,
+    size: Dp = 40.dp,
+) {
+    Box(
+        modifier = modifier
+            .size(size)
+            .clip(CircleShape)
+            .background(TibetanColors.Brown600)
+            .border(1.5.dp, TibetanColors.Gold400, CircleShape),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            name.trim().take(1).uppercase().ifEmpty { "?" },
+            color = TibetanColors.Gold300,
+            fontSize = (size.value * 0.42f).sp,
+            fontWeight = FontWeight.ExtraBold,
+        )
+        if (!photoUrl.isNullOrBlank()) {
+            AsyncImage(
+                model = photoUrl,
+                contentDescription = null,
+                contentScale = ContentScale.Crop,
+                modifier = Modifier.fillMaxSize().padding(1.5.dp).clip(CircleShape),
+            )
+        }
+    }
+}
+
 /** Small rounded badge, e.g. "PRO". */
 @Composable
 fun PillBadge(
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/home/HomeActivity.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/home/HomeActivity.kt
index bede653..4127bbe 100644
--- a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/home/HomeActivity.kt
+++ b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/home/HomeActivity.kt
@@ -130,6 +130,7 @@ class HomeActivity : InputMethodActivity() {
         super.onResume()
         refreshSetupState()
         viewModel.refreshJourney()
+        viewModel.refreshAccount()
         // CRITICAL: sync purchases on resume to acknowledge pending subscriptions
         // (prevents Google Play auto-cancelling after 3 days).
         if (viewModel.isUserAuthenticated()) {
@@ -205,6 +206,16 @@ class HomeActivity : InputMethodActivity() {
             AppAnalytics.logJourneyOpened(AppAnalytics.JourneySource.HOME)
             startActivity(Intent(this, JourneyActivity::class.java))
         },
+        onSignIn = {
+            AppAnalytics.logHomeAction(AppAnalytics.HomeAction.SIGN_IN)
+            // Home stays underneath, so signing in (or backing out) lands back here.
+            AuthManager(this).redirectToLogin(finishCaller = false, returnAfterLogin = true)
+        },
+        onAccount = {
+            AppAnalytics.logHomeAction(AppAnalytics.HomeAction.ACCOUNT)
+            // Plan, manage subscription and sign out live in Settings → Account.
+            startActivity(Intent(this, SettingsActivity::class.java))
+        },
     )
 
     /**
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/home/HomeScreen.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/home/HomeScreen.kt
index b94df1c..c5a8672 100644
--- a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/home/HomeScreen.kt
+++ b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/home/HomeScreen.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.material3.Icon
@@ -34,15 +35,18 @@ import androidx.compose.ui.layout.boundsInRoot
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.viewinterop.AndroidView
 import com.bumptech.glide.Glide
 import com.kharagedition.tibetankeyboard.R
 import com.kharagedition.tibetankeyboard.analytics.AppAnalytics
+import com.kharagedition.tibetankeyboard.ui.compose.components.AccountAvatar
 import com.kharagedition.tibetankeyboard.ui.compose.components.AppIcons
 import com.kharagedition.tibetankeyboard.ui.compose.components.BoText
 import com.kharagedition.tibetankeyboard.ui.compose.components.IconTile
@@ -61,8 +65,13 @@ data class HomeUiState(
     val isPremium: Boolean = false,
     val streakDays: Int = 0,
     val wordsToday: Int = 0,
+    /** Who is signed in; null when signed out. */
+    val account: HomeAccount? = null,
 )
 
+/** The signed-in user as the Home header shows them. */
+data class HomeAccount(val name: String, val photoUrl: String?)
+
 /** Callbacks for Home actions, owned by the Activity. */
 class HomeActions(
     val onEnableKeyboard: () -> Unit,
@@ -75,6 +84,8 @@ class HomeActions(
     val onAbout: () -> Unit,
     val onUpgrade: () -> Unit,
     val onJourney: () -> Unit,
+    val onSignIn: () -> Unit,
+    val onAccount: () -> Unit,
 )
 
 private data class QuickAction(
@@ -124,7 +135,7 @@ fun HomeScreen(
     Box(modifier = Modifier.fillMaxSize()) {
         ScreenScaffold(horizontalPadding = 18.dp) {
             Spacer(Modifier.height(8.dp))
-            BrandHeader()
+            BrandHeader(state.account, onSignIn = actions.onSignIn, onAccount = actions.onAccount)
             Spacer(Modifier.height(18.dp))
             SetupCard(
                 state = state,
@@ -229,7 +240,7 @@ private fun UpdateReadyBanner(onInstall: () -> Unit, modifier: Modifier = Modifi
 }
 
 @Composable
-private fun BrandHeader() {
+private fun BrandHeader(account: HomeAccount?, onSignIn: () -> Unit, onAccount: () -> Unit) {
     Row(
         modifier = Modifier.fillMaxWidth().padding(vertical = 6.dp),
         verticalAlignment = Alignment.CenterVertically,
@@ -248,10 +259,50 @@ private fun BrandHeader() {
                 modifier = Modifier.size(72.dp,).clip(RoundedCornerShape(10.dp))
             )
         }
-        Column {
-            Text(stringResource(R.string.app_name), color = TibetanColors.Cream, fontSize = 18.sp, fontWeight = FontWeight.ExtraBold)
+        Column(Modifier.weight(1f)) {
+            Text(
+                stringResource(R.string.app_name),
+                color = TibetanColors.Cream, fontSize = 18.sp, fontWeight = FontWeight.ExtraBold,
+                maxLines = 1, overflow = TextOverflow.Ellipsis,
+            )
             BoText(stringResource(R.string.bo_app_name), color = TibetanColors.CreamDim, fontSize = 13.sp)
         }
+        AccountControl(account, onSignIn = onSignIn, onAccount = onAccount)
+    }
+}
+
+/**
+ * Top right of Home: "Sign in" for a signed-out user, their picture once signed in. Without it
+ * the only way to sign in was to reach a PRO screen first, so a subscriber on a new phone had no
+ * obvious way back to their PRO.
+ */
+@Composable
+private fun AccountControl(account: HomeAccount?, onSignIn: () -> Unit, onAccount: () -> Unit) {
+    if (account == null) {
+        Row(
+            modifier = Modifier
+                .clip(TibetanTokens.Pill)
+                .border(1.dp, TibetanColors.Gold400.copy(alpha = 0.7f), TibetanTokens.Pill)
+                .clickable(role = Role.Button, onClick = onSignIn)
+                .padding(horizontal = 14.dp, vertical = 10.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(6.dp),
+        ) {
+            Icon(AppIcons.Person, null, tint = TibetanColors.Gold300, modifier = Modifier.size(17.dp))
+            Text(stringResource(R.string.sign_in), color = TibetanColors.Gold300, fontSize = 13.sp, fontWeight = FontWeight.Bold)
+        }
+    } else {
+        AccountAvatar(
+            name = account.name,
+            photoUrl = account.photoUrl,
+            modifier = Modifier
+                .clip(CircleShape)
+                .clickable(
+                    onClickLabel = stringResource(R.string.title_account),
+                    role = Role.Button,
+                    onClick = onAccount,
+                ),
+        )
     }
 }
 
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/home/HomeViewModel.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/home/HomeViewModel.kt
index 14bfb66..2b39735 100644
--- a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/home/HomeViewModel.kt
@@ -53,6 +53,18 @@ class HomeViewModel(app: Application) : AndroidViewModel(app) {
     init {
         premiumLiveData.observeForever(premiumObserver)
         RevenueCatManager.getInstance().refreshCustomerInfo()
+        refreshAccount()
+    }
+
+    /** Re-read who is signed in (every resume: signing in and out happen on other screens). */
+    fun refreshAccount() {
+        val account = if (authManager.isUserAuthenticated()) {
+            HomeAccount(
+                name = authManager.getCurrentUserName(),
+                photoUrl = authManager.getCurrentUserPhotoUrl().takeIf { it.isNotBlank() },
+            )
+        } else null
+        _uiState.update { it.copy(account = account) }
     }
 
     /** Called by the Activity after it reads keyboard-enabled / default-IME status. */
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/login/LoginActivity.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/login/LoginActivity.kt
index 8d5ec60..043ebc4 100644
--- a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/login/LoginActivity.kt
+++ b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/login/LoginActivity.kt
@@ -83,6 +83,8 @@ class LoginActivity : AppCompatActivity() {
                     onGoogleSignIn = { signInWithGoogle() },
                     onTerms = { openTermsOfService() },
                     onPrivacy = { openPrivacyPolicy() },
+                    // Swiped away, tapped outside or Back: whatever is underneath is still there.
+                    onDismiss = { finish() },
                 )
             }
         }
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/login/LoginScreen.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/login/LoginScreen.kt
index fc36ec3..2b2d267 100644
--- a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/login/LoginScreen.kt
+++ b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/login/LoginScreen.kt
@@ -1,5 +1,6 @@
 package com.kharagedition.tibetankeyboard.ui.login
 
+import androidx.annotation.StringRes
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -8,98 +9,156 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Icon
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.kharagedition.tibetankeyboard.R
 import com.kharagedition.tibetankeyboard.ui.compose.components.AppIcons
-import com.kharagedition.tibetankeyboard.ui.compose.components.BoText
+import com.kharagedition.tibetankeyboard.ui.compose.components.IconTile
 import com.kharagedition.tibetankeyboard.ui.compose.theme.TibetanColors
 import com.kharagedition.tibetankeyboard.ui.compose.theme.TibetanTokens
 
+/** One thing an account gives. */
+private data class SignInBenefit(
+    val icon: ImageVector,
+    @StringRes val title: Int,
+    @StringRes val description: Int,
+)
+
+/** Only what the app really ties to the account; typing stats, for one, stay on the phone. */
+private val SignInBenefits = listOf(
+    SignInBenefit(AppIcons.Crown, R.string.sign_in_benefit_pro, R.string.sign_in_benefit_pro_desc),
+    SignInBenefit(AppIcons.Bot, R.string.sign_in_benefit_ai, R.string.sign_in_benefit_ai_desc),
+    SignInBenefit(AppIcons.Star, R.string.sign_in_benefit_community, R.string.sign_in_benefit_community_desc),
+)
+
+/**
+ * Sign-in as a bottom sheet over the screen that asked for it: the user keeps their place, sees
+ * what an account is for, and can swipe the sheet away. [LoginActivity]'s window is see-through
+ * and shows nothing else.
+ */
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun LoginScreen(
     isLoading: Boolean,
     onGoogleSignIn: () -> Unit,
     onTerms: () -> Unit,
     onPrivacy: () -> Unit,
+    onDismiss: () -> Unit,
 ) {
-    Box(
-        modifier = Modifier.fillMaxSize().background(TibetanColors.Bg900).systemBarsPadding(),
-        contentAlignment = Alignment.Center,
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
+        shape = RoundedCornerShape(topStart = 28.dp, topEnd = 28.dp),
+        containerColor = TibetanColors.Bg800,
+        contentColor = TibetanColors.Cream,
+        scrimColor = TibetanColors.Espresso.copy(alpha = 0.72f),
+        dragHandle = { SheetHandle() },
     ) {
         Column(
-            modifier = Modifier.fillMaxWidth().padding(horizontal = 32.dp),
+            modifier = Modifier
+                .fillMaxWidth()
+                .verticalScroll(rememberScrollState())
+                .padding(horizontal = 24.dp)
+                .padding(bottom = 20.dp),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            // brand
-            Box(
-                modifier = Modifier.size(80.dp).clip(RoundedCornerShape(22.dp)).background(TibetanTokens.GoldVertical),
-                contentAlignment = Alignment.Center,
-            ) {
-                Icon(AppIcons.Lotus, null, tint = TibetanColors.Espresso, modifier = Modifier.size(44.dp))
-            }
-            Spacer(Modifier.height(20.dp))
-            Text(stringResource(R.string.app_name), color = TibetanColors.Cream, fontSize = 24.sp, fontWeight = FontWeight.ExtraBold)
-            Spacer(Modifier.height(4.dp))
-            BoText(stringResource(R.string.bo_app_name), color = TibetanColors.Gold300, fontSize = 16.sp)
-
-            Spacer(Modifier.height(40.dp))
-            Text(stringResource(R.string.welcome), color = TibetanColors.Cream, fontSize = 20.sp, fontWeight = FontWeight.Bold)
+            Image(
+                painter = painterResource(R.mipmap.ic_launcher),
+                contentDescription = null,
+                modifier = Modifier.size(56.dp).clip(RoundedCornerShape(16.dp)),
+            )
+            Spacer(Modifier.height(14.dp))
+            Text(
+                stringResource(R.string.sign_in_title, stringResource(R.string.app_name)),
+                color = TibetanColors.Cream, fontSize = 21.sp, fontWeight = FontWeight.ExtraBold,
+                textAlign = TextAlign.Center,
+            )
             Spacer(Modifier.height(6.dp))
             Text(
-                stringResource(R.string.login_subtitle),
-                color = TibetanColors.CreamDim, fontSize = 14.sp, lineHeight = 21.sp,
+                stringResource(R.string.sign_in_subtitle),
+                color = TibetanColors.CreamDim, fontSize = 14.sp, lineHeight = 20.sp,
                 textAlign = TextAlign.Center,
             )
 
-            Spacer(Modifier.height(28.dp))
+            Spacer(Modifier.height(22.dp))
+            Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(14.dp)) {
+                SignInBenefits.forEach { BenefitRow(it) }
+            }
+
+            Spacer(Modifier.height(24.dp))
             GoogleSignInButton(isLoading = isLoading, onClick = onGoogleSignIn)
+            Spacer(Modifier.height(14.dp))
+            LegalLine(onTerms = onTerms, onPrivacy = onPrivacy)
         }
+    }
+}
 
-        // privacy footer
-        Row(
-            modifier = Modifier
-                .align(Alignment.BottomCenter)
-                .statusBarsPadding()
-                .padding(horizontal = 32.dp, vertical = 24.dp),
-            horizontalArrangement = Arrangement.Center,
-        ) {
-            Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                Text(stringResource(R.string.by_signing_in), color = TibetanColors.CreamFaint, fontSize = 12.sp)
-                Row(horizontalArrangement = Arrangement.Center) {
-                    Text(
-                        stringResource(R.string.terms_of_service)+" ",
-                        color = TibetanColors.Gold300, fontSize = 12.sp, fontWeight = FontWeight.SemiBold,
-                        modifier = Modifier.clickable(onClick = onTerms),
-                    )
-                    Text(stringResource(R.string.and_word)+" ", color = TibetanColors.CreamFaint, fontSize = 12.sp)
-                    Text(
-                        stringResource(R.string.privacy_policy),
-                        color = TibetanColors.Gold300, fontSize = 12.sp, fontWeight = FontWeight.SemiBold,
-                        modifier = Modifier.clickable(onClick = onPrivacy),
-                    )
-                }
-            }
+@Composable
+private fun SheetHandle() {
+    Box(
+        modifier = Modifier
+            .padding(top = 12.dp, bottom = 18.dp)
+            .size(width = 40.dp, height = 4.dp)
+            .clip(TibetanTokens.Pill)
+            .background(TibetanColors.Line2),
+    )
+}
+
+@Composable
+private fun BenefitRow(benefit: SignInBenefit) {
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        IconTile(benefit.icon, size = 40.dp, iconSize = 20.dp)
+        Spacer(Modifier.width(14.dp))
+        Column(Modifier.weight(1f)) {
+            Text(
+                stringResource(benefit.title),
+                color = TibetanColors.Cream, fontSize = 14.5.sp, fontWeight = FontWeight.Bold,
+            )
+            Text(stringResource(benefit.description), color = TibetanColors.CreamDim, fontSize = 12.5.sp)
+        }
+    }
+}
+
+@Composable
+private fun LegalLine(onTerms: () -> Unit, onPrivacy: () -> Unit) {
+    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+        Text(stringResource(R.string.by_signing_in), color = TibetanColors.CreamFaint, fontSize = 12.sp)
+        Row(horizontalArrangement = Arrangement.Center) {
+            Text(
+                stringResource(R.string.terms_of_service) + " ",
+                color = TibetanColors.Gold300, fontSize = 12.sp, fontWeight = FontWeight.SemiBold,
+                modifier = Modifier.clickable(role = Role.Button, onClick = onTerms),
+            )
+            Text(stringResource(R.string.and_word) + " ", color = TibetanColors.CreamFaint, fontSize = 12.sp)
+            Text(
+                stringResource(R.string.privacy_policy),
+                color = TibetanColors.Gold300, fontSize = 12.sp, fontWeight = FontWeight.SemiBold,
+                modifier = Modifier.clickable(role = Role.Button, onClick = onPrivacy),
+            )
         }
     }
 }
@@ -112,7 +171,7 @@ private fun GoogleSignInButton(isLoading: Boolean, onClick: () -> Unit) {
             .height(54.dp)
             .clip(RoundedCornerShape(27.dp))
             .background(TibetanColors.Cream)
-            .clickable(enabled = !isLoading, onClick = onClick),
+            .clickable(enabled = !isLoading, role = Role.Button, onClick = onClick),
         contentAlignment = Alignment.Center,
     ) {
         if (isLoading) {
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/settings/SettingsActivity.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/settings/SettingsActivity.kt
index 322dbc4..94dd7a9 100644
--- a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/settings/SettingsActivity.kt
@@ -17,6 +17,7 @@ import com.kharagedition.tibetankeyboard.BuildConfig
 import com.kharagedition.tibetankeyboard.ui.subscription.ManageSubscriptionActivity
 import com.kharagedition.tibetankeyboard.R
 import com.kharagedition.tibetankeyboard.analytics.AppAnalytics
+import com.kharagedition.tibetankeyboard.auth.AuthManager
 import com.kharagedition.tibetankeyboard.ui.compose.theme.TibetanKeyboardTheme
 import com.kharagedition.tibetankeyboard.util.openPremiumUpgrade
 import com.kharagedition.tibetankeyboard.util.showConfirmationDialog
@@ -59,6 +60,7 @@ class SettingsActivity : AppCompatActivity() {
         onStreakReminder = viewModel::setStreakReminder,
         onUpgrade = { openPremiumUpgrade(AppAnalytics.UpgradeSource.SETTINGS) },
         onManageSubscription = { ManageSubscriptionActivity.open(this) },
+        onSignIn = { viewModel.signIn() },
         onLogout = {
             showConfirmationDialog(
                 title = getString(R.string.sign_out),
@@ -71,8 +73,8 @@ class SettingsActivity : AppCompatActivity() {
 
     private fun signOut() {
         viewModel.signOut {
-            viewModel.redirectToLogin()
             showToast(getString(R.string.signed_out))
+            AuthManager(this).redirectToHome()
         }
     }
 
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/settings/SettingsScreen.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/settings/SettingsScreen.kt
index 24eaf7b..21f00ff 100644
--- a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/settings/SettingsScreen.kt
@@ -60,6 +60,9 @@ data class SettingsState(
     val streakReminder: Boolean = true,
     val isPremium: Boolean = false,
     val isAuthenticated: Boolean = false,
+    /** The signed-in account, shown at the top of the Account group. */
+    val accountName: String = "",
+    val accountEmail: String = "",
 )
 
 class SettingsActions(
@@ -72,6 +75,7 @@ class SettingsActions(
     val onStreakReminder: (Boolean) -> Unit,
     val onUpgrade: () -> Unit,
     val onManageSubscription: () -> Unit,
+    val onSignIn: () -> Unit,
     val onLogout: () -> Unit,
 )
 
@@ -146,6 +150,22 @@ fun SettingsScreen(
                 SectionLabel(stringResource(R.string.title_account))
                 Spacer(Modifier.height(9.dp))
                 SettingsGroup {
+                    if (state.isAuthenticated) {
+                        SettingsRow(
+                            icon = AppIcons.Person,
+                            title = state.accountName,
+                            subtitle = state.accountEmail.takeIf { it.isNotBlank() },
+                        )
+                    } else {
+                        SettingsRow(
+                            icon = AppIcons.Person,
+                            title = stringResource(R.string.sign_in),
+                            subtitle = stringResource(R.string.sign_in_benefit),
+                            onClick = actions.onSignIn,
+                            trailing = { ChevronIcon() },
+                        )
+                    }
+                    SettingsDivider()
                     SettingsRow(
                         icon = AppIcons.Crown,
                         title = stringResource(R.string.subscription),
@@ -182,7 +202,7 @@ fun SettingsScreen(
                         SettingsDivider()
                         SettingsRow(
                             icon = AppIcons.Logout,
-                            title = stringResource(R.string.logout),
+                            title = stringResource(R.string.sign_out),
                             onClick = actions.onLogout,
                             trailing = { ChevronIcon() },
                         )
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/settings/SettingsViewModel.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/settings/SettingsViewModel.kt
index 4394013..c9b4b80 100644
--- a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/settings/SettingsViewModel.kt
@@ -20,9 +20,7 @@ class SettingsViewModel(app: Application) : AndroidViewModel(app) {
     private val authManager = AuthManager(app)
     private val premiumLiveData = RevenueCatManager.getInstance().isPremiumUser
 
-    private val _uiState = MutableStateFlow(
-        SettingsPrefs.read(app).copy(isAuthenticated = authManager.isUserAuthenticated())
-    )
+    private val _uiState = MutableStateFlow(SettingsPrefs.read(app).withAccount())
     val uiState: StateFlow<SettingsState> = _uiState.asStateFlow()
 
     private val premiumObserver = Observer<Boolean> { isPremium ->
@@ -68,12 +66,21 @@ class SettingsViewModel(app: Application) : AndroidViewModel(app) {
     /** Reload prefs in case they changed elsewhere (e.g. legacy preference screen). */
     fun reload() {
         val current = _uiState.value
-        _uiState.value = SettingsPrefs.read(getApplication())
-            .copy(isPremium = current.isPremium, isAuthenticated = authManager.isUserAuthenticated())
+        _uiState.value = SettingsPrefs.read(getApplication()).copy(isPremium = current.isPremium).withAccount()
+    }
+
+    private fun SettingsState.withAccount(): SettingsState {
+        val signedIn = authManager.isUserAuthenticated()
+        return copy(
+            isAuthenticated = signedIn,
+            accountName = if (signedIn) authManager.getCurrentUserName() else "",
+            accountEmail = if (signedIn) authManager.getCurrentUserEmail() else "",
+        )
     }
 
     fun signOut(onComplete: () -> Unit) = authManager.signOut(onComplete)
-    fun redirectToLogin() = authManager.redirectToLogin()
+    /** Sign in from Settings: this screen stays underneath, so the user lands back here. */
+    fun signIn() = authManager.redirectToLogin(finishCaller = false, returnAfterLogin = true)
     fun refreshPremium() = RevenueCatManager.getInstance().refreshCustomerInfo()
 
     override fun onCleared() {
diff --git a/app/src/main/res/values-mcc402/strings.xml b/app/src/main/res/values-mcc402/strings.xml
index e89e362..1296ec3 100644
--- a/app/src/main/res/values-mcc402/strings.xml
+++ b/app/src/main/res/values-mcc402/strings.xml
@@ -5,7 +5,6 @@
     <string name="ime_subtype_tibetan">Dzongkha</string>
     <string name="chat_assistant">Dzongkha Assistant</string>
     <string name="ask_in_english">Ask in English/Dzongkha</string>
-    <string name="login_subtitle">Your AI Assistant for Dzongkha Language</string>
     <string name="grammar_analyzer_hint">Enter Dzongkha text to analyze</string>
     <string name="analyze_your_tibetan">Analyze your Dzongkha text for grammar, spelling, and style</string>
     <string name="enter_tibetan_text">Enter text to transliterate&#8230;</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a7968a..31d0471 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,10 +48,19 @@
     <string name="typing">Typing...</string>
     <!-- Login Activity -->
     <string name="app_logo">App Logo</string>
-    <string name="login_subtitle">Your AI Assistant for Tibetan Language</string>
     <string name="welcome_back">Welcome Back</string>
     <string name="sign_in_to_continue">Sign in to continue chatting</string>
     <string name="sign_in_with_google">Continue with Google</string>
+    <string name="sign_in">Sign in</string>
+    <string name="sign_in_benefit">Keep PRO on every device</string>
+    <string name="sign_in_title">Sign in to %1$s</string>
+    <string name="sign_in_subtitle">One tap with your Google account.</string>
+    <string name="sign_in_benefit_pro">PRO on every device</string>
+    <string name="sign_in_benefit_pro_desc">Your subscription follows your account</string>
+    <string name="sign_in_benefit_ai">AI chat and translate</string>
+    <string name="sign_in_benefit_ai_desc">Ask questions and translate with AI</string>
+    <string name="sign_in_benefit_community">Community comparison</string>
+    <string name="sign_in_benefit_community_desc">See how your streak compares</string>
     <string name="privacy_policy_text">By signing in, you agree to our Terms of Service and Privacy Policy</string>
 
     <!-- Chat Activity -->
@@ -62,7 +71,7 @@
     <!-- Menu Items -->
     <string name="clear_chat">Clear Chat</string>
     <string name="profile">Profile</string>
-    <string name="sign_out">Sign Out</string>
+    <string name="sign_out">Sign out</string>
 
     <!-- General -->
     <string name="loading">Loading...</string>
@@ -245,7 +254,6 @@
     <string name="subscription">Subscription</string>
     <string name="premium_plan">Premium plan</string>
     <string name="free_plan">Free plan</string>
-    <string name="logout">Logout</string>
     <string name="done">Done</string>
     <string name="ai_assistant">AI Assistant</string>
     <string name="online_tibetan">Online · Tibetan</string>
@@ -301,7 +309,6 @@
     <string name="github">GitHub</string>
     <string name="contact">Contact</string>
     <string name="get">Get</string>
-    <string name="welcome">Welcome</string>
     <string name="by_signing_in">By signing in, you agree to our</string>
     <string name="terms_of_service">Terms of Service</string>
     <string name="and_word"> and </string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index cd1478a..8f4357a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,7 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
     <style name="Theme.TibetanKeyboard" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="android:typeface">monospace</item>
+        <!-- No android:typeface here. It used to be "monospace", the hook an old font override
+             replaced with a Tibetan face; with the override gone it put every View-based text
+             (dialogs, ad cards) in real monospace, unlike the Compose screens. -->
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/brown_700</item>
         <item name="colorPrimaryVariant">@color/brown_700</item>
@@ -19,6 +21,16 @@
         <item name="android:textColorSecondary">@color/black</item>
         <item name="android:textColorTertiary">@color/black</item>
     </style>
+    <!-- Sign-in is a bottom sheet over the screen that asked for it: the window itself is
+         see-through and unanimated, the sheet draws the scrim and slides in. -->
+    <style name="Theme.TibetanKeyboard.Sheet">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:statusBarColor" tools:targetApi="l">@android:color/transparent</item>
+        <item name="android:navigationBarColor" tools:targetApi="l">@android:color/transparent</item>
+    </style>
     <style name="CircularImageView">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">50%</item>
@@ -43,6 +55,9 @@
         <item name="android:textColorSecondary">@color/tk_cream_dim</item>
         <item name="shapeAppearanceMediumComponent">@style/TkDialogShape</item>
         <item name="materialAlertDialogTitleTextStyle">@style/TkDialogTitle</item>
+        <item name="materialAlertDialogBodyTextStyle">@style/TkDialogBody</item>
+        <item name="buttonBarPositiveButtonStyle">@style/TkDialogButton</item>
+        <item name="buttonBarNegativeButtonStyle">@style/TkDialogButton.Quiet</item>
     </style>
 
     <style name="TkDialogShape" parent="">
@@ -50,9 +65,32 @@
         <item name="cornerSize">20dp</item>
     </style>
 
+    <!-- The dialog's text follows the Compose screens: the system sans face, sentence case. -->
     <style name="TkDialogTitle" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
         <item name="android:textColor">@color/tk_cream</item>
         <item name="android:textStyle">bold</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textSize">19sp</item>
+    </style>
+
+    <style name="TkDialogBody" parent="MaterialAlertDialog.MaterialComponents.Body.Text">
+        <item name="android:textColor">@color/tk_cream_dim</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textSize">14.5sp</item>
+    </style>
+
+    <style name="TkDialogButton" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">@color/tk_gold</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:letterSpacing">0</item>
+        <item name="android:textSize">14sp</item>
+        <item name="rippleColor">@color/tk_gold_500</item>
+    </style>
+
+    <!-- The way out (Cancel) reads quieter than the action. -->
+    <style name="TkDialogButton.Quiet">
+        <item name="android:textColor">@color/tk_cream_dim</item>
     </style>
 
         <style name="SearchKeyStyle">